Fix various stuff v3

Author: Waterpicker

src/library/java/gg/generations/rarecandy/pokeutils/MaterialReference.java

@@ -124,7 +124,7 @@ public MaterialReference deserialize(JsonElement json, Type typeOfT, JsonDeseria
 
                     images.setDiffuse(texture);
 
-                    if (type.equals("masked")) {
+                    if (type.contains("masked")) {
                         var color = jsonObject.has("color") ? color(jsonObject.get("color")) : new Vector3f(1.0f, 1.0f, 1.0f);
                         shader = "masked";
                         values.setBaseColor1(color);

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

@@ -164,6 +164,8 @@ public void close() throws IOException {
 
         GL43.glDeleteBuffers(modelBuffer);
         GL43.glDeleteBuffers(destBuffer);
+        this.uvTransformBuffer.delete();
+        this.instanceBuffer.delete();
     }
 
     public boolean isEmpty() {
@@ -198,12 +200,13 @@ public void updateSSBOs() {
                     transform = Transform.DEFAULT;
                 }
 
-                transform.upload(i * meshes.length + meshId * Float.BYTES * 4, uvTransformBuffer);
-            }
-
-            instanceBuffer.upload();
-            uvTransformBuffer.upload();
+                int stride = Float.BYTES * 4; // 16
+                int index = i * meshes.length + meshId;
+                transform.upload(index * stride, uvTransformBuffer);            }
         }
+
+        instanceBuffer.upload();
+        uvTransformBuffer.upload();
     }
 
     public <T extends ObjectInstance> boolean add(@NotNull T instance) {
@@ -221,6 +224,11 @@ private void ensureCapacity() {
         var size = instances.size();
 
         instanceBuffer.ensureCapacity((long) size * InstanceDetails.size);
+        uvTransformBuffer.ensureCapacity(
+                (long) instances.size()
+                        * meshes.length
+                        * Float.BYTES * 4
+        );
     }
 
     public abstract int targetVertexStride();

src/library/java/gg/generations/rarecandy/renderer/loading/ModelLoader.java

@@ -78,7 +78,7 @@ public static void processModel(
         var dimensions = new Vector3f();
 
         var vertexCount = 0;
-        var indexBytes = 0;
+        var indexCount = 0;
 
 
         int alignment = glGetInteger(GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT);
@@ -89,14 +89,14 @@ public static void processModel(
             maxVertex = Math.max(maxVertex, mesh.mNumFaces() * 3);
 
             vertexCount += mesh.mNumVertices();
-            indexBytes += mesh.mNumFaces() * 3;
+            indexCount += mesh.mNumFaces() * 3;
         }
 
         objects.maxVertex = maxVertex;
 
 
 
-        indexBytes *= Integer.BYTES;
+        var indexBytes = indexCount *= Integer.BYTES;
 
         int drawBytes = meshes.length * Integer.BYTES * 2;
 
@@ -115,7 +115,7 @@ public static void processModel(
         objects.vertex = new SbboOffset(0, vertexBytes);
         objects.index = new SbboOffset(indexOffset, indexBytes);
         objects.draw = new SbboOffset(drawOffset, drawBytes);
-        objects.target = new SbboOffset(0, objects.targetVertexStride() * maxVertex);
+        objects.target = new SbboOffset(0, objects.targetVertexStride() * indexCount);
 
         int[] counters = new int[2]; // index Count
 
@@ -148,7 +148,7 @@ public static void processModel(
         GL43.glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
         objects.destBuffer = bufferId;
 
-        objects.uvTransformBuffer = new SSBOBuffer(Float.BYTES * 4);
+        objects.uvTransformBuffer = new SSBOBuffer(Float.BYTES * 4 * objects.meshes.length);
         objects.instanceBuffer = new SSBOBuffer(InstanceDetails.size);
 
         MemoryUtil.memFree(buffer);

src/library/java/gg/generations/rarecandy/renderer/pipeline/util/Uniform.java

@@ -17,11 +17,13 @@ public class Uniform {
     private static final FloatBuffer VEC2_TRANSFER_BUFFER = MemoryUtil.memAllocFloat(2);
     private static final FloatBuffer VEC3_TRANSFER_BUFFER = MemoryUtil.memAllocFloat(3);
     private static final FloatBuffer VEC4_TRANSFER_BUFFER = MemoryUtil.memAllocFloat(4);
+    protected final String name;
     public final int type;
     public final int count;
     private final int[] locations;
 
     public Uniform(int program, String name, int type, int count) {
+        this.name = name;
         this.type = type;
         this.count = count;
         this.locations = new int[count];

src/library/java/gg/generations/rarecandy/renderer/pipeline/util/UniformBinding.java

@@ -7,4 +7,8 @@
 public record UniformBinding(
     Uniform uniform,
     UniformCallback callback
-) {}
+) {
+    public String name() {
+        return uniform.name;
+    }
+}

src/library/java/gg/generations/rarecandy/renderer/rendering/RareCandy.java

@@ -15,7 +15,7 @@ public class RareCandy {
     private static final Queue<Runnable> TASKS = new ConcurrentLinkedQueue<>();
 
     private final List<MultiRenderObject> objects = new ArrayList<>();
-    private final List<MultiRenderObject> objectsToRemove = new ArrayList<>();
+    private final java.util.Set<MultiRenderObject> objectsToRemove = new java.util.HashSet<>();
 
     public RareCandy() {
         ThreadSafety.initContextThread();
@@ -96,4 +96,8 @@ public void end() {
             objectsToRemove.clear();
         }
     }
+
+    public void remove(MultiRenderObject loadedModel) {
+        objects.remove(loadedModel);
+    }
 }

src/library/java/gg/generations/rarecandy/renderer/storage/SSBOBuffer.java

@@ -30,7 +30,7 @@ public SSBOBuffer(int capacity) {
     public void ensureCapacity(long newCapacity) {
         // Resize native buffer if needed
         if (pointer == 0 || currentCapacity < newCapacity) {
-            if(pointer > 0) MemoryUtil.nmemAlloc(pointer);
+            if(pointer > 0) MemoryUtil.nmemFree(pointer);
             pointer = MemoryUtil.nmemAlloc((int) newCapacity);
         }
 

src/main/java/gg/generations/rarecandy/tools/gui/GuiPipelines.java

@@ -71,9 +71,14 @@ public static void onInitialize(RareCandyCanvas canvas, PokeUtilsGui.Settings se
                 .addSSBORange(Scope.MODEL, "SrcBuffer", 0, ctx -> ctx.object().modelBuffer, ctx -> ctx.object().vertex)
                 .addSSBORange(Scope.MODEL, "IndexBuffer", 1, ctx -> ctx.object().modelBuffer, ctx -> ctx.object().index)
                 .addSSBORange(Scope.MODEL, "DrawCommands", 2, ctx -> ctx.object().modelBuffer, ctx -> ctx.object().draw)
-                .addSSBO(Scope.MODEL, "InstanceBuffer", 3, ctx -> ctx.object().instanceBuffer.getBufferId())
-                .addSSBO(Scope.MODEL, "TransformBuffer", 4, ctx -> ctx.object().instanceBuffer.getBufferId())
-                .addSSBO(Scope.MODEL, "DstBuffer", 5, ctx -> ctx.object().destBuffer)
+                .addSSBO(Scope.MODEL, "InstanceBuffer", 3, ctx -> {
+                    var id = ctx.object().instanceBuffer.getBufferId();
+                    return id;
+                })
+                .addSSBO(Scope.MODEL, "TransformBuffer", 4, ctx -> ctx.object().uvTransformBuffer.getBufferId())
+                .addSSBO(Scope.MODEL, "DstBuffer", 5, ctx -> {
+                    return ctx.object().destBuffer;
+                })
                 .addUniform(Scope.MODEL, "variantSize", (uniform, ctx) -> uniform.uploadInt(ctx.object().meshes.length))
                 .addUniform(Scope.GLOBAL, "instanceId", (uniform, ctx) -> uniform.uploadInt(instanceId))
                 .build();
@@ -103,11 +108,11 @@ public static void onInitialize(RareCandyCanvas canvas, PokeUtilsGui.Settings se
         SOLID = TraditionalPipeline.builder(builtin("rewrite/solid.vs.glsl"), builtin("rewrite/solid.fs.glsl"))
                 .apply(builder -> GuiPipelines.common(builder, canvas))
                 .autoSampler2D(Scope.GLOBAL, "tex", 0, ctx -> textures[1].getId())
-//                .addUniform(Scope.GLOBAL, "light", (uniform, ctx) -> {
-//                    var light = (int) (RareCandyCanvas.getLightLevel() * 15);
-//
-//                    uniform.upload2i(0, light);
-//                })
+                .addUniform(Scope.GLOBAL, "light", (uniform, ctx) -> {
+                    var light = (int) (RareCandyCanvas.getLightLevel() * 15);
+
+                    uniform.upload2i(0, light);
+                })
                 .autoSampler2D(Scope.GLOBAL, "lightmap", 1, (ctx) -> ITextureLoader.instance().getTexture("light_map").getId())
                 .autoVec3(Scope.GLOBAL, "Light0_Direction", (ctx) -> light0)
                 .autoVec3(Scope.GLOBAL, "Light1_Direction", (ctx) -> light1)

src/main/java/gg/generations/rarecandy/tools/gui/RareCandyCanvas.java

@@ -97,32 +97,39 @@ public void openFile(PixelAsset pkFile, String name, Runnable runnable, boolean
         currentAnimation = null;
         rendering = false;
 
+        // Detach references immediately so render() will not touch freed objects
+        final ToggleableMultiRenderObject oldModel = loadedModel;
+        final AnimatedObjectInstance oldInstance = loadedModelInstance;
+        final List<AnimatedObjectInstance> oldInstances = new ArrayList<>(instances);
 
+        loadedModel = null;
+        loadedModelInstance = null;
+        instances.clear();
 
-        if(loadedModel != null) {
-            loadedModel.close();
-
-            renderer.clear();
+        this.fileName = name;
 
-            loadedModel = null;
-            instances.forEach(animatedObjectInstance -> {
+        // Schedule destruction on the GL/context thread at a safe point
+        if (oldModel != null) {
+            RareCandy.runLater(() -> {
                 try {
-                    animatedObjectInstance.close();
+                    // Ensure renderer no longer references the object BEFORE deleting its GL resources
+                    renderer.remove(oldModel); // must only detach, not close
+
+                    // Close instances first (if they own per-instance GL objects), then the model
+                    for (var inst : oldInstances) {
+                        inst.close();
+                    }
+
+                    oldModel.close();
                 } catch (IOException e) {
                     throw new RuntimeException(e);
                 }
             });
-
-            instances.clear();
         }
 
-        this.fileName = name;
-
-        if(pkFile == null) return;
+        if (pkFile == null) return;
 
         loadPokemonModel(pkFile, model -> {
-            var i = 0;
-
             loadedModel = (ToggleableMultiRenderObject) model;
 
             scaleModifier = loadedModel.scale;
@@ -131,18 +138,16 @@ public void openFile(PixelAsset pkFile, String name, Runnable runnable, boolean
             handler.fileViewer.scale.reset();
 
             var variants = model.availableVariants();
-
             var variant = !variants.isEmpty() ? variants.iterator().next() : null;
 
             var instance = new AnimatedObjectInstance(new Matrix4f(), loadedModel.variantNameToId.get(variant));
-
             loadedModelInstance = renderer.add(model, instance);
             loadedModelInstance.use();
 
             model.updateDimensions();
             runnable.run();
 
-            if(resetAnimation) setAnimation("idle");
+            if (resetAnimation) setAnimation("idle");
 
             rendering = true;
         });
@@ -210,7 +215,7 @@ public void render() {
         }
 
         if(animate) time = (System.currentTimeMillis() - startTime) / 1000f;
-        renderer.update(time);
+//        renderer.update(time);
 
         if (runnable != null) runnable.pre();
 

src/main/resources/shaders/rewrite/solid.vs.glsl

@@ -61,10 +61,10 @@ void main() {
     Vertex v = vertices[gl_VertexID];
 
     mat4 worldSpace = projectionMatrix * viewMatrix;
-    vec4 worldPosition = vec4(v.position, 1.0);
+    vec4 pos = worldSpace * vec4(v.position, 1.0);
 
     texCoord0 = v.texcoord;
-    gl_Position = worldSpace * worldPosition;
-    vertexDistance = fog_distance(v.position, FogShape);
+    gl_Position = pos;
+    vertexDistance = fog_distance(pos.xyz, FogShape);
     vertexColor = getVertexColor(v.normal);
 }