start using Jackson to parse yaml matdefs

codex128 · codex128 · commit 381b05d3b871 · 2025-10-17T14:49:17.000-04:00
diff --git a/jme3-core/build.gradle b/jme3-core/build.gradle
@@ -20,6 +20,9 @@ dependencies {
     testImplementation project(':jme3-desktop')
     testRuntimeOnly project(':jme3-plugins')
 
+    // jackson yaml parsing
+    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.2"
+
     // Use LWJGL3 directly in core. This destroys LWJGL2 and JOGL compatibility.
     api (libs.lwjgl3.awt) {
         exclude group: 'org.lwjgl', module: 'lwjgl'
@@ -34,6 +37,7 @@ dependencies {
     api libs.lwjgl3.vulkan
     api libs.lwjgl3.shaderc
 
+    // include natives
     runtimeOnly(variantOf(libs.lwjgl3.base){ classifier('natives-windows') })
     runtimeOnly(variantOf(libs.lwjgl3.base){ classifier('natives-windows-x86') })
     runtimeOnly(variantOf(libs.lwjgl3.base){ classifier('natives-linux') })
diff --git a/jme3-core/src/main/java/com/jme3/material/Material.java b/jme3-core/src/main/java/com/jme3/material/Material.java
@@ -36,8 +36,6 @@
 import com.jme3.scene.Geometry;
 import com.jme3.texture.Texture;
 import com.jme3.vulkan.buffers.GpuBuffer;
-import com.jme3.vulkan.frames.SingleResource;
-import com.jme3.vulkan.frames.VersionedResource;
 
 /**
  * <code>Material</code> describes the rendering style for a given
@@ -48,7 +46,7 @@
  * shader.
  * </p>
  *
- * @author Kirill Vainer
+ * @author codex
  */
 public interface Material extends Savable {
 
diff --git a/jme3-core/src/main/java/com/jme3/math/Matrix3f.java b/jme3-core/src/main/java/com/jme3/math/Matrix3f.java
@@ -34,7 +34,10 @@
 import com.jme3.export.*;
 import com.jme3.util.BufferUtils;
 import com.jme3.util.TempVars;
+import com.jme3.vulkan.buffers.BufferMember;
+
 import java.io.IOException;
+import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
 import java.util.logging.Logger;
 
@@ -55,7 +58,7 @@
  * @author Mark Powell
  * @author Joshua Slack
  */
-public final class Matrix3f implements Savable, Cloneable, java.io.Serializable {
+public final class Matrix3f implements BufferMember, Savable, Cloneable, java.io.Serializable {
 
     static final long serialVersionUID = 1;
 
@@ -1500,4 +1503,17 @@ public Matrix3f clone() {
             throw new AssertionError(); // can not happen
         }
     }
+
+    @Override
+    public void fillBuffer(ByteBuffer buffer) {
+        buffer.putFloat(m00).putFloat(m10).putFloat(m20)
+              .putFloat(m01).putFloat(m11).putFloat(m21)
+              .putFloat(m02).putFloat(m12).putFloat(m22);
+    }
+
+    @Override
+    public int getSizeInBytes() {
+        return 9 * Float.BYTES;
+    }
+
 }
diff --git a/jme3-core/src/main/java/com/jme3/vulkan/buffers/BufferMember.java b/jme3-core/src/main/java/com/jme3/vulkan/buffers/BufferMember.java
@@ -0,0 +1,23 @@
+package com.jme3.vulkan.buffers;
+
+import java.nio.ByteBuffer;
+
+public interface BufferMember {
+
+    /**
+     * Fills {@link #getSizeInBytes()} bytes of {@code buffer},
+     * starting from the buffer's current position and incrementing
+     * the position by {@link #getSizeInBytes()} bytes.
+     *
+     * @param buffer buffer to fill
+     */
+    void fillBuffer(ByteBuffer buffer);
+
+    /**
+     * Gets the size of this member in bytes.
+     *
+     * @return size in bytes
+     */
+    int getSizeInBytes();
+
+}
diff --git a/jme3-core/src/main/java/com/jme3/vulkan/descriptors/Descriptor.java b/jme3-core/src/main/java/com/jme3/vulkan/descriptors/Descriptor.java
@@ -2,6 +2,9 @@
 
 import com.jme3.vulkan.util.IntEnum;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import static org.lwjgl.vulkan.VK10.*;
 
 public enum Descriptor implements IntEnum<Descriptor> {
@@ -29,4 +32,6 @@ public int getEnum() {
         return vkEnum;
     }
 
+    private static final Map<String, IntEnum<Descriptor>> custom = new HashMap<>();
+
 }
diff --git a/jme3-core/src/main/java/com/jme3/vulkan/material/LoadedMaterial.java b/jme3-core/src/main/java/com/jme3/vulkan/material/LoadedMaterial.java
@@ -0,0 +1,65 @@
+package com.jme3.vulkan.material;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
+import com.fasterxml.jackson.dataformat.yaml.YAMLMapper;
+import com.jme3.vulkan.descriptors.Descriptor;
+import com.jme3.vulkan.descriptors.DescriptorPool;
+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.GraphicsPipeline;
+import com.jme3.vulkan.util.ReflectionArgs;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.util.*;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
+public class LoadedMaterial extends NewMaterial {
+
+    private static final Map<String, Function<ReflectionArgs, Object>> natives = new HashMap<>();
+
+    public LoadedMaterial(DescriptorPool pool, String fileName) {
+        super(pool);
+        ObjectMapper mapper = YAMLMapper.builder()
+                .disable(YAMLGenerator.Feature.WRITE_DOC_START_MARKER)
+                .build();
+        InputStream stream = null;
+        Map<Integer, List<Uniform<?>>> sets = new HashMap<>();
+        try {
+            JsonNode root = mapper.readTree(stream);
+            JsonNode imports = root.get("imports");
+            JsonNode parameters = root.get("parameters");
+            parameters.fields();
+            for (Iterator<Map.Entry<String, JsonNode>> it = parameters.fields(); it.hasNext();) {
+                Map.Entry<String, JsonNode> param = it.next();
+                int set = Objects.requireNonNull(param.getValue().get("set"),
+                        "Set index not defined in \"" + param.getKey() + "\"").asInt();
+                sets.computeIfAbsent(set, n -> new ArrayList<>()).add(
+                        instantiate(param.getKey(), param.getValue(), imports));
+            }
+            // add uniforms to sets
+            for (Map.Entry<Integer, List<Uniform<?>>> set : sets.entrySet()) {
+                addSet(set.getKey(), set.getValue().toArray(new Uniform[0]));
+            }
+            // load pipelines
+            JsonNode pipelines = root.get("pipelines");
+            for (Iterator<Map.Entry<String, JsonNode>> it = pipelines.fields(); it.hasNext();) {
+                Map.Entry<String, JsonNode> pipeline = it.next();
+                Object state = instantiate(pipeline.getKey(), pipeline.getValue(), imports);
+            }
+        } catch (IOException
+                 | ClassNotFoundException
+                 | NoSuchMethodException
+                 | InvocationTargetException
+                 | InstantiationException
+                 | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/jme3-core/src/main/java/com/jme3/vulkan/material/UniformSet.java b/jme3-core/src/main/java/com/jme3/vulkan/material/UniformSet.java
@@ -22,7 +22,7 @@ public UniformSet(int setIndex, Uniform... uniforms) {
         for (Uniform u : uniforms) {
             int i = u.getBindingIndex();
             if (bindings.get(i)) {
-                throw new IllegalArgumentException("Duplicate binding index in set: " + u.getBindingIndex());
+                throw new IllegalArgumentException("Duplicate binding index in set " + setIndex + ": " + u.getBindingIndex());
             }
             bindings.set(i);
         }
diff --git a/jme3-core/src/main/java/com/jme3/vulkan/material/uniforms/AbstractUniform.java b/jme3-core/src/main/java/com/jme3/vulkan/material/uniforms/AbstractUniform.java
@@ -1,11 +1,16 @@
 package com.jme3.vulkan.material.uniforms;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.jme3.vulkan.descriptors.Descriptor;
 import com.jme3.vulkan.descriptors.SetLayoutBinding;
 import com.jme3.vulkan.frames.VersionedResource;
 import com.jme3.vulkan.shader.ShaderStage;
 import com.jme3.vulkan.util.Flag;
+import com.jme3.vulkan.util.FlagParser;
 import com.jme3.vulkan.util.IntEnum;
+import com.jme3.vulkan.util.ReflectionArgs;
+
+import java.util.Objects;
 
 public abstract class AbstractUniform <T> implements Uniform<T> {
 
@@ -22,6 +27,15 @@ public AbstractUniform(String name, IntEnum<Descriptor> type, int bindingIndex,
         this.stages = stages;
     }
 
+    public AbstractUniform(IntEnum<Descriptor> type, ReflectionArgs args) {
+        this.name = args.getName();
+        this.type = type;
+        this.bindingIndex = Objects.requireNonNull(args.getProperties().get("binding"),
+                "Binding index is not specified for \"" + name + "\"").asInt();
+        this.stages = FlagParser.parseFlag(ShaderStage.class,
+                args.getProperties().get("stages"), ShaderStage.All);
+    }
+
     @Override
     public SetLayoutBinding createBinding() {
         return new SetLayoutBinding(type, bindingIndex, 1, stages);
diff --git a/jme3-core/src/main/java/com/jme3/vulkan/material/uniforms/BufferUniform.java b/jme3-core/src/main/java/com/jme3/vulkan/material/uniforms/BufferUniform.java
@@ -1,24 +1,53 @@
 package com.jme3.vulkan.material.uniforms;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.jme3.vulkan.buffers.*;
+import com.jme3.vulkan.buffers.generate.BufferGenerator;
 import com.jme3.vulkan.descriptors.Descriptor;
 import com.jme3.vulkan.descriptors.DescriptorSetWriter;
 import com.jme3.vulkan.descriptors.SetLayoutBinding;
+import com.jme3.vulkan.memory.MemorySize;
+import com.jme3.vulkan.mesh.AccessFrequency;
 import com.jme3.vulkan.shader.ShaderStage;
 import com.jme3.vulkan.util.Flag;
 import com.jme3.vulkan.util.IntEnum;
+import com.jme3.vulkan.util.ReflectionArgs;
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.vulkan.VkDescriptorBufferInfo;
 import org.lwjgl.vulkan.VkWriteDescriptorSet;
 
-import java.util.Objects;
+import java.nio.ByteBuffer;
+import java.util.*;
 
 public class BufferUniform extends AbstractUniform<GpuBuffer> {
 
     public BufferUniform(String name, IntEnum<Descriptor> type, int bindingIndex, Flag<ShaderStage> stages) {
         super(name, type, bindingIndex, stages);
     }
 
+    public BufferUniform(IntEnum<Descriptor> type, ReflectionArgs args) {
+        super(type, args);
+        if (args.getProperties().has("usage")) {
+            AccessFrequency usage = AccessFrequency.valueOf(args.getProperties().get("usage").asText());
+            List<BufferMember> members = new ArrayList<>();
+            int size = 0;
+            for (Iterator<Map.Entry<String, JsonNode>> it = args.getProperties().get("layout").fields(); it.hasNext();) {
+                Map.Entry<String, JsonNode> el = it.next();
+                BufferMember member = args.create(el.getKey(), el.getValue()).instantiate();
+                members.add(member);
+                size += member.getSizeInBytes();
+            }
+            value = args.getGenerator().createBuffer(MemorySize.bytes(size), BufferUsage.Uniform, usage);
+            ByteBuffer bytes = value.mapBytes();
+            bytes.clear();
+            for (BufferMember m : members) {
+                m.fillBuffer(bytes);
+            }
+            bytes.flip();
+            value.unmap();
+        }
+    }
+
     @Override
     public DescriptorSetWriter createWriter() {
         if (value == null) {
diff --git a/jme3-core/src/main/java/com/jme3/vulkan/material/uniforms/TextureUniform.java b/jme3-core/src/main/java/com/jme3/vulkan/material/uniforms/TextureUniform.java
@@ -1,13 +1,16 @@
 package com.jme3.vulkan.material.uniforms;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.jme3.texture.Texture;
 import com.jme3.vulkan.descriptors.Descriptor;
 import com.jme3.vulkan.descriptors.DescriptorSetWriter;
 import com.jme3.vulkan.descriptors.SetLayoutBinding;
 import com.jme3.vulkan.images.VulkanImage;
 import com.jme3.vulkan.shader.ShaderStage;
 import com.jme3.vulkan.util.Flag;
+import com.jme3.vulkan.util.FlagParser;
 import com.jme3.vulkan.util.IntEnum;
+import com.jme3.vulkan.util.ReflectionArgs;
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.vulkan.VkDescriptorImageInfo;
 import org.lwjgl.vulkan.VkWriteDescriptorSet;
@@ -23,6 +26,14 @@ public TextureUniform(String name, IntEnum<VulkanImage.Layout> layout, int bindi
         this.layout = layout;
     }
 
+    public TextureUniform(ReflectionArgs args) {
+        super(Descriptor.CombinedImageSampler, args);
+        this.layout = FlagParser.parseEnum(VulkanImage.Layout.class, args.getProperties().get("layout").asText());
+        if (args.getProperties().has("default")) {
+            value = args.getAssetManager().loadTexture(args.getProperties().get("default").asText());
+        }
+    }
+
     @Override
     public DescriptorSetWriter createWriter() {
         if (value == null) {
diff --git a/jme3-core/src/main/java/com/jme3/vulkan/util/FlagParser.java b/jme3-core/src/main/java/com/jme3/vulkan/util/FlagParser.java
@@ -0,0 +1,77 @@
+package com.jme3.vulkan.util;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class FlagParser {
+
+    private static final Map<Class, Map<String, Object>> custom = new HashMap<>();
+
+    public static <T extends Flag> void add(Class<T> clazz, String name, Flag<T> flag) {
+        custom.computeIfAbsent(clazz, k -> new HashMap<>()).put(name, flag);
+    }
+
+    public static Object remove(Class clazz, String name) {
+        Map<String, Object> map = custom.get(clazz);
+        if (map == null) return null;
+        Object rmv = map.remove(name);
+        if (map.isEmpty()) custom.remove(clazz, map);
+        return rmv;
+    }
+
+    public static Object get(Class clazz, String name) {
+        Map<String, Object> map = custom.get(clazz);
+        if (map == null) return null;
+        return map.get(name);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T extends Flag> Flag<T> parseFlag(Class<? extends Enum> clazz, String name) {
+        Object flag = get(clazz, name);
+        if (flag != null) {
+            flag = Enum.valueOf(clazz, name);
+        }
+        return (Flag<T>)flag;
+    }
+
+    public static <T extends Flag> Flag<T> parseFlag(Class<? extends Enum> clazz, String... names) {
+        int bits = 0;
+        for (String n : names) {
+            bits |= parseFlag(clazz, n).bits();
+        }
+        return Flag.of(bits);
+    }
+
+    public static <T extends Flag> Flag<T> parseFlag(Class<? extends Enum> clazz, JsonNode array) {
+        if (array == null) {
+            throw new NullPointerException("Json element cannot be null.");
+        }
+        if (!array.isArray()) {
+            throw new IllegalArgumentException("Json element must be an array.");
+        }
+        int bits = 0;
+        for (int i = 0; i < array.size(); i++) {
+            bits |= parseFlag(clazz, array.get(i).asText()).bits();
+        }
+        return Flag.of(bits);
+    }
+
+    public static <T extends Flag> Flag<T> parseFlag(Class<? extends Enum> clazz, JsonNode array, Flag<T> defVal) {
+        if (array == null || !array.isArray()) {
+            return defVal;
+        }
+        return parseFlag(clazz, array);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T extends IntEnum> IntEnum<T> parseEnum(Class<? extends Enum> clazz, String name) {
+        Object enm = get(clazz, name);
+        if (enm != null) {
+            enm = Enum.valueOf(clazz, name);
+        }
+        return (IntEnum<T>)enm;
+    }
+
+}
diff --git a/jme3-core/src/main/java/com/jme3/vulkan/util/ReflectionArgs.java b/jme3-core/src/main/java/com/jme3/vulkan/util/ReflectionArgs.java
diff --git a/jme3-testdata/src/main/resources/Shaders/VulkanTest.yml b/jme3-testdata/src/main/resources/Shaders/VulkanTest.yml

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,9 @@`
`2`	`2`
`3`	`3`	`import com.jme3.vulkan.util.IntEnum;`
`4`	`4`
	`5`	`+import java.util.HashMap;`
	`6`	`+import java.util.Map;`
	`7`	`+`
`5`	`8`	`import static org.lwjgl.vulkan.VK10.*;`
`6`	`9`
`7`	`10`	`public enum Descriptor implements IntEnum<Descriptor> {`
`@@ -29,4 +32,6 @@ public int getEnum() {`
`29`	`32`	`return vkEnum;`
`30`	`33`	`}`
`31`	`34`
	`35`	`+ private static final Map<String, IntEnum<Descriptor>> custom = new HashMap<>();`
	`36`	`+`
`32`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public UniformSet(int setIndex, Uniform... uniforms) {`
`22`	`22`	`for (Uniform u : uniforms) {`
`23`	`23`	`int i = u.getBindingIndex();`
`24`	`24`	`if (bindings.get(i)) {`
`25`		`- throw new IllegalArgumentException("Duplicate binding index in set: " + u.getBindingIndex());`
	`25`	`+ throw new IllegalArgumentException("Duplicate binding index in set " + setIndex + ": " + u.getBindingIndex());`
`26`	`26`	`}`
`27`	`27`	`bindings.set(i);`
`28`	`28`	`}`