Skip to content

Commit 702a7e5

Browse files
WaterpickerWaterpicker
committed
Refine all the pipelines!
1 parent 4ccd021 commit 702a7e5

37 files changed

+779
-1044
lines changed

‎src/library/java/gg/generations/rarecandy/renderer/components/GuiObject.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package gg.generations.rarecandy.renderer.components;
22

3-
import gg.generations.rarecandy.renderer.pipeline.neo.regular.Pipeline;
3+
import gg.generations.rarecandy.renderer.pipeline.traditional.TraditionalPipeline;
44
import gg.generations.rarecandy.renderer.rendering.ObjectInstance;
55
import gg.generations.rarecandy.renderer.rendering.RenderStage;
66

@@ -9,7 +9,7 @@
99
public class GuiObject extends RenderObject {
1010

1111
@Override
12-
public <T extends RenderObject> void render(Pipeline pipeline, RenderStage stage, List<ObjectInstance> instances) {
12+
public <T extends RenderObject> void render(TraditionalPipeline pipeline, RenderStage stage, List<ObjectInstance> instances) {
1313

1414
}
1515

‎src/library/java/gg/generations/rarecandy/renderer/components/MeshObject.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import gg.generations.rarecandy.renderer.model.RenderModel;
44
import gg.generations.rarecandy.renderer.model.Variant;
5-
import gg.generations.rarecandy.renderer.pipeline.neo.regular.Pipeline;
5+
import gg.generations.rarecandy.renderer.pipeline.traditional.TraditionalPipeline;
66
import gg.generations.rarecandy.renderer.rendering.ObjectInstance;
77
import gg.generations.rarecandy.renderer.rendering.RenderStage;
88

@@ -23,7 +23,7 @@ public void setup(Map<String, Variant> variants, RenderModel model, String name)
2323
this.ready = true;
2424
}
2525

26-
public <T extends RenderObject> void render(Pipeline pipeline, RenderStage stage, List<ObjectInstance> instances) {
26+
public <T extends RenderObject> void render(TraditionalPipeline pipeline, RenderStage stage, List<ObjectInstance> instances) {
2727
model.render(stage, pipeline, instances, this);
2828
}
2929

‎src/library/java/gg/generations/rarecandy/renderer/components/MultiRenderObject.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package gg.generations.rarecandy.renderer.components;
22

33
import gg.generations.rarecandy.renderer.model.material.Material;
4-
import gg.generations.rarecandy.renderer.pipeline.neo.regular.Pipeline;
4+
import gg.generations.rarecandy.renderer.pipeline.traditional.TraditionalPipeline;
55
import gg.generations.rarecandy.renderer.rendering.ObjectInstance;
66
import gg.generations.rarecandy.renderer.rendering.RenderStage;
77
import org.jetbrains.annotations.Nullable;
@@ -97,7 +97,7 @@ public Material getMaterial(@Nullable String materialId) {
9797
}
9898

9999
@Override
100-
public <V extends RenderObject> void render(Pipeline pipeline, RenderStage stage, List<ObjectInstance> instances) {
100+
public <V extends RenderObject> void render(TraditionalPipeline pipeline, RenderStage stage, List<ObjectInstance> instances) {
101101
for (T object : this.objects) {
102102
if (object != null) {
103103
object.render(pipeline, stage, instances);

‎src/library/java/gg/generations/rarecandy/renderer/components/RenderObject.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import gg.generations.rarecandy.renderer.animation.Transform;
55
import gg.generations.rarecandy.renderer.model.Variant;
66
import gg.generations.rarecandy.renderer.model.material.Material;
7-
import gg.generations.rarecandy.renderer.pipeline.neo.regular.Pipeline;
7+
import gg.generations.rarecandy.renderer.pipeline.traditional.TraditionalPipeline;
88
import gg.generations.rarecandy.renderer.rendering.ObjectInstance;
99
import gg.generations.rarecandy.renderer.rendering.RenderStage;
1010
import org.jetbrains.annotations.Nullable;
@@ -44,7 +44,7 @@ public Transform getTransform(@Nullable String variantId) {
4444
return variant != null && variant.offset() != null ? variant.offset() : AnimationController.NO_OFFSET;
4545
}
4646

47-
public abstract <T extends RenderObject> void render(Pipeline pipeline, RenderStage stage, List<ObjectInstance> instances);
47+
public abstract <T extends RenderObject> void render(TraditionalPipeline pipeline, RenderStage stage, List<ObjectInstance> instances);
4848

4949
public boolean shouldRender(ObjectInstance instance) {
5050
var variant = getVariant(instance);

‎src/library/java/gg/generations/rarecandy/renderer/model/GLModel.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
import gg.generations.rarecandy.pokeutils.BlendType;
44
import gg.generations.rarecandy.renderer.components.RenderObject;
55
import gg.generations.rarecandy.renderer.loading.Attribute;
6-
import gg.generations.rarecandy.renderer.model.material.Material;
7-
import gg.generations.rarecandy.renderer.pipeline.Pipeline;
6+
import gg.generations.rarecandy.renderer.pipeline.traditional.TraditionalPipeline;
87
import gg.generations.rarecandy.renderer.rendering.ObjectInstance;
98
import gg.generations.rarecandy.renderer.rendering.RenderStage;
109
import org.joml.Vector3f;
@@ -16,7 +15,6 @@
1615

1716
import java.nio.ByteBuffer;
1817
import java.util.*;
19-
import java.util.function.Consumer;
2018

2119
import static gg.generations.rarecandy.renderer.loading.ModelLoader.generateVao;
2220
import static org.lwjgl.opengl.GL15C.*;
@@ -90,9 +88,9 @@ public Vector3f getDimensions() {
9088
return dimensions;
9189
}
9290

93-
private Map<Material, List<Consumer<Pipeline>>> EMPTY = Collections.emptyMap();
91+
// private Map<Material, List<Consumer<Pipeline>>> EMPTY = Collections.emptyMap();
9492

95-
public <T extends RenderObject> void render(RenderStage stage, gg.generations.rarecandy.renderer.pipeline.neo.regular.Pipeline pipeline, List<ObjectInstance> instances, T object) {
93+
public <T extends RenderObject> void render(RenderStage stage, TraditionalPipeline pipeline, List<ObjectInstance> instances, T object) {
9694

9795
for (var instance : instances) {
9896
if (object.shouldRender(instance)) {

‎src/library/java/gg/generations/rarecandy/renderer/model/RenderModel.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import gg.generations.rarecandy.renderer.components.RenderObject;
44
import gg.generations.rarecandy.renderer.loading.Attribute;
5-
import gg.generations.rarecandy.renderer.pipeline.neo.regular.Pipeline;
5+
import gg.generations.rarecandy.renderer.pipeline.traditional.TraditionalPipeline;
66
import gg.generations.rarecandy.renderer.rendering.ObjectInstance;
77
import gg.generations.rarecandy.renderer.rendering.RenderStage;
88
import org.joml.Vector3f;
@@ -16,7 +16,7 @@ public interface RenderModel extends Closeable {
1616

1717
Vector3f getDimensions();
1818

19-
public <T extends RenderObject> void render(RenderStage stage, Pipeline pipeline, List<ObjectInstance> instances, T object);
19+
public <T extends RenderObject> void render(RenderStage stage, TraditionalPipeline pipeline, List<ObjectInstance> instances, T object);
2020

2121
public <T extends RenderObject> void render(ObjectInstance instance, T object);
2222

‎src/library/java/gg/generations/rarecandy/renderer/model/material/Material.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
import gg.generations.rarecandy.pokeutils.CullType;
55
import gg.generations.rarecandy.pokeutils.reader.ITextureLoader;
66
import gg.generations.rarecandy.renderer.loading.ITexture;
7-
import gg.generations.rarecandy.renderer.pipeline.UniformBlockProvider;
8-
import gg.generations.rarecandy.renderer.ubo.UniformBlockUploader;
9-
import org.lwjgl.system.MemoryStack;
107
import org.lwjgl.system.MemoryUtil;
118

129
import java.io.Closeable;

‎src/library/java/gg/generations/rarecandy/renderer/model/material/PipelineRegistry.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package gg.generations.rarecandy.renderer.model.material;
22

3-
import gg.generations.rarecandy.renderer.pipeline.neo.regular.Pipeline;
3+
import gg.generations.rarecandy.renderer.pipeline.traditional.TraditionalPipeline;
44

55
import java.util.function.Function;
66

77
public class PipelineRegistry {
8-
public static Function<String, Pipeline> function;
8+
public static Function<String, TraditionalPipeline> function;
99

10-
public static void setFunction(Function<String, Pipeline> pipelineFunction) {
10+
public static void setFunction(Function<String, TraditionalPipeline> pipelineFunction) {
1111
function = pipelineFunction;
1212
}
1313

14-
public static Pipeline get(String name) {
14+
public static TraditionalPipeline get(String name) {
1515
return function.apply(name);
1616
}
1717
}

‎src/library/java/gg/generations/rarecandy/renderer/pipeline/ComputePipeline.java‎

Lines changed: 0 additions & 157 deletions
This file was deleted.

0 commit comments

Comments
 (0)