Skip to content

better engine arch #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MrScriptX merged 2 commits into from
May 6, 2021
Merged

better engine arch #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e488e7
#26 #31 remove tiny_obj_loader & load obj with assimp
MrScriptX May 6, 2021
8b9a4c7
#23 update documentation
MrScriptX May 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Engine/Engine.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'">
Expand Down
14 changes: 7 additions & 7 deletions Engine/Engine.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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">
Expand Down Expand Up @@ -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>
Binary file added Engine/assimp-vc142-mtd.dll
View file
Open in desktop
Binary file not shown.
8 changes: 8 additions & 0 deletions Engine/libs/assimp-5.0.1/include/assimp/.editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading