Skip to content

Commit 4ed8145

Browse files
author
Floyd Huizinga
committed
set up 3D Rendering application
1 parent 7148d19 commit 4ed8145

26 files changed

+995
-1428
lines changed

‎src/Cpp/1-getting-started/1-3-4-3DRendering/1-3-4-3DRendering.vcxproj‎

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,15 @@
4747
<LinkIncremental>true</LinkIncremental>
4848
<OutDir>bin\$(Configuration)\</OutDir>
4949
<IntDir>obj\$(Configuration)\</IntDir>
50-
<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>
52-
<SourcePath>$(SourcePath)</SourcePath>
50+
<IncludePath>$(SolutionDir)..\lib\glfw-3.3.6\include\;$(SolutionDir)..\lib\FreeImage\include\;$(SolutionDir)..\lib\DirectXTex\include\;$(SolutionDir)Cpp\Framework\</IncludePath>
51+
<LibraryPath>$(SolutionDir)..\lib\glfw-3.3.6\lib-vc2022\;$(SolutionDir)..\lib\DirectXTex\lib\$(Configuration)\;$(SolutionDir)..\lib\FreeImage\lib\;$(LibraryPath);$(SolutionDir)Cpp\Framework\lib\$(Configuration)\;</LibraryPath>
5352
</PropertyGroup>
5453
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
5554
<LinkIncremental>false</LinkIncremental>
5655
<OutDir>bin\$(Configuration)\</OutDir>
5756
<IntDir>obj\$(Configuration)\</IntDir>
5857
<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>
60-
<SourcePath>$(SourcePath)</SourcePath>
58+
<LibraryPath>$(SolutionDir)..\lib\glfw-3.3.6\lib-vc2022\;$(SolutionDir)..\lib\DirectXTex\lib\$(Configuration)\;$(SolutionDir)..\lib\FreeImage\lib\;$(LibraryPath);$(SolutionDir)Cpp\Framework\lib\$(Configuration)\</LibraryPath>
6159
</PropertyGroup>
6260
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
6361
<ClCompile>
@@ -66,11 +64,12 @@
6664
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6765
<ConformanceMode>true</ConformanceMode>
6866
<LanguageStandard>stdcpp17</LanguageStandard>
67+
<AdditionalOptions>/D FREEIMAGE_LIB %(AdditionalOptions)</AdditionalOptions>
6968
</ClCompile>
7069
<Link>
7170
<SubSystem>Console</SubSystem>
7271
<GenerateDebugInformation>true</GenerateDebugInformation>
73-
<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>
72+
<AdditionalDependencies>Framework.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>
7473
<IgnoreSpecificDefaultLibraries>msvcrt</IgnoreSpecificDefaultLibraries>
7574
</Link>
7675
<PostBuildEvent>
@@ -92,13 +91,14 @@ xcopy /Y $(ProjectDir)Assets\Textures\*.* $(OutDir)Assets\Textures\</Command>
9291
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9392
<ConformanceMode>true</ConformanceMode>
9493
<LanguageStandard>stdcpp17</LanguageStandard>
94+
<AdditionalOptions>/D FREEIMAGE_LIB %(AdditionalOptions)</AdditionalOptions>
9595
</ClCompile>
9696
<Link>
9797
<SubSystem>Console</SubSystem>
9898
<EnableCOMDATFolding>true</EnableCOMDATFolding>
9999
<OptimizeReferences>true</OptimizeReferences>
100100
<GenerateDebugInformation>true</GenerateDebugInformation>
101-
<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>
101+
<AdditionalDependencies>Framework.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>
102102
</Link>
103103
<PostBuildEvent>
104104
<Command>xcopy /Y $(SolutionDir)..\lib\assimp\lib\assimp.dll $(OutDir)
@@ -111,30 +111,15 @@ xcopy /Y $(ProjectDir)Assets\Textures\*.* $(OutDir)Assets\Textures\</Command>
111111
</PostBuildEvent>
112112
</ItemDefinitionGroup>
113113
<ItemGroup>
114-
<ClCompile Include="..\..\..\..\lib\imgui\include\imgui\backend\imgui_impl_dx11.cpp" />
115-
<ClCompile Include="..\..\..\..\lib\imgui\include\imgui\backend\imgui_impl_glfw.cpp" />
116-
<ClCompile Include="..\..\..\..\lib\imgui\include\imgui\imgui.cpp" />
117-
<ClCompile Include="..\..\..\..\lib\imgui\include\imgui\imgui_demo.cpp" />
118-
<ClCompile Include="..\..\..\..\lib\imgui\include\imgui\imgui_draw.cpp" />
119-
<ClCompile Include="..\..\..\..\lib\imgui\include\imgui\imgui_tables.cpp" />
120-
<ClCompile Include="..\..\..\..\lib\imgui\include\imgui\imgui_widgets.cpp" />
121-
<ClCompile Include="DeviceContext.cpp" />
114+
<ClCompile Include="3DRenderingApplication.cpp" />
122115
<ClCompile Include="Main.cpp" />
123-
<ClCompile Include="DepthBufferApplication.cpp" />
124-
<ClCompile Include="ModelFactory.cpp" />
125-
<ClCompile Include="Pipeline.cpp" />
126-
<ClCompile Include="PipelineFactory.cpp" />
127-
<ClCompile Include="TextureFactory.cpp" />
116+
<ClCompile Include="ShaderCollection.cpp" />
128117
</ItemGroup>
129118
<ItemGroup>
119+
<ClInclude Include="3DRenderingApplication.hpp" />
130120
<ClInclude Include="Definitions.hpp" />
131-
<ClInclude Include="DeviceContext.hpp" />
132-
<ClInclude Include="DepthBufferApplication.hpp" />
133-
<ClInclude Include="ModelFactory.hpp" />
134-
<ClInclude Include="Pipeline.hpp" />
135-
<ClInclude Include="PipelineFactory.hpp" />
136121
<ClInclude Include="ResourceDescriptor.hpp" />
137-
<ClInclude Include="TextureFactory.hpp" />
122+
<ClInclude Include="ShaderCollection.hpp" />
138123
<ClInclude Include="VertexType.hpp" />
139124
</ItemGroup>
140125
<ItemGroup>

‎src/Cpp/1-getting-started/1-3-4-3DRendering/1-3-4-3DRendering.vcxproj.filters‎

Lines changed: 7 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -15,75 +15,30 @@
1515
</Filter>
1616
</ItemGroup>
1717
<ItemGroup>
18-
<ClCompile Include="Main.cpp">
19-
<Filter>Source Files</Filter>
20-
</ClCompile>
21-
<ClCompile Include="DepthBufferApplication.cpp">
22-
<Filter>Source Files</Filter>
23-
</ClCompile>
24-
<ClCompile Include="TextureFactory.cpp">
25-
<Filter>Source Files</Filter>
26-
</ClCompile>
27-
<ClCompile Include="ModelFactory.cpp">
28-
<Filter>Source Files</Filter>
29-
</ClCompile>
30-
<ClCompile Include="PipelineFactory.cpp">
31-
<Filter>Source Files</Filter>
32-
</ClCompile>
33-
<ClCompile Include="Pipeline.cpp">
34-
<Filter>Source Files</Filter>
35-
</ClCompile>
36-
<ClCompile Include="DeviceContext.cpp">
37-
<Filter>Source Files</Filter>
38-
</ClCompile>
39-
<ClCompile Include="..\..\..\..\lib\imgui\include\imgui\imgui.cpp">
40-
<Filter>Source Files</Filter>
41-
</ClCompile>
42-
<ClCompile Include="..\..\..\..\lib\imgui\include\imgui\imgui_demo.cpp">
43-
<Filter>Source Files</Filter>
44-
</ClCompile>
45-
<ClCompile Include="..\..\..\..\lib\imgui\include\imgui\imgui_draw.cpp">
46-
<Filter>Source Files</Filter>
47-
</ClCompile>
48-
<ClCompile Include="..\..\..\..\lib\imgui\include\imgui\imgui_tables.cpp">
49-
<Filter>Source Files</Filter>
50-
</ClCompile>
51-
<ClCompile Include="..\..\..\..\lib\imgui\include\imgui\imgui_widgets.cpp">
18+
<ClCompile Include="3DRenderingApplication.cpp">
5219
<Filter>Source Files</Filter>
5320
</ClCompile>
54-
<ClCompile Include="..\..\..\..\lib\imgui\include\imgui\backend\imgui_impl_dx11.cpp">
21+
<ClCompile Include="ShaderCollection.cpp">
5522
<Filter>Source Files</Filter>
5623
</ClCompile>
57-
<ClCompile Include="..\..\..\..\lib\imgui\include\imgui\backend\imgui_impl_glfw.cpp">
24+
<ClCompile Include="Main.cpp">
5825
<Filter>Source Files</Filter>
5926
</ClCompile>
6027
</ItemGroup>
6128
<ItemGroup>
62-
<ClInclude Include="DepthBufferApplication.hpp">
63-
<Filter>Header Files</Filter>
64-
</ClInclude>
65-
<ClInclude Include="TextureFactory.hpp">
66-
<Filter>Header Files</Filter>
67-
</ClInclude>
68-
<ClInclude Include="ModelFactory.hpp">
29+
<ClInclude Include="3DRenderingApplication.hpp">
6930
<Filter>Header Files</Filter>
7031
</ClInclude>
7132
<ClInclude Include="VertexType.hpp">
7233
<Filter>Header Files</Filter>
7334
</ClInclude>
74-
<ClInclude Include="ResourceDescriptor.hpp">
35+
<ClInclude Include="ShaderCollection.hpp">
7536
<Filter>Header Files</Filter>
7637
</ClInclude>
77-
<ClInclude Include="PipelineFactory.hpp">
78-
<Filter>Header Files</Filter>
79-
</ClInclude>
80-
<ClInclude Include="Pipeline.hpp">
81-
<Filter>Header Files</Filter>
82-
</ClInclude>
83-
<ClInclude Include="DeviceContext.hpp">
38+
<ClInclude Include="Definitions.hpp">
8439
<Filter>Header Files</Filter>
8540
</ClInclude>
86-
<ClInclude Include="Definitions.hpp">
41+
<ClInclude Include="ResourceDescriptor.hpp">
8742
<Filter>Header Files</Filter>
8843
</ClInclude>
8944
</ItemGroup>

0 commit comments

Comments
 (0)