Merge branch 'master' into feature_splines

Author: VZout

install.bat

@@ -67,7 +67,7 @@ FOR /F "delims=" %%i IN ('dir "C:\Program Files (x86)\Windows Kits\10\Include" /
     GOTO :found
 )
 call :colorEcho %red% No Windows SDK found in location: C:\Program Files (x86)\Windows Kits\10\Include
-EXIT 1
+goto :eof
 :found
 echo Latest installed Windows SDK: %windows_sdk_version%
 echo Windows SDK required: 10.0.17763.0 or newer
@@ -84,7 +84,7 @@ if "%is_remote%" == "1" (
 ) else (
   pause
 )
-EXIT
+goto :eof
 REM ##### MAIN #####
 
 REM ##### DOWNLOAD DEPS #####

reload.bat

@@ -35,7 +35,7 @@ if "%is_remote%" == "1" (
 ) else (
   pause
 )
-EXIT
+goto :eof
 REM ##### MAIN #####
 
 REM ##### Update Submodules ####

src/d3d12/d3d12_settings.hpp

@@ -49,5 +49,7 @@ namespace wr::d3d12::settings
 	static const constexpr unsigned int num_max_rt_materials = 3000;
 	static const constexpr unsigned int num_max_rt_textures = 1000;
 	static const constexpr unsigned int fallback_ptrs_offset = 3500;
+	static const constexpr std::uint32_t res_skybox = 1024;
+	static const constexpr std::uint32_t res_envmap = 512;
 
 } /* wr::d3d12::settings */

src/render_tasks/d3d12_equirect_to_cubemap.hpp

@@ -180,9 +180,9 @@ namespace wr
 
 			data.in_equirect = skybox_node->m_hdr;
 
-			skybox_node->m_skybox = skybox_node->m_hdr.m_pool->CreateCubemap("Skybox", 3840, 3840, 0, wr::Format::R32G32B32A32_FLOAT, true);
+			skybox_node->m_skybox = skybox_node->m_hdr.m_pool->CreateCubemap("Skybox", d3d12::settings::res_skybox, d3d12::settings::res_skybox, 0, wr::Format::R32G32B32A32_FLOAT, true);
 
-			skybox_node->m_prefiltered_env_map = skybox_node->m_hdr.m_pool->CreateCubemap("FilteredEnvMap", 512, 512, 5, wr::Format::R32G32B32A32_FLOAT, true);
+			skybox_node->m_prefiltered_env_map = skybox_node->m_hdr.m_pool->CreateCubemap("FilteredEnvMap", d3d12::settings::res_envmap, d3d12::settings::res_envmap, 5, wr::Format::R32G32B32A32_FLOAT, true);
 
 			data.out_cubemap = skybox_node->m_skybox.value();
 			data.out_pref_env = skybox_node->m_prefiltered_env_map.value();

src/scene_graph/camera_node.cpp

@@ -39,8 +39,12 @@ namespace wr
 		DirectX::XMVECTOR right = DirectX::XMVector3Normalize(m_transform.r[0]);
 
 		m_view = DirectX::XMMatrixLookToRH(pos, forward, up);
+		
+		if (!m_override_projection)
+		{
+			m_projection = DirectX::XMMatrixPerspectiveFovRH(m_fov.m_fov, m_aspect_ratio, m_frustum_near, m_frustum_far);
+		}
 
-		m_projection = DirectX::XMMatrixPerspectiveFovRH(m_fov.m_fov, m_aspect_ratio, m_frustum_near, m_frustum_far);
 		m_view_projection = m_view * m_projection;
 		m_inverse_projection = DirectX::XMMatrixInverse(nullptr, m_projection);
 		m_inverse_view = DirectX::XMMatrixInverse(nullptr, m_view);

src/scene_graph/camera_node.hpp

@@ -41,7 +41,8 @@ namespace wr
 			m_f_number(32.0f),
 			m_shape_amt(0.0f),
 			m_aperture_blades(5),
-			m_focus_dist(0)
+			m_focus_dist(0),
+			m_override_projection(false)
 		{
 		}
 
@@ -71,6 +72,7 @@ namespace wr
 		float m_shape_amt;
 		int m_aperture_blades;
 		bool m_enable_dof = false;
+		bool m_override_projection;
 
 		FoV m_fov;
 

src/scene_graph/node.cpp

@@ -11,6 +11,7 @@ namespace wr
 	Node::Node(std::type_info const & type_info) : m_type_info(type_info)
 	{
 		SignalTransformChange();
+		m_used_quaternion = false;
 	}
 
 	void Node::SignalChange()
@@ -62,6 +63,13 @@ namespace wr
 		SignalTransformChange();
 	}
 
+	void Node::SetQuaternionRotation( float x, float y, float z, float w )
+	{
+		m_rotation = { x,y,z,w };
+		m_used_quaternion = true;
+		SignalTransformChange();
+	}
+
 	void Node::SetPosition(DirectX::XMVECTOR position)
 	{
 		m_position = position;

src/scene_graph/node.hpp

@@ -24,6 +24,9 @@ namespace wr
 		virtual void SetRotation(DirectX::XMVECTOR roll_pitch_yaw);
 		virtual void SetRotationQuaternion(DirectX::XMVECTOR rotation);
 
+		//Takes raw values of a quaternion
+		virtual void SetQuaternionRotation( float x, float y, float z, float w );
+
 		//Sets position
 		virtual void SetPosition(DirectX::XMVECTOR position);
 
@@ -62,6 +65,6 @@ namespace wr
 	private:
 		std::bitset<3> m_requires_update;
 		std::bitset<3> m_requires_transform_update;
-
+		bool m_used_quaternion;
 	};
 } // namespace wr