[Refactoring] Vector3 should not derivate from another type as it is …

…used in 3d buffers
fabsgc · Jan 1, 2025 · 07099c8 · 07099c8
1 parent 151b5d8
commit 07099c8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Source/Framework/Utility/Math/TeQuaternion.h b/Source/Framework/Utility/Math/TeQuaternion.h
@@ -1,14 +1,14 @@
 #pragma once
 
 #include "Prerequisites/TePrerequisitesUtility.h"
+#include "ThirdParty/Json/json.h"
 #include "Math/TeMath.h"
 #include "Math/TeVector3.h"
-#include "Serialization/TeJsonSerialization.h"
 
 namespace te
 {
      /** Represents a quaternion used for 3D rotations. */
-    class TE_UTILITY_EXPORT Quaternion : public serialization::JsonSerialization
+    class TE_UTILITY_EXPORT Quaternion
     {
     private:
         struct EulerAngleOrderData
@@ -389,7 +389,7 @@ namespace te
 
     public:
         /** @copydoc serialization::JsonSerialization::ExportJson */
-        void ExportJson(nlohmann::json& document) const override;
+        void ExportJson(nlohmann::json& document) const;
 
         /** Creates a Quaternion from a json document */
         static Quaternion ImportJson(nlohmann::json& document);

diff --git a/Source/Framework/Utility/Math/TeVector3.h b/Source/Framework/Utility/Math/TeVector3.h
@@ -3,13 +3,13 @@
 #include <cmath>
 
 #include "Prerequisites/TePrerequisitesUtility.h"
-#include "Serialization/TeJsonSerialization.h"
+#include "ThirdParty/Json/json.h"
 #include "Math/TeRadian.h"
 
 namespace te
 {
      /** A three dimensional vector. */
-    class TE_UTILITY_EXPORT Vector3 : public serialization::JsonSerialization
+    class TE_UTILITY_EXPORT Vector3
     {
     public:
         float x = 0.0f , y = 0.0f, z = 0.0f;
@@ -410,7 +410,7 @@ namespace te
 
     public:
         /** @copydoc serialization::JsonSerialization::ExportJson */
-        void ExportJson(nlohmann::json& document) const override;
+        void ExportJson(nlohmann::json& document) const;
 
         /** Creates a Vector3 from a json document */
         static Vector3 ImportJson(nlohmann::json& document);