Merge pull request #253 from TeamWisp/feature_splines

Feature splines

Author: VZout

demo/CMakeLists.txt

@@ -1,6 +1,6 @@
 
-file(GLOB SOURCES CONFIGURE_DEPENDS "*.cpp")
-file(GLOB HEADERS CONFIGURE_DEPENDS "*.hpp")
+file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS "*.cpp")
+file(GLOB_RECURSE HEADERS CONFIGURE_DEPENDS "*.hpp")
 
 add_executable(WispDemo WIN32 ${HEADERS} ${SOURCES})
 target_include_directories(WispDemo PUBLIC ../src/)

demo/debug_camera.hpp

@@ -19,6 +19,7 @@ class DebugCamera : public wr::CameraNode
 	virtual void SetRotation(DirectX::XMVECTOR roll_pitch_yaw) override
 	{
 		m_rotation_radians = roll_pitch_yaw;
+		m_use_quaternion = false;
 		m_target_rotation_radians = roll_pitch_yaw;
 	}
 
@@ -39,7 +40,8 @@ class DebugCamera : public wr::CameraNode
 		POINT cursor_pos;
 		GetCursorPos(&cursor_pos);
 
-		if (m_rmb_down) {
+		if (m_rmb_down)
+		{
 			// Translation
 			m_right_axis = std::min(m_right_axis, 1.f);
 			m_right_axis = std::max(m_right_axis, -1.f);
@@ -60,7 +62,7 @@ class DebugCamera : public wr::CameraNode
 
 			// Rotation
 			DirectX::XMVECTOR new_rot{ cursor_pos.y - m_last_cursor_pos.y, cursor_pos.x - m_last_cursor_pos.x };
-			m_target_rotation_radians = DirectX::XMVectorSubtract(m_target_rotation_radians, DirectX::XMVectorScale(new_rot, m_sensitivity));
+			SetRotation(DirectX::XMVectorSubtract(m_target_rotation_radians, DirectX::XMVectorScale(new_rot, m_sensitivity)));
 		}
 		else
 		{
@@ -70,7 +72,7 @@ class DebugCamera : public wr::CameraNode
 		}
 
 		m_position = DirectX::XMVectorLerp(m_position, m_target_position, delta * m_position_lerp_speed);
-		m_rotation_radians = DirectX::XMVectorLerp(m_rotation_radians, m_target_rotation_radians, delta * m_rotation_lerp_speed);
+		SetRotation(DirectX::XMVectorLerp(m_rotation_radians, m_target_rotation_radians, delta * m_rotation_lerp_speed));
 		SignalTransformChange();
 
 		m_last_cursor_pos = cursor_pos;

demo/scene_viknell.hpp

@@ -6,6 +6,7 @@
 #include "scene_graph/scene_graph.hpp"
 #include "imgui/imgui.hpp"
 #include "debug_camera.hpp"
+#include "spline_node.hpp"
 
 namespace viknell_scene
 {
@@ -82,6 +83,7 @@ namespace viknell_scene
 
 
 	static std::shared_ptr<DebugCamera> camera;
+	static std::shared_ptr<SplineNode> camera_spline_node;
 	static std::shared_ptr<wr::LightNode> directional_light_node;
 	static std::shared_ptr<wr::MeshNode> test_model;
 	static float t = 0;
@@ -92,6 +94,8 @@ namespace viknell_scene
 		camera->SetPosition({0, 0, 2});
 		camera->SetSpeed(10);
 
+		camera_spline_node = scene_graph->CreateChild<SplineNode>(nullptr, "Camera Spline", false);
+
 		scene_graph->m_skybox = resources::equirectangular_environment_map;
 		auto skybox = scene_graph->CreateChild<wr::SkyboxNode>(nullptr, resources::equirectangular_environment_map);
 
@@ -125,10 +129,8 @@ namespace viknell_scene
 		test_model->SetRotation({0, 180_deg, 0});
 		test_model->SetScale({0.01f,0.01f,0.01f});
 
-
 		// Lights
-		auto point_light_0 = scene_graph->CreateChild<wr::LightNode>(nullptr, wr::LightType::DIRECTIONAL, DirectX::XMVECTOR{1, 1, 1});
-		//point_light_0->SetRadius(3.0f);
+		auto point_light_0 = scene_graph->CreateChild<wr::LightNode>(nullptr, wr::LightType::DIRECTIONAL, DirectX::XMVECTOR{ 1, 1, 1 });
 		point_light_0->SetRotation({20.950, 0.98, 0});
 		point_light_0->SetPosition({-0.002, 0.080, 1.404});
 
@@ -152,5 +154,6 @@ namespace viknell_scene
 		//test_model->SetPosition(pos);
 
 		camera->Update(ImGui::GetIO().DeltaTime);
+		camera_spline_node->UpdateSplineNode(ImGui::GetIO().DeltaTime, camera);
 	}
 } /* cube_scene */