Skip to content

Some proposals #7

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.

Sign up for GitHub

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

Draft
feliwir wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

Some proposals #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f5a3e15
Some cleanup
feliwir Sep 29, 2021
d7e9660
Replace FreeType with stb_image
feliwir Sep 29, 2021
623ae50
Small fixes
feliwir Sep 29, 2021
a321235
Use GLFW
feliwir Sep 29, 2021
a7c8324
Use gli for format conversions
feliwir Sep 30, 2021
c0cccd6
Remove accident
feliwir Oct 1, 2021
732acc0
Split app & library
feliwir Oct 1, 2021
7f8774e
Use microsoft styling
feliwir Oct 1, 2021
7b7e688
Bit of restructuring
feliwir Oct 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
45 changes: 3 additions & 42 deletions .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,3 @@
---
BasedOnStyle: Google
AlignAfterOpenBracket: Align
#AlignConsecutiveAssignments: 'true'
AlignEscapedNewlines: DontAlign
AllowShortFunctionsOnASingleLine: InlineOnly
AllowShortIfStatementsOnASingleLine: 'false'
AllowShortLoopsOnASingleLine: 'false'
BinPackParameters: 'true'
BreakBeforeBraces: Custom
ColumnLimit: '105'
ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
BreakConstructorInitializers: 'AfterColon'
ConstructorInitializerIndentWidth: '4'
ContinuationIndentWidth: '4'
Cpp11BracedListStyle: 'false'
DerivePointerAlignment: 'false'
IndentCaseLabels: 'false'
IndentWidth: '4'
NamespaceIndentation: All
PointerAlignment: Right
SpaceBeforeParens: Never
SpaceInEmptyParentheses: 'false'
SpacesInParentheses: 'true'
TabWidth: '4'
UseTab: ForIndentation
AccessModifierOffset: '-4'
IndentPPDirectives: 'AfterHash'
BraceWrapping:
AfterClass: true
AfterControlStatement: true
AfterEnum: true
AfterFunction: true
AfterNamespace: true
AfterObjCDeclaration: true
AfterStruct: true
AfterUnion: true
BeforeCatch: true
BeforeElse: true
IndentBraces: false

...
BasedOnStyle: Microsoft
SortIncludes: false
IndentWidth: 2
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
build/
.vscode/
9 changes: 9 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[submodule "contrib/stb"]
path = contrib/stb
url = https://github.com/nothings/stb
[submodule "contrib/glfw"]
path = contrib/glfw
url = https://github.com/glfw/glfw.git
[submodule "contrib/gli"]
path = contrib/gli
url = https://github.com/g-truc/gli.git
9 changes: 0 additions & 9 deletions .hgignore
View file
Open in desktop

This file was deleted.

58 changes: 0 additions & 58 deletions CMake/Bootstrap.cmake
View file
Open in desktop

This file was deleted.

193 changes: 0 additions & 193 deletions CMake/Dependencies/FindSDL2.cmake
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions CMake/Dependencies/sdl2-config.cmake
View file
Open in desktop

This file was deleted.

Loading