remove enums

jMonkeyEngine · May 8, 2024 · 1e0af25 · 1e0af25
1 parent f68d0ea
commit 1e0af25
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 115 deletions.
diff --git a/jme3-core/src/main/java/com/jme3/material/TechniqueDef.java b/jme3-core/src/main/java/com/jme3/material/TechniqueDef.java
@@ -62,47 +62,6 @@ public class TechniqueDef implements Savable, Cloneable {
      */
     public static final String DEFAULT_TECHNIQUE_NAME = "Default";
 
-    /**
-     * RenderPipeline.
-     */
-    public enum Pipeline{
-        /**
-         * Default, most basic rendering
-         */
-        Forward("Forward"),
-
-        /**
-         * Forward based on Cluster
-         */
-        ForwardPlus("ForwardPlus"),
-
-        /**
-         * Standard Deferred Rendering
-         */
-        Deferred("Deferred"),
-
-        /**
-         * Tiled Based Deferred Rendering
-         */
-        TiledBasedDeferred("TiledBasedDeferred"),
-
-        /**
-         * Clustered Based Deferred Rendering
-         */
-        ClusteredBasedDeferred("ClusteredBasedDeferred"),
-        ;
-
-        private String text;
-        Pipeline(String t){
-            text = t;
-        }
-
-        @Override
-        public String toString() {
-            return text;
-        }
-    }
-
     /**
      * Describes light rendering mode.
      */
@@ -215,7 +174,6 @@ public enum LightSpace {
 
     private LightMode lightMode = LightMode.Disable;
     private ShadowMode shadowMode = ShadowMode.Disable;
-    private Pipeline pipeline = Pipeline.Forward;
     private TechniqueDefLogic logic;
 
     private ArrayList<UniformBinding> worldBinds;
@@ -299,19 +257,6 @@ public void setLightMode(LightMode lightMode) {
         }
     }
 
-    public Pipeline getPipeline() {
-        return pipeline;
-    }
-
-    /**
-     * Set the pipeline
-     * @param pipeline the render pipeline
-     * @see Pipeline
-     */
-    public void setPipeline(Pipeline pipeline){
-        this.pipeline = pipeline;
-    }
-
     public void setLogic(TechniqueDefLogic logic) {
         this.logic = logic;
     }

diff --git a/jme3-core/src/main/java/com/jme3/renderer/RenderManager.java b/jme3-core/src/main/java/com/jme3/renderer/RenderManager.java
@@ -82,29 +82,6 @@
  */
 public class RenderManager {
 
-    // RenderPath
-    public enum RenderPath {
-        None(-1, "None"),
-        Forward(0, "Forward"),
-        ForwardPlus(1, "ForwardPlus"),
-        Deferred(2, "Deferred"),
-        TiledDeferred(3, "TiledDeferred")
-        ;
-        private int id;
-        private String info;
-        RenderPath(int id, String info){
-            this.id = id;
-            this.info = info;
-        }
-
-        public int getId() {
-            return id;
-        }
-        public String getInfo(){
-            return info;
-        }
-    }
-
     private final Renderer renderer;
     private final UniformBindingManager uniformBindingManager = new UniformBindingManager();
     private final ArrayList<ViewPort> preViewPorts = new ArrayList<>();

diff --git a/jme3-core/src/main/java/com/jme3/renderer/ViewPort.java b/jme3-core/src/main/java/com/jme3/renderer/ViewPort.java
@@ -112,8 +112,6 @@ public class ViewPort {
     protected boolean clearStencil = false;
     private boolean enabled = true;
 
-    private RenderManager.RenderPath renderPath = RenderManager.RenderPath.None;
-
     /**
      * Creates a new viewport. User code should generally use these methods instead:<br>
      * <ul>
@@ -131,18 +129,6 @@ public ViewPort(String name, Camera cam) {
         this.cam = cam;
     }
 
-    /**
-     * forceRenderPath,if None use GlobalRenderPath
-     * @param renderPath
-     */
-    public void setRenderPath(RenderManager.RenderPath renderPath) {
-        this.renderPath = renderPath;
-    }
-
-    public RenderManager.RenderPath getRenderPath() {
-        return renderPath;
-    }
-
     /**
      * Returns the name of the viewport as set in the constructor.
      *

diff --git a/jme3-core/src/main/resources/Common/MatDefs/Light/Lighting.j3md b/jme3-core/src/main/resources/Common/MatDefs/Light/Lighting.j3md
@@ -261,8 +261,8 @@ MaterialDef Phong Lighting {
 
     }
 
-    Technique GBufferPass{
-        Pipeline Deferred
+    Technique GBufferPass {
+
         VertexShader GLSL310 GLSL300 GLSL100 GLSL150:   Common/MatDefs/Light/LightingGBufferPack.vert
         FragmentShader GLSL310 GLSL300 GLSL100 GLSL150: Common/MatDefs/Light/LightingGBufferPack.frag
 

diff --git a/jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.j3md b/jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.j3md
@@ -217,8 +217,8 @@ MaterialDef PBR Lighting {
 
     }
 
-    Technique GBufferPass{
-        Pipeline Deferred
+    Technique GBufferPass {
+
         VertexShader GLSL310 GLSL300 GLSL100 GLSL150:   Common/MatDefs/Light/PBRLightingGBufferPack.vert
         FragmentShader GLSL310 GLSL300 GLSL100 GLSL150: Common/MatDefs/Light/PBRLightingGBufferPack.frag
 

diff --git a/jme3-core/src/main/resources/Common/MatDefs/Misc/Unshaded.j3md b/jme3-core/src/main/resources/Common/MatDefs/Misc/Unshaded.j3md
@@ -92,9 +92,9 @@ MaterialDef Unshaded {
         }
     }
 
-    Technique GBufferPass{
-        Pipeline Deferred
-        VertexShader   GLSL310 GLSL300 GLSL150 GLSL100 :   Common/MatDefs/Misc/Unshaded.vert
+    Technique GBufferPass {
+
+        VertexShader   GLSL310 GLSL300 GLSL150 GLSL100 : Common/MatDefs/Misc/Unshaded.vert
         FragmentShader GLSL310 GLSL300 GLSL150 GLSL100 : Common/MatDefs/Misc/UnshadedGBufferPack.frag
 
         WorldParameters {

diff --git a/jme3-core/src/main/resources/Common/MatDefs/ShadingCommon/DeferredShading.j3md b/jme3-core/src/main/resources/Common/MatDefs/ShadingCommon/DeferredShading.j3md
@@ -21,8 +21,6 @@ MaterialDef DeferredShading {
     }
 
     Technique DeferredPass {
-
-        Pipeline Deferred
 
         VertexShader GLSL310 GLSL300 GLSL100 GLSL150:   Common/MatDefs/ShadingCommon/DeferredShading.vert
         FragmentShader GLSL310 GLSL300 GLSL100 GLSL150: Common/MatDefs/ShadingCommon/DeferredShading.frag

diff --git a/jme3-core/src/main/resources/Common/MatDefs/ShadingCommon/TileBasedDeferredShading.j3md b/jme3-core/src/main/resources/Common/MatDefs/ShadingCommon/TileBasedDeferredShading.j3md
@@ -25,8 +25,6 @@ MaterialDef DeferredShading {
     }
 
     Technique TileBasedDeferredPass {
-
-        Pipeline Deferred
 
         VertexShader GLSL310 GLSL300 GLSL100 GLSL150:   Common/MatDefs/ShadingCommon/DeferredShading.vert
         FragmentShader GLSL310 GLSL300 GLSL100 GLSL150: Common/MatDefs/ShadingCommon/TileBasedDeferredShading.frag

diff --git a/jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java b/jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java
@@ -121,17 +121,6 @@ private void readShaderDefinition(Shader.ShaderType shaderType, String name, Str
         }
     }
 
-    // Pipeline <MODE>
-    private void readPipeline(String statement) throws IOException{
-        String[] split = statement.split(whitespacePattern);
-        if (split.length != 2){
-            throw new IOException("Pipeline statement syntax incorrect");
-        }
-
-        TechniqueDef.Pipeline pl = TechniqueDef.Pipeline.valueOf(split[1]);
-        technique.setPipeline(pl);
-    }
-
     // LightMode <MODE>
     private void readLightMode(String statement) throws IOException{
         String[] split = statement.split(whitespacePattern);
@@ -578,7 +567,7 @@ private void readTechniqueStatement(Statement statement) throws IOException{
                 split[0].equals("TessellationEvaluationShader")) {
             readShaderStatement(statement.getLine());
         }else if(split[0].equals("Pipeline")){
-            readPipeline(statement.getLine());
+            throw new UnsupportedOperationException("Pipeline statement is not supported.");
         }else if (split[0].equals("LightMode")){
             readLightMode(statement.getLine());
         }else if (split[0].equals("LightSpace")){