Merge pull request #84 from ThanatosGit/change-bmsld

Rename unknown, add all_actors method

src/mercury_engine_data_structures/formats/bmsld.py

@@ -1,10 +1,10 @@
 import logging
-from typing import Iterator
+from typing import Iterator, Tuple
 
 import construct
 from construct import Const, Construct, Container, Flag, Float32l, Hex, Int32ul, Struct, Switch
 
-from mercury_engine_data_structures.common_types import Float, StrId, make_dict, make_vector
+from mercury_engine_data_structures.common_types import CVector3D, Float, StrId, make_dict, make_vector
 from mercury_engine_data_structures.construct_extensions.misc import ErrorWithMessage
 from mercury_engine_data_structures.formats import BaseResource
 from mercury_engine_data_structures.formats.collision import collision_formats
@@ -52,13 +52,8 @@
 ProperActor = Struct(
     type=StrId,
 
-    x=Float,
-    y=Float,
-    z=Float,
-    unk05=Hex(Int32ul),
-    unk06=Hex(Int32ul),
-    unk07=Hex(Int32ul),
-
+    position=CVector3D,
+    rotation=CVector3D,
     components=make_vector(Struct(
         component_type=StrId,
         command=StrId,
@@ -149,6 +144,11 @@ class Bmsld(BaseResource):
     def construct_class(cls, target_game: Game) -> Construct:
         return BMSLD
 
+    def all_actors(self) -> Iterator[Tuple[int, str, construct.Container]]:
+        for layer in self.raw.actors:
+            for actor_name, actor in layer.items():
+                yield layer, actor_name, actor
+
     def all_actor_groups(self) -> Iterator[tuple[str, Container]]:
         for sub_area in self.raw.sub_areas:
             yield sub_area.name, sub_area

src/mercury_engine_data_structures/samus_returns_types.json

@@ -1353,12 +1353,8 @@
         "parent": "CGameObject",
         "fields": {
             "type": "base::global::StrId",
-            "x": "float",
-            "y": "float",
-            "z": "float",
-            "unk05": "unsigned",
-            "unk06": "unsigned",
-            "unk07": "unsigned",
+            "position": "base::math::CVector3D",
+            "rotation": "base::math::CVector3D",
             "components": "base::global::CRntVector<Component>"
         }
     },
@@ -1409,5 +1405,9 @@
     "unsigned": {
         "kind": "primitive",
         "primitive_kind": "uint"
+    },
+    "base::math::CVector3D": {
+        "kind": "primitive",
+        "primitive_kind": "float_vec3"
     }
 }

tests/formats/test_bmsld.py

@@ -60,6 +60,10 @@ def test_get_actor_group(surface_bmsld: Bmsld):
     with pytest.raises(KeyError):
         surface_bmsld.get_actor_group("blabla")
 
+def test_all_actors(surface_bmsld: Bmsld):
+    all_actors = list(surface_bmsld.all_actors())
+    assert len(all_actors) == 232
+
 def test_all_actor_group_names_for_actor(surface_bmsld: Bmsld):
     groups = surface_bmsld.all_actor_group_names_for_actor("LE_EnergyRecharge")
     assert groups == [