spline save and load

adafcaefc · Dec 5, 2024 · b08f50b · b08f50b
1 parent c3e6220
commit b08f50b
Show file tree

Hide file tree

Showing 12 changed files with 515 additions and 505 deletions.
diff --git a/Geome3Dash/src/LevelDataManager.cpp b/Geome3Dash/src/LevelDataManager.cpp
@@ -94,6 +94,8 @@ namespace g3d
         nlohmann::json jsonData = data;
         std::string jsonMsg = jsonData.dump();
         msgLevelEncode(layer, jsonMsg);
+        std::ofstream out("g3d.out.json");
+        out << jsonMsg;
     }
 
     LevelData LevelData::getDefault()
@@ -104,14 +106,16 @@ namespace g3d
         ld.z = 40;
         ld.yaw = -55;
         ld.pitch = -6;
-        ld.bezierMultiplier = 1.0 / 3.0;
-        ld.bezierCurve =
-        {
-           0.167 * 6, 0.355 * 6,
-           0.516 * 6, 0.124 * 6,
-           0.121 * 6, 0.557 * 6,
-           0.412 * 6, 0.352 * 6
-        };
+        //ld.bezierMultiplier = 1.0 / 3.0;
+        //ld.bezierCurve =
+        //{
+        //   0.167 * 6, 0.355 * 6,
+        //   0.516 * 6, 0.124 * 6,
+        //   0.121 * 6, 0.557 * 6,
+        //   0.412 * 6, 0.352 * 6
+        //};
+        ld.spline = Spline();
+        ld.spline.addSegment(Curve(glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(1.0f, 0.0f, 0.0f), glm::vec3(2.0f, 0.0f, 0.0f), glm::vec3(3.0f, 0.0f, 0.0f)));
         return ld;
     }
 }
diff --git a/Geome3Dash/src/LevelDataManager.h b/Geome3Dash/src/LevelDataManager.h
@@ -3,9 +3,12 @@
 #include "CameraAction.h"
 
 #include "helper/BezierHelper.h"
+#include "helper/spline/Spline.h"
 
 #include <nlohmann/json.hpp>
 
+#include <glm/glm.hpp>
+
 #include <string>
 #include <vector>
 
@@ -25,16 +28,19 @@ namespace g3d
 
 	struct LevelData
 	{
-		CubicBezierLD bezierCurve;           // Bezier values
-		double bezierMultiplier;             // Path size
+		//CubicBezierLD bezierCurve;           // Bezier values
+		//double bezierMultiplier;             // Path size
+		//std::vector<CameraActionLD> actions; // Camera actions
+
+
 		double x, y, z;                      // Position
 		double yaw, pitch;                   // Rotation
 		bool lock;                           // Lock camera
-		std::vector<CameraActionLD> actions; // Camera actions
+		Spline spline;                       // Spline path
 
 		static LevelData getDefault();
 
-		NLOHMANN_DEFINE_TYPE_INTRUSIVE(LevelData, bezierCurve, bezierMultiplier, x, y, z, yaw, pitch, lock, actions);
+		NLOHMANN_DEFINE_TYPE_INTRUSIVE(LevelData, spline, x, y, z, yaw, pitch, lock);
 	};
 
 	void msgLevelEncode(GJBaseGameLayer* layer, const std::string& message);