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

Preview only PR #409

Merged
merged 93 commits into from
Nov 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
32044b7
enables the folder property of files to be set in cmake
Ragingram2 Dec 14, 2022
9fa9b21
Merge remote-tracking branch 'origin/develop/current' into develop/co…
Ragingram2 Dec 14, 2022
8860e62
VS22All.bat and ignore build/* folder
Ragingram2 Dec 14, 2022
e9e24f7
trying to add folders
Ragingram2 Dec 16, 2022
ae9e586
Merge remote-tracking branch 'origin/develop/current' into develop/co…
GlynLeine Dec 16, 2022
a7120ee
another attempt at folder in cmake
GlynLeine Dec 17, 2022
1ebfa4c
configure filters in generated visual studio solutions, and fix sandb…
GlynLeine Dec 17, 2022
e1c8d3c
Attempt at configure project
Ragingram2 Dec 21, 2022
7626bf5
configure project and renaming and reordering of project filters/fold…
GlynLeine Dec 22, 2022
3a81ca0
fix configure util target
GlynLeine Dec 27, 2022
6b35a08
start work on core submodule
GlynLeine Dec 27, 2022
5901bc6
fix cmake failing with empty modules
GlynLeine Dec 29, 2022
9a12fcf
update core
GlynLeine Jan 16, 2023
1e1dcb4
Merge branch 'develop/core-3' of https://github.com/Rythe-Interactive…
GlynLeine Jan 16, 2023
5a5fba6
update to c++20
GlynLeine Jan 16, 2023
3698509
Update RSL
GlynLeine Mar 4, 2023
72e817d
update gitattributes
GlynLeine Mar 4, 2023
22d7bec
update Core
GlynLeine Mar 4, 2023
d330d5a
RSL test application
GlynLeine Mar 27, 2023
3f06986
Merge branch 'develop/core-3' of https://github.com/Rythe-Interactive…
GlynLeine Mar 27, 2023
64b495a
Update Core
GlynLeine Mar 27, 2023
cabaf4f
Update Core
GlynLeine Mar 29, 2023
3d6739e
make sandbox compile with only core
GlynLeine Apr 14, 2023
2eaf94e
update rsl, test rsl::time_point
GlynLeine Apr 16, 2023
df031c8
update core
GlynLeine Apr 16, 2023
c1b3efd
start work on tests
GlynLeine May 3, 2023
ea68877
adress cmake comments on draft PR
GlynLeine May 15, 2023
63a6dd3
moving back to premake
Ragingram2 Jul 9, 2023
6aa2f77
renaming namespaces and functions, and added RSL
Ragingram2 Jul 9, 2023
4448732
fixing namespaces
Ragingram2 Jul 16, 2023
c046ab9
updating premake and submodules
Ragingram2 Jul 16, 2023
c477293
making the premake better
Ragingram2 Aug 2, 2023
7a94036
re ordering application files, updating premake, and added a vs code …
Ragingram2 Aug 11, 2023
37e07a1
updating modules
Ragingram2 Aug 20, 2023
12363c6
updating core module
Ragingram2 Aug 20, 2023
3d2113a
ensuring rsl is a submodule again
Ragingram2 Aug 20, 2023
9cb1ec6
updating core
Ragingram2 Aug 20, 2023
1bade7b
updating core, and the build script for RSL
Ragingram2 Sep 11, 2023
f97e297
rebased on to core-3
Ragingram2 Sep 14, 2023
0be00bf
updating submodules
Ragingram2 Sep 22, 2023
4d119a5
updating a texture
Ragingram2 Sep 22, 2023
7df6ddb
fix core submodule binding
GlynLeine Sep 22, 2023
91b8451
Merge branch 'develop/premake' of https://github.com/Rythe-Interactiv…
GlynLeine Sep 22, 2023
07994de
re uploading the premake.exe
Ragingram2 Sep 22, 2023
8f1ae79
u[dating the gitignore
Ragingram2 Sep 22, 2023
0b57e33
removed duped source files
Ragingram2 Sep 22, 2023
f72c392
fixed git ignore,
Ragingram2 Sep 22, 2023
fa4fb55
update physics, graphics, and core
GlynLeine Sep 22, 2023
f365a40
update VisualStudio22-All.bat & core & physics
GlynLeine Sep 23, 2023
245c9d5
update premake
GlynLeine Sep 28, 2023
37befd2
fixing namespaces, reremoved macro defines, made sure the sandbox bui…
Ragingram2 Sep 28, 2023
aa26615
Merge branch 'develop/premake' of https://github.com/Rythe-Interactiv…
Ragingram2 Sep 28, 2023
0c02e00
updating gitignore, updating submoudles, fixing some naming.
Ragingram2 Sep 29, 2023
7c5cc8a
changed a few shader names, updated the engine icon, fixed a few file…
Ragingram2 Oct 4, 2023
d2bf26f
WIP new build system
GlynLeine Nov 3, 2023
6e02720
Merge branch 'develop/premake' of https://github.com/Rythe-Interactiv…
GlynLeine Nov 3, 2023
10038a4
update core with new build script
GlynLeine Nov 3, 2023
da99bf8
update Core
GlynLeine Nov 3, 2023
9ea4dc8
starting to get dirs setup for projects
GlynLeine Nov 3, 2023
fbeb9cf
start working on file filters for projects
GlynLeine Nov 25, 2023
364912e
a whole lotta stuff
GlynLeine Dec 14, 2023
0800201
project dependency scope, recursive dependency resolve, migrate appli…
GlynLeine Dec 14, 2023
10a709f
migrate all modules to new build system
GlynLeine Dec 14, 2023
08e5f36
utility projects and third party projects
GlynLeine Dec 14, 2023
0f18a70
catch2 test setup
GlynLeine Dec 14, 2023
2937220
fork catch2, fix fs.exists, add additional_external_include_dirs and …
GlynLeine Dec 14, 2023
101b8a4
fuck opencl(again)
Ragingram2 Dec 14, 2023
ce9399f
fix includes for third party libraries
GlynLeine Dec 14, 2023
ed0694c
move build files to build/_ACTION, rename configure to refresh, auto …
GlynLeine Dec 24, 2023
a5781db
clang format file
GlynLeine Feb 3, 2024
ad04ee1
added a any type to rsl
Ragingram2 Feb 3, 2024
f68a808
fix clang-format doc
GlynLeine Feb 3, 2024
3b0834f
Merge branch 'develop/premake' of https://github.com/Rythe-Interactiv…
GlynLeine Feb 3, 2024
49b4fe5
updating rsl
Ragingram2 Feb 3, 2024
be399ad
clang-format
GlynLeine Feb 4, 2024
b5e0269
finish support for linking and header-only libraries
GlynLeine Feb 4, 2024
33fa04a
add disable fast up to date check feature for utility projects
GlynLeine Apr 29, 2024
9214166
allows external include dirs to also include libs without a nd includ…
Ragingram2 May 3, 2024
6edd409
Merge branch 'develop/premake' of https://github.com/Rythe-Interactiv…
Ragingram2 May 3, 2024
bb8e234
glyn fixed the quantaum dependencies
Ragingram2 May 3, 2024
84a0dc0
production has begin on a new core
Ragingram2 May 3, 2024
a08f4a9
tried merging premake and this branch, and now i have this?
Ragingram2 May 3, 2024
25b0b33
Merge branch 'develop/premake' into develop/core-3
Ragingram2 May 3, 2024
a4b58aa
update max line width for easier reviews and multiple documents on on…
GlynLeine May 4, 2024
4bbc96d
Merge branch 'develop/core-3' of https://github.com/Rythe-Interactive…
GlynLeine Jun 15, 2024
4dfb066
fuck up from merge
bss-glyn-leine Aug 8, 2024
9b7fcb7
update spdlog to 1.14.1
GlynLeine Oct 15, 2024
52e6838
Merge branch 'develop/core-3' of https://github.com/Rythe-Interactive…
GlynLeine Oct 15, 2024
ea187ed
update catch2 to v3.7.1
GlynLeine Oct 15, 2024
7e74dd3
fix warnings, update premake, add build system features: warning leve…
GlynLeine Oct 17, 2024
161d31a
fix leaking of catch2 dep
GlynLeine Nov 9, 2024
363a003
remove build-system files
GlynLeine Nov 9, 2024
9248a15
re-add build-system as a submodule
GlynLeine Nov 9, 2024
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
70 changes: 70 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
Language: Cpp
BasedOnStyle: LLVM

# Newlines
LineEnding: LF
InsertNewlineAtEOF: true
MaxEmptyLinesToKeep: 3
BreakBeforeBraces: Allman
BreakConstructorInitializers: BeforeColon
BreakInheritanceList: AfterColon
BreakAdjacentStringLiterals: true
BreakAfterAttributes: Leave
BreakBeforeConceptDeclarations: Always

# General rules
InsertBraces: false
PointerAlignment: Left
ColumnLimit: 120

# Indentation: use 4 spaces for all indentation
UseTab: ForContinuationAndIndentation
TabWidth: 4
IndentWidth: 4
ContinuationIndentWidth: 4
ConstructorInitializerIndentWidth: 4
AccessModifierOffset: -4
IndentCaseLabels: true
IndentPPDirectives: BeforeHash
LambdaBodyIndentation: OuterScope

# namespaces
NamespaceIndentation: All
FixNamespaceComments: true
CompactNamespaces: false

# Alignment
AlignAfterOpenBracket: BlockIndent
AlignArrayOfStructures: Right
PackConstructorInitializers: Never
AlignTrailingComments:
Kind: Always
OverEmptyLines: 1
AlignEscapedNewlines: Right
AllowAllArgumentsOnNextLine: true
AllowBreakBeforeNoexceptSpecifier: Always
AllowShortBlocksOnASingleLine: true
AllowShortCaseLabelsOnASingleLine: true
AllowShortCompoundRequirementOnASingleLine: true
AllowShortEnumsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Inline
AllowShortIfStatementsOnASingleLine: Never
AllowShortLambdasOnASingleLine: All
AllowShortLoopsOnASingleLine: true
AlwaysBreakTemplateDeclarations: Yes
BitFieldColonSpacing: Both

# includes
SortIncludes: CaseSensitive
IncludeBlocks: Preserve

# Empty lines
EmptyLineAfterAccessModifier: Never
EmptyLineBeforeAccessModifier: Always

# Prevent indentation on next line after these macros:
StatementMacros: [ESMeta, MetaExternal]




17 changes: 7 additions & 10 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
* text eol=LF
*.inl text=auto eol=LF
*.h text=auto eol=LF
*.hpp text=auto eol=LF
*.c text=auto eol=LF
*.cpp text=auto eol=LF
*.png filter=lfs diff=lfs merge=lfs -text
*.obj filter=lfs diff=lfs merge=lfs -text
*.wav filter=lfs diff=lfs merge=lfs -text
*.mp4 filter=lfs diff=lfs merge=lfs -text
*.mp3 filter=lfs diff=lfs merge=lfs -text
*.avi filter=lfs diff=lfs merge=lfs -text
*.ogg filter=lfs diff=lfs merge=lfs -text
*.inl text=auto eol=LF
*.inl text=auto eol=LF
*.h text=auto eol=LF
*.h text=auto eol=LF
*.hpp text=auto eol=LF
*.hpp text=auto eol=LF
*.c text=auto eol=LF
*.c text=auto eol=LF
*.cpp text=auto eol=LF
*.cpp text=auto eol=LF
*.jpg filter=lfs diff=lfs merge=lfs -text
*.glb filter=lfs diff=lfs merge=lfs -text
*.bin filter=lfs diff=lfs merge=lfs -text
*.exe -text
176 changes: 106 additions & 70 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,32 +1,75 @@
###################
# Rythe Generated #
###################
# User-specific files
*.rsuser
*.suo
*.user
*.userosscache
*.sln.docstates

# Mono auto generated files
mono_crash.*

# Rythe library output
include/**
lib/*
# Visual Studio 2015/2017 cache/options directory
.vs/

# Rythe Precompiled shader files
*.shil
# Visual Studio code files
.vscode/

#########
# Build #
#########

# CMake
CMakeFiles/
CMakeScripts/
cmake_install.cmake
CMakeCache.txt
cmake-build-*/
CMakeDoxyfile.in
CMakeDoxygenDefaults.cmake

# CMake Tests
CTestTestfile.cmake
DartConfiguration.tcl
unit_tests_*.cmake
Testing/
# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
*.VC.db
*.VC.VC.opendb

# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap

# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!?*.[Cc]ache/

# Files built by Visual Studio
*_i.c
*_p.c
*_h.h
*.ilk
*.meta
*.obj
*.iobj
*.pch
*.pdb
*.ipdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*_wpftmp.csproj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc

# Executables
*.exe
*.out
*.app

# Build results
[Dd]ebug/
Expand All @@ -38,63 +81,56 @@ x86/
[Ww][Ii][Nn]32/
[Aa][Rr][Mm]/
[Aa][Rr][Mm]64/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/
[Ll]ogs/

# Executables
*.exe
*.out
*.app

#############
# Platforms #
#############

# Windows

# Linux
# Rythe engine asset folder
!**/assets/**
!**/engine/resources/**

# MacOS
*.DS_Store
*.sb-*
# Rythe engine tools folder
!**/tools/**

#############
# Compilers #
#############
# Word temporary files
~$*.*

################
# IDEs/Editors #
################
# linux Makefiles
**/Makefile

# Visual Studio
*.sln
*.vcxproj
*.vcxproj.user
*.vcxproj.filters
.vs/
# Windows Preview files
**/Thumbs.db
*.xcf

# Visual Studio Code
.vscode/
*.shil
!**/applications/**/engine/**

# CLion
*.idea/
# Mono VM
vm/**

# XCode
*.xcodeproj/
XCBuildData/
# Rythe Libraries
lib/*

########
# Misc #
########
# Rythe Precompiled shader files
*.shil

# Mono
mono_crash.*
vm/**
# Rythe Includes
include/**

# Word temporary files
~$*.*
# Misc
*/**/Thumbs.db
applications/sandbox/imgui.ini

# Dear Imgui
imgui.ini
# Reference files (not for upload)
**/**_ref/*
docs/venv
**/__pycache__/**
**/imgui.ini
*.sln
*.vcxproj
*.filters
build/.cmake
build/CMakeFiles
build/CMakeCache.txt
29 changes: 19 additions & 10 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
[submodule "rythe/engine/core"]
path = rythe/engine/core
[submodule "modules/rythe/core"]
path = modules/rythe/core
url = https://github.com/Rythe-Interactive/Rythe-Core.git
[submodule "rythe/engine/application"]
path = rythe/engine/application
[submodule "modules/rythe/application"]
path = modules/rythe/application
url = https://github.com/Rythe-Interactive/Rythe-Application.git
[submodule "rythe/engine/graphics"]
path = rythe/engine/graphics
[submodule "modules/rythe/graphics"]
path = modules/rythe/graphics
url = https://github.com/Rythe-Interactive/Rythe-Graphics.git
[submodule "rythe/engine/audio"]
path = rythe/engine/audio
[submodule "modules/rythe/audio"]
path = modules/rythe/audio
url = https://github.com/Rythe-Interactive/Rythe-Audio.git
[submodule "rythe/engine/physics"]
path = rythe/engine/physics
[submodule "modules/rythe/physics"]
path = modules/rythe/physics
url = https://github.com/Rythe-Interactive/Rythe-Physics.git
[submodule "libraries/rythe/rythe-standard-library"]
path = libraries/rythe/rythe-standard-library
url = https://github.com/Rythe-Interactive/Rythe-Standard-Library.git
[submodule "libraries/third_party/catch2"]
path = libraries/third_party/catch2
url = https://github.com/Rythe-Interactive/Catch2.git
[submodule "premake/rythe"]
path = premake/rythe
url = https://github.com/Rythe-Interactive/rythe-build-system.git
4 changes: 2 additions & 2 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
| Last Name(s) | First Name(s) | Handle[role] | E-Mail |
|--------------|-------------------|----------------------------------------|-----------------------------------|
| Leine | Glyn Marcus | @GlynLeine[Owner/Lead Developer] | [email protected] |
| Baier | Raphael Sebastian | @algo-ryth-mix[Lead Developer] | [email protected] |
| Baier | Raphael Sebastian | @algo-ryth-mix[Developer] | [email protected] |
| Priatama | Raphael Alexander | @Developer-The-Great[Physics Developer]| [email protected] |
| Ramsey | Rowan Jan Henry | @RowanRamsey[Cerealliizer] | [email protected] |
| Ramsey | Rowan Jan Henry | @RowanRamsey[General Developer] | [email protected] |
| Vrieze | Jelle | @Jelled1st[Audio Developer] | [email protected] |
| de Aldrey | Arjen | @tuhri444[General Developer] | [email protected] |
| Hausmann | Lukas | @kukash[Developer] | [email protected] |
Expand Down
Loading
Loading