ref: remove old OBJ module

Author: Goldenfield192

src/main/java/cam72cam/mod/model/common/mesh/Model.java

@@ -4,7 +4,7 @@
 import cam72cam.mod.model.common.ModelLoader;
 import cam72cam.mod.model.common.util.FaceAccessor;
 import cam72cam.mod.render.common.ModelRenderer;
-import cam72cam.mod.render.obj.OBJTextureSheet;
+import cam72cam.mod.render.common.CachedTexture;
 import cam72cam.mod.resource.Identifier;
 
 import java.util.*;
@@ -32,9 +32,9 @@ public class Model {
     public final int packedTextureHeight;
     private int defaultLodSize;
 
-    private final Map<String, NavigableMap<Integer, OBJTextureSheet>> textures = new HashMap<>();
-    private final Map<String, NavigableMap<Integer, OBJTextureSheet>> speculars = new HashMap<>();
-    private final Map<String, NavigableMap<Integer, OBJTextureSheet>> normals = new HashMap<>();
+    private final Map<String, NavigableMap<Integer, CachedTexture>> textures = new HashMap<>();
+    private final Map<String, NavigableMap<Integer, CachedTexture>> speculars = new HashMap<>();
+    private final Map<String, NavigableMap<Integer, CachedTexture>> normals = new HashMap<>();
 
     public String hash;
 
@@ -66,9 +66,9 @@ public Model(Identifier location, VAOLayout layout, Supplier<float[]> vboSupplie
      * @param spec specular sheets per variant/LOD (may be empty)
      * @param norm normal sheets per variant/LOD (may be empty)
      */
-    public void linkTextures(Map<String, NavigableMap<Integer, OBJTextureSheet>> tex,
-                             Map<String, NavigableMap<Integer, OBJTextureSheet>> spec,
-                             Map<String, NavigableMap<Integer, OBJTextureSheet>> norm) {
+    public void linkTextures(Map<String, NavigableMap<Integer, CachedTexture>> tex,
+                             Map<String, NavigableMap<Integer, CachedTexture>> spec,
+                             Map<String, NavigableMap<Integer, CachedTexture>> norm) {
         this.textures.putAll(tex);
         this.speculars.putAll(spec);
         this.normals.putAll(norm);
@@ -198,17 +198,17 @@ public float[] getVboData() {
     }
 
     /** @return albedo texture sheets, keyed by variant name then LOD size */
-    public Map<String, NavigableMap<Integer, OBJTextureSheet>> getTextures() {
+    public Map<String, NavigableMap<Integer, CachedTexture>> getTextures() {
         return textures;
     }
 
     /** @return specular texture sheets, keyed by variant name then LOD size */
-    public Map<String, NavigableMap<Integer, OBJTextureSheet>> getSpeculars() {
+    public Map<String, NavigableMap<Integer, CachedTexture>> getSpeculars() {
         return speculars;
     }
 
     /** @return normal texture sheets, keyed by variant name then LOD size */
-    public Map<String, NavigableMap<Integer, OBJTextureSheet>> getNormals() {
+    public Map<String, NavigableMap<Integer, CachedTexture>> getNormals() {
         return normals;
     }
 
@@ -253,18 +253,18 @@ protected final void shareTexturesWith(Model owner) {
     }
 
     private void deallocTextures() {
-        for (Map<Integer, OBJTextureSheet> lodMap : textures.values()) {
-            for (OBJTextureSheet texture : lodMap.values()) {
+        for (Map<Integer, CachedTexture> lodMap : textures.values()) {
+            for (CachedTexture texture : lodMap.values()) {
                 texture.dealloc();
             }
         }
-        for (Map<Integer, OBJTextureSheet> lodMap : speculars.values()) {
-            for (OBJTextureSheet texture : lodMap.values()) {
+        for (Map<Integer, CachedTexture> lodMap : speculars.values()) {
+            for (CachedTexture texture : lodMap.values()) {
                 texture.dealloc();
             }
         }
-        for (Map<Integer, OBJTextureSheet> lodMap : normals.values()) {
-            for (OBJTextureSheet texture : lodMap.values()) {
+        for (Map<Integer, CachedTexture> lodMap : normals.values()) {
+            for (CachedTexture texture : lodMap.values()) {
                 texture.dealloc();
             }
         }

src/main/java/cam72cam/mod/model/common/util/ModelCache.java

@@ -5,7 +5,7 @@
 import cam72cam.mod.model.common.format.Parser;
 import cam72cam.mod.model.common.material.TextureRepacker;
 import cam72cam.mod.model.common.mesh.*;
-import cam72cam.mod.render.obj.OBJTextureSheet;
+import cam72cam.mod.render.common.CachedTexture;
 import cam72cam.mod.resource.Identifier;
 import cam72cam.mod.serialization.ResourceCache;
 import cam72cam.mod.serialization.ResourceCache.GenericByteBuffer;
@@ -113,8 +113,8 @@ public Model buildModel(int cacheSeconds) throws IOException {
         return model;
     }
 
-    private Map<String, NavigableMap<Integer, OBJTextureSheet>> loadTextures(String suffix, int cacheSeconds) throws IOException {
-        Map<String, NavigableMap<Integer, OBJTextureSheet>> result = new HashMap<>();
+    private Map<String, NavigableMap<Integer, CachedTexture>> loadTextures(String suffix, int cacheSeconds) throws IOException {
+        Map<String, NavigableMap<Integer, CachedTexture>> result = new HashMap<>();
         if (!meta.hasKey("packedTextureWidth")) {
             return result;
         }
@@ -123,16 +123,16 @@ private Map<String, NavigableMap<Integer, OBJTextureSheet>> loadTextures(String
         int texSize = Math.max(textureWidth, textureHeight);
         for (String variant : meta.getList("variants", k -> k.getString("variant"))) {
             // TreeMap keeps LOD sizes sorted so ModelConfig can use floorEntry/lastEntry
-            NavigableMap<Integer, OBJTextureSheet> lodMap = new TreeMap<>();
-            lodMap.put(texSize, new OBJTextureSheet(textureWidth, textureHeight,
-                                                    cache.getResource(variant + suffix + ".rgba", bm -> getTextureBytes(bm, variant, suffix, null)),
-                                                    cacheSeconds));
+            NavigableMap<Integer, CachedTexture> lodMap = new TreeMap<>();
+            lodMap.put(texSize, new CachedTexture(textureWidth, textureHeight,
+                                                  cache.getResource(variant + suffix + ".rgba", bm -> getTextureBytes(bm, variant, suffix, null)),
+                                                  cacheSeconds));
             for (Integer lodValue : lodValues) {
                 if (lodValue < texSize) {
                     Pair<Integer, Integer> size = scaleSize(textureWidth, textureHeight, lodValue);
-                    lodMap.put(lodValue, new OBJTextureSheet(size.getLeft(), size.getRight(),
-                            cache.getResource(variant + "_" + lodValue + suffix + ".rgba", bm -> getTextureBytes(bm, variant, suffix, lodValue)),
-                            cacheSeconds));
+                    lodMap.put(lodValue, new CachedTexture(size.getLeft(), size.getRight(),
+                                                           cache.getResource(variant + "_" + lodValue + suffix + ".rgba", bm -> getTextureBytes(bm, variant, suffix, lodValue)),
+                                                           cacheSeconds));
                 }
             }
             result.put(variant, lodMap);