Skip to content

Commit

Permalink
Merge branch 'develop/premake' into develop/core-3
Browse files Browse the repository at this point in the history
# Conflicts:
#	applications/sandbox/assets/textures/warlock/retopo_and_uv_warlock_5_Warlock_AO.tif
#	applications/sandbox/engine/resources/rythe/icon
#	applications/sandbox/engine/tools/lgnspre/VCRUNTIME140.dll
#	applications/sandbox/engine/tools/lgnspre/_asyncio.pyd
#	applications/sandbox/engine/tools/lgnspre/_bz2.pyd
#	applications/sandbox/engine/tools/lgnspre/_ctypes.pyd
#	applications/sandbox/engine/tools/lgnspre/_decimal.pyd
#	applications/sandbox/engine/tools/lgnspre/_elementtree.pyd
#	applications/sandbox/engine/tools/lgnspre/_hashlib.pyd
#	applications/sandbox/engine/tools/lgnspre/_lzma.pyd
#	applications/sandbox/engine/tools/lgnspre/_multiprocessing.pyd
#	applications/sandbox/engine/tools/lgnspre/_overlapped.pyd
#	applications/sandbox/engine/tools/lgnspre/_queue.pyd
#	applications/sandbox/engine/tools/lgnspre/_socket.pyd
#	applications/sandbox/engine/tools/lgnspre/_ssl.pyd
#	applications/sandbox/engine/tools/lgnspre/_testcapi.pyd
#	applications/sandbox/engine/tools/lgnspre/_tkinter.pyd
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-console-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-datetime-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-debug-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-errorhandling-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-file-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-file-l1-2-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-file-l2-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-handle-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-heap-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-interlocked-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-libraryloader-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-localization-l1-2-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-memory-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-namedpipe-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-processenvironment-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-processthreads-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-processthreads-l1-1-1.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-profile-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-rtlsupport-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-string-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-synch-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-synch-l1-2-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-sysinfo-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-timezone-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-util-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-conio-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-convert-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-environment-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-filesystem-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-heap-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-locale-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-math-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-process-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-runtime-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-stdio-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-string-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-time-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-utility-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/base_library.zip
#	applications/sandbox/engine/tools/lgnspre/libcrypto-1_1-x64.dll
#	applications/sandbox/engine/tools/lgnspre/libffi-7.dll
#	applications/sandbox/engine/tools/lgnspre/libssl-1_1-x64.dll
#	applications/sandbox/engine/tools/lgnspre/pyexpat.pyd
#	applications/sandbox/engine/tools/lgnspre/python38.dll
#	applications/sandbox/engine/tools/lgnspre/pywintypes38.dll
#	applications/sandbox/engine/tools/lgnspre/select.pyd
#	applications/sandbox/engine/tools/lgnspre/tcl86t.dll
#	applications/sandbox/engine/tools/lgnspre/tk86t.dll
#	applications/sandbox/engine/tools/lgnspre/ucrtbase.dll
#	applications/sandbox/engine/tools/lgnspre/unicodedata.pyd
#	applications/sandbox/engine/tools/lgnspre/win32api.pyd
#	applications/sandbox/engine/tools/lgnspre/win32evtlog.pyd
  • Loading branch information
Ragingram2 committed May 3, 2024
2 parents a08f4a9 + 84a0dc0 commit 25b0b33
Show file tree
Hide file tree
Showing 132 changed files with 3,571 additions and 3,076 deletions.
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: 0

# 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]




1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@
*.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
177 changes: 106 additions & 71 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,64 +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
build/*
# Reference files (not for upload)
**/**_ref/*
docs/venv
**/__pycache__/**
**/imgui.ini
*.sln
*.vcxproj
*.filters
build/.cmake
build/CMakeFiles
build/CMakeCache.txt
26 changes: 16 additions & 10 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
[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
Loading

0 comments on commit 25b0b33

Please sign in to comment.