Skip to content
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.

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

Dpeter99/feature/ecs rework #39

Draft
wants to merge 19 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
55 changes: 55 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Generated from CLion C/C++ Code Style settings
---
Language: Cpp
BasedOnStyle: LLVM
AlignConsecutiveAssignments: true
AlignConsecutiveDeclarations: false
AlignOperands: false
AlignTrailingComments: false
AlwaysBreakTemplateDeclarations: Yes
BraceWrapping:
AfterCaseLabel: true
AfterClass: true
AfterControlStatement: true
AfterEnum: true
AfterFunction: true
AfterNamespace: true
AfterStruct: true
AfterUnion: true
AfterExternBlock: false
BeforeCatch: true
BeforeElse: true
BeforeLambdaBody: true
BeforeWhile: true
SplitEmptyFunction: true
SplitEmptyRecord: true
SplitEmptyNamespace: true
BreakBeforeBraces: Custom
BreakConstructorInitializers: AfterColon
BreakConstructorInitializersBeforeComma: false
ColumnLimit: 120
ConstructorInitializerAllOnOneLineOrOnePerLine: false
ContinuationIndentWidth: 2
IncludeCategories:
- Regex: '^<.*'
Priority: 1
- Regex: '^".*'
Priority: 2
- Regex: '.*'
Priority: 3
IncludeIsMainRegex: '([-_](test|unittest))?$'
IndentCaseBlocks: true
IndentCaseLabels: true
IndentWrappedFunctionNames: true
InsertNewlineAtEOF: true
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 2
NamespaceIndentation: All
SpaceInEmptyParentheses: false
SpacesInAngles: false
SpacesInConditionalStatement: false
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
TabWidth: 2
...
1 change: 1 addition & 0 deletions .gdbinit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
source ./experiment-ecs-printer.py
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ cmake-build-debug-msvc/
cmake-build-debug-msvc-vs/
out/
.vs/
.idea/
17 changes: 10 additions & 7 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
[submodule "projs/shadow/extern/spdlog"]
path = projs/shadow/extern/spdlog
url = https://github.com/gabime/spdlog.git
[submodule "projs/shadow/extern/imgui"]
path = projs/shadow/extern/imgui
url = https://github.com/ocornut/imgui
[submodule "projs/shadow/extern/dxmath"]
path = projs/shadow/extern/dxmath
url = https://github.com/microsoft/DirectXMath.git
[submodule "projs/shadow/extern/catch2"]
path = projs/shadow/extern/catch2
url = https://github.com/catchorg/Catch2.git
[submodule "projs/shadow/extern/glm"]
path = projs/shadow/extern/glm
url = https://github.com/g-truc/glm.git
Expand All @@ -18,4 +12,13 @@
url = https://github.com/martin-olivier/dylib
[submodule "projs/shadow/extern/vulkan_memory_allocator"]
path = projs/shadow/extern/vulkan_memory_allocator
url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
[submodule "extern/fmt"]
path = projs/extern/fmt
url = git@github.com:fmtlib/fmt.git
[submodule "projs/extern/spdlog"]
path = projs/extern/spdlog
url = https://github.com/gabime/spdlog.git
[submodule "projs/extern/catch2"]
path = projs/extern/catch2
url = https://github.com/catchorg/Catch2.git
8 changes: 0 additions & 8 deletions .idea/.gitignore

This file was deleted.

9 changes: 0 additions & 9 deletions .idea/cmake.xml

This file was deleted.

73 changes: 0 additions & 73 deletions .idea/codeStyles/Project.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/codeStyles/codeStyleConfig.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/customTargets.xml

This file was deleted.

4 changes: 0 additions & 4 deletions .idea/encodings.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/fileTemplates/Shadow Entitiy Header.h

This file was deleted.

1 change: 0 additions & 1 deletion .idea/fileTemplates/Shadow Entitiy.cpp

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/fileTemplates/internal/C++ Class Header.h

This file was deleted.

4 changes: 0 additions & 4 deletions .idea/fileTemplates/internal/C++ Class.cc

This file was deleted.

9 changes: 0 additions & 9 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/misc.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/runConfigurations/test_game.xml

This file was deleted.

9 changes: 0 additions & 9 deletions .idea/runConfigurations/test_game_EDITOR.xml

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/scopes/shadow.xml

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/statistic.xml

This file was deleted.

2 changes: 0 additions & 2 deletions .idea/umbra.iml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/vcs.xml

This file was deleted.

8 changes: 6 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ include(shadow-modules.cmake)
set(CMAKE_STATIC_LIBRARY_PREFIX "")
set(CMAKE_SHARED_LIBRARY_PREFIX "")

add_subdirectory(projs/shadow)
add_subdirectory(projs/extern)

add_subdirectory(projs/test-game)
#add_subdirectory(projs/shadow)

#add_subdirectory(projs/test-game)

add_subdirectory(projs/experiments/ecs)
16 changes: 16 additions & 0 deletions deps.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Include(FetchContent)
include(ExternalProject)


add_subdirectory(projs/extern/fmt)

# ###############################################
# Fetch Catch2 for the file format tests
# ###############################################
#FetchContent_Declare(
# Catch2
# GIT_REPOSITORY https://github.com/catchorg/Catch2.git
# GIT_TAG v2.13.9 # or a later release
#)
#FetchContent_MakeAvailable(Catch2)
#list(APPEND CMAKE_MODULE_PATH "${Catch2_SOURCE_DIR}/contrib")
Loading