Implement SpawnParams struct (#536)

* Impl SpawnParams

* Added json submodule

* Update json

* Update

* Works

* Remove comment

* Works refactor

* Snowman and thwomp working

* Impl hot air balloon

* More progress

* All OObjects are done

* cleanup

* Refactor 2Dpath to normal path

* Update nlohmann json & fix compile

* Rest of actors

* MORE CHANGES

* Finish actors

* Done PR, some fix to collision viewer

* Impl falling rocks

* Add const

* wip editor refactor

* Property work

* continue

* Overridable editor properties

* Actor saving/loading works now

* Fix light alignment

* Clarification

* Impl penguin

* params impl signs

* properties impl falling rock

* More property impls

* impl air balloon

* Add spawnParams to OObject Translate

* Snowman translate better

* impl hedgehog properly

* properties impl trophy

* thwomp progress

* Finish impl properties

* Fix compile

* Fix cursor collisions

* Move registered actors

* Rename pathPoint XYZ to xyz

* Fix editor pause bug

* Clean up

* Review comments

* Remove SpawnParams struct from actor classes

* Rename

* Player Label First Iteration

* Work now

* Working 3d text

* Fix boo bug

* Finish AText actor

* Fix spawnparams compile

* Register AText

* Finish Text Actor

* Fix thwomp interpolation

* Fix compile

* Fix crab and hedgehog

* Fix loading flagpole

* Fix Hot Air Balloon

* Turn zbuffer on for AText

* Update

---------

Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>

1 files changed, 18 insertions, 5 deletions

diff --git a/src/engine/objects/Boos.h b/src/engine/objects/Boos.h
index cc49df474..693405dcb 100644
--- a/src/engine/objects/Boos.h
+++ b/src/engine/objects/Boos.h
@@ -36,7 +36,19 @@ extern "C" {
  */
 class OBoos : public OObject {
 public:
-    explicit OBoos(size_t numBoos, const IPathSpan& leftBoundary, const IPathSpan& active, const IPathSpan& rightBoundary);
+    // This is simply a helper function to keep Spawning code clean
+    static inline OBoos* Spawn(size_t numBoos, const IPathSpan& leftBoundary, const IPathSpan& triggerBoundary, const IPathSpan& rightBoundary) {
+        SpawnParams params = {
+            .Name = "mk:boos",
+            .Count = numBoos,
+            .LeftExitSpan = leftBoundary,
+            .TriggerSpan = triggerBoundary,
+            .RightExitSpan = rightBoundary,
+        };
+        return static_cast<OBoos*>(gWorldInstance.AddObject(new OBoos(params)));
+    }
+
+    explicit OBoos(const SpawnParams& params);
 
     ~OBoos() {
         _count--;
@@ -46,8 +58,10 @@ public:
         return _count;
     }
 
+    virtual void SetSpawnParams(SpawnParams& params) override;
     virtual void Tick() override;
     virtual void Draw(s32 cameraId) override;
+    virtual void DrawEditorProperties() override;
     void func_800523B8(s32 objectIndex, s32 arg1, u32 arg2);
 
     void func_8007CA70(void);
@@ -59,6 +73,9 @@ public:
     void BooExit(s32 someIndex);
     void func_8007C550(s32 objectIndex);
 
+    IPathSpan LeftTrigger;
+    IPathSpan ActiveZone;
+    IPathSpan RightTrigger;
 private:
     FVector _pos;
     static size_t _count;
@@ -68,8 +85,4 @@ private:
 
     bool _isActive = false;
     s32 _playerId = 0;
-
-    IPathSpan _leftBoundary;
-    IPathSpan _active;
-    IPathSpan _rightBoundary;
 };