Merge branch 'main' into SDLIntegration

SHADE_Application/SHADE_Application.vcxproj

@@ -66,13 +66,11 @@
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>spdlogd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\Dependencies\spdlog\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
     </Link>
   </ItemDefinitionGroup>
@@ -90,14 +88,12 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>spdlog.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\Dependencies\spdlog\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
     </Link>
   </ItemDefinitionGroup>

SHADE_Application/premake5.lua

@@ -1,7 +1,7 @@
 project "SHADE_Application"
   kind "WindowedApp"
   language "C++"
-  cppdialect "C++latest"
+  cppdialect "C++20"
   targetdir (outputdir)
   objdir    (interdir)
   systemversion "latest"
@@ -47,18 +47,12 @@ project "SHADE_Application"
     "%{IncludeDir.SDL}/lib",
   }
 
-  postbuildcommands
-  {
-  }
-
   warnings 'Extra'
   
   filter "configurations:Debug"
     symbols "On"
     defines {"_DEBUG"}
-    links{"spdlogd.lib"}
     
   filter "configurations:Release"
     optimize "On"
     defines{"_RELEASE"}
-    links{"spdlog.lib"}

SHADE_Application/src/Application/SBApplication.cpp

@@ -7,6 +7,7 @@
 #endif // SHEDITOR
 
 #include "Tools/SHLogger.h"
+#include "Tools/SHFileUtilties.h"
 
 #include <chrono>
 #include <ratio>
@@ -24,7 +25,9 @@ namespace Sandbox
     _In_      INT       nCmdShow
   )
   {
-    //SHLOG_TITLE("Initialising SBApplication")
+	// Set working directory
+	SHADE::SHFileUtilities::SetWorkDirToExecDir();
+
     SDL_Init(SDL_INIT_VIDEO);
     window.Create(hInstance, hPrevInstance, lpCmdLine, nCmdShow);
     SDL_CreateWindowFrom(window.GetHWND());

SHADE_Engine/SHADE_Engine.vcxproj

@@ -66,13 +66,13 @@
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>vulkan-1.lib;shaderc_shared.lib;assimp-vc142-mtd.lib;ktxd.lib;librttr_core_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>vulkan-1.lib;shaderc_shared.lib;shlwapi.lib;assimp-vc142-mtd.lib;librttr_core_d.lib;spdlogd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>libs;$(VULKAN_SDK)\Lib;..\Dependencies\assimp\lib\Debug;..\Dependencies\assimp\lib\Release;..\Dependencies\RTTR\lib;..\Dependencies\ktx\lib\Debug;..\Dependencies\ktx\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>libs;$(VULKAN_SDK)\Lib;..\Dependencies\assimp\lib\Debug;..\Dependencies\assimp\lib\Release;..\Dependencies\RTTR\lib;..\Dependencies\spdlog\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ImportLibrary>..\bin\Debug\SHADE_Engine.lib</ImportLibrary>
     </Link>
     <PostBuildEvent>
@@ -93,14 +93,14 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>vulkan-1.lib;shaderc_shared.lib;assimp-vc142-mt.lib;ktx.lib;librttr_core.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>vulkan-1.lib;shaderc_shared.lib;shlwapi.lib;assimp-vc142-mt.lib;librttr_core.lib;spdlog.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>libs;$(VULKAN_SDK)\Lib;..\Dependencies\assimp\lib\Debug;..\Dependencies\assimp\lib\Release;..\Dependencies\RTTR\lib;..\Dependencies\ktx\lib\Debug;..\Dependencies\ktx\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>libs;$(VULKAN_SDK)\Lib;..\Dependencies\assimp\lib\Debug;..\Dependencies\assimp\lib\Release;..\Dependencies\RTTR\lib;..\Dependencies\spdlog\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ImportLibrary>..\bin\Release\SHADE_Engine.lib</ImportLibrary>
     </Link>
     <PostBuildEvent>
@@ -180,7 +180,6 @@
     <ClInclude Include="src\Graphics\Windowing\Surface\SHVkSurface.h" />
     <ClInclude Include="src\Math\SHMath.h" />
     <ClInclude Include="src\Math\SHMathHelpers.h" />
-    <ClInclude Include="src\Math\SHMathHelpers.hpp" />
     <ClInclude Include="src\Math\SHMatrix.h" />
     <ClInclude Include="src\Math\SHQuaternion.h" />
     <ClInclude Include="src\Math\Vector\SHVec2.h" />
@@ -190,6 +189,7 @@
     <ClInclude Include="src\Resource\Handle.h" />
     <ClInclude Include="src\Resource\ResourceLibrary.h" />
     <ClInclude Include="src\Resource\SparseSet.h" />
+    <ClInclude Include="src\SHCommonTypes.h" />
     <ClInclude Include="src\SH_API.h" />
     <ClInclude Include="src\SHpch.h" />
     <ClInclude Include="src\Scene\SHScene.h" />
@@ -197,6 +197,7 @@
     <ClInclude Include="src\Scene\SHSceneManager.h" />
     <ClInclude Include="src\Tools\SHException.h" />
     <ClInclude Include="src\Tools\SHExceptionHandler.h" />
+    <ClInclude Include="src\Tools\SHFileUtilties.h" />
     <ClInclude Include="src\Tools\SHLogger.h" />
     <ClInclude Include="src\Tools\SHUtilities.h" />
   </ItemGroup>
@@ -269,6 +270,7 @@
     <ClCompile Include="src\Scene\SHSceneManager.cpp" />
     <ClCompile Include="src\Tools\SHException.cpp" />
     <ClCompile Include="src\Tools\SHExceptionHandler.cpp" />
+    <ClCompile Include="src\Tools\SHFileUtilties.cpp" />
     <ClCompile Include="src\Tools\SHLogger.cpp" />
   </ItemGroup>
   <ItemGroup>

SHADE_Engine/SHADE_Engine.vcxproj.filters

@@ -360,6 +360,7 @@
     <ClInclude Include="src\Resource\SparseSet.h">
       <Filter>Resource</Filter>
     </ClInclude>
+    <ClInclude Include="src\SHCommonTypes.h" />
     <ClInclude Include="src\SH_API.h" />
     <ClInclude Include="src\SHpch.h" />
     <ClInclude Include="src\Scene\SHScene.h">
@@ -377,13 +378,15 @@
     <ClInclude Include="src\Tools\SHExceptionHandler.h">
       <Filter>Tools</Filter>
     </ClInclude>
+    <ClInclude Include="src\Tools\SHFileUtilties.h">
+      <Filter>Tools</Filter>
+    </ClInclude>
     <ClInclude Include="src\Tools\SHLogger.h">
       <Filter>Tools</Filter>
     </ClInclude>
     <ClInclude Include="src\Tools\SHUtilities.h">
       <Filter>Tools</Filter>
     </ClInclude>
-    <ClInclude Include="src\Math\SHMathHelpers.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\ECS_Base\Components\SHComponent.cpp">
@@ -582,6 +585,9 @@
     <ClCompile Include="src\Tools\SHExceptionHandler.cpp">
       <Filter>Tools</Filter>
     </ClCompile>
+    <ClCompile Include="src\Tools\SHFileUtilties.cpp">
+      <Filter>Tools</Filter>
+    </ClCompile>
     <ClCompile Include="src\Tools\SHLogger.cpp">
       <Filter>Tools</Filter>
     </ClCompile>

SHADE_Engine/premake5.lua

@@ -1,7 +1,7 @@
 project "SHADE_Engine"
   kind "SharedLib"
   language "C++"
-  cppdialect "C++latest"
+  cppdialect "C++20"
   targetdir (outputdir)
   objdir    (interdir)
   systemversion "latest"
@@ -46,6 +46,7 @@ project "SHADE_Engine"
     "%{IncludeDir.assimp}/lib/Release",
     "%{IncludeDir.RTTR}/lib",
     "%{IncludeDir.SDL}/lib",
+    "%{IncludeDir.spdlog}/lib"
   }
   
   links
@@ -56,9 +57,10 @@ project "SHADE_Engine"
     "reactphysics3d",
     "imgui",
     "vulkan-1.lib",
-    "shaderc_shared.lib",
     "SDL2.lib",
-    "SDL2main.lib"
+    "SDL2main.lib",
+    "shaderc_shared.lib",
+    "shlwapi"
   }
   
   defines
@@ -94,11 +96,11 @@ project "SHADE_Engine"
   filter "configurations:Debug"
     symbols "On"
     defines {"_DEBUG"}
-    links{"assimp-vc142-mtd.lib", "librttr_core_d.lib"}
+    links{"assimp-vc142-mtd.lib", "librttr_core_d.lib", "spdlogd.lib"}
     --links{"fmodstudioL_vc.lib", "fmodL_vc.lib"}
   
   filter "configurations:Release"
     optimize "On"
     defines{"_RELEASE"}
-    links{"assimp-vc142-mt.lib", "librttr_core.lib"}
+    links{"assimp-vc142-mt.lib", "librttr_core.lib", "spdlog.lib"}
     --links{"fmodstudio_vc.lib", "fmod_vc.lib"}

SHADE_Engine/src/SHCommonTypes.h

@@ -0,0 +1,28 @@
+/************************************************************************************//*!
+\file           SHCommonTypes.h
+\author         Tng Kah Wei, kahwei.tng, 390009620
+\par            email: kahwei.tng\@digipen.edu
+\date           Sep 8, 2022
+\brief			Contains the definitions of type alias for commonly used units for 
+                clarity and convenience.
+
+
+Copyright (C) 2022 DigiPen Institute of Technology.
+Reproduction or disclosure of this file or its contents without the prior written consent
+of DigiPen Institute of Technology is prohibited.
+*//*************************************************************************************/
+#pragma once
+
+namespace SHADE
+{
+	/*---------------------------------------------------------------------------------*/
+	/* Type Definitions                                                                */
+	/*---------------------------------------------------------------------------------*/	
+    /***********************************************************************************/
+    /*!
+      \brief
+        Type used to mark a value that is supposed to represent a size in bytes.
+    */
+    /***********************************************************************************/
+	using Byte = size_t;
+}

SHADE_Engine/src/SHpch.h

@@ -30,3 +30,5 @@
 #include <functional>
 #include <sstream>
 #include <iomanip>
+
+#include "SHCommonTypes.h"

SHADE_Engine/src/Tools/SHFileUtilties.cpp

@@ -0,0 +1,30 @@
+/************************************************************************************//*!
+\file           SHFileUtilities.cpp
+\author         Tng Kah Wei, kahwei.tng, 390009620
+\par            email: kahwei.tng\@digipen.edu
+\date           Sep 15, 2022
+\brief          Contains the definition of functions of the SHFileUtilities static class.
+
+Copyright (C) 2022 DigiPen Institute of Technology.
+Reproduction or disclosure of this file or its contents without the prior written consent
+of DigiPen Institute of Technology is prohibited.
+*//*************************************************************************************/
+// Precompiled Header
+#include "SHpch.h"
+// Primary Header
+#include "SHFileUtilties.h"
+// Standard Libraries
+#include <filesystem>
+// External Dependencies
+#include <shlwapi.h>  // GetModuleFileName, PathRemoveFileSpec
+
+namespace SHADE
+{
+  void SHFileUtilities::SetWorkDirToExecDir()
+  {
+  	TCHAR currentExecFilePath[MAX_PATH] = { '\0' };
+  	GetModuleFileName(nullptr, currentExecFilePath, MAX_PATH);
+  	PathRemoveFileSpec(currentExecFilePath);
+  	std::filesystem::current_path(currentExecFilePath);
+  }
+}

SHADE_Engine/src/Tools/SHFileUtilties.h

@@ -0,0 +1,38 @@
+/************************************************************************************//*!
+\file           SHFileUtilities.h
+\author         Tng Kah Wei, kahwei.tng, 390009620
+\par            email: kahwei.tng\@digipen.edu
+\date           Sep 15, 2022
+\brief          Contains the SHFileUtilities static class.
+
+Copyright (C) 2022 DigiPen Institute of Technology.
+Reproduction or disclosure of this file or its contents without the prior written consent
+of DigiPen Institute of Technology is prohibited.
+*//*************************************************************************************/
+
+// Project Headers
+#include "SH_API.h"
+
+namespace SHADE
+{
+  /*!************************************************************************************
+  
+    \class SHFileUtilities
+
+    \brief
+      Static class that contains functions for working with files and directories.
+    
+  **************************************************************************************/
+  class SH_API SHFileUtilities
+  {
+    public:
+    /*!**********************************************************************************
+    
+      \brief
+        Sets the application's current working directory to the application executable's
+        directory.
+      
+    ************************************************************************************/
+    static void SetWorkDirToExecDir();
+  };
+}