[Editor][Core] Working on serialization for components (colliders and…

… joints)
fabsgc · Nov 1, 2024 · 295b10f · 295b10f
1 parent e47dfbb
commit 295b10f
Show file tree

Hide file tree

Showing 27 changed files with 157 additions and 3 deletions.
diff --git a/Source/Framework/Core/Components/TeCBoxCollider.cpp b/Source/Framework/Core/Components/TeCBoxCollider.cpp
@@ -81,4 +81,13 @@ namespace te
                 _parent->AddCollider(static_object_cast<CCollider>(GetHandle()));
         }
     }
+
+    void CBoxCollider::ExportComponent(nlohmann::json& coJsonDocument) const
+    {
+        CCollider::ExportComponent(coJsonDocument);
+
+        coJsonDocument["type"] = GetComponentType();
+
+        // TODO serialization
+    }
 }
diff --git a/Source/Framework/Core/Components/TeCBoxCollider.h b/Source/Framework/Core/Components/TeCBoxCollider.h
@@ -30,6 +30,9 @@ namespace te
         /** @copydoc BoxCollider::GetExtents */
         Vector3 GetExtents() const { return _extents; }
 
+    public:
+        void ExportComponent(nlohmann::json& coJsonDocument) const override;
+
     protected:
         friend class SceneObject;
 

diff --git a/Source/Framework/Core/Components/TeCCapsuleCollider.cpp b/Source/Framework/Core/Components/TeCCapsuleCollider.cpp
@@ -98,4 +98,13 @@ namespace te
                 _parent->AddCollider(static_object_cast<CCollider>(GetHandle()));
         }
     }
+
+    void CCapsuleCollider::ExportComponent(nlohmann::json& coJsonDocument) const
+    {
+        CCollider::ExportComponent(coJsonDocument);
+
+        coJsonDocument["type"] = GetComponentType();
+
+        // TODO serialization
+    }
 }
diff --git a/Source/Framework/Core/Components/TeCCapsuleCollider.h b/Source/Framework/Core/Components/TeCCapsuleCollider.h
@@ -35,6 +35,9 @@ namespace te
         /** @copydoc CapsuleCollider::GetHeight */
         float GetHeight() const { return _height;  }
 
+    public:
+        void ExportComponent(nlohmann::json& coJsonDocument) const override;
+
     protected:
         friend class SceneObject;
 

diff --git a/Source/Framework/Core/Components/TeCConeCollider.cpp b/Source/Framework/Core/Components/TeCConeCollider.cpp
@@ -100,4 +100,13 @@ namespace te
                 _parent->AddCollider(static_object_cast<CCollider>(GetHandle()));
         }
     }
+
+    void CConeCollider::ExportComponent(nlohmann::json& coJsonDocument) const
+    {
+        CCollider::ExportComponent(coJsonDocument);
+
+        coJsonDocument["type"] = GetComponentType();
+
+        // TODO serialization
+    }
 }
diff --git a/Source/Framework/Core/Components/TeCConeCollider.h b/Source/Framework/Core/Components/TeCConeCollider.h
@@ -35,6 +35,9 @@ namespace te
         /** @copydoc CapsuleCollider::GetHeight */
         float GetHeight() const { return _height; }
 
+    public:
+        void ExportComponent(nlohmann::json& coJsonDocument) const override;
+
     protected:
         friend class SceneObject;
 

diff --git a/Source/Framework/Core/Components/TeCConeTwistJoint.cpp b/Source/Framework/Core/Components/TeCConeTwistJoint.cpp
@@ -195,4 +195,13 @@ namespace te
         if (_internal != nullptr)
             std::static_pointer_cast<ConeTwistJoint>(_internal)->SetMaxMotorImpulse(motorImpulse);
     }
+
+    void CConeTwistJoint::ExportComponent(nlohmann::json& coJsonDocument) const
+    {
+        CJoint::ExportComponent(coJsonDocument);
+
+        coJsonDocument["type"] = GetComponentType();
+
+        // TODO serialization
+    }
 }
diff --git a/Source/Framework/Core/Components/TeCConeTwistJoint.h b/Source/Framework/Core/Components/TeCConeTwistJoint.h
@@ -83,6 +83,9 @@ namespace te
         /** @copydoc ConeTwistJoint::GetMaxMotorImpulse */
         bool GetMaxMotorImpulse() const { return _motorImpulse; }
 
+    public:
+        void ExportComponent(nlohmann::json& coJsonDocument) const override;
+
     protected:
         friend class SceneObject;
 

diff --git a/Source/Framework/Core/Components/TeCCylinderCollider.cpp b/Source/Framework/Core/Components/TeCCylinderCollider.cpp
@@ -78,4 +78,13 @@ namespace te
                 _parent->AddCollider(static_object_cast<CCollider>(GetHandle()));
         }
     }
+
+    void CCylinderCollider::ExportComponent(nlohmann::json& coJsonDocument) const
+    {
+        CCollider::ExportComponent(coJsonDocument);
+
+        coJsonDocument["type"] = GetComponentType();
+
+        // TODO serialization
+    }
 }
diff --git a/Source/Framework/Core/Components/TeCCylinderCollider.h b/Source/Framework/Core/Components/TeCCylinderCollider.h
@@ -29,6 +29,9 @@ namespace te
         /** @copydoc CylinderCollider::GetExtents */
         Vector3 GetExtents() const { return _extents; }
 
+    public:
+        void ExportComponent(nlohmann::json& coJsonDocument) const override;
+
     protected:
         friend class SceneObject;
 

diff --git a/Source/Framework/Core/Components/TeCD6Joint.cpp b/Source/Framework/Core/Components/TeCD6Joint.cpp
@@ -193,4 +193,13 @@ namespace te
         if (_internal != nullptr)
             std::static_pointer_cast<D6Joint>(_internal)->SetAngularDamping(angularDamping);
     }
+
+    void CD6Joint::ExportComponent(nlohmann::json& coJsonDocument) const
+    {
+        CJoint::ExportComponent(coJsonDocument);
+
+        coJsonDocument["type"] = GetComponentType();
+
+        // TODO serialization
+    }
 }
diff --git a/Source/Framework/Core/Components/TeCD6Joint.h b/Source/Framework/Core/Components/TeCD6Joint.h
@@ -83,6 +83,9 @@ namespace te
         /** @copydoc D6Joint::GetAngularDamping */
         float GetAngularDamping() const { return _angularDamping; }
 
+    public:
+        void ExportComponent(nlohmann::json& coJsonDocument) const override;
+
     protected:
         friend class SceneObject;
 

diff --git a/Source/Framework/Core/Components/TeCHeightFieldCollider.cpp b/Source/Framework/Core/Components/TeCHeightFieldCollider.cpp
@@ -124,4 +124,13 @@ namespace te
                 _parent->AddCollider(static_object_cast<CCollider>(GetHandle()));
         }
     }
+
+    void CHeightFieldCollider::ExportComponent(nlohmann::json& coJsonDocument) const
+    {
+        CCollider::ExportComponent(coJsonDocument);
+
+        coJsonDocument["type"] = GetComponentType();
+
+        // TODO serialization
+    }
 }
diff --git a/Source/Framework/Core/Components/TeCHeightFieldCollider.h b/Source/Framework/Core/Components/TeCHeightFieldCollider.h
@@ -43,6 +43,9 @@ namespace te
         /** @copydoc HeightFieldCollider::GetMaxHeight */
         float GetMaxHeight() const { return _maxHeight; }
 
+    public:
+        void ExportComponent(nlohmann::json& coJsonDocument) const override;
+
     protected:
         friend class SceneObject;
 

diff --git a/Source/Framework/Core/Components/TeCHingeJoint.cpp b/Source/Framework/Core/Components/TeCHingeJoint.cpp
@@ -184,4 +184,13 @@ namespace te
         if (_internal != nullptr)
             std::static_pointer_cast<HingeJoint>(_internal)->SetMotorVelocity(motorVelocity);
     }
+
+    void CHingeJoint::ExportComponent(nlohmann::json& coJsonDocument) const
+    {
+        CJoint::ExportComponent(coJsonDocument);
+
+        coJsonDocument["type"] = GetComponentType();
+
+        // TODO serialization
+    }
 }
diff --git a/Source/Framework/Core/Components/TeCHingeJoint.h b/Source/Framework/Core/Components/TeCHingeJoint.h
@@ -77,6 +77,9 @@ namespace te
         /** @copydoc HingeJoint::GetMotorVelocity */
         bool GetMotorVelocity() const { return _motorVelocity; }
 
+    public:
+        void ExportComponent(nlohmann::json& coJsonDocument) const override;
+
     protected:
         friend class SceneObject;
 

diff --git a/Source/Framework/Core/Components/TeCJoint.h b/Source/Framework/Core/Components/TeCJoint.h
@@ -77,7 +77,7 @@ namespace te
         Joint* GetInternal() const { return _internal.get(); }
 
     public:
-        void ExportComponent(nlohmann::json& coJsonDocument) const override;
+        virtual void ExportComponent(nlohmann::json& coJsonDocument) const override;
 
     protected:
         friend class SceneObject;

diff --git a/Source/Framework/Core/Components/TeCMeshCollider.cpp b/Source/Framework/Core/Components/TeCMeshCollider.cpp
@@ -112,4 +112,13 @@ namespace te
                 _parent->AddCollider(static_object_cast<CCollider>(GetHandle()));
         }
     }
+
+    void CMeshCollider::ExportComponent(nlohmann::json& coJsonDocument) const
+    {
+        CCollider::ExportComponent(coJsonDocument);
+
+        coJsonDocument["type"] = GetComponentType();
+
+        // TODO serialization
+    }
 }
diff --git a/Source/Framework/Core/Components/TeCMeshCollider.h b/Source/Framework/Core/Components/TeCMeshCollider.h
@@ -33,6 +33,9 @@ namespace te
 
         PhysicsMeshType GetCollisionType() const { return _collisionType; }
 
+    public:
+        void ExportComponent(nlohmann::json& coJsonDocument) const override;
+
     protected:
         friend class SceneObject;
 

diff --git a/Source/Framework/Core/Components/TeCPlaneCollider.cpp b/Source/Framework/Core/Components/TeCPlaneCollider.cpp
@@ -85,4 +85,13 @@ namespace te
                 _parent->AddCollider(static_object_cast<CCollider>(GetHandle()));
         }
     }
+
+    void CPlaneCollider::ExportComponent(nlohmann::json& coJsonDocument) const
+    {
+        CCollider::ExportComponent(coJsonDocument);
+
+        coJsonDocument["type"] = GetComponentType();
+
+        // TODO serialization
+    }
 }
diff --git a/Source/Framework/Core/Components/TeCPlaneCollider.h b/Source/Framework/Core/Components/TeCPlaneCollider.h
@@ -29,6 +29,9 @@ namespace te
         /** @copydoc PlaneCollider::GetNormal */
         const Vector3& GetNormal() const { return _normal; }
 
+    public:
+        void ExportComponent(nlohmann::json& coJsonDocument) const override;
+
     protected:
         friend class SceneObject;
 

diff --git a/Source/Framework/Core/Components/TeCSliderJoint.cpp b/Source/Framework/Core/Components/TeCSliderJoint.cpp
@@ -429,4 +429,13 @@ namespace te
         if (_internal != nullptr)
             std::static_pointer_cast<SliderJoint>(_internal)->SetMaxAngMotorForce(maxAngMotorForce);
     }
+
+    void CSliderJoint::ExportComponent(nlohmann::json& coJsonDocument) const
+    {
+        CJoint::ExportComponent(coJsonDocument);
+
+        coJsonDocument["type"] = GetComponentType();
+
+        // TODO serialization
+    }
 }
diff --git a/Source/Framework/Core/Components/TeCSliderJoint.h b/Source/Framework/Core/Components/TeCSliderJoint.h
@@ -191,6 +191,9 @@ namespace te
         /** @copydoc GetMaxAngMotorForce */
         float GetMaxAngMotorForce() const { return _maxAngMotorForce; }
 
+    public:
+        void ExportComponent(nlohmann::json& coJsonDocument) const override;
+
     protected:
         friend class SceneObject;
 

diff --git a/Source/Framework/Core/Components/TeCSphereCollider.cpp b/Source/Framework/Core/Components/TeCSphereCollider.cpp
@@ -79,4 +79,13 @@ namespace te
                 _parent->AddCollider(static_object_cast<CCollider>(GetHandle()));
         }
     }
+
+    void CSphereCollider::ExportComponent(nlohmann::json& coJsonDocument) const
+    {
+        CCollider::ExportComponent(coJsonDocument);
+
+        coJsonDocument["type"] = GetComponentType();
+
+        // TODO serialization
+    }
 }
diff --git a/Source/Framework/Core/Components/TeCSphereCollider.h b/Source/Framework/Core/Components/TeCSphereCollider.h
@@ -14,8 +14,6 @@ namespace te
     class TE_CORE_EXPORT CSphereCollider : public CCollider
     {
     public:
-
-
         /** Return Component type */
         static UINT32 GetComponentType() { return TypeID_Core::TID_CSphereCollider; }
 
@@ -31,6 +29,9 @@ namespace te
         /** @copydoc SphereCollider::GetRadius */
         float GetRadius() const { return _radius; }
 
+    public:
+        void ExportComponent(nlohmann::json& coJsonDocument) const override;
+
     protected:
         friend class SceneObject;
 

diff --git a/Source/Framework/Core/Components/TeCSphericalJoint.cpp b/Source/Framework/Core/Components/TeCSphericalJoint.cpp
@@ -54,4 +54,13 @@ namespace te
     {
         CJoint::OnEnabled();
     }
+
+    void CSphericalJoint::ExportComponent(nlohmann::json& coJsonDocument) const
+    {
+        CJoint::ExportComponent(coJsonDocument);
+
+        coJsonDocument["type"] = GetComponentType();
+
+        // TODO serialization
+    }
 }
diff --git a/Source/Framework/Core/Components/TeCSphericalJoint.h b/Source/Framework/Core/Components/TeCSphericalJoint.h
@@ -23,6 +23,9 @@ namespace te
         /** @copydoc Component::Clone */
         bool Clone(const HComponent& c, const String& suffix = "") override;
 
+    public:
+        void ExportComponent(nlohmann::json& coJsonDocument) const override;
+
     protected:
         friend class SceneObject;