scaling fix

Author: mcmonkey4eva

DenizenModelsConverter/MinecraftModelMaker.cs

@@ -35,10 +35,10 @@ public static string CreateModelFor(BBModel model, BBModel.Outliner outline)
                     any = true;
                     JObject jElement = new();
                     jElement.Add("name", element.Name);
-                    jElement.Add("from", DVecToArray(element.From - outline.Origin));
-                    jElement.Add("to", DVecToArray(element.To - outline.Origin));
+                    jElement.Add("from", DVecToArray((element.From - outline.Origin) * SCALE_FACTOR));
+                    jElement.Add("to", DVecToArray((element.To - outline.Origin) * SCALE_FACTOR));
                     JObject rotation = new();
-                    rotation.Add("origin", DVecToArray(element.Origin - outline.Origin));
+                    rotation.Add("origin", DVecToArray((element.Origin - outline.Origin) * SCALE_FACTOR));
                     if (element.Rotation.X != 0)
                     {
                         rotation.Add("angle", element.Rotation.X);
@@ -72,12 +72,12 @@ public static string CreateModelFor(BBModel model, BBModel.Outliner outline)
                 return null;
             }
             group.Add("name", outline.Name);
-            group.Add("origin", DVecToArray(outline.Origin));
+            group.Add("origin", DVecToArray(outline.Origin * SCALE_FACTOR));
             group.Add("color", 0);
             group.Add("children", childrenList);
             groups.Add(group);
-            head.Add("translation", new JArray(8 * Program.SCALE, 3.75 * Program.SCALE, 8 * Program.SCALE));
-            head.Add("scale", new JArray(Program.SCALE, Program.SCALE, Program.SCALE));
+            head.Add("translation", new JArray(32, 25, 32));
+            head.Add("scale", new JArray(4, 4, 4));
             display.Add("head", head);
             jout.Add("textures", textures);
             jout.Add("elements", elements);
@@ -86,6 +86,9 @@ public static string CreateModelFor(BBModel model, BBModel.Outliner outline)
             return jout.ToString();
         }
 
+        /// <summary>2.285 is the scale to be 'normal' size (16 BlockBench pixels = 1 minecraft block), but 4.0 is the scale objects are applied at, so this factor corrects for that.</summary>
+        public const double SCALE_FACTOR = 2.285 / 4.0;
+
         public static JObject FaceToJObj(BBModel.Element.Face face, BBModel model)
         {
             float relativeU = 16f / model.ResolutionX;

DenizenModelsConverter/Program.cs

@@ -13,8 +13,6 @@ public static class Program
     {
         public static AsciiMatcher PATH_CHARS = new(AsciiMatcher.LowercaseLetters + AsciiMatcher.Digits + "_/");
 
-        public const double SCALE = 1.5f;
-
         public static bool Verbose = false;
 
         public static void Debug(string text)

scripts/dmodels.dsc

@@ -125,13 +125,9 @@ dmodels_spawn_model:
         - define parentage.<[id]>.offset <[rot_offset].add[<[parent_offset]>]>
         - if !<[part.item].exists>:
             - foreach next
-        # Idk wtf is with the .div[...] scale below. It's somewhere in the range of 25 to 26. 25.45 seems closest in one of my tests,
-        # but I think that's minecraft packet location imprecision at fault so it's possibly just 26?
-        # Supposedly it's 25.6 according to external docs (16 * 1.6), but that also is wrong in my testing.
-        # 24.5 is closest in my testing thus far.
-        - spawn dmodel_part_stand[equipment=[helmet=<[part.item]>];armor_pose=[head=<[new_rot].xyz>]] <[center].add[<[new_pos].div[24.5].rotate_around_y[<[yaw_mod].mul[-1]>]>]> save:spawned
+        - spawn dmodel_part_stand[equipment=[helmet=<[part.item]>];armor_pose=[head=<[new_rot].xyz>]] <[center].add[<[new_pos].div[16].rotate_around_y[<[yaw_mod].mul[-1]>]>]> save:spawned
         - flag <entry[spawned].spawned_entity> dmodel_def_pose:<[new_rot].xyz>
-        - flag <entry[spawned].spawned_entity> dmodel_def_offset:<[new_pos].div[24.5]>
+        - flag <entry[spawned].spawned_entity> dmodel_def_offset:<[new_pos].div[16]>
         - flag <entry[spawned].spawned_entity> dmodel_root:<entry[root].spawned_entity>
         - flag <entry[root].spawned_entity> dmodel_parts:->:<entry[spawned].spawned_entity>
         - flag <entry[root].spawned_entity> dmodel_anim_part.<[id]>:->:<entry[spawned].spawned_entity>
@@ -257,8 +253,7 @@ dmodels_move_to_frame:
         - define parentage.<[part_id]>.rotation <[new_rot]>
         - define parentage.<[part_id]>.offset <[rot_offset].add[<[parent_offset]>]>
         - foreach <[root_entity].flag[dmodel_anim_part.<[part_id]>]||<list>> as:ent:
-            # Note: 24.5 is the offset multiplifer explained in the comments of dmodels_spawn_model
-            - teleport <[ent]> <[center].add[<[new_pos].div[24.5].rotate_around_y[<[yaw_mod].mul[-1]>]>]>
+            - teleport <[ent]> <[center].add[<[new_pos].div[16].rotate_around_y[<[yaw_mod].mul[-1]>]>]>
             - define radian_rot <[new_rot].add[<[pose]>].xyz.split[,]>
             - define pose <[radian_rot].get[1]>,<[radian_rot].get[2]>,<[radian_rot].get[3]>
             - adjust <[ent]> armor_pose:[head=<[pose]>]