Skip to content

Commit b432830

Browse files
spndadeccer
spnda
and
deccer
authored
Change: Move Application abstraction into Framework project (#109)
* Change: Move Application abstraction into Framework project * Fix Project configuration - get rid of Win32 * Fix mouse input Co-authored-by: deccer <[email protected]>
1 parent 7cd5a4d commit b432830

File tree

67 files changed

+473
-1902
lines changed

Some content is hidden

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

67 files changed

+473
-1902
lines changed

‎src/Cpp/1-getting-started/1-1-1-HelloWindow/Application.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ class Application
1414
void Run();
1515

1616
protected:
17-
virtual void Cleanup();
1817
virtual bool Initialize();
1918
virtual bool Load() = 0;
2019
virtual void Render() = 0;
2120
virtual void Update() = 0;
2221

2322
private:
23+
virtual void Cleanup();
24+
2425
GLFWwindow* _window = nullptr;
2526
int32_t _width = 0;
2627
int32_t _height = 0;

‎src/Cpp/1-getting-started/1-1-2-HelloD3D11/1-1-2-HelloD3D11.vcxproj‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@
4545
<PropertyGroup Label="UserMacros" />
4646
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
4747
<LinkIncremental>true</LinkIncremental>
48-
<IncludePath>$(SolutionDir)..\lib\glfw-3.3.6\include\;$(IncludePath)</IncludePath>
49-
<LibraryPath>$(SolutionDir)..\lib\glfw-3.3.6\lib-vc2022\;$(LibraryPath)</LibraryPath>
48+
<IncludePath>$(SolutionDir)..\lib\glfw-3.3.6\include\;$(IncludePath);$(SolutionDir)Cpp\Framework\;</IncludePath>
49+
<LibraryPath>$(SolutionDir)..\lib\glfw-3.3.6\lib-vc2022\;$(LibraryPath);$(SolutionDir)Cpp\Framework\lib\$(Configuration)\;</LibraryPath>
5050
<OutDir>bin\$(Configuration)\</OutDir>
5151
<IntDir>obj\$(Configuration)\</IntDir>
5252
</PropertyGroup>
5353
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
5454
<LinkIncremental>false</LinkIncremental>
55-
<IncludePath>$(SolutionDir)..\lib\glfw-3.3.6\include\;$(IncludePath)</IncludePath>
56-
<LibraryPath>$(SolutionDir)..\lib\glfw-3.3.6\lib-vc2022\;$(LibraryPath)</LibraryPath>
55+
<IncludePath>$(SolutionDir)..\lib\glfw-3.3.6\include\;$(IncludePath);$(SolutionDir)Cpp\Framework\;</IncludePath>
56+
<LibraryPath>$(SolutionDir)..\lib\glfw-3.3.6\lib-vc2022\;$(LibraryPath);$(SolutionDir)Cpp\Framework\lib\$(Configuration)\;</LibraryPath>
5757
<OutDir>bin\$(Configuration)\</OutDir>
5858
<IntDir>obj\$(Configuration)\</IntDir>
5959
</PropertyGroup>
@@ -68,7 +68,7 @@
6868
<Link>
6969
<SubSystem>Console</SubSystem>
7070
<GenerateDebugInformation>true</GenerateDebugInformation>
71-
<AdditionalDependencies>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>
71+
<AdditionalDependencies>Framework.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>
7272
</Link>
7373
<PostBuildEvent>
7474
<Command>mkdir $(OutDir)Assets\Models\
@@ -94,7 +94,7 @@ xcopy /Y $(ProjectDir)Assets\Textures\*.* $(OutDir)Assets\Textures\</Command>
9494
<EnableCOMDATFolding>true</EnableCOMDATFolding>
9595
<OptimizeReferences>true</OptimizeReferences>
9696
<GenerateDebugInformation>true</GenerateDebugInformation>
97-
<AdditionalDependencies>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>
97+
<AdditionalDependencies>Framework.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>
9898
</Link>
9999
<PostBuildEvent>
100100
<Command>mkdir $(OutDir)Assets\Models\
@@ -106,12 +106,10 @@ xcopy /Y $(ProjectDir)Assets\Textures\*.* $(OutDir)Assets\Textures\</Command>
106106
</PostBuildEvent>
107107
</ItemDefinitionGroup>
108108
<ItemGroup>
109-
<ClCompile Include="Application.cpp" />
110109
<ClCompile Include="HelloD3D11Application.cpp" />
111110
<ClCompile Include="Main.cpp" />
112111
</ItemGroup>
113112
<ItemGroup>
114-
<ClInclude Include="Application.hpp" />
115113
<ClInclude Include="HelloD3D11Application.hpp" />
116114
</ItemGroup>
117115
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎src/Cpp/1-getting-started/1-1-2-HelloD3D11/1-1-2-HelloD3D11.vcxproj.filters‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
</Filter>
1616
</ItemGroup>
1717
<ItemGroup>
18-
<ClCompile Include="Application.cpp">
19-
<Filter>Source Files</Filter>
20-
</ClCompile>
2118
<ClCompile Include="HelloD3D11Application.cpp">
2219
<Filter>Source Files</Filter>
2320
</ClCompile>
@@ -26,9 +23,6 @@
2623
</ClCompile>
2724
</ItemGroup>
2825
<ItemGroup>
29-
<ClInclude Include="Application.hpp">
30-
<Filter>Header Files</Filter>
31-
</ClInclude>
3226
<ClInclude Include="HelloD3D11Application.hpp">
3327
<Filter>Header Files</Filter>
3428
</ClInclude>

‎src/Cpp/1-getting-started/1-1-2-HelloD3D11/Application.hpp‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎src/Cpp/1-getting-started/1-1-2-HelloD3D11/HelloD3D11Application.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "HelloD3D11Application.hpp"
2+
#include "Application.hpp"
23

34
#include <GLFW/glfw3.h>
45
#define GLFW_EXPOSE_NATIVE_WIN32
@@ -28,7 +29,6 @@ HelloD3D11Application::~HelloD3D11Application()
2829
_dxgiFactory.Reset();
2930
_deviceContext.Reset();
3031
_device.Reset();
31-
Application::Cleanup();
3232
}
3333

3434
bool HelloD3D11Application::Initialize()

‎src/Cpp/1-getting-started/1-1-3-HelloTriangle-Refactored/1-1-3-HelloTriangle-Refactored.vcxproj‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +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\;$(IncludePath)</IncludePath>
51-
<LibraryPath>$(SolutionDir)..\lib\glfw-3.3.6\lib-vc2022\;$(LibraryPath)</LibraryPath>
50+
<IncludePath>$(SolutionDir)..\lib\glfw-3.3.6\include\;$(IncludePath);$(SolutionDir)Cpp\Framework\;</IncludePath>
51+
<LibraryPath>$(SolutionDir)..\lib\glfw-3.3.6\lib-vc2022\;$(LibraryPath);$(SolutionDir)Cpp\Framework\lib\$(Configuration)\;</LibraryPath>
5252
</PropertyGroup>
5353
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
5454
<LinkIncremental>false</LinkIncremental>
5555
<OutDir>bin\$(Configuration)\</OutDir>
5656
<IntDir>obj\$(Configuration)\</IntDir>
57-
<IncludePath>$(SolutionDir)..\lib\glfw-3.3.6\include\;$(IncludePath)</IncludePath>
58-
<LibraryPath>$(SolutionDir)..\lib\glfw-3.3.6\lib-vc2022\;$(LibraryPath)</LibraryPath>
57+
<IncludePath>$(SolutionDir)..\lib\glfw-3.3.6\include\;$(IncludePath);$(SolutionDir)Cpp\Framework\;</IncludePath>
58+
<LibraryPath>$(SolutionDir)..\lib\glfw-3.3.6\lib-vc2022\;$(LibraryPath);$(SolutionDir)Cpp\Framework\lib\$(Configuration)\;</LibraryPath>
5959
</PropertyGroup>
6060
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
6161
<ClCompile>
@@ -68,7 +68,7 @@
6868
<Link>
6969
<SubSystem>Console</SubSystem>
7070
<GenerateDebugInformation>true</GenerateDebugInformation>
71-
<AdditionalDependencies>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>
71+
<AdditionalDependencies>Framework.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>
7272
</Link>
7373
<PostBuildEvent>
7474
<Command>mkdir $(OutDir)Assets\Models\
@@ -94,7 +94,7 @@ xcopy /Y $(ProjectDir)Assets\Textures\*.* $(OutDir)Assets\Textures\</Command>
9494
<EnableCOMDATFolding>true</EnableCOMDATFolding>
9595
<OptimizeReferences>true</OptimizeReferences>
9696
<GenerateDebugInformation>true</GenerateDebugInformation>
97-
<AdditionalDependencies>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>
97+
<AdditionalDependencies>Framework.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>
9898
</Link>
9999
<PostBuildEvent>
100100
<Command>mkdir $(OutDir)Assets\Models\
@@ -106,15 +106,13 @@ xcopy /Y $(ProjectDir)Assets\Textures\*.* $(OutDir)Assets\Textures\</Command>
106106
</PostBuildEvent>
107107
</ItemDefinitionGroup>
108108
<ItemGroup>
109-
<ClCompile Include="Application.cpp" />
110109
<ClCompile Include="DeviceContext.cpp" />
111110
<ClCompile Include="HelloTriangleApplication.cpp" />
112111
<ClCompile Include="Main.cpp" />
113112
<ClCompile Include="Pipeline.cpp" />
114113
<ClCompile Include="PipelineFactory.cpp" />
115114
</ItemGroup>
116115
<ItemGroup>
117-
<ClInclude Include="Application.hpp" />
118116
<ClInclude Include="Definitions.hpp" />
119117
<ClInclude Include="DeviceContext.hpp" />
120118
<ClInclude Include="HelloTriangleApplication.hpp" />

‎src/Cpp/1-getting-started/1-1-3-HelloTriangle-Refactored/1-1-3-HelloTriangle-Refactored.vcxproj.filters‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
</Filter>
1616
</ItemGroup>
1717
<ItemGroup>
18-
<ClCompile Include="Application.cpp">
19-
<Filter>Source Files</Filter>
20-
</ClCompile>
2118
<ClCompile Include="HelloTriangleApplication.cpp">
2219
<Filter>Source Files</Filter>
2320
</ClCompile>
@@ -35,9 +32,6 @@
3532
</ClCompile>
3633
</ItemGroup>
3734
<ItemGroup>
38-
<ClInclude Include="Application.hpp">
39-
<Filter>Header Files</Filter>
40-
</ClInclude>
4135
<ClInclude Include="HelloTriangleApplication.hpp">
4236
<Filter>Header Files</Filter>
4337
</ClInclude>

‎src/Cpp/1-getting-started/1-1-3-HelloTriangle-Refactored/Application.cpp‎

Lines changed: 0 additions & 105 deletions
This file was deleted.

‎src/Cpp/1-getting-started/1-1-3-HelloTriangle-Refactored/Application.hpp‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎src/Cpp/1-getting-started/1-1-3-HelloTriangle-Refactored/HelloTriangleApplication.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ HelloTriangleApplication::~HelloTriangleApplication()
3737
_dxgiFactory.Reset();
3838
_deviceContext.reset();
3939
_device.Reset();
40-
Application::Cleanup();
4140
}
4241

4342
bool HelloTriangleApplication::Initialize()

0 commit comments

Comments
 (0)