Continuing rewrite.

Author: Waterpicker

build.gradle.kts

@@ -60,7 +60,7 @@ dependencies {
     shadow(implementation("org.lwjgl", "lwjgl-assimp", "3.3.4")) {
         isTransitive = true
     }
-    shadow(implementation("com.github.thecodewarrior", "BinarySMD", "-SNAPSHOT"))
+    shadow(implementation("com.github.thecodewarrior", "BinarySMD", "d10a00b720"))
     shadow(implementation("org.msgpack", "msgpack-core", "0.8.17"))
     shadowTools(implementation(fileTree(mapOf("dir" to "libs", "include" to "*.jar")))!!)
     shadow(implementation("com.github.ben-manes.caffeine:caffeine:3.1.8")!!)

imgui.ini

@@ -4,22 +4,22 @@ Size=400,400
 Collapsed=0
 
 [Window][File Tree]
-Pos=60,60
-Size=110,115
+Pos=740,493
+Size=606,454
 Collapsed=0
 
 [Window][Terastalization]
-Pos=60,60
-Size=88,77
+Pos=197,596
+Size=271,167
 Collapsed=0
 
 [Window][Fog]
-Pos=60,60
-Size=75,100
+Pos=1696,417
+Size=286,135
 Collapsed=0
 
 [Window][Features]
-Pos=60,60
+Pos=173,470
 Size=144,77
 Collapsed=0
 

settings.json

@@ -0,0 +1,30 @@
+{
+  "urls": {
+    "openArchiveUrl": "D:\\Git Repos\\Models\\Generation Packs\\Generation 2\\assets\\generations_core\\bedrock\\pokemon\\models\\lugia.pk",
+    "saveAsUrl": "",
+    "createArchiveUrl": "",
+    "sequenceUrl": ""
+  },
+  "terastalization": {
+    "enabled": false,
+    "tint": {
+      "x": 1.0,
+      "y": 1.0,
+      "z": 1.0
+    }
+  },
+  "features": {
+    "terastalization": true,
+    "fog": true
+  },
+  "fog": {
+    "color": {
+      "x": 1.0,
+      "y": 1.0,
+      "z": 1.0,
+      "w": 1.0
+    },
+    "start": 0.0,
+    "end": 5.0
+  }
+}

src/library/java/gg/generations/rarecandy/renderer/LoggerUtil.java

@@ -26,7 +26,7 @@ public static void printError(Exception e) {
 
     public static void print(String string) {
         checkLogger();
-//        LOGGER.info(string);
+        LOGGER.info(string);
     }
 
     public static void print(long bytesWritten) {

src/library/java/gg/generations/rarecandy/renderer/animation/Animation.java

@@ -50,7 +50,7 @@ public class Animation {
     public boolean loops;
     public boolean ignoreInstancedTime = false;
 
-    private boolean ignoreScaling;
+    private final boolean ignoreScaling;
 
     public Animation(int id, int ticksPerSecond, boolean loops, Skeleton skeleton, AnimationNode[] animationNodes, Offset[] offsets, boolean ignoreScaling, SkeletalTransform offset) {
         this.id = id;

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

@@ -202,7 +202,7 @@ public void updateSSBOs() {
                 }
 
                 transform.upload(uvTransformBuffer);
-                uvTransformBuffer.put(instance.variant());
+                uvTransformBuffer.put(variantRelationships[meshId][instance.variant()]);
                 uvTransformBuffer.move(4);
             }
         }

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

@@ -93,11 +93,8 @@ public static void processModel(
         int totalBytes = variantOffset + variantBytes;
 
         var vertexBuffer = MemoryUtil.memAlloc(vertexBytes);
-
         var indexBuffer = MemoryUtil.memAlloc(indexBytes);
-
         var drawBuffer = MemoryUtil.memAlloc(drawBytes);
-
         var materialBuffer = MemoryUtil.memAlloc(materialBytes);
         var variantBuffer = MemoryUtil.memAlloc(variantBytes);
 
@@ -122,8 +119,12 @@ public static void processModel(
                     counters, skeleton, mesh, config.modelOptions != null ? config.modelOptions : Collections.emptyMap(), dimensions);
         }
 
-        for(var material : objects.materials) {
-            material.put(materialBuffer);
+        for (int i = 0; i < objects.materials.length; i++) {
+            var material = objects.materials[i];
+            System.out.println("material[" + i + "] = " + material);
+            if (material != null) {
+                material.put(materialBuffer);
+            }
         }
 
         for(var variant : objects.variants) {
@@ -134,6 +135,14 @@ public static void processModel(
         objects.vertex.put(buffer, vertexBuffer.flip());
         objects.index.put(buffer, indexBuffer.flip());
         objects.draw.put(buffer, drawBuffer.flip());
+
+
+        System.out.println("objects.materials.length = " + objects.materials.length);
+        System.out.println("materialBytes = " + materialBytes);
+        System.out.println("materialBuffer.position() = " + materialBuffer.position());
+        System.out.println("objects.material.size() = " + objects.material.size());
+
+
         objects.material.put(buffer, materialBuffer.flip());
         objects.variant.put(buffer, variantBuffer.flip());
 
@@ -156,6 +165,7 @@ public static void processModel(
         MemoryUtil.memFree(vertexBuffer);
         MemoryUtil.memFree(indexBuffer);
         MemoryUtil.memFree(drawBuffer);
+        MemoryUtil.memFree(materialBuffer);
         MemoryUtil.memFree(variantBuffer);
 
         var transform = new Matrix4f();

src/library/java/gg/generations/rarecandy/renderer/model/material/Material.java

@@ -13,7 +13,7 @@ public record Material(
         BlendType blendType,
         int colorMethod) implements Closeable {
 
-    public void  put(ByteBuffer buffer) {
+    public void put(ByteBuffer buffer) {
         values.put(buffer);
         buffer.putInt(colorMethod);
         buffer.putInt(0);

src/library/java/gg/generations/rarecandy/renderer/model/material/MaterialValues.java

@@ -276,26 +276,18 @@ public int hashCode() {
     }
 
     public void put(ByteBuffer pointer) {
-        baseColor1.get(pointer);
-        pointer.position(pointer.position() + 16);
-        baseColor2.get(pointer);
-        pointer.position(pointer.position() + 16);
-        baseColor3.get(pointer);
-        pointer.position(pointer.position() + 16);
-        baseColor4.get(pointer);
-        pointer.position(pointer.position() + 16);
-        baseColor5.get(pointer);
-        pointer.position(pointer.position() + 16);
-        emiColor1.get(pointer);
-        pointer.position(pointer.position() + 16);
-        emiColor2.get(pointer);
-        pointer.position(pointer.position() + 16);
-        emiColor3.get(pointer);
-        pointer.position(pointer.position() + 16);
-        emiColor4.get(pointer);
-        pointer.position(pointer.position() + 16);
-        emiColor5.get(pointer);
-        pointer.position(pointer.position() + 16);
+        pointer.putFloat(baseColor1.x).putFloat(baseColor1.y).putFloat(baseColor1.z).putFloat(0f);
+        pointer.putFloat(baseColor2.x).putFloat(baseColor2.y).putFloat(baseColor2.z).putFloat(0f);
+        pointer.putFloat(baseColor3.x).putFloat(baseColor3.y).putFloat(baseColor3.z).putFloat(0f);
+        pointer.putFloat(baseColor4.x).putFloat(baseColor4.y).putFloat(baseColor4.z).putFloat(0f);
+        pointer.putFloat(baseColor5.x).putFloat(baseColor5.y).putFloat(baseColor5.z).putFloat(0f);
+
+        pointer.putFloat(emiColor1.x).putFloat(emiColor1.y).putFloat(emiColor1.z).putFloat(0f);
+        pointer.putFloat(emiColor2.x).putFloat(emiColor2.y).putFloat(emiColor2.z).putFloat(0f);
+        pointer.putFloat(emiColor3.x).putFloat(emiColor3.y).putFloat(emiColor3.z).putFloat(0f);
+        pointer.putFloat(emiColor4.x).putFloat(emiColor4.y).putFloat(emiColor4.z).putFloat(0f);
+        pointer.putFloat(emiColor5.x).putFloat(emiColor5.y).putFloat(emiColor5.z).putFloat(0f);
+
         pointer.putFloat(emiIntensity1);
         pointer.putFloat(emiIntensity2);
         pointer.putFloat(emiIntensity3);

src/library/java/gg/generations/rarecandy/renderer/pipeline/Pipeline.java

@@ -344,4 +344,8 @@ public static <T> Map<Scope, List<T>> deepCopy(Map<Scope, List<T>> src) {
             return result;
         }
     }
+
+    public void destroy() {
+        GL32.glDeleteProgram(program);
+    }
 }