merge dev

.clang-format

@@ -0,0 +1,81 @@
+---
+Language: Cpp
+BasedOnStyle: LLVM
+AlignConsecutiveShortCaseStatements:
+  Enabled: true
+  AcrossEmptyLines: true
+  AcrossComments: true
+  AlignCaseColons: true
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignOperands: AlignAfterOperator
+AlignEscapedNewlines: Left
+AlignAfterOpenBracket: Align
+PackConstructorInitializers: CurrentLine
+BracedInitializerIndentWidth: 2
+BreakArrays: true
+AlignTrailingComments:
+  Kind: Always
+  OverEmptyLines: 2
+AllowShortFunctionsOnASingleLine: All
+AllowShortLambdasOnASingleLine: All
+AllowShortCaseLabelsOnASingleLine: true
+AllowAllArgumentsOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortIfStatementsOnASingleLine: false
+DerivePointerAlignment: false
+PointerAlignment: Left
+QualifierAlignment: Left
+BinPackParameters: false
+BinPackArguments: false
+BraceWrapping:
+  AfterCaseLabel: false
+  AfterClass: false
+  AfterControlStatement: false
+  AfterEnum: false
+  AfterFunction: false
+  AfterNamespace: false
+  AfterStruct: false
+  AfterUnion: false
+  AfterExternBlock: false
+  BeforeCatch: false
+  BeforeElse: false
+  BeforeLambdaBody: false
+  BeforeWhile: false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+BreakBeforeBraces: Custom
+# BreakAfterReturnType: Automatic # clang-format 19 feature
+PenaltyReturnTypeOnItsOwnLine: 5000
+PenaltyBreakAssignment: 5000
+PenaltyBreakBeforeFirstCallParameter: 5000
+PenaltyBreakOpenParenthesis: 5000
+AlwaysBreakAfterReturnType: None
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: AfterColon
+BreakBeforeConceptDeclarations: Always
+BreakAfterAttributes: Leave
+AlwaysBreakTemplateDeclarations: true
+Cpp11BracedListStyle: true
+ColumnLimit: 150
+ContinuationIndentWidth: 2
+IncludeCategories:
+  - Regex: "^<.*"
+    Priority: 1
+  - Regex: '^".*'
+    Priority: 2
+  - Regex: ".*"
+    Priority: 3
+IncludeIsMainRegex: "([-_](test|unittest))?$"
+NamespaceIndentation: None
+IndentCaseLabels: true
+IndentPPDirectives: BeforeHash
+SortUsingDeclarations: LexicographicNumeric
+InsertNewlineAtEOF: true
+LambdaBodyIndentation: OuterScope
+MacroBlockBegin: ""
+MacroBlockEnd: ""
+MaxEmptyLinesToKeep: 1
+SpacesInAngles: false
+TabWidth: 2

.github/FUNDING.yml

@@ -1,7 +1,7 @@
 # These are supported funding model platforms
 
 github: Hatrickek
-patreon: hatrickek
+patreon: # hatrickek
 open_collective: # Replace with a single Open Collective username
 ko_fi: #hatrickek
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
@@ -10,4 +10,4 @@ liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
 lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-custom: [https://kreosus.com/hatrickek] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom:  # [https://kreosus.com/hatrickek] Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.gitignore

@@ -1,5 +1,11 @@
 # Prerequisites
 *.d
+*.bat
+*.dll
+*.cmake
+*.toml
+*.cap
+*.ini
 
 # Compiled Object files
 *.slo
@@ -40,6 +46,7 @@
 /bin-int
 /.cache
 /OxylusEditor/Resources/Shaders/Compiled
+/OxylusEditor/SandboxProject
 /OxylusEditor/logs
 *.ccls
 *.vcxproj

.gitmodules

@@ -1,12 +1,6 @@
 [submodule "Oxylus/vendor/miniaudio"]
 	path = Oxylus/vendor/miniaudio
 	url = https://github.com/mackron/miniaudio.git
-[submodule "Oxylus/vendor/glm"]
-	path = Oxylus/vendor/glm
-	url = https://github.com/g-truc/glm.git
 [submodule "Oxylus/vendor/ImGuizmo"]
 	path = Oxylus/vendor/ImGuizmo
 	url = https://github.com/CedricGuillemet/ImGuizmo.git
-[submodule "Oxylus/vendor/CMake-Utils"]
-	path = Oxylus/vendor/CMake-Utils
-	url = https://github.com/Hatrickek/CMake-Utils.git

CMakeLists.txt

@@ -22,12 +22,21 @@ if (ENABLE_ASAN)
     add_link_options(-fsanitize=address)
 endif()
 
-
 # fix for dxc
 if (UNIX)
     add_compile_options(-fms-extensions)
 endif(UNIX)
 
+# compile commands
+if (NOT MSVC)
+	set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+endif ()
+
+# GIT_SUBMODULE "" policy
+cmake_policy(SET CMP0097 NEW)
+
+set(CMAKE_WARN_DEPRECATED OFF CACHE BOOL "")
+
 # Sub-projects
 add_subdirectory(Oxylus)
 add_subdirectory(OxylusEditor)

LICENSE.txt

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2024 Hatrickek
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.