Skip to content

Commit 0d239ad

Browse files
committed
improved naming
1 parent d1df61d commit 0d239ad

File tree

7 files changed

+1186
-1074
lines changed

7 files changed

+1186
-1074
lines changed

.clang-format

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
# Generated from CLion C/C++ Code Style settings
22
BasedOnStyle: LLVM
3-
AccessModifierOffset: -4
3+
AccessModifierOffset: -3
44
AlignAfterOpenBracket: Align
55
AlignConsecutiveAssignments: None
66
AlignOperands: DontAlign
77
AllowAllArgumentsOnNextLine: false
88
AllowAllConstructorInitializersOnNextLine: false
99
AllowAllParametersOfDeclarationOnNextLine: false
1010
AllowShortBlocksOnASingleLine: Always
11-
AllowShortCaseLabelsOnASingleLine: true
12-
AllowShortFunctionsOnASingleLine: All
13-
AllowShortIfStatementsOnASingleLine: Never
11+
AllowShortCaseLabelsOnASingleLine: false
12+
AllowShortFunctionsOnASingleLine: None
13+
AllowShortIfStatementsOnASingleLine: Always
1414
AllowShortLambdasOnASingleLine: All
15-
AllowShortLoopsOnASingleLine: false
16-
AlwaysBreakAfterReturnType: All
17-
AlwaysBreakTemplateDeclarations: MultiLine
15+
AllowShortLoopsOnASingleLine: true
16+
AlwaysBreakAfterReturnType: None
17+
AlwaysBreakTemplateDeclarations: Yes
1818
BreakBeforeBraces: Custom
1919
BraceWrapping:
2020
AfterCaseLabel: false
2121
AfterClass: true
22-
AfterControlStatement: MultiLine
22+
AfterControlStatement: Always
2323
AfterEnum: true
2424
AfterFunction: true
2525
AfterNamespace: true
2626
AfterUnion: true
2727
BeforeCatch: true
2828
BeforeElse: true
2929
IndentBraces: false
30-
SplitEmptyFunction: false
30+
SplitEmptyFunction: true
3131
SplitEmptyRecord: true
3232
BreakBeforeBinaryOperators: NonAssignment
3333
BreakBeforeTernaryOperators: true
@@ -36,15 +36,15 @@ BreakInheritanceList: BeforeColon
3636
ColumnLimit: 0
3737
CompactNamespaces: false
3838
ContinuationIndentWidth: 4
39-
IndentCaseLabels: true
39+
IndentCaseLabels: false
4040
IndentPPDirectives: None
4141
IndentWidth: 4
4242
KeepEmptyLinesAtTheStartOfBlocks: true
4343
MaxEmptyLinesToKeep: 1
44-
NamespaceIndentation: None
44+
NamespaceIndentation: All
4545
ObjCSpaceAfterProperty: false
4646
ObjCSpaceBeforeProtocolList: false
47-
PointerAlignment: Right
47+
PointerAlignment: Left
4848
ReflowComments: false
4949
SpaceAfterCStyleCast: false
5050
SpaceAfterLogicalNot: false
@@ -54,7 +54,7 @@ SpaceBeforeCpp11BracedList: false
5454
SpaceBeforeCtorInitializerColon: true
5555
SpaceBeforeInheritanceColon: true
5656
SpaceBeforeParens: ControlStatements
57-
SpaceBeforeRangeBasedForLoopColon: true
57+
SpaceBeforeRangeBasedForLoopColon: false
5858
SpaceInEmptyParentheses: false
5959
SpacesBeforeTrailingComments: 0
6060
SpacesInAngles: false

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Modified from that of Cocos2dx and forked from [SDL2-particles](https://github.c
66

77
## Effect Examples
88

9+
//TODO add gifs
10+
911
Fire
1012

1113
![fire](./pic/fire.png)

examples/sdl2/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ add_executable(sdl2-example main.cpp)
55

66
find_package(SDL2 REQUIRED)
77
find_package(sdl2-image REQUIRED)
8+
include_directories(${SDL2_INCLUDE_DIR} ${SDL2_IMAGE_INCLUDE_DIR})
9+
include_directories(${SDL2_INCLUDE_DIRS} ${SDL2_IMAGE_INCLUDE_DIRS})
10+
target_link_libraries(sdl2-example ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES})
811

912
#target_link_directories(sdl2-example PRIVATE CppParticleSystem/)
1013
target_link_libraries(sdl2-example CppParticleSystem)

examples/sdl2/assets/snow.png

-15 KB
Binary file not shown.

examples/sdl2/main.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#include <ParticleSystem.h>
2+
#include "SDL.h"
23

34
int main(int argc, char* argv[]) {
45
//TODO create example
6+
SDL_Rect ok = SDL_Rect();
57
Pointf test = Pointf(3, 3);
68
return 0;
79
}

0 commit comments

Comments
 (0)