Merge pull request #44 from MrScriptX/engine

better engine arch

Author: MrScriptX

Engine/Engine.vcxproj

@@ -226,12 +226,12 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(ProjectDir)\libs\stb_image;$(VULKAN_SDK)\Include;$(ProjectDir)\libs\glfw-3.3.4\include;$(ProjectDir)\libs\glm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\libs\stb_image;$(VULKAN_SDK)\Include;$(ProjectDir)\libs\glfw-3.3.4\include;$(ProjectDir)\libs\glm;$(ProjectDir)\libs\assimp-5.0.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(VULKAN_SDK)\Lib;$(ProjectDir)\libs\glfw-3.3.4\lib;$(ProjectDir)\glew-2.1.0\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>vulkan-1.lib;glfw3.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(VULKAN_SDK)\Lib;$(ProjectDir)\libs\glfw-3.3.4\lib;$(ProjectDir)\glew-2.1.0\lib;$(ProjectDir)\libs\assimp-5.0.1\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>vulkan-1.lib;glfw3.lib;assimp-vc142-mtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Vulkan_elman_pc|x64'">

Engine/Engine.vcxproj.filters

@@ -10,9 +10,6 @@
     <Filter Include="Engine">
       <UniqueIdentifier>{be767481-ce1d-4bad-a5f3-4aeae38d9b7f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Engine\shaders">
-      <UniqueIdentifier>{e06a0a1d-1845-47d4-806a-03cbfb95abf7}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Engine\Renderer">
       <UniqueIdentifier>{fc06610a-7ac2-4f0f-b638-951b5eff3bd8}</UniqueIdentifier>
     </Filter>
@@ -31,6 +28,9 @@
     <Filter Include="Engine\World">
       <UniqueIdentifier>{f0d3173b-0d3b-48a2-a5fb-0ec342f99870}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Asset">
+      <UniqueIdentifier>{cbc302f8-152a-45f7-b3f6-ede5fab25a31}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Source.cpp">
@@ -175,11 +175,11 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\shaders\shader.vert">
-      <Filter>Engine\shaders</Filter>
-    </None>
     <None Include="..\shaders\shader.frag">
-      <Filter>Engine\shaders</Filter>
+      <Filter>Asset</Filter>
+    </None>
+    <None Include="..\shaders\shader.vert">
+      <Filter>Asset</Filter>
     </None>
   </ItemGroup>
 </Project>

Engine/assimp-vc142-mtd.dll

@@ -0,0 +1,8 @@
+# See <http://EditorConfig.org> for details
+
+[*.{h,hpp,inl}]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_size = 4
+indent_style = space