bones logic

mcmonkey4eva · mcmonkey4eva · commit ab493a81b1bc · 2022-05-29T09:10:21.000-07:00
diff --git a/DenizenModelsConverter/BBModel.cs b/DenizenModelsConverter/BBModel.cs
@@ -93,7 +93,7 @@ public class Outliner
 
             public List<Guid> Children = new();
 
-            public List<Guid> Paired = new();
+            public Guid? Parent;
         }
 
         public class Animation
diff --git a/DenizenModelsConverter/BBModelReader.cs b/DenizenModelsConverter/BBModelReader.cs
@@ -231,16 +231,15 @@ public static void AddOutlineChild(BBModel model, BBModel.Outliner outline, JTok
                     element.Rotation = new DoubleVector();
                     element.Origin = new DoubleVector();
                     element.Outline = specialSideOutline;
+                    specialSideOutline.Parent = outline.UUID;
                     specialSideOutline.Children.Add(element.UUID);
                     model.Outlines.Add(specialSideOutline);
-                    outline.Paired.Add(specialSideOutline.UUID);
                 }
             }
             else
             {
                 BBModel.Outliner subLine = ReadOutliner(model, (JObject)child, names);
-                outline.Paired.Add(subLine.UUID);
-                outline.Paired.AddRange(subLine.Paired);
+                subLine.Parent = outline.UUID;
             }
         }
 
diff --git a/DenizenModelsConverter/PackMaker.cs b/DenizenModelsConverter/PackMaker.cs
@@ -86,7 +86,7 @@ public static void BuildPack(string rawModelPath, BBModel model, string item, st
                     JObject skippedEntry = new();
                     skippedEntry.Add("name", outline.Name);
                     skippedEntry.Add("empty", true);
-                    skippedEntry.Add("pairs", new JArray(outline.Paired.Select(p => p.ToString()).ToArray()));
+                    skippedEntry.Add("parent", outline.Parent == null ? "none" : outline.Parent.ToString());
                     modelSet.Add(outline.UUID.ToString(), skippedEntry);
                     continue;
                 }
@@ -110,7 +110,7 @@ public static void BuildPack(string rawModelPath, BBModel model, string item, st
                 modelEntry.Add("item", $"{item}[custom_model_data={id}]");
                 modelEntry.Add("origin", outline.Origin.ToDenizenString());
                 modelEntry.Add("rotation", outline.Rotation.ToDenizenString());
-                modelEntry.Add("pairs", new JArray(outline.Paired.Select(p => p.ToString()).ToArray()));
+                modelEntry.Add("parent", outline.Parent == null ? "none" : outline.Parent.ToString());
                 modelSet.Add(outline.UUID.ToString(), modelEntry);
             }
             Debug("Models done. Outputting new item override...");
@@ -153,11 +153,42 @@ public static void BuildPack(string rawModelPath, BBModel model, string item, st
                 animations.Add(animation.Name, jAnimation);
             }
             Debug("Animations done. Building Denizen file...");
+            JArray partsOrder = new();
+            BuildPartsOrder(model, null, partsOrder);
+            if (partsOrder.Count != model.Outlines.Count)
+            {
+                throw new Exception($"Failed to build parts order, listed {partsOrder.Count} but expected {model.Outlines.Count} ... are bone parents wrong?");
+            }
             JObject denizenFile = new();
+            denizenFile.Add("order", partsOrder);
             denizenFile.Add("models", modelSet);
             denizenFile.Add("animations", animations);
             File.WriteAllText($"{rawModelPath.Replace(".bbmodel", "")}.dmodel.yml", denizenFile.ToString());
             Console.WriteLine("Exported full bbmodel.");
         }
+
+        public static void BuildPartsOrder(BBModel model, Guid? id, JArray output)
+        {
+            List<BBModel.Outliner> partsToAdd = new();
+            foreach (BBModel.Outliner outline in model.Outlines)
+            {
+                if (outline.Parent == id)
+                {
+                    partsToAdd.Add(outline);
+                }
+            }
+            if (partsToAdd.IsEmpty())
+            {
+                return;
+            }
+            foreach (BBModel.Outliner part in partsToAdd)
+            {
+                output.Add(part.UUID.ToString());
+            }
+            foreach (BBModel.Outliner part in partsToAdd)
+            {
+                BuildPartsOrder(model, part.UUID, output);
+            }
+        }
     }
 }
diff --git a/scripts/dmodels.dsc b/scripts/dmodels.dsc
@@ -1,5 +1,5 @@
 
-model_part_stand:
+dmodel_part_stand:
     type: entity
     debug: false
     entity_type: armor_stand
@@ -8,25 +8,46 @@ model_part_stand:
         gravity: false
         visible: false
 
-spawn_model:
+dmodels_load_model:
     type: task
     debug: false
-    definitions: model_name|location
+    definitions: model_name
     script:
-    - define location <[location].center>
     - define yamlid dmodels_<[model_name]>
     - define filename data/models/<[model_name]>.dmodel.yml
     - if !<server.has_file[<[filename]>]>:
         - debug error "Invalid model <[model_name]>, file does not exist: <[filename]>, cannot load"
         - stop
     - ~yaml id:<[yamlid]> load:<[filename]>
+    - define order <yaml[<[yamlid]>].read[order]>
     - define parts <yaml[<[yamlid]>].read[models]>
-    - flag server dmodels_data.model_<[model_name]>:<[parts]>
-    - flag server dmodels_data.animations_<[model_name]>:<yaml[<[yamlid]>].read[animations]||<map>>
+    - define animations <yaml[<[yamlid]>].read[animations]||<map>>
     - yaml unload id:<[yamlid]>
-    - spawn model_part_stand <[location]> save:root
+    - foreach <[order]> as:id:
+        - define raw_parts.<[id]> <[parts.<[id]>]>
+    - foreach <[animations]> key:name as:anim:
+        - foreach <[order]> as:id:
+            - if <[anim.animators].contains[<[id]>]>:
+                - define raw_animators.<[id]> <[anim.animators.<[id]>]>
+            - else:
+                - define raw_animators.<[id]> <map[frames=<list>]>
+        - define anim.animators <[raw_animators]>
+        - define raw_animations.<[name]> <[anim]>
+    - flag server dmodels_data.model_<[model_name]>:<[raw_parts]>
+    - flag server dmodels_data.animations_<[model_name]>:<[raw_animations]>
+
+dmodels_spawn_model:
+    type: task
+    debug: false
+    definitions: model_name|location
+    script:
+    - if !<server.has_flag[dmodels_data.model_<[model_name]>]>:
+        - debug error "[DModels] cannot spawn model <[model_name]>, model not loaded"
+        - stop
+    - define location <[location].center>
+    - spawn dmodel_part_stand <[location]> save:root
     - flag <entry[root].spawned_entity> dmodel_model_id:<[model_name]>
-    - foreach <[parts]> key:id as:part:
+    - foreach <server.flag[dmodels_data.model_<[model_name]>]> key:id as:part:
         - if <[part.empty]||false>:
             - foreach next
         - define rots <[part.rotation].split[,].parse[to_radians]>
@@ -35,15 +56,12 @@ spawn_model:
         # Supposedly it's 25.6 according to external docs (16 * 1.6), but that also is wrong in my testing.
         - define offset <location[<[part.origin]>].div[25.6].rotate_around_y[<util.pi>]>
         - define pose <[rots].get[1].mul[-1]>,<[rots].get[2].mul[-1]>,<[rots].get[3]>
-        - spawn model_part_stand[equipment=[helmet=<[part.item]>];armor_pose=[head=<[pose]>]] <[location].add[<[offset]>]> save:spawned
+        - spawn dmodel_part_stand[equipment=[helmet=<[part.item]>];armor_pose=[head=<[pose]>]] <[location].add[<[offset]>]> save:spawned
         - flag <entry[spawned].spawned_entity> dmodel_def_pose:<[pose]>
         - flag <entry[spawned].spawned_entity> dmodel_def_offset:<[offset]>
         - 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>
-    - foreach <[parts]> key:id as:part:
-        - foreach <[part.pairs]> as:pair_id:
-            - flag <entry[root].spawned_entity> dmodel_anim_part.<[id]>:|:<entry[root].spawned_entity.flag[dmodel_anim_part.<[pair_id]>]||<list>>
     - determine <entry[root].spawned_entity>
 
 dmodels_correct_to_default_position:
@@ -74,7 +92,8 @@ dmodels_move_to_frame:
     debug: false
     definitions: root_entity|animation|timespot
     script:
-    - define animation_data <server.flag[dmodels_data.animations_<[root_entity].flag[dmodel_model_id]>.<[animation]>]||null>
+    - define model_data <server.flag[dmodels_data.model_<[root_entity].flag[dmodel_model_id]>]>
+    - define animation_data <server.flag[dmodels_data.animations_<[root_entity].flag[dmodel_model_id]>.<[animation]>]>
     - if <[timespot]> > <[animation_data.length]>:
         - choose <[animation_data.loop]>:
             - case loop:
@@ -89,10 +108,8 @@ dmodels_move_to_frame:
             - case hold:
                 - define timespot <[animation_data.length]>
                 - flag server dmodels_anim_active.<[root_entity].uuid>:!
+    - define parentage <map>
     - foreach <[animation_data.animators]> key:part_id as:animator:
-        - define ents <[root_entity].flag[dmodel_anim_part.<[part_id]>]||<list>>
-        - if <[ents].is_empty>:
-            - foreach next
         - foreach position|rotation as:channel:
             - define relevant_frames <[animator.frames].filter[get[channel].equals[<[channel]>]]>
             - define before_frame <[relevant_frames].filter[get[time].is_less_than_or_equal_to[<[timespot]>]].last||null>
@@ -102,35 +119,47 @@ dmodels_move_to_frame:
             - if <[after_frame]> == null:
                 - define after_frame <[before_frame]>
             - if <[before_frame]> == null:
-                - foreach next
-            - define time_range <[after_frame.time].sub[<[before_frame.time]>]>
-            - if <[time_range]> == 0:
-                - define time_percent 0
+                - define data 0,0,0
             - else:
-                - define time_percent <[timespot].sub[<[before_frame.time]>].div[<[time_range]>]>
-            - choose <[before_frame.interpolation]>:
-                - case catmullrom:
-                    - define before_extra <[relevant_frames].filter[get[time].is_less_than[<[before_frame.time]>]].last||null>
-                    - if <[before_extra]> == null:
-                        - define before_extra <[before_frame]>
-                    - define after_extra <[relevant_frames].filter[get[time].is_more_than[<[after_frame.time]>]].first||null>
-                    - if <[after_extra]> == null:
-                        - define after_extra <[after_frame]>
-                    - define p0 <[before_extra.data].as_location>
-                    - define p1 <[before_frame.data].as_location>
-                    - define p2 <[after_frame.data].as_location>
-                    - define p3 <[after_extra.data].as_location>
-                    - define data <proc[dmodels_catmullrom_proc].context[<[p0]>|<[p1]>|<[p2]>|<[p3]>|<[time_percent]>]>
-                - case linear:
-                    - define data <[after_frame.data].as_location.sub[<[before_frame.data]>].mul[<[time_percent]>].add[<[before_frame.data]>].xyz>
-                - case step:
-                    - define data <[before_frame.data]>
-            - foreach <[ents]> as:ent:
+                - define time_range <[after_frame.time].sub[<[before_frame.time]>]>
+                - if <[time_range]> == 0:
+                    - define time_percent 0
+                - else:
+                    - define time_percent <[timespot].sub[<[before_frame.time]>].div[<[time_range]>]>
+                - choose <[before_frame.interpolation]>:
+                    - case catmullrom:
+                        - define before_extra <[relevant_frames].filter[get[time].is_less_than[<[before_frame.time]>]].last||null>
+                        - if <[before_extra]> == null:
+                            - define before_extra <[before_frame]>
+                        - define after_extra <[relevant_frames].filter[get[time].is_more_than[<[after_frame.time]>]].first||null>
+                        - if <[after_extra]> == null:
+                            - define after_extra <[after_frame]>
+                        - define p0 <[before_extra.data].as_location>
+                        - define p1 <[before_frame.data].as_location>
+                        - define p2 <[after_frame.data].as_location>
+                        - define p3 <[after_extra.data].as_location>
+                        - define data <proc[dmodels_catmullrom_proc].context[<[p0]>|<[p1]>|<[p2]>|<[p3]>|<[time_percent]>]>
+                    - case linear:
+                        - define data <[after_frame.data].as_location.sub[<[before_frame.data]>].mul[<[time_percent]>].add[<[before_frame.data]>].xyz>
+                    - case step:
+                        - define data <[before_frame.data]>
+            - define parent_data 0,0,0
+            - define parent_id <[model_data.<[part_id]>.parent]>
+            - while <[parent_id]> != none:
+                - define new_data <[parentage.<[parent_id]>.<[channel]>]||null>
+                - if <[new_data]> != null:
+                    - define parent_data <[new_data]>
+                    - while stop
+                - define parent_id <[model_data.<[parent_id]>.parent]>
+            - define data <[data].as_location.add[<[parent_data]>]>
+            - define parentage.<[part_id]>.<[channel]>:<[data]>
+            - debug log "<[data]> and <[parent_data]> for <[part_id]> and <[model_data.<[part_id]>.parent]||0> in <[channel]>"
+            - foreach <[root_entity].flag[dmodel_anim_part.<[part_id]>]||<list>> as:ent:
                 - choose <[channel]>:
                     - case position:
-                        - teleport <[ent]> <[root_entity].location.add[<[ent].flag[dmodel_def_offset].add[<[data].as_location.div[25.6]>]>]>
+                        - teleport <[ent]> <[root_entity].location.add[<[ent].flag[dmodel_def_offset].add[<[data].div[25.6]>]>]>
                     - case rotation:
-                        - define radian_rot <[data].as_location.xyz.split[,].parse[to_radians].separated_by[,]>
+                        - define radian_rot <[data].xyz.split[,].parse[to_radians].separated_by[,]>
                         - adjust <[ent]> armor_pose:[head=<[ent].flag[dmodel_def_pose].as_location.add[<[radian_rot]>].xyz>]
 
 dmodels_catmullrom_get_t:

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public class Outliner`
`93`	`93`
`94`	`94`	`public List<Guid> Children = new();`
`95`	`95`
`96`		`- public List<Guid> Paired = new();`
	`96`	`+ public Guid? Parent;`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`public class Animation`
Original file line number	Diff line number	Diff line change
`@@ -231,16 +231,15 @@ public static void AddOutlineChild(BBModel model, BBModel.Outliner outline, JTok`
`231`	`231`	`element.Rotation = new DoubleVector();`
`232`	`232`	`element.Origin = new DoubleVector();`
`233`	`233`	`element.Outline = specialSideOutline;`
	`234`	`+ specialSideOutline.Parent = outline.UUID;`
`234`	`235`	`specialSideOutline.Children.Add(element.UUID);`
`235`	`236`	`model.Outlines.Add(specialSideOutline);`
`236`		`- outline.Paired.Add(specialSideOutline.UUID);`
`237`	`237`	`}`
`238`	`238`	`}`
`239`	`239`	`else`
`240`	`240`	`{`
`241`	`241`	`BBModel.Outliner subLine = ReadOutliner(model, (JObject)child, names);`
`242`		`- outline.Paired.Add(subLine.UUID);`
`243`		`- outline.Paired.AddRange(subLine.Paired);`
	`242`	`+ subLine.Parent = outline.UUID;`
`244`	`243`	`}`
`245`	`244`	`}`
`246`	`245`