Start of helicopter Implementation (#239)

* Start of helicopter Implementation

Mostly Matching, some issues with MxMatrix and/or MxVector4

* Fix some style issues

* Fix some style issues

LEGO1/act3.cpp

@@ -1,5 +1,7 @@
 #include "act3.h"
 
+DECOMP_SIZE_ASSERT(Act3, 0x4274)
+
 // OFFSET: LEGO1 0x10072270 STUB
 Act3::Act3()
 {

LEGO1/act3.h

@@ -25,6 +25,11 @@ public:
     return !strcmp(name, Act3::ClassName()) || LegoWorld::IsA(name);
   }
 
+  inline void SetUnkown420c(MxEntity *p_entity) { m_unk420c = p_entity; }
+  protected:
+    undefined m_unkf8[0x4114];
+    MxEntity *m_unk420c;
+    undefined m_unk4210[0x64];
 };
 
 

LEGO1/helicopter.cpp

@@ -1,13 +1,43 @@
 #include "helicopter.h"
+#include "act3.h"
+#include "legoomni.h"
+#include "legocontrolmanager.h"
+#include "legogamestate.h"
+#include "legoworld.h"
 
-// OFFSET: LEGO1 0x10001e60 STUB
+DECOMP_SIZE_ASSERT(Helicopter, 0x230)
+
+// OFFSET: LEGO1 0x10001e60
 Helicopter::Helicopter()
 {
-  // TODO
+  m_unk13c = 60;
 }
 
-// OFFSET: LEGO1 0x10003230 STUB
+// OFFSET: LEGO1 0x10003230
 Helicopter::~Helicopter()
 {
-  // TODO
+  ControlManager()->Unregister(this);
+  IslePathActor::Destroy(TRUE);
 }
+
+// OFFSET: LEGO1 0x100032c0
+MxResult Helicopter::InitFromMxDSObject(MxDSObject &p_dsObject)
+{
+  MxResult result = IslePathActor::InitFromMxDSObject(p_dsObject);
+  LegoWorld *world = GetCurrentWorld();
+  SetWorld(world);
+  if (world->IsA("Act3")) {
+    ((Act3 *)GetWorld())->SetUnkown420c(this);
+  }
+  world = GetWorld();
+  if (world) world->VTable0x58(this); 
+  GetState();
+  return result;
+}
+
+// OFFSET: LEGO1 0x10003320
+void Helicopter::GetState()
+{
+  m_state = (HelicopterState *)GameState()->GetState("HelicopterState");
+  if (!m_state) m_state = (HelicopterState *)GameState()->CreateState("HelicopterState");
+}

LEGO1/helicopter.h

@@ -1,7 +1,9 @@
 #ifndef HELICOPTER_H
 #define HELICOPTER_H
 
+#include "helicopterstate.h"
 #include "islepathactor.h"
+#include "mxmatrix.h"
 
 // VTABLE 0x100d40f8
 // SIZE 0x230
@@ -9,7 +11,6 @@ class Helicopter : public IslePathActor
 {
 public:
   Helicopter();
-  virtual ~Helicopter(); // vtable+0x0
 
   // OFFSET: LEGO1 0x10003070
   inline virtual const char *ClassName() const override // vtable+0x0c
@@ -24,6 +25,24 @@ public:
     return !strcmp(name, Helicopter::ClassName()) || IslePathActor::IsA(name);
   }
 
+  virtual MxResult InitFromMxDSObject(MxDSObject &p_dsObject) override; // vtable+0x18
+
+  // OFFSET: LEGO1 0x10003210 TEMPLATE
+  // Helicopter::`scalar deleting destructor'
+  virtual ~Helicopter() override; // vtable+0x0
+
+protected:
+  MxMatrixData m_unk160;
+  MxMatrixData m_unk1a8;
+  undefined4 m_unk1f0;
+  MxVector4Data m_unk1f4;
+  MxVector4Data m_unk20c;
+  undefined4 m_unk224;
+  HelicopterState *m_state;
+  MxAtomId m_unk22c;
+
+private:
+  void GetState();
 };
 
 #endif // HELICOPTER_H

LEGO1/islepathactor.cpp

@@ -11,7 +11,7 @@ IslePathActor::IslePathActor()
   this->m_unk158 = 0;
 }
 
-// OFFSET: LEGO1 0x10002e10
+// OFFSET: LEGO1 0x1001a280
-IslePathActor::~IslePathActor()
+MxResult IslePathActor::InitFromMxDSObject(MxDSObject &p_dsObject) {
-{
+  return MxEntity::InitFromMxDSObject(p_dsObject);
-}
+}

LEGO1/islepathactor.h

@@ -11,7 +11,6 @@ class IslePathActor : public LegoPathActor
 {
 public: 
   IslePathActor();
-  ~IslePathActor();
 
   // OFFSET: LEGO1 0x10002ea0
   inline virtual const char *ClassName() const override // vtable+0x0c
@@ -26,8 +25,20 @@ public:
     return !strcmp(name, IslePathActor::ClassName()) || LegoPathActor::IsA(name);
   }
 
+  // OFFSET: LEGO1 0x10002ff0 TEMPLATE
+  // IslePathActor::`scalar deleting destructor'
+  inline virtual ~IslePathActor() override
+  {
+    IslePathActor::Destroy(TRUE);
+  }
+
+  virtual MxResult InitFromMxDSObject(MxDSObject &p_dsObject) override; // vtable+0x18
+  
+  inline void SetWorld(LegoWorld *p_world) { m_pLegoWorld = p_world; }
+  inline LegoWorld *GetWorld() { return m_pLegoWorld; }
+  
 private:
-  LegoWorld* m_pLegoWorld; // 0x154
+  LegoWorld *m_pLegoWorld; // 0x154
   MxFloat m_unk158;
   MxFloat m_unk15c;
 };

LEGO1/legoworld.cpp

@@ -32,7 +32,7 @@ void LegoWorld::VTable0x54()
 }
 
 // OFFSET: LEGO1 0x10020220 STUB
-void LegoWorld::VTable0x58()
+void LegoWorld::VTable0x58(MxCore *p_object)
 {
   // TODO
 }

LEGO1/legoworld.h

@@ -27,7 +27,7 @@ public:
 
   virtual void Stop(); // vtable+50
   virtual void VTable0x54(); // vtable+54
-  virtual void VTable0x58(); // vtable+58
+  virtual void VTable0x58(MxCore *p_object); // vtable+58
   virtual MxBool VTable0x5c();  // vtable+5c
   virtual void VTable0x60();  // vtable+60
   virtual MxBool VTable0x64(); // vtable+64

LEGO1/mxentity.h

@@ -4,6 +4,7 @@
 #include "decomp.h"
 #include "mxatomid.h"
 #include "mxcore.h"
+#include "mxdsobject.h"
 #include "mxtypes.h"
 
 // VTABLE 0x100d5390
@@ -28,7 +29,12 @@ public:
   }
 
   virtual MxResult SetEntityId(MxS32 p_id, const MxAtomId &p_atom); // vtable+0x14
-
+  inline  MxResult InitFromMxDSObject(MxDSObject &p_dsObject)
+  {
+    m_mxEntityId = p_dsObject.GetObjectId();
+    m_atom = p_dsObject.GetAtomId();
+    return SUCCESS;
+  }
 protected:
   MxS32 m_mxEntityId; // 0x8
   MxAtomId m_atom; // 0xc