added methods to Material interface for compatibility with old GlMaterial usage

Author: codex128

jme3-core/src/main/java/com/jme3/material/GlMaterial.java

@@ -56,13 +56,13 @@
 import com.jme3.scene.Geometry;
 import com.jme3.shader.*;
 import com.jme3.shader.bufferobject.BufferObject;
-import com.jme3.texture.GlImage;
-import com.jme3.texture.GlTexture;
-import com.jme3.texture.TextureImage;
+import com.jme3.texture.*;
 import com.jme3.texture.image.ColorSpace;
 import com.jme3.util.ListMap;
 import com.jme3.util.SafeArrayList;
+import com.jme3.vulkan.buffers.GpuBuffer;
 import com.jme3.vulkan.commands.CommandBuffer;
+import com.jme3.vulkan.frames.VersionedResource;
 import com.jme3.vulkan.pipelines.Pipeline;
 import org.lwjgl.opengl.GL45;
 
@@ -104,23 +104,9 @@ public class GlMaterial implements Material, CloneableSmartAsset, Cloneable, Sav
     private boolean receivesShadows = false;
     private int sortingId = -1;
 
-    @Override
-    public void bind(CommandBuffer cmd, Pipeline pipeline, int offset) {
-        // todo: implement properly
-        int loc = GL45.glGetUniformLocation(pipeline.getNativeObject().intValue(), "MyUniformName");
-        GL45.glUniform1f(loc, 123.4f);
-    }
-
     @Override
     public void setParam(String uniform, String param, Object value) {
-        // todo: implement
-        throw new UnsupportedOperationException("Not implemented yet.");
-    }
-
-    @Override
-    public <T extends com.jme3.vulkan.material.uniforms.Uniform> T getUniform(String name) {
-        // todo: implement
-        throw new UnsupportedOperationException("Not implemented yet.");
+        setParam(param, value);
     }
 
     /**
@@ -578,6 +564,7 @@ public void setParam(String name, VarType type, Object value) {
      * @param name the name of the parameter defined in the material definition (j3md)
      * @param value the value of the parameter
      */
+    @Override
     public void setParam(String name, Object value) {
         MatParam p = getMaterialDef().getMaterialParam(name);
         setParam(name, p.getVarType(), value);
@@ -669,15 +656,20 @@ private void checkTextureParamColorSpace(String name, GlTexture value) {
      *              (.j3md) (e.g. Texture for Lighting.j3md)
      * @param value the Texture object previously loaded by the asset manager
      */
-    public void setTexture(String name, GlTexture value) {
+    @Override
+    public void setTexture(String name, VersionedResource<? extends Texture> value) {
         if (value == null) {
             // clear it
             clearParam(name);
             return;
         }
+        if (!(value.get() instanceof GlTexture)) {
+            throw new IllegalArgumentException("Must be a GlTexture.");
+        }
 
         VarType paramType = null;
-        switch (value.getType()) {
+        GlTexture.Type type = ((GlTexture)value.get()).getType();
+        switch (type) {
             case TwoDimensional:
                 paramType = VarType.Texture2D;
                 break;
@@ -691,10 +683,10 @@ public void setTexture(String name, GlTexture value) {
                 paramType = VarType.TextureCubeMap;
                 break;
             default:
-                throw new UnsupportedOperationException("Unknown texture type: " + value.getType());
+                throw new UnsupportedOperationException("Unknown texture type: " + type);
         }
 
-        setTextureParam(name, paramType, value);
+        setTextureParam(name, paramType, (GlTexture)value);
     }
 
     /**
@@ -703,6 +695,7 @@ public void setTexture(String name, GlTexture value) {
      * @param name the name of the matrix defined in the material definition (j3md)
      * @param value the Matrix4f object
      */
+    @Override
     public void setMatrix4(String name, Matrix4f value) {
         setParam(name, VarType.Matrix4, value);
     }
@@ -713,6 +706,7 @@ public void setMatrix4(String name, Matrix4f value) {
      * @param name the name of the boolean defined in the material definition (j3md)
      * @param value the boolean value
      */
+    @Override
     public void setBoolean(String name, boolean value) {
         setParam(name, VarType.Boolean, value);
     }
@@ -723,6 +717,7 @@ public void setBoolean(String name, boolean value) {
      * @param name the name of the float defined in the material definition (j3md)
      * @param value the float value
      */
+    @Override
     public void setFloat(String name, float value) {
         setParam(name, VarType.Float, value);
     }
@@ -734,6 +729,7 @@ public void setFloat(String name, float value) {
      * @param name the name of the float defined in the material definition (j3md)
      * @param value the float value
      */
+    @Override
     public void setFloat(String name, Float value) {
         setParam(name, VarType.Float, value);
     }
@@ -744,6 +740,7 @@ public void setFloat(String name, Float value) {
      * @param name the name of the int defined in the material definition (j3md)
      * @param value the int value
      */
+    @Override
     public void setInt(String name, int value) {
         setParam(name, VarType.Int, value);
     }
@@ -754,6 +751,7 @@ public void setInt(String name, int value) {
      * @param name the name of the color defined in the material definition (j3md)
      * @param value the ColorRGBA value
      */
+    @Override
     public void setColor(String name, ColorRGBA value) {
         setParam(name, VarType.Vector4, value);
     }
@@ -778,12 +776,18 @@ public void setShaderStorageBufferObject(final String name, final BufferObject v
         setParam(name, VarType.ShaderStorageBufferObject, value);
     }
 
+    @Override
+    public void setUniform(String name, VersionedResource<? extends GpuBuffer> buffer) {
+
+    }
+
     /**
      * Pass a Vector2f to the material shader.
      *
      * @param name the name of the Vector2f defined in the material definition (j3md)
      * @param value the Vector2f value
      */
+    @Override
     public void setVector2(String name, Vector2f value) {
         setParam(name, VarType.Vector2, value);
     }
@@ -794,6 +798,7 @@ public void setVector2(String name, Vector2f value) {
      * @param name the name of the Vector3f defined in the material definition (j3md)
      * @param value the Vector3f value
      */
+    @Override
     public void setVector3(String name, Vector3f value) {
         setParam(name, VarType.Vector3, value);
     }
@@ -804,6 +809,7 @@ public void setVector3(String name, Vector3f value) {
      * @param name the name of the Vector4f defined in the material definition (j3md)
      * @param value the Vector4f value
      */
+    @Override
     public void setVector4(String name, Vector4f value) {
         setParam(name, VarType.Vector4, value);
     }
@@ -1106,6 +1112,7 @@ private void resetUniformsNotSetByCurrent(Shader shader) {
      * @param lights Presorted and filtered light list to use for rendering
      * @param renderManager The render manager requesting the rendering
      */
+    @Override
     public void render(Geometry geometry, LightList lights, RenderManager renderManager) {
         if (technique == null) {
             selectTechnique(TechniqueDef.DEFAULT_TECHNIQUE_NAME, renderManager);

jme3-core/src/main/java/com/jme3/material/Material.java

@@ -32,13 +32,13 @@
 package com.jme3.material;
 
 import com.jme3.export.Savable;
+import com.jme3.light.LightList;
+import com.jme3.math.*;
+import com.jme3.renderer.RenderManager;
 import com.jme3.scene.Geometry;
 import com.jme3.texture.Texture;
-import com.jme3.vulkan.commands.CommandBuffer;
-import com.jme3.vulkan.frames.SingleResource;
-import com.jme3.vulkan.material.uniforms.TextureUniform;
-import com.jme3.vulkan.material.uniforms.Uniform;
-import com.jme3.vulkan.pipelines.Pipeline;
+import com.jme3.vulkan.buffers.GpuBuffer;
+import com.jme3.vulkan.frames.VersionedResource;
 
 /**
  * <code>Material</code> describes the rendering style for a given
@@ -53,19 +53,56 @@
  */
 public interface Material extends Savable {
 
-    void bind(CommandBuffer cmd, Pipeline pipeline, int offset);
+    String DEFAULT_UNIFORM_BUFFER = "DefaultUniformBuffer";
+
+    void render(Geometry geometry, LightList lights, RenderManager renderManager);
+
+    void setUniform(String name, VersionedResource<? extends GpuBuffer> buffer);
+
+    void setTexture(String name, VersionedResource<? extends Texture> texture);
 
     void setParam(String uniform, String param, Object value);
 
-    <T extends Uniform> T getUniform(String name);
+    /* ----- COMPATABILITY WITH OLD MATERIAL ----- */
+
+    default void setParam(String param, Object value) {
+        setParam(DEFAULT_UNIFORM_BUFFER, param, value);
+    }
+
+    default void setBoolean(String param, boolean value) {
+        setParam(param, value);
+    }
+
+    default void setInt(String param, int value) {
+        setParam(param, value);
+    }
+
+    default void setFloat(String param, float value) {
+        setParam(param, value);
+    }
+
+    default void setFloat(String param, Float value) {
+        setParam(param, value);
+    }
+
+    default void setColor(String param, ColorRGBA value) {
+        setParam(param, value);
+    }
+
+    default void setVector2(String param, Vector2f value) {
+        setParam(param, value);
+    }
+
+    default void setVector3(String param, Vector3f value) {
+        setParam(param, value);
+    }
 
-    default void bind(CommandBuffer cmd, Pipeline pipeline) {
-        bind(cmd, pipeline, 0);
+    default void setVector4(String param, Vector4f value) {
+        setParam(param, value);
     }
 
-    default void setTexture(String name, Texture texture) {
-        TextureUniform u = getUniform(name);
-        u.setResource(new SingleResource<>(texture));
+    default void setMatrix4(String param, Matrix4f value) {
+        setParam(param, value);
     }
 
 }

jme3-core/src/main/java/com/jme3/texture/GlImage.java

@@ -43,7 +43,6 @@
 import com.jme3.texture.image.LastTextureState;
 import com.jme3.util.natives.GlNative;
 import com.jme3.vulkan.images.GpuImage;
-import com.jme3.vulkan.images.VulkanImage;
 import com.jme3.vulkan.util.IntEnum;
 
 import java.io.IOException;
@@ -62,33 +61,11 @@
  * @author Joshua Slack
  * @version $Id: Image.java 4131 2009-03-19 20:15:28Z blaine.dev $
  */
-public class GlImage extends GlNative<Integer> implements GpuImage, ImageView<GlImage>, Savable /*, Cloneable*/ {
+public class GlImage extends GlNative<Integer> implements GpuImage, Savable /*, Cloneable*/ {
 
     @Override
-    public GlImage getImage() {
-        return this;
-    }
-
-    @Override
-    public int getBaseMipmap() {
-        return 0;
-    }
-
-    @Override
-    public int getMipmapCount() {
-        // todo: determine if this is correct
-        return mipMapSizes.length;
-    }
-
-    @Override
-    public int getBaseLayer() {
-        return 0;
-    }
-
-    @Override
-    public int getLayerCount() {
-        // todo: determine if this is correct
-        return 1;
+    public IntEnum<Type> getType() {
+        return Type.TwoDemensional;
     }
 
     public enum Format {
@@ -1114,11 +1091,6 @@ public long getId() {
         return object;
     }
 
-    @Override
-    public IntEnum<Type> getType() {
-        return VulkanImage.Type.TwoDemensional;
-    }
-
     /**
      * <code>getWidth</code> returns the width of this image.
      *