improved locator support

tomalbrc · Apr 9, 2024 · 15494ca · 15494ca
1 parent 8ade777
commit 15494ca
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 24 deletions.
diff --git a/src/main/java/de/tomalbrc/bil/file/bbmodel/BbElement.java b/src/main/java/de/tomalbrc/bil/file/bbmodel/BbElement.java
@@ -25,6 +25,7 @@ public class BbElement {
     public int color;
     public float inflate;
     public Vector3f origin;
+    public Vector3f position; // used by locators
     public Object2ObjectOpenHashMap<String, BbFace> faces;
     public ElementType type;
     public UUID uuid;

diff --git a/src/main/java/de/tomalbrc/bil/file/extra/BbModelUtils.java b/src/main/java/de/tomalbrc/bil/file/extra/BbModelUtils.java
@@ -77,10 +77,10 @@ public static BbOutliner findParent(BbModel model, BbOutliner x, BbElement eleme
         return null;
     }
 
-    public static List<BbElement> elementsForOutliner(BbModel model, BbOutliner outliner) {
+    public static List<BbElement> elementsForOutliner(BbModel model, BbOutliner outliner, BbElement.ElementType elementType) {
         List<BbElement> elements = new ObjectArrayList<>();
         for (BbElement element: model.elements) {
-            if (outliner.hasUuidChild(element.uuid) && element.type == BbElement.ElementType.CUBE) {
+            if (outliner.hasUuidChild(element.uuid) && element.type == elementType) {
                 elements.add(element);
             }
         }

diff --git a/src/main/java/de/tomalbrc/bil/file/importer/AjModelImporter.java b/src/main/java/de/tomalbrc/bil/file/importer/AjModelImporter.java
@@ -66,7 +66,7 @@ protected Reference2ObjectOpenHashMap<UUID, Variant> variants() {
                     }
 
                     if (!outliner.isHitbox() && affected) {
-                        List<BbElement> elements = BbModelUtils.elementsForOutliner(model, outliner);
+                        List<BbElement> elements = BbModelUtils.elementsForOutliner(model, outliner, BbElement.ElementType.CUBE);
 
                         Int2ObjectOpenHashMap<BbTexture> textureMap = new Int2ObjectOpenHashMap<>();
                         if (variant.textureMap() == null || variant.textureMap().isEmpty()) {

diff --git a/src/main/java/de/tomalbrc/bil/file/importer/BbModelImporter.java b/src/main/java/de/tomalbrc/bil/file/importer/BbModelImporter.java
@@ -56,7 +56,7 @@ protected Object2ObjectOpenHashMap<UUID, Node> makeNodeMap() {
     }
 
     protected PolymerModelData generateModel(BbOutliner outliner) {
-        List<BbElement> elements = BbModelUtils.elementsForOutliner(model, outliner);
+        List<BbElement> elements = BbModelUtils.elementsForOutliner(model, outliner, BbElement.ElementType.CUBE);
 
         ResourcePackItemModel.Builder builder = new ResourcePackItemModel.Builder(model.modelIdentifier)
                 .withTextures(this.makeDefaultTextureMap())
@@ -89,6 +89,18 @@ protected void createBones(Node parent, BbOutliner parentOutliner, Collection<Bb
                 Node node = new Node(Node.NodeType.BONE, parent, tr, outliner.name, outliner.uuid, modelData);
                 nodeMap.put(outliner.uuid, node);
 
+                List<BbElement> locatorElements = BbModelUtils.elementsForOutliner(model, outliner, BbElement.ElementType.LOCATOR);
+                for (BbElement locator : locatorElements) {
+                    Vector3f localPos2 = locator.position.sub(outliner.origin, new Vector3f());
+
+                    var locatorTransform = new Node.Transform(localPos2.div(16), createQuaternion(locator.rotation), 1);
+                    locatorTransform.mul(node.transform());
+
+                    Node locatorNode = new Node(Node.NodeType.LOCATOR, node, locatorTransform, locator.name, locator.uuid, null);
+                    nodeMap.put(locator.uuid, locatorNode);
+                }
+
+
                 // children
                 createBones(node, outliner, outliner.children, nodeMap);
             }
@@ -133,32 +145,30 @@ protected Reference2ObjectOpenHashMap<UUID, Pose> poses(BbAnimation animation, O
         Reference2ObjectOpenHashMap<UUID, Pose> poses = new Reference2ObjectOpenHashMap<>();
 
         for (var entry: nodeMap.entrySet()) {
-            if (entry.getValue().modelData() != null) {
-                Matrix4f matrix4f = new Matrix4f().rotateY(Mth.PI);
-                boolean requiresFrame = time == 0;
-                List<Node> nodePath = nodePath(entry.getValue());
-
-                for (var node : nodePath) {
-                    BbAnimator animator = animation.animators.get(node.uuid());
-                    requiresFrame |= animator != null;
+            Matrix4f matrix4f = new Matrix4f().rotateY(Mth.PI);
+            boolean requiresFrame = time == 0;
+            List<Node> nodePath = nodePath(entry.getValue());
 
-                    Vector3fc origin = node.transform().origin();
+            for (var node : nodePath) {
+                BbAnimator animator = animation.animators.get(node.uuid());
+                requiresFrame |= animator != null;
 
-                    var triple = animator == null ?
-                            Triple.of(new Vector3f(), new Vector3f(), new Vector3f(1.f)) :
-                            Sampler.sample(animator.keyframes, model.animationVariablePlaceholders, environment, time);
+                Vector3fc origin = node.transform().origin();
 
-                    Quaternionf localRot = node.transform().rotation().mul(createQuaternion(triple.getMiddle().mul(-1, -1, 1)), new Quaternionf());
-                    Vector3f localPos = triple.getLeft().mul(-1,1,1).div(16).add(origin);
+                var triple = animator == null ?
+                        Triple.of(new Vector3f(), new Vector3f(), new Vector3f(1.f)) :
+                        Sampler.sample(animator.keyframes, model.animationVariablePlaceholders, environment, time);
 
-                    matrix4f.translate(localPos);
-                    matrix4f.rotate(localRot);
-                    matrix4f.scale(triple.getRight());
-                }
+                Quaternionf localRot = node.transform().rotation().mul(createQuaternion(triple.getMiddle().mul(-1, -1, 1)), new Quaternionf());
+                Vector3f localPos = triple.getLeft().mul(-1,1,1).div(16).add(origin);
 
-                if (requiresFrame)
-                    poses.put(entry.getKey(), Pose.of(matrix4f.scale(entry.getValue().transform().scale())));
+                matrix4f.translate(localPos);
+                matrix4f.rotate(localRot);
+                matrix4f.scale(triple.getRight());
             }
+
+            if (requiresFrame)
+                poses.put(entry.getKey(), Pose.of(matrix4f.scale(entry.getValue().transform().scale())));
         }
         return poses;
     }