Skip to content

Commit

Permalink
Add missing files.
Browse files Browse the repository at this point in the history
  • Loading branch information
janhsimon committed Mar 14, 2020
1 parent b343ca3 commit 4ba8f0e
Show file tree
Hide file tree
Showing 224 changed files with 7,401 additions and 0 deletions.
47 changes: 47 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
AccessModifierOffset: -2
AlignEscapedNewlinesLeft: true
AlignTrailingComments: true
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortFunctionsOnASingleLine: false
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: false
BinPackParameters: false
BreakBeforeBinaryOperators: false
BreakBeforeBraces: Allman
BreakBeforeTernaryOperators: false
BreakConstructorInitializersBeforeComma: false
ColumnLimit: 120
CommentPragmas: ''
ConstructorInitializerAllOnOneLineOrOnePerLine: false
ConstructorInitializerIndentWidth: 0
ContinuationIndentWidth: 2
Cpp11BracedListStyle: false
DerivePointerBinding: false
IndentCaseLabels: false
IndentFunctionDeclarationAfterType: false
IndentWidth: 2
Language: Cpp
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
ObjCSpaceAfterProperty: true
ObjCSpaceBeforeProtocolList: true
PenaltyBreakBeforeFirstCallParameter: 100
PenaltyBreakComment: 100
PenaltyBreakFirstLessLess: 0
PenaltyBreakString: 100
PenaltyExcessCharacter: 99999
PenaltyReturnTypeOnItsOwnLine: 20
PointerAlignment: Left
SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: ControlStatements
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: false
SpacesInCStyleCastParentheses: false
SpacesInContainerLiterals: false
SpacesInParentheses: false
Standard: Cpp11
TabWidth: 2
UseTab: Never
14 changes: 14 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
*.*

!external/**
!Models/**
!Shaders/**
!src/**
!Textures/**

!.clang-format
!.gitignore
!.gitmodules
!CMakeLists.txt
!README.md
!Screenshot.png
16 changes: 16 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
cmake_minimum_required(VERSION 3.1)
project(makma)

add_subdirectory(external)

include(FindVulkan)

file(GLOB_RECURSE SOURCE LIST_DIRECTORIES false "src/*.cpp" "src/*.hpp")
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCE})
add_executable(makma ${SOURCE})

set_property(TARGET makma PROPERTY CXX_STANDARD 17)
target_include_directories(makma PRIVATE "external/assimp/include" "build/external/assimp/include" "external/glm" "external/imgui" "external/imguizmo" "external/sdl/include" "external/stb" "external/sdl/include" ${Vulkan_INCLUDE_DIRS})
target_link_libraries(makma assimp imgui imguizmo SDL2 SDL2main ${Vulkan_LIBRARIES})

set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT makma)
Loading

0 comments on commit 4ba8f0e

Please sign in to comment.