Skip to content

Commit 862b4d3

Browse files
author
Floyd Huizinga
committed
fix&clean up solution and rename projects
1 parent a323add commit 862b4d3

File tree

68 files changed

+1500
-40
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1500
-40
lines changed

src/Cpp/1-getting-started/1-3-3-SettingUp3DRendering/1-3-6-Camera.vcxproj renamed to src/Cpp/1-getting-started/1-3-4-3DRendering/1-3-4-3DRendering.vcxproj

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PropertyGroup Label="Globals">
1414
<VCProjectVersion>16.0</VCProjectVersion>
1515
<Keyword>Win32Proj</Keyword>
16-
<ProjectGuid>{E38C17E3-29B9-40BF-9372-0EB24DDE4B06}</ProjectGuid>
16+
<ProjectGuid>{3AEC1AA5-69B7-4B50-ACB3-ED3E3DD3CB71}</ProjectGuid>
1717
<RootNamespace>My13HelloTriangle</RootNamespace>
1818
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
1919
</PropertyGroup>
@@ -48,15 +48,15 @@
4848
<OutDir>bin\$(Configuration)\</OutDir>
4949
<IntDir>obj\$(Configuration)\</IntDir>
5050
<IncludePath>$(SolutionDir)..\lib\glfw-3.3.6\include\;$(SolutionDir)..\lib\FreeImage\include\;$(SolutionDir)..\lib\DirectXTex\include\;$(SolutionDir)..\lib\assimp\include\;$(SolutionDir)..\lib\imgui\include\;$(SolutionDir)Cpp\Framework\;</IncludePath>
51-
<LibraryPath>$(SolutionDir)..\lib\glfw-3.3.6\lib-vc2022\;$(SolutionDir)..\lib\DirectXTex\lib\$(Configuration)\;$(SolutionDir)..\lib\FreeImage\lib\;$(SolutionDir)..\lib\assimp\lib\;$(LibraryPath);$(SolutionDir)Cpp\Framework\lib\$(Configuration)\</LibraryPath>
51+
<LibraryPath>$(SolutionDir)..\lib\glfw-3.3.6\lib-vc2022\;$(SolutionDir)..\lib\DirectXTex\lib\$(Configuration)\;$(SolutionDir)..\lib\FreeImage\lib\;$(SolutionDir)..\lib\assimp\lib\;$(LibraryPath);$(SolutionDir)Cpp\Framework\lib\$(Configuration)\;</LibraryPath>
5252
<SourcePath>$(SourcePath)</SourcePath>
5353
</PropertyGroup>
5454
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
5555
<LinkIncremental>false</LinkIncremental>
5656
<OutDir>bin\$(Configuration)\</OutDir>
5757
<IntDir>obj\$(Configuration)\</IntDir>
5858
<IncludePath>$(SolutionDir)..\lib\glfw-3.3.6\include\;$(SolutionDir)..\lib\FreeImage\include\;$(SolutionDir)..\lib\DirectXTex\include\;$(SolutionDir)..\lib\assimp\include\;$(SolutionDir)..\lib\imgui\include\;$(SolutionDir)Cpp\Framework\;</IncludePath>
59-
<LibraryPath>$(SolutionDir)..\lib\glfw-3.3.6\lib-vc2022\;$(SolutionDir)..\lib\DirectXTex\lib\$(Configuration)\;$(SolutionDir)..\lib\FreeImage\lib\;$(SolutionDir)..\lib\assimp\lib\;$(LibraryPath);$(SolutionDir)Cpp\Framework\lib\$(Configuration)\</LibraryPath>
59+
<LibraryPath>$(SolutionDir)..\lib\glfw-3.3.6\lib-vc2022\;$(SolutionDir)..\lib\DirectXTex\lib\$(Configuration)\;$(SolutionDir)..\lib\FreeImage\lib\;$(SolutionDir)..\lib\assimp\lib\;$(LibraryPath);$(SolutionDir)Cpp\Framework\lib\$(Configuration)\;</LibraryPath>
6060
<SourcePath>$(SourcePath)</SourcePath>
6161
</PropertyGroup>
6262
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -66,13 +66,11 @@
6666
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6767
<ConformanceMode>true</ConformanceMode>
6868
<LanguageStandard>stdcpp17</LanguageStandard>
69-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
7069
</ClCompile>
7170
<Link>
7271
<SubSystem>Console</SubSystem>
7372
<GenerateDebugInformation>true</GenerateDebugInformation>
7473
<AdditionalDependencies>Framework.lib;assimp.lib;FreeImage.lib;DirectXTex.lib;glfw3.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
75-
<AdditionalOptions>/verbose:lib</AdditionalOptions>
7674
<IgnoreSpecificDefaultLibraries>msvcrt</IgnoreSpecificDefaultLibraries>
7775
</Link>
7876
<PostBuildEvent>
@@ -99,8 +97,8 @@ xcopy /Y $(ProjectDir)Assets\Textures\*.* $(OutDir)Assets\Textures\</Command>
9997
<SubSystem>Console</SubSystem>
10098
<EnableCOMDATFolding>true</EnableCOMDATFolding>
10199
<OptimizeReferences>true</OptimizeReferences>
100+
<GenerateDebugInformation>true</GenerateDebugInformation>
102101
<AdditionalDependencies>Framework.lib;assimp.lib;FreeImage.lib;DirectXTex.lib;glfw3.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
103-
<AdditionalOptions>/verbose:lib</AdditionalOptions>
104102
</Link>
105103
<PostBuildEvent>
106104
<Command>xcopy /Y $(SolutionDir)..\lib\assimp\lib\assimp.dll $(OutDir)
@@ -120,29 +118,28 @@ xcopy /Y $(ProjectDir)Assets\Textures\*.* $(OutDir)Assets\Textures\</Command>
120118
<ClCompile Include="..\..\..\..\lib\imgui\include\imgui\imgui_draw.cpp" />
121119
<ClCompile Include="..\..\..\..\lib\imgui\include\imgui\imgui_tables.cpp" />
122120
<ClCompile Include="..\..\..\..\lib\imgui\include\imgui\imgui_widgets.cpp" />
123-
<ClCompile Include="ApplicationWithInput.cpp" />
124-
<ClCompile Include="Camera.cpp" />
125121
<ClCompile Include="DeviceContext.cpp" />
126122
<ClCompile Include="Main.cpp" />
127-
<ClCompile Include="CameraApplication.cpp" />
123+
<ClCompile Include="DepthBufferApplication.cpp" />
128124
<ClCompile Include="ModelFactory.cpp" />
129125
<ClCompile Include="Pipeline.cpp" />
130126
<ClCompile Include="PipelineFactory.cpp" />
131127
<ClCompile Include="TextureFactory.cpp" />
132128
</ItemGroup>
133129
<ItemGroup>
134-
<ClInclude Include="ApplicationWithInput.hpp" />
135-
<ClInclude Include="Camera.hpp" />
136130
<ClInclude Include="Definitions.hpp" />
137131
<ClInclude Include="DeviceContext.hpp" />
138-
<ClInclude Include="CameraApplication.hpp" />
132+
<ClInclude Include="DepthBufferApplication.hpp" />
139133
<ClInclude Include="ModelFactory.hpp" />
140134
<ClInclude Include="Pipeline.hpp" />
141135
<ClInclude Include="PipelineFactory.hpp" />
142136
<ClInclude Include="ResourceDescriptor.hpp" />
143137
<ClInclude Include="TextureFactory.hpp" />
144138
<ClInclude Include="VertexType.hpp" />
145139
</ItemGroup>
140+
<ItemGroup>
141+
<Image Include="Assets\Textures\T_Good_Froge.dds" />
142+
</ItemGroup>
146143
<ItemGroup>
147144
<None Include="Assets\Shaders\Main.ps.hlsl">
148145
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>

src/Cpp/1-getting-started/1-3-3-SettingUp3DRendering/1-3-6-Camera.vcxproj.filters renamed to src/Cpp/1-getting-started/1-3-4-3DRendering/1-3-4-3DRendering.vcxproj.filters

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<ClCompile Include="Main.cpp">
1919
<Filter>Source Files</Filter>
2020
</ClCompile>
21-
<ClCompile Include="CameraApplication.cpp">
21+
<ClCompile Include="DepthBufferApplication.cpp">
2222
<Filter>Source Files</Filter>
2323
</ClCompile>
2424
<ClCompile Include="TextureFactory.cpp">
@@ -57,23 +57,14 @@
5757
<ClCompile Include="..\..\..\..\lib\imgui\include\imgui\backend\imgui_impl_glfw.cpp">
5858
<Filter>Source Files</Filter>
5959
</ClCompile>
60-
<ClCompile Include="Camera.cpp">
61-
<Filter>Source Files</Filter>
62-
</ClCompile>
63-
<ClCompile Include="ApplicationWithInput.cpp">
64-
<Filter>Source Files</Filter>
65-
</ClCompile>
6660
</ItemGroup>
6761
<ItemGroup>
68-
<ClInclude Include="CameraApplication.hpp">
62+
<ClInclude Include="DepthBufferApplication.hpp">
6963
<Filter>Header Files</Filter>
7064
</ClInclude>
7165
<ClInclude Include="TextureFactory.hpp">
7266
<Filter>Header Files</Filter>
7367
</ClInclude>
74-
<ClInclude Include="Definitions.hpp">
75-
<Filter>Header Files</Filter>
76-
</ClInclude>
7768
<ClInclude Include="ModelFactory.hpp">
7869
<Filter>Header Files</Filter>
7970
</ClInclude>
@@ -92,13 +83,13 @@
9283
<ClInclude Include="DeviceContext.hpp">
9384
<Filter>Header Files</Filter>
9485
</ClInclude>
95-
<ClInclude Include="Camera.hpp">
96-
<Filter>Header Files</Filter>
97-
</ClInclude>
98-
<ClInclude Include="ApplicationWithInput.hpp">
86+
<ClInclude Include="Definitions.hpp">
9987
<Filter>Header Files</Filter>
10088
</ClInclude>
10189
</ItemGroup>
90+
<ItemGroup>
91+
<Image Include="Assets\Textures\T_Good_Froge.dds" />
92+
</ItemGroup>
10293
<ItemGroup>
10394
<None Include="Assets\Shaders\Main.ps.hlsl" />
10495
<None Include="Assets\Shaders\Main.vs.hlsl" />

src/Cpp/1-getting-started/1-3-6-Models/1-3-6-Models.vcxproj.user renamed to src/Cpp/1-getting-started/1-3-4-3DRendering/1-3-4-3DRendering.vcxproj.user

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<ShowAllFiles>true</ShowAllFiles>
4+
<ShowAllFiles>false</ShowAllFiles>
55
</PropertyGroup>
66
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
77
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>

src/Cpp/1-getting-started/1-3-6-Models-Refactored/Assets/Models/SM_Good_Froge.fbx renamed to src/Cpp/1-getting-started/1-3-4-3DRendering/Assets/Models/SM_Good_Froge.fbx

File renamed without changes.

src/Cpp/1-getting-started/1-3-6-Models-Refactored/Assets/Shaders/Main.ps.hlsl renamed to src/Cpp/1-getting-started/1-3-4-3DRendering/Assets/Shaders/Main.ps.hlsl

File renamed without changes.

src/Cpp/1-getting-started/1-3-6-Models-Refactored/Assets/Shaders/Main.vs.hlsl renamed to src/Cpp/1-getting-started/1-3-4-3DRendering/Assets/Shaders/Main.vs.hlsl

File renamed without changes.

src/Cpp/1-getting-started/1-3-6-Models-Refactored/Assets/Textures/T_Good_Froge.dds renamed to src/Cpp/1-getting-started/1-3-4-3DRendering/Assets/Textures/T_Good_Froge.dds

File renamed without changes.

src/Cpp/1-getting-started/1-3-6-Models-Refactored/Definitions.hpp renamed to src/Cpp/1-getting-started/1-3-4-3DRendering/Definitions.hpp

File renamed without changes.

0 commit comments

Comments
 (0)