Skip to content

Commit 5b68d24

Browse files
plushmonkeyplushmonkey
committed
Improve project layout and cleanup includes
1 parent fb0c6fb commit 5b68d24

96 files changed

Lines changed: 567 additions & 570 deletions

Some content is hidden

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

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Debug
22
Release
33
build
4+
clang
45
bin
56
*.opensdf
67
*.sdf

‎CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ set(IMGUI_SOURCES
1414
lib/imgui/backends/imgui_impl_opengl3.cpp)
1515

1616
if(WIN32)
17-
add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_GLFW_WIN32 -D_MBCS -DNDEBUG)
17+
add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_GLFW_WIN32 -D_MBCS -DNDEBUG -DNOMINMAX -DWIN32_LEAN_AND_MEAN)
1818
set(GLFW_SOURCES
1919
lib/glfw/src/context.cpp
2020
lib/glfw/src/egl_context.cpp
@@ -45,6 +45,7 @@ list(APPEND SOURCES ${IMGUI_SOURCES})
4545
add_executable(nullspace ${SOURCES})
4646

4747
target_include_directories(nullspace PRIVATE
48+
src
4849
lib
4950
lib/imgui
5051
lib/glad/include

‎nullspace.vcxproj‎

Lines changed: 101 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -70,24 +70,24 @@
7070
</ImportGroup>
7171
<PropertyGroup Label="UserMacros" />
7272
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
73-
<IncludePath>lib\imgui;lib\;lib\glad\include;lib\glfw\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
73+
<IncludePath>src;lib\imgui;lib\;lib\glad\include;lib\glfw\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
7474
</PropertyGroup>
7575
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
76-
<IncludePath>lib\imgui;lib\;lib\glad\include;lib\glfw\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
76+
<IncludePath>src;lib\imgui;lib\;lib\glad\include;lib\glfw\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
7777
</PropertyGroup>
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
79-
<IncludePath>lib\imgui;lib\;lib\glad\include;lib\glfw\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
79+
<IncludePath>src;lib\imgui;lib\;lib\glad\include;lib\glfw\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
8080
</PropertyGroup>
8181
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
82-
<IncludePath>lib\imgui;lib\;lib\glad\include;lib\glfw\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
82+
<IncludePath>src;lib\imgui;lib\;lib\glad\include;lib\glfw\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
8383
</PropertyGroup>
8484
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
8585
<ClCompile>
8686
<WarningLevel>Level3</WarningLevel>
8787
<Optimization>Disabled</Optimization>
8888
<SDLCheck>true</SDLCheck>
8989
<ConformanceMode>true</ConformanceMode>
90-
<PreprocessorDefinitions>_GLFW_WIN32;_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
90+
<PreprocessorDefinitions>NOMINMAX;WIN32_LEAN_AND_MEAN;_GLFW_WIN32;_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9191
</ClCompile>
9292
<Link>
9393
<SubSystem>Console</SubSystem>
@@ -101,7 +101,7 @@
101101
<SDLCheck>true</SDLCheck>
102102
<ConformanceMode>true</ConformanceMode>
103103
<LanguageStandard>stdcpp17</LanguageStandard>
104-
<PreprocessorDefinitions>_GLFW_WIN32;_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
104+
<PreprocessorDefinitions>NOMINMAX;WIN32_LEAN_AND_MEAN;_GLFW_WIN32;_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
105105
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
106106
<MultiProcessorCompilation>true</MultiProcessorCompilation>
107107
</ClCompile>
@@ -118,7 +118,7 @@
118118
<IntrinsicFunctions>true</IntrinsicFunctions>
119119
<SDLCheck>true</SDLCheck>
120120
<ConformanceMode>true</ConformanceMode>
121-
<PreprocessorDefinitions>NDEBUG;_GLFW_WIN32;_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
121+
<PreprocessorDefinitions>NOMINMAX;WIN32_LEAN_AND_MEAN;NDEBUG;_GLFW_WIN32;_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
122122
</ClCompile>
123123
<Link>
124124
<SubSystem>Console</SubSystem>
@@ -136,7 +136,7 @@
136136
<SDLCheck>false</SDLCheck>
137137
<ConformanceMode>true</ConformanceMode>
138138
<LanguageStandard>stdcpp17</LanguageStandard>
139-
<PreprocessorDefinitions>NDEBUG;_GLFW_WIN32;_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
139+
<PreprocessorDefinitions>NOMINMAX;WIN32_LEAN_AND_MEAN;NDEBUG;_GLFW_WIN32;_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
140140
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
141141
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
142142
<OmitFramePointers>true</OmitFramePointers>
@@ -176,46 +176,46 @@
176176
<ClCompile Include="lib\imgui\imgui_draw.cpp" />
177177
<ClCompile Include="lib\imgui\imgui_tables.cpp" />
178178
<ClCompile Include="lib\imgui\imgui_widgets.cpp" />
179-
<ClCompile Include="src\BannerPool.cpp" />
180-
<ClCompile Include="src\BrickManager.cpp" />
181-
<ClCompile Include="src\Buffer.cpp" />
182-
<ClCompile Include="src\ChatController.cpp" />
183-
<ClCompile Include="src\FileRequester.cpp" />
184-
<ClCompile Include="src\Logger.cpp" />
185-
<ClCompile Include="src\LvzController.cpp" />
186-
<ClCompile Include="src\net\security\SecuritySolver.cpp" />
187-
<ClCompile Include="src\Notification.cpp" />
188-
<ClCompile Include="src\Radar.cpp" />
189-
<ClCompile Include="src\render\AnimatedTileRenderer.cpp" />
190-
<ClCompile Include="src\render\BackgroundRenderer.cpp" />
191-
<ClCompile Include="src\render\Colors.cpp" />
192-
<ClCompile Include="src\render\Graphics.cpp" />
193-
<ClCompile Include="src\render\Image.cpp" />
194-
<ClCompile Include="src\net\security\Checksum.cpp" />
195-
<ClCompile Include="src\Game.cpp" />
196-
<ClCompile Include="src\Inflate.cpp" />
197-
<ClCompile Include="src\main.cpp" />
198-
<ClCompile Include="src\Map.cpp" />
199-
<ClCompile Include="src\net\security\MD5.cpp" />
200-
<ClCompile Include="src\Memory.cpp" />
201-
<ClCompile Include="src\net\Connection.cpp" />
202-
<ClCompile Include="src\net\security\Crypt.cpp" />
203-
<ClCompile Include="src\net\PacketDispatcher.cpp" />
204-
<ClCompile Include="src\net\PacketSequencer.cpp" />
205-
<ClCompile Include="src\Platform.cpp" />
206-
<ClCompile Include="src\PlayerManager.cpp" />
207-
<ClCompile Include="src\render\Animation.cpp" />
208-
<ClCompile Include="src\render\Shader.cpp" />
209-
<ClCompile Include="src\render\SpriteRenderer.cpp" />
210-
<ClCompile Include="src\render\TileRenderer.cpp" />
211-
<ClCompile Include="src\ShipController.cpp" />
212-
<ClCompile Include="src\Soccer.cpp" />
213-
<ClCompile Include="src\Sound.cpp" />
214-
<ClCompile Include="src\SpectateView.cpp" />
215-
<ClCompile Include="src\StatBox.cpp" />
216-
<ClCompile Include="src\Clock.cpp" />
217-
<ClCompile Include="src\WeaponManager.cpp" />
218-
<ClCompile Include="src\WorkQueue.cpp" />
179+
<ClCompile Include="src\null\BannerPool.cpp" />
180+
<ClCompile Include="src\null\BrickManager.cpp" />
181+
<ClCompile Include="src\null\Buffer.cpp" />
182+
<ClCompile Include="src\null\ChatController.cpp" />
183+
<ClCompile Include="src\null\FileRequester.cpp" />
184+
<ClCompile Include="src\null\Logger.cpp" />
185+
<ClCompile Include="src\null\LvzController.cpp" />
186+
<ClCompile Include="src\null\net\security\SecuritySolver.cpp" />
187+
<ClCompile Include="src\null\Notification.cpp" />
188+
<ClCompile Include="src\null\Radar.cpp" />
189+
<ClCompile Include="src\null\render\AnimatedTileRenderer.cpp" />
190+
<ClCompile Include="src\null\render\BackgroundRenderer.cpp" />
191+
<ClCompile Include="src\null\render\Colors.cpp" />
192+
<ClCompile Include="src\null\render\Graphics.cpp" />
193+
<ClCompile Include="src\null\render\Image.cpp" />
194+
<ClCompile Include="src\null\net\security\Checksum.cpp" />
195+
<ClCompile Include="src\null\Game.cpp" />
196+
<ClCompile Include="src\null\Inflate.cpp" />
197+
<ClCompile Include="src\null\main.cpp" />
198+
<ClCompile Include="src\null\Map.cpp" />
199+
<ClCompile Include="src\null\net\security\MD5.cpp" />
200+
<ClCompile Include="src\null\Memory.cpp" />
201+
<ClCompile Include="src\null\net\Connection.cpp" />
202+
<ClCompile Include="src\null\net\security\Crypt.cpp" />
203+
<ClCompile Include="src\null\net\PacketDispatcher.cpp" />
204+
<ClCompile Include="src\null\net\PacketSequencer.cpp" />
205+
<ClCompile Include="src\null\Platform.cpp" />
206+
<ClCompile Include="src\null\PlayerManager.cpp" />
207+
<ClCompile Include="src\null\render\Animation.cpp" />
208+
<ClCompile Include="src\null\render\Shader.cpp" />
209+
<ClCompile Include="src\null\render\SpriteRenderer.cpp" />
210+
<ClCompile Include="src\null\render\TileRenderer.cpp" />
211+
<ClCompile Include="src\null\ShipController.cpp" />
212+
<ClCompile Include="src\null\Soccer.cpp" />
213+
<ClCompile Include="src\null\Sound.cpp" />
214+
<ClCompile Include="src\null\SpectateView.cpp" />
215+
<ClCompile Include="src\null\StatBox.cpp" />
216+
<ClCompile Include="src\null\Clock.cpp" />
217+
<ClCompile Include="src\null\WeaponManager.cpp" />
218+
<ClCompile Include="src\null\WorkQueue.cpp" />
219219
</ItemGroup>
220220
<ItemGroup>
221221
<ClInclude Include="lib\imgui\backends\imgui_impl_glfw.h" />
@@ -226,60 +226,60 @@
226226
<ClInclude Include="lib\imgui\imstb_rectpack.h" />
227227
<ClInclude Include="lib\imgui\imstb_textedit.h" />
228228
<ClInclude Include="lib\imgui\imstb_truetype.h" />
229-
<ClInclude Include="src\ArenaSettings.h" />
230-
<ClInclude Include="src\BannerPool.h" />
231-
<ClInclude Include="src\BrickManager.h" />
232-
<ClInclude Include="src\Buffer.h" />
233-
<ClInclude Include="src\ChatController.h" />
234-
<ClInclude Include="src\FileRequester.h" />
235-
<ClInclude Include="src\HashMap.h" />
236-
<ClInclude Include="src\Logger.h" />
237-
<ClInclude Include="src\LvzController.h" />
238-
<ClInclude Include="src\net\security\SecuritySolver.h" />
239-
<ClInclude Include="src\net\Socket.h" />
240-
<ClInclude Include="src\Notification.h" />
241-
<ClInclude Include="src\Radar.h" />
242-
<ClInclude Include="src\Random.h" />
243-
<ClInclude Include="src\render\AnimatedTileRenderer.h" />
244-
<ClInclude Include="src\render\BackgroundRenderer.h" />
245-
<ClInclude Include="src\render\Colors.h" />
246-
<ClInclude Include="src\render\Graphics.h" />
247-
<ClInclude Include="src\render\Image.h" />
248-
<ClInclude Include="src\InputState.h" />
249-
<ClInclude Include="src\net\security\Checksum.h" />
250-
<ClInclude Include="src\Game.h" />
251-
<ClInclude Include="src\Inflate.h" />
252-
<ClInclude Include="src\Map.h" />
253-
<ClInclude Include="src\net\security\MD5.h" />
254-
<ClInclude Include="src\net\security\Crypt.h" />
255-
<ClInclude Include="src\Memory.h" />
256-
<ClInclude Include="src\net\Connection.h" />
257-
<ClInclude Include="src\net\PacketDispatcher.h" />
258-
<ClInclude Include="src\net\PacketSequencer.h" />
259-
<ClInclude Include="src\net\Protocol.h" />
260-
<ClInclude Include="src\Platform.h" />
261-
<ClInclude Include="src\Player.h" />
229+
<ClInclude Include="src\null\ArenaSettings.h" />
230+
<ClInclude Include="src\null\BannerPool.h" />
231+
<ClInclude Include="src\null\BrickManager.h" />
232+
<ClInclude Include="src\null\Buffer.h" />
233+
<ClInclude Include="src\null\ChatController.h" />
234+
<ClInclude Include="src\null\FileRequester.h" />
235+
<ClInclude Include="src\null\HashMap.h" />
236+
<ClInclude Include="src\null\Logger.h" />
237+
<ClInclude Include="src\null\LvzController.h" />
238+
<ClInclude Include="src\null\net\security\SecuritySolver.h" />
239+
<ClInclude Include="src\null\net\Socket.h" />
240+
<ClInclude Include="src\null\Notification.h" />
241+
<ClInclude Include="src\null\Radar.h" />
242+
<ClInclude Include="src\null\Random.h" />
243+
<ClInclude Include="src\null\render\AnimatedTileRenderer.h" />
244+
<ClInclude Include="src\null\render\BackgroundRenderer.h" />
245+
<ClInclude Include="src\null\render\Colors.h" />
246+
<ClInclude Include="src\null\render\Graphics.h" />
247+
<ClInclude Include="src\null\render\Image.h" />
248+
<ClInclude Include="src\null\InputState.h" />
249+
<ClInclude Include="src\null\net\security\Checksum.h" />
250+
<ClInclude Include="src\null\Game.h" />
251+
<ClInclude Include="src\null\Inflate.h" />
252+
<ClInclude Include="src\null\Map.h" />
253+
<ClInclude Include="src\null\net\security\MD5.h" />
254+
<ClInclude Include="src\null\net\security\Crypt.h" />
255+
<ClInclude Include="src\null\Memory.h" />
256+
<ClInclude Include="src\null\net\Connection.h" />
257+
<ClInclude Include="src\null\net\PacketDispatcher.h" />
258+
<ClInclude Include="src\null\net\PacketSequencer.h" />
259+
<ClInclude Include="src\null\net\Protocol.h" />
260+
<ClInclude Include="src\null\Platform.h" />
261+
<ClInclude Include="src\null\Player.h" />
262262
<ClInclude Include="lib\stb_image.h" />
263-
<ClInclude Include="src\PlayerManager.h" />
264-
<ClInclude Include="src\render\Animation.h" />
265-
<ClInclude Include="src\render\Camera.h" />
266-
<ClInclude Include="src\render\Layer.h" />
267-
<ClInclude Include="src\render\Shader.h" />
268-
<ClInclude Include="src\render\Sprite.h" />
269-
<ClInclude Include="src\render\SpriteRenderer.h" />
270-
<ClInclude Include="src\render\TextureMap.h" />
271-
<ClInclude Include="src\render\TileRenderer.h" />
272-
<ClInclude Include="src\Settings.h" />
273-
<ClInclude Include="src\ShipController.h" />
274-
<ClInclude Include="src\Soccer.h" />
275-
<ClInclude Include="src\Sound.h" />
276-
<ClInclude Include="src\SpectateView.h" />
277-
<ClInclude Include="src\StatBox.h" />
278-
<ClInclude Include="src\Clock.h" />
279-
<ClInclude Include="src\Types.h" />
280-
<ClInclude Include="src\Math.h" />
281-
<ClInclude Include="src\WeaponManager.h" />
282-
<ClInclude Include="src\WorkQueue.h" />
263+
<ClInclude Include="src\null\PlayerManager.h" />
264+
<ClInclude Include="src\null\render\Animation.h" />
265+
<ClInclude Include="src\null\render\Camera.h" />
266+
<ClInclude Include="src\null\render\Layer.h" />
267+
<ClInclude Include="src\null\render\Shader.h" />
268+
<ClInclude Include="src\null\render\Sprite.h" />
269+
<ClInclude Include="src\null\render\SpriteRenderer.h" />
270+
<ClInclude Include="src\null\render\TextureMap.h" />
271+
<ClInclude Include="src\null\render\TileRenderer.h" />
272+
<ClInclude Include="src\null\Settings.h" />
273+
<ClInclude Include="src\null\ShipController.h" />
274+
<ClInclude Include="src\null\Soccer.h" />
275+
<ClInclude Include="src\null\Sound.h" />
276+
<ClInclude Include="src\null\SpectateView.h" />
277+
<ClInclude Include="src\null\StatBox.h" />
278+
<ClInclude Include="src\null\Clock.h" />
279+
<ClInclude Include="src\null\Types.h" />
280+
<ClInclude Include="src\null\Math.h" />
281+
<ClInclude Include="src\null\WeaponManager.h" />
282+
<ClInclude Include="src\null\WorkQueue.h" />
283283
</ItemGroup>
284284
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
285285
<ImportGroup Label="ExtensionTargets">

src/ArenaSettings.h renamed to src/null/ArenaSettings.h

File renamed without changes.

src/BannerPool.cpp renamed to src/null/BannerPool.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#include "BannerPool.h"
22

3+
#include <null/Memory.h>
4+
#include <null/PlayerManager.h>
5+
#include <null/net/PacketDispatcher.h>
6+
#include <null/render/Image.h>
7+
//
38
#include <assert.h>
49
#include <glad/glad.h>
510
#include <stdio.h>
611
#include <string.h>
712

8-
#include "Memory.h"
9-
#include "PlayerManager.h"
10-
#include "net/PacketDispatcher.h"
11-
#include "render/Image.h"
12-
1313
namespace null {
1414

1515
void OnBannerPkt(void* user, u8* pkt, size_t size) {

src/BannerPool.h renamed to src/null/BannerPool.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#ifndef NULLSPACE_BANNERMANAGER_H_
22
#define NULLSPACE_BANNERMANAGER_H_
33

4-
#include "Types.h"
5-
#include "render/Sprite.h"
4+
#include <null/Types.h>
5+
#include <null/render/Sprite.h>
66

77
namespace null {
88

src/BrickManager.cpp renamed to src/null/BrickManager.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#include "BrickManager.h"
22

3-
#include <cassert>
4-
5-
#include "Buffer.h"
6-
#include "Clock.h"
7-
#include "Map.h"
8-
#include "PlayerManager.h"
9-
#include "net/Connection.h"
10-
#include "net/PacketDispatcher.h"
11-
#include "render/Camera.h"
12-
#include "render/Graphics.h"
13-
#include "render/SpriteRenderer.h"
3+
#include <null/Buffer.h>
4+
#include <null/Clock.h>
5+
#include <null/Map.h>
6+
#include <null/PlayerManager.h>
7+
#include <null/net/Connection.h>
8+
#include <null/net/PacketDispatcher.h>
9+
#include <null/render/Camera.h>
10+
#include <null/render/Graphics.h>
11+
#include <null/render/SpriteRenderer.h>
12+
//
13+
#include <assert.h>
1414

1515
namespace null {
1616

src/BrickManager.h renamed to src/null/BrickManager.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#ifndef NULLSPACE_BRICKMANAGER_H_
22
#define NULLSPACE_BRICKMANAGER_H_
33

4-
#include "HashMap.h"
5-
#include "Math.h"
6-
#include "Types.h"
7-
#include "render/Animation.h"
4+
#include <null/HashMap.h>
5+
#include <null/Math.h>
6+
#include <null/Types.h>
7+
#include <null/render/Animation.h>
88

99
namespace null {
1010

src/Buffer.cpp renamed to src/null/Buffer.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include "Buffer.h"
22

3-
#include <cassert>
4-
#include <cstdlib>
5-
#include <cstring>
3+
#include <assert.h>
4+
#include <stdlib.h>
5+
#include <string.h>
66

77
// TODO: Protocol is little endian. Should convert on big endian
88
#ifdef _MSC_VER

src/Buffer.h renamed to src/null/Buffer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#ifndef NULLSPACE_BUFFER_H_
22
#define NULLSPACE_BUFFER_H_
33

4-
#include "Memory.h"
5-
#include "Types.h"
4+
#include <null/Memory.h>
5+
#include <null/Types.h>
66

77
namespace null {
88

0 commit comments

Comments
 (0)