fix several incompatibilities

Author: codex128

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

@@ -76,7 +76,7 @@
 import java.util.logging.Logger;
 
 /**
- * <code>Material</code> describes the rendering style for a given
+ * <code>GlMaterial</code> describes the rendering style for a given
  * {@link Geometry}.
  * <p>A material is essentially a list of {@link MatParam parameters},
  * those parameters map to uniforms which are defined in a shader.
@@ -649,6 +649,11 @@ private void checkTextureParamColorSpace(String name, GlTexture value) {
         }
     }
 
+    @Override
+    public void setTexture(String name, VersionedResource<? extends Texture> value) {
+        setTexture(name, value.get());
+    }
+
     /**
      * Pass a texture to the material shader.
      *
@@ -657,18 +662,18 @@ private void checkTextureParamColorSpace(String name, GlTexture value) {
      * @param value the Texture object previously loaded by the asset manager
      */
     @Override
-    public void setTexture(String name, VersionedResource<? extends Texture> value) {
+    public void setTexture(String name, Texture value) {
         if (value == null) {
             // clear it
             clearParam(name);
             return;
         }
-        if (!(value.get() instanceof GlTexture)) {
+        if (!(value instanceof GlTexture)) {
             throw new IllegalArgumentException("Must be a GlTexture.");
         }
 
         VarType paramType = null;
-        GlTexture.Type type = ((GlTexture)value.get()).getType();
+        GlTexture.Type type = ((GlTexture)value).getType();
         switch (type) {
             case TwoDimensional:
                 paramType = VarType.Texture2D;
@@ -1151,18 +1156,9 @@ public void render(Geometry geometry, LightList lights, RenderManager renderMana
         technique.render(renderManager, shader, geometry, lights, units);
     }
 
-    /**
-     * Called by {@link RenderManager} to render the geometry by
-     * using this material.
-     *
-     * Note that this version of the render method
-     * does not perform light filtering.
-     *
-     * @param geom The geometry to render
-     * @param rm The render manager requesting the rendering
-     */
-    public void render(Geometry geom, RenderManager rm) {
-        render(geom, geom.getWorldLightList(), rm);
+    @Override
+    public void render(Geometry geometry, LightList lights, CommandBuffer cmd, Pipeline pipeline) {
+        throw new UnsupportedOperationException("Unable to render in a Vulkan context.");
     }
 
     @Override

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

@@ -38,7 +38,10 @@
 import com.jme3.scene.Geometry;
 import com.jme3.texture.Texture;
 import com.jme3.vulkan.buffers.GpuBuffer;
+import com.jme3.vulkan.commands.CommandBuffer;
+import com.jme3.vulkan.frames.SingleResource;
 import com.jme3.vulkan.frames.VersionedResource;
+import com.jme3.vulkan.pipelines.Pipeline;
 
 /**
  * <code>Material</code> describes the rendering style for a given
@@ -57,18 +60,32 @@ public interface Material extends Savable {
 
     void render(Geometry geometry, LightList lights, RenderManager renderManager);
 
+    void render(Geometry geometry, LightList lights, CommandBuffer cmd, Pipeline pipeline);
+
     void setUniform(String name, VersionedResource<? extends GpuBuffer> buffer);
 
     void setTexture(String name, VersionedResource<? extends Texture> texture);
 
     void setParam(String uniform, String param, Object value);
 
+    default void render(Geometry geometry, RenderManager renderManager) {
+        render(geometry, geometry.getWorldLightList(), renderManager);
+    }
+
+    default void render(Geometry geometry, CommandBuffer cmd, Pipeline pipeline) {
+        render(geometry, geometry.getWorldLightList(), cmd, pipeline);
+    }
+
     /* ----- COMPATABILITY WITH OLD MATERIAL ----- */
 
     default void setParam(String param, Object value) {
         setParam(DEFAULT_UNIFORM_BUFFER, param, value);
     }
 
+    default void setTexture(String param, Texture value) {
+        setTexture(param, new SingleResource<>(value));
+    }
+
     default void setBoolean(String param, boolean value) {
         setParam(param, value);
     }

jme3-core/src/main/java/com/jme3/scene/GlMesh.java

@@ -63,7 +63,7 @@
  * <ul>
  * <li>Points - Every vertex represents a single point in space.
  * <li>Lines - 2 vertices represent a line segment, with the width specified
- * via {@link Material#getAdditionalRenderState()} and {@link RenderState#setLineWidth(float)}.</li>
+ * via {@link com.jme3.material.GlMaterial#getAdditionalRenderState()} and {@link RenderState#setLineWidth(float)}.</li>
  * <li>Triangles - 3 vertices represent a solid triangle primitive. </li>
  * </ul>
  *
@@ -88,23 +88,23 @@ public enum Mode {
         Points(true),
         /**
          * A primitive is a line segment. Every two vertices specify
-         * a single line. {@link Material#getAdditionalRenderState()}
+         * a single line. {@link com.jme3.material.GlMaterial#getAdditionalRenderState()}
          * and {@link RenderState#setLineWidth(float)} can be used
          * to set the width of the lines.
          */
         Lines(true),
         /**
          * A primitive is a line segment. The first two vertices specify
          * a single line, while subsequent vertices are combined with the
-         * previous vertex to make a line. {@link Material#getAdditionalRenderState()}
+         * previous vertex to make a line. {@link com.jme3.material.GlMaterial#getAdditionalRenderState()}
          * and {@link RenderState#setLineWidth(float)} can
          * be used to set the width of the lines.
          */
         LineStrip(false),
         /**
          * Identical to {@link #LineStrip} except that at the end
          * the last vertex is connected with the first to form a line.
-         * {@link Material#getAdditionalRenderState()}
+         * {@link com.jme3.material.GlMaterial#getAdditionalRenderState()}
          * and {@link RenderState#setLineWidth(float)} can be used
          * to set the width of the lines.
          */
@@ -202,7 +202,6 @@ public boolean isListMode() {
     private int[] modeStart;
 
     private Mode mode = Mode.Triangles;
-
     private SafeArrayList<MorphTarget> morphTargets;
 
     /**
@@ -651,7 +650,7 @@ public float getPointSize() {
      * Returns the line width for line meshes.
      *
      * @return the line width
-     * @deprecated use {@link Material#getAdditionalRenderState()}
+     * @deprecated use {@link com.jme3.material.GlMaterial#getAdditionalRenderState()}
      *             and {@link RenderState#getLineWidth()}
      */
     @Deprecated
@@ -665,7 +664,7 @@ public float getLineWidth() {
      * the default value is 1.0.
      *
      * @param lineWidth The line width
-     * @deprecated use {@link GlMesh#getAdditionalRenderState()}
+     * @deprecated use {@link com.jme3.material.GlMaterial#getAdditionalRenderState()}
      *             and {@link RenderState#setLineWidth(float)}
      */
     @Deprecated
@@ -1527,6 +1526,7 @@ public boolean isAnimatedByBone(int boneIndex) {
      * @param jointIndex the bone's index in its skeleton
      * @return true if the specified bone animates this mesh, otherwise false
      */
+    @Override
     public boolean isAnimatedByJoint(int jointIndex) {
         VertexBuffer biBuf = getBuffer(VertexBuffer.Type.BoneIndex);
         VertexBuffer wBuf = getBuffer(VertexBuffer.Type.BoneWeight);

jme3-core/src/main/java/com/jme3/scene/Mesh.java

@@ -35,29 +35,18 @@
 import com.jme3.collision.Collidable;
 import com.jme3.collision.CollisionResults;
 import com.jme3.export.*;
-import com.jme3.material.Material;
-import com.jme3.material.RenderState;
 import com.jme3.renderer.Renderer;
 import com.jme3.vulkan.commands.CommandBuffer;
 import com.jme3.vulkan.mesh.AttributeModifier;
-import com.jme3.vulkan.mesh.BuiltInAttribute;
 
 /**
- * <code>Mesh</code> is used to store rendering data.
- * <p>
- * All visible elements in a scene are represented by meshes.
- * Meshes may contain three types of geometric primitives:
- * <ul>
- * <li>Points - Every vertex represents a single point in space.
- * <li>Lines - 2 vertices represent a line segment, with the width specified
- * via {@link Material#getAdditionalRenderState()} and {@link RenderState#setLineWidth(float)}.</li>
- * <li>Triangles - 3 vertices represent a solid triangle primitive. </li>
- * </ul>
  *
- * @author Kirill Vainer
+ * @author codex
  */
 public interface Mesh extends Collidable, Savable {
 
+
+
     void draw(CommandBuffer cmd, Geometry geometry);
 
     void draw(Renderer renderer, Geometry geometry, int instances, VertexBuffer[] instanceData);
@@ -78,8 +67,20 @@ public interface Mesh extends Collidable, Savable {
 
     int getNumLodLevels();
 
-    default AttributeModifier modifyAttribute(BuiltInAttribute name) {
+    default AttributeModifier modifyAttribute(VertexBuffer.Type name) {
         return modifyAttribute(name.getName());
     }
 
+    /* ----- COMPATIBILITY WITH OLD MESH ----- */
+
+    // todo: determine what to do with this method
+    // It's used only seriously by Joint, and only then for attachment nodes.
+    // I hope it can be replaced by something else or attachment nodes could
+    // be refactored to remove that dependency, because the GlMesh implementation
+    // for this is concerning.
+    @Deprecated
+    default boolean isAnimatedByJoint(int i) {
+        return false;
+    }
+
 }

jme3-core/src/main/java/com/jme3/scene/VertexBuffer.java

@@ -57,7 +57,7 @@ public class VertexBuffer extends NativeObject implements Savable, Cloneable {
     /**
      * Type of buffer. Specifies the actual attribute it defines.
      */
-    public static enum Type {
+    public enum Type {
         /**
          * Position of the vertex (3 floats)
          */
@@ -225,7 +225,22 @@ public static enum Type {
         MorphTarget10,
         MorphTarget11,
         MorphTarget12,
-        MorphTarget13,
+        MorphTarget13;
+
+        private final String name;
+
+        Type() {
+            this.name = name();
+        }
+
+        Type(String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+
     }
 
     /**

jme3-core/src/main/java/com/jme3/scene/debug/custom/ArmatureDebugger.java

@@ -37,6 +37,7 @@
 import com.jme3.asset.AssetManager;
 import com.jme3.collision.Collidable;
 import com.jme3.collision.CollisionResults;
+import com.jme3.material.GlMaterial;
 import com.jme3.material.Material;
 import com.jme3.material.RenderState;
 import com.jme3.renderer.Camera;
@@ -125,29 +126,29 @@ public void initialize(AssetManager assetManager, Camera camera) {
 
         armatureNode.setCamera(camera);
 
-        Material matJoints = new Material(assetManager, "Common/MatDefs/Misc/Billboard.j3md");
+        GlMaterial matJoints = new GlMaterial(assetManager, "Common/MatDefs/Misc/Billboard.j3md");
         GlTexture t = assetManager.loadTexture("Common/Textures/dot.png");
         matJoints.setTexture("Texture", t);
         matJoints.getAdditionalRenderState().setDepthTest(false);
         matJoints.getAdditionalRenderState().setBlendMode(RenderState.BlendMode.Alpha);
         joints.setQueueBucket(RenderQueue.Bucket.Translucent);
         joints.setMaterial(matJoints);
 
-        Material matWires = new Material(assetManager, "Common/MatDefs/Misc/Unshaded.j3md");
+        GlMaterial matWires = new GlMaterial(assetManager, "Common/MatDefs/Misc/Unshaded.j3md");
         matWires.setBoolean("VertexColor", true);
         matWires.getAdditionalRenderState().setLineWidth(1f);
         wires.setMaterial(matWires);
 
-        Material matOutline = new Material(assetManager, "Common/MatDefs/Misc/Unshaded.j3md");
+        GlMaterial matOutline = new GlMaterial(assetManager, "Common/MatDefs/Misc/Unshaded.j3md");
         matOutline.setBoolean("VertexColor", true);
         matOutline.getAdditionalRenderState().setLineWidth(1f);
         outlines.setMaterial(matOutline);
 
-        Material matOutline2 = new Material(assetManager, "Common/MatDefs/Misc/DashedLine.j3md");
+        GlMaterial matOutline2 = new GlMaterial(assetManager, "Common/MatDefs/Misc/DashedLine.j3md");
         matOutline2.getAdditionalRenderState().setLineWidth(1);
         outlines.getChild(1).setMaterial(matOutline2);
 
-        Material matWires2 = new Material(assetManager, "Common/MatDefs/Misc/DashedLine.j3md");
+        GlMaterial matWires2 = new GlMaterial(assetManager, "Common/MatDefs/Misc/DashedLine.j3md");
         matWires2.getAdditionalRenderState().setLineWidth(1);
         wires.getChild(1).setMaterial(matWires2);
 

jme3-core/src/main/java/com/jme3/scene/debug/custom/ArmatureNode.java

@@ -41,6 +41,7 @@
 import com.jme3.scene.*;
 import com.jme3.scene.shape.Line;
 
+import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
 import java.util.*;
 

jme3-core/src/main/java/com/jme3/vulkan/material/NewMaterial.java

@@ -6,10 +6,14 @@
 import com.jme3.material.Material;
 import com.jme3.renderer.RenderManager;
 import com.jme3.scene.Geometry;
+import com.jme3.texture.Texture;
 import com.jme3.vulkan.buffers.GpuBuffer;
 import com.jme3.vulkan.commands.CommandBuffer;
 import com.jme3.vulkan.descriptors.*;
 import com.jme3.vulkan.devices.LogicalDevice;
+import com.jme3.vulkan.frames.VersionedResource;
+import com.jme3.vulkan.material.uniforms.BufferUniform;
+import com.jme3.vulkan.material.uniforms.TextureUniform;
 import com.jme3.vulkan.material.uniforms.Uniform;
 import com.jme3.vulkan.pipelines.Pipeline;
 import com.jme3.vulkan.struct.Structure;
@@ -54,8 +58,24 @@ public void bind(CommandBuffer cmd, Pipeline pipeline, int offset) {
 
     @Override
     public void render(Geometry geometry, LightList lights, RenderManager renderManager) {
-        bind(cmd, pipeline);
-        geometry.getMesh().draw(cmd, geometry);
+        throw new UnsupportedOperationException("Unable to render in an OpenGL context.");
+    }
+
+    @Override
+    public void render(Geometry geometry, LightList lights, CommandBuffer cmd, Pipeline pipeline) {
+
+    }
+
+    @Override
+    public void setUniform(String name, VersionedResource<? extends GpuBuffer> buffer) {
+        BufferUniform u = getUniform(name);
+        u.setResource(buffer);
+    }
+
+    @Override
+    public void setTexture(String name, VersionedResource<? extends Texture> texture) {
+        TextureUniform u = getUniform(name);
+        u.setResource(texture);
     }
 
     @Override
@@ -66,7 +86,6 @@ public void setParam(String uniform, String param, Object value) {
         buffer.unmap();
     }
 
-    @Override
     @SuppressWarnings("unchecked")
     public <T extends Uniform> T getUniform(String name) {
         // Not sure if caching the results is really worth it...

jme3-core/src/main/java/com/jme3/vulkan/mesh/AdaptiveMesh.java

@@ -200,10 +200,6 @@ public void setMode(String name, VertexMode mode) {
             }
         }
 
-        public void setMode(BuiltInAttribute name, VertexMode mode) {
-            setMode(name.getName(), mode);
-        }
-
         private VersionedResource<? extends GpuBuffer> createBufferResource(VertexBinding binding, VertexMode mode) {
             MemorySize size = MemorySize.bytes(binding.getStride() * vertices);
             switch (mode) {