Fixed normal transformation and fixed window closing

MAGE/FPS/src/core/FPS.cpp

@@ -77,7 +77,6 @@ class TestScene final : public Scene {
 		omni_light->SetTranslationY(2.0f);
 		omni_light->GetObject()->SetDistanceFalloff(0.0f, 2.0f);
 		SharedPtr< SpotLightNode > spot_light = GetWorld()->CreateSpotLightNode();
-		//spot_light->SetTranslation(0.0f, 2.0f, 0.0f);
 		spot_light->GetObject()->SetDistanceFalloff(0.0f, 3.0f);
 		camera->AddChildTransformNode(spot_light);
 

MAGE/MAGE.vcxproj

@@ -175,7 +175,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="MAGE\src\binary\binary_writer.cpp" />
-    <ClCompile Include="MAGE\src\buffer\transform_buffer.cpp" />
     <ClCompile Include="MAGE\src\camera\perspective_camera.cpp" />
     <ClCompile Include="MAGE\src\core\engine.cpp" />
     <ClCompile Include="MAGE\src\core\version.cpp" />

MAGE/MAGE.vcxproj.filters

@@ -223,9 +223,6 @@
     <Filter Include="Header Files\buffer">
       <UniqueIdentifier>{6611e24b-5030-4508-99c0-733263f8d080}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\buffer">
-      <UniqueIdentifier>{d58afbdd-86c4-4381-a6d1-4e4284f2e246}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="MAGE\src\collection\collection.hpp">
@@ -926,9 +923,6 @@
     <ClCompile Include="MAGE\src\math\transform_node.cpp">
       <Filter>Source Files\math</Filter>
     </ClCompile>
-    <ClCompile Include="MAGE\src\buffer\transform_buffer.cpp">
-      <Filter>Source Files\buffer</Filter>
-    </ClCompile>
     <ClCompile Include="MAGE\src\logging\exception.cpp">
       <Filter>Source Files\logging</Filter>
     </ClCompile>

MAGE/MAGE/shaders/lambertian.fx

@@ -2,10 +2,10 @@
 // Transformations
 //-----------------------------------------------------------------------------
 cbuffer Transform : register(b0) {
-	matrix model_to_world;					// The model-to-world transformation matrix.
-	matrix world_to_view;					// The world-to-view transformation matrix.
-	matrix world_to_view_inverse_transpose; // The world-to-view inverse transpose transformation matrix.
-	matrix view_to_projection;				// The view-to-projection transformation matrix.
+	matrix object_to_world;					 // The object-to-world transformation matrix.
+	matrix world_to_view;					 // The world-to-view transformation matrix.
+	matrix object_to_view_inverse_transpose; // The object-to-view inverse transpose transformation matrix.
+	matrix view_to_projection;				 // The view-to-projection transformation matrix.
 }
 
 //-----------------------------------------------------------------------------
@@ -301,11 +301,11 @@ struct PS_INPUT {
 
 PS_INPUT VS(VS_INPUT input) {
 	PS_INPUT output = (PS_INPUT)0;
-	output.p_view   = mul(input.p, model_to_world);
+	output.p_view   = mul(input.p, object_to_world);
 	output.p_view   = mul(output.p_view, world_to_view);
 	output.p        = mul(output.p_view, view_to_projection);
 	output.tex      = input.tex;
-	output.n_view   = mul(input.n, (float3x3)world_to_view_inverse_transpose);
+	output.n_view   = normalize(mul(input.n, (float3x3)object_to_view_inverse_transpose));
 	return output;
 }
 

MAGE/MAGE/src/buffer/transform_buffer.hpp

@@ -23,8 +23,10 @@ namespace mage {
 		// Constructors and Destructors
 		//---------------------------------------------------------------------
 
-		explicit TransformBuffer(const XMMATRIX &world_to_view, 
-			const XMMATRIX &view_to_projection);
+		explicit TransformBuffer(const XMMATRIX &world_to_view,
+			const XMMATRIX &view_to_projection) :
+			m_world_to_view(XMMatrixTranspose(world_to_view)),
+			m_view_to_projection(XMMatrixTranspose(view_to_projection)) {}
 		TransformBuffer(const TransformBuffer &buffer) = default;
 		TransformBuffer(TransformBuffer &&buffer) = default;
 		~TransformBuffer() = default;
@@ -43,14 +45,15 @@ namespace mage {
 		const XMMATRIX GetWorldToViewMatrix() const {
 			return XMMatrixTranspose(m_world_to_view);
 		}
-		const XMMATRIX GetWorldToViewInverseTransposeMatrix() const {
-			return XMMatrixTranspose(m_world_to_view_inverse_transpose);
-		}
 		const XMMATRIX GetViewToProjectionMatrix() const {
 			return XMMatrixTranspose(m_view_to_projection);
 		}
-		void SetModelToWorld(const XMMATRIX &model_to_world) const {
-			m_model_to_world = XMMatrixTranspose(model_to_world);
+		void SetObjectMatrices(const XMMATRIX &object_to_world,
+			const XMMATRIX &view_to_object) const {
+			m_object_to_world 
+				= XMMatrixTranspose(object_to_world);
+			m_object_to_view_inverse_transpose
+				= view_to_object;
 		}
 
 	private:
@@ -59,10 +62,10 @@ namespace mage {
 		// Member Variables
 		//---------------------------------------------------------------------
 
-		mutable XMMATRIX m_model_to_world;
-		XMMATRIX m_world_to_view;
-		XMMATRIX m_world_to_view_inverse_transpose;
-		XMMATRIX m_view_to_projection;
+		mutable XMMATRIX m_object_to_world;
+		XMMATRIX         m_world_to_view;
+		mutable XMMATRIX m_object_to_view_inverse_transpose;
+		XMMATRIX         m_view_to_projection;
 	};
 
 	static_assert(sizeof(TransformBuffer) == 256, "CPU/GPU struct mismatch");

MAGE/MAGE/src/core/engine.cpp

@@ -5,6 +5,7 @@
 
 #include "core\engine.hpp"
 #include "core\version.hpp"
+#include "logging\error.hpp"
 #include "logging\exception.hpp"
 #include "logging\logging.hpp"
 #include "rendering\device_enumeration.hpp"
@@ -27,7 +28,7 @@ namespace mage {
 	//-------------------------------------------------------------------------
 
 	Engine::Engine(const EngineSetup &setup) 
-		: m_main_window(), m_deactive(false), 
+		: Loadable(), m_main_window(), m_deactive(false), 
 		m_renderer(), m_mode_switch(false),
 		m_input_manager(), m_resource_factory(),
 		m_scene(), m_timer(new Timer()) {
@@ -40,12 +41,23 @@ namespace mage {
 		InitializeConsole();
 		PrintConsoleHeader();
 
+		// Enumerate the devices.
+		SAFE_DELETE(g_device_enumeration);
+		g_device_enumeration = new DeviceEnumeration();
+		const HRESULT result_enumerate = g_device_enumeration->Enumerate();
+		if (FAILED(result_enumerate)) {
+			Error("Device enumeration setup failed: %ld", result_enumerate);
+			return;
+		}
+
 		// Initialize the different engine systems.
 		InitializeSystems(setup);
 
 		// Initializes the COM library for use by the calling thread 
 		// and sets the thread's concurrency model to multithreaded concurrency.
 		CoInitializeEx(nullptr, COINIT_MULTITHREADED);
+
+		SetLoaded();
 	}
 
 	Engine::~Engine() {
@@ -57,11 +69,6 @@ namespace mage {
 	}
 
 	void Engine::InitializeSystems(const EngineSetup &setup) {
-		// Enumerate the devices.
-		SAFE_DELETE(g_device_enumeration);
-		g_device_enumeration = new DeviceEnumeration();
-		g_device_enumeration->Enumerate();
-
 		const LONG width  = static_cast< LONG >(g_device_enumeration->GetDisplayMode()->Width);
 		const LONG height = static_cast< LONG >(g_device_enumeration->GetDisplayMode()->Height);
 
@@ -106,6 +113,11 @@ namespace mage {
 	}
 
 	void Engine::Run(int nCmdShow) {
+		if (!IsLoaded()) {
+			Error("Game loop can not start because the engine is not loaded.");
+			return;
+		}
+
 		m_main_window->Show(nCmdShow);
 
 		// Handle startup in fullscreen mode.

MAGE/MAGE/src/core/engine.hpp

@@ -7,6 +7,7 @@
 
 #include "core\targetver.hpp"
 
+#include "core\loadable.hpp"
 #include "rendering\renderer.hpp"
 #include "input\input_manager.hpp"
 #include "ui\main_window.hpp"
@@ -25,7 +26,7 @@ namespace mage {
 	/**
 	 A class of engines.
 	 */
-	class Engine final {
+	class Engine final : public Loadable {
 
 	public:
 
@@ -62,7 +63,7 @@ namespace mage {
 		/**
 		 Destructs this engine.
 		 */
-		~Engine();
+		virtual ~Engine();
 
 		//---------------------------------------------------------------------
 		// Assignment Operators

MAGE/MAGE/src/parallel/lock.cpp

@@ -288,7 +288,7 @@ namespace mage {
 	}
 
 	void ReadWriteMutexLock::UpgradeToWrite() {
-		Assert(m_type == READ);
+		Assert(m_type == ReadWriteMutexLockType_Read);
 		m_mutex.ReleaseRead();
 		m_mutex.AcquireWrite();
 		m_type = ReadWriteMutexLockType_Write;

MAGE/MAGE/src/string/string_utils.cpp

@@ -171,4 +171,12 @@ namespace mage {
 	const char *str_convert(const wchar_t *str) {
 		return CW2A(str);
 	}
+
+	const wstring str_convert(const string &str) {
+		return wstring(CA2W(str.c_str()));
+	}
+
+	const string str_convert(const wstring &str) {
+		return string(CW2A(str.c_str()));
+	}
 }

MAGE/MAGE/src/string/string_utils.hpp

@@ -245,9 +245,7 @@ namespace mage {
 					A reference to the byte string to copy.
 	 @return		The wide string copy of the given byte string.
 	 */
-	inline const wstring str_convert(const string &str) {
-		return str_convert(str.c_str());
-	}
+	const wstring str_convert(const string &str);
 
 	/**
 	 Converts the given wide string to an byte string.
@@ -256,7 +254,5 @@ namespace mage {
 					A reference to the wide string to copy.
 	 @return		The byte string copy of the given wide string.
 	 */
-	inline const string str_convert(const wstring &str) {
-		return str_convert(str.c_str());
-	}
+	const string str_convert(const wstring &str);
 }

MAGE/MAGE/src/world/world.cpp

@@ -43,6 +43,7 @@ namespace mage {
 	void World::Render3D() const {
 
 		const XMMATRIX world_to_view = m_camera->GetWorldToViewMatrix();
+		const XMMATRIX view_to_world = XMMatrixInverse(nullptr, world_to_view);
 
 		// Update omni light structured buffer.
 		vector< OmniLightBuffer > omni_lights_buffer;
@@ -100,7 +101,12 @@ namespace mage {
 
 				// Update transform constant buffer.
 				const XMMATRIX object_to_world = model_node.GetObjectToWorldMatrix();
-				transform_buffer.SetModelToWorld(object_to_world);
+				const XMMATRIX world_to_object = model_node.GetWorldToObjectMatrix();
+
+				XMFLOAT4X4 m;
+				XMStoreFloat4x4(&m, world_to_object);
+				const XMMATRIX view_to_object  = view_to_world * world_to_object;
+				transform_buffer.SetObjectMatrices(object_to_world, view_to_object);
 				m_transform_buffer.UpdateData(transform_buffer);
 
 				// Draw model.