Skip to content

Commit 7964dae

Browse files
author
GamerMan7799
committed
Update to v1.4.0-Beta.1
## [1.4.0] - 2018-03-16 ### Added * Code of Conduct * Doc Folder ### Changed * Moved docs files into doc folder * Started framework for adding toolbar
1 parent 72f9cd7 commit 7964dae

16 files changed

+199
-10
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ or you can read [here](http://unlicense.org) for infomation of the Unlicense in
2323

2424
In order to run the program properly you will need to download SDL2-2.0.3 or higher AND SDL2-image (these are two different libraries).
2525

26-
A link for SDL2 can be found [here] (https://www.libsdl.org/download-2.0.php).
26+
A link for SDL2 can be found [here](https://www.libsdl.org/download-2.0.php).
2727

2828
A link for SDL2 image can be found [here](https://www.libsdl.org/projects/SDL_image/) .
2929

‎docs/CODE_OF_CONDUCT.md

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
6+
7+
## Our Standards
8+
9+
Examples of behavior that contributes to creating a positive environment include:
10+
11+
* Using welcoming and inclusive language
12+
* Being respectful of differing viewpoints and experiences
13+
* Gracefully accepting constructive criticism
14+
* Focusing on what is best for the community
15+
* Showing empathy towards other community members
16+
17+
Examples of unacceptable behavior by participants include:
18+
19+
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
* Trolling, insulting/derogatory comments, and personal or political attacks
21+
* Public or private harassment
22+
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23+
* Other conduct which could reasonably be considered inappropriate in a professional setting
24+
25+
## Our Responsibilities
26+
27+
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
28+
29+
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
30+
31+
## Scope
32+
33+
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
34+
35+
## Enforcement
36+
37+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at GamerMan7799. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
38+
39+
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
40+
41+
## Attribution
42+
43+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
44+
45+
[homepage]: http://contributor-covenant.org
46+
[version]: http://contributor-covenant.org/version/1/4/

‎docs/CONTRIBUTING.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# How to contribute
2+
3+
Contribute what you want.
4+
5+
6+
## Coding conventions
7+
8+
More or less the Google Style which can be found [here](https://google.github.io/styleguide/cppguide.html)
9+
10+
Some expections exist, but they are mostly because of old formatting that hasn't been updated yet.
11+

‎ChangesLog.md renamed to ‎docs/ChangesLog.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
All notable changes to this project will be documented here.
44
This project adheres to [Semantic Versioning](http://semver.org/)
55

6+
## [1.4.0] - 2018-03-16
7+
### Added
8+
* Code of Conduct
9+
* Doc Folder
10+
* Toolbar
11+
* More tools
12+
13+
### Changed
14+
* Moved docs files into doc folder
15+
16+
617
## [1.3.0] - 2018-03-06
718
### Added
819
* Interia/energy from spins

‎docs/Credits.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Credits
2+
3+
We would like to thank the following people for their work and support (knowingly or not) towards this project.
4+
5+
The Developers of the [SDL Library] (https://www.libsdl.org/credits.php)
6+
7+
Mr Foo for his amazing tutorial on SDL, which can be found [here](http://lazyfoo.net/)
8+
9+
Sam Lantinga for his SDL TTF library
10+

‎docs/LICENSE.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
This is free and unencumbered software released into the public domain.
2+
3+
Anyone is free to copy, modify, publish, use, compile, sell, or
4+
distribute this software, either in source code form or as a compiled
5+
binary, for any purpose, commercial or non-commercial, and by any
6+
means.
7+
8+
In jurisdictions that recognize copyright laws, the author or authors
9+
of this software dedicate any and all copyright interest in the
10+
software to the public domain. We make this dedication for the benefit
11+
of the public at large and to the detriment of our heirs and
12+
successors. We intend this dedication to be an overt act of
13+
relinquishment in perpetuity of all present and future rights to this
14+
software under copyright law.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19+
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
20+
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
21+
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
22+
OTHER DEALINGS IN THE SOFTWARE.
23+
24+
For more information, please refer to <http://unlicense.org>
25+

‎project/Physics-Simulator.cbp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<Add option="-g" />
2323
<Add option="-DDEFINED_BUILD_MODE_PRIVATE" />
2424
<Add directory="src/" />
25+
<Add directory="include" />
2526
</Compiler>
2627
<Linker>
2728
<Add option="-pg -lgmon" />
@@ -46,6 +47,7 @@
4647
<Add option="-w" />
4748
<Add option="-D__NO_INLINE__" />
4849
<Add directory="src/" />
50+
<Add directory="include" />
4951
</Compiler>
5052
<Linker>
5153
<Add option="-s" />
@@ -73,6 +75,7 @@
7375
<Add option="-g" />
7476
<Add option="-DDEFINED_BUILD_MODE_PRIVATE" />
7577
<Add directory="src/" />
78+
<Add directory="include" />
7679
</Compiler>
7780
<Linker>
7881
<Add option="-pg" />
@@ -96,6 +99,7 @@
9699
<Add option="-std=c++11" />
97100
<Add option="-w" />
98101
<Add directory="src/" />
102+
<Add directory="include" />
99103
</Compiler>
100104
<Linker>
101105
<Add option="-s" />
@@ -143,6 +147,8 @@
143147
<Unit filename="../src/screen.h" />
144148
<Unit filename="../src/tick.cpp" />
145149
<Unit filename="../src/tick.h" />
150+
<Unit filename="../src/toolbox.cpp" />
151+
<Unit filename="../src/toolbox.h" />
146152
<Unit filename="../src/version.h" />
147153
<Extensions>
148154
<code_completion />

‎project/doxygen/Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = Physics-Collision-Simulator
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = v1.0.2
41+
PROJECT_NUMBER = v1.4.0
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

‎src/cannonball.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ clsCannonball::clsCannonball() {
2727

2828
props_.radius = 5.0; //in meters
2929
props_.density = global::physics::kBallDensity; //density of steel in kg/m^3
30+
props_.volume = (double) ((4.0/3.0) * M_PI * pow(props_.radius,3));
31+
props_.mass = props_.density * props_.volume;
32+
props_.interia = 2 * props_.mass * pow(props_.radius,2) / 5.0;
3033

3134
place_ = {0,0};
3235
dblLOC_.x = (double) place_.x;

‎src/image_toolbox_frame.xpm

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/* XPM */
2+
static char * image_toolbox_frame_xpm[] = {
3+
"28 28 2 1",
4+
" c None",
5+
". c #ffffff",
6+
"............................",
7+
"............................",
8+
".. ..",
9+
".. ..",
10+
".. ..",
11+
".. ..",
12+
".. ..",
13+
".. ..",
14+
".. ..",
15+
".. ..",
16+
".. ..",
17+
".. ..",
18+
".. ..",
19+
".. ..",
20+
".. ..",
21+
".. ..",
22+
".. ..",
23+
".. ..",
24+
".. ..",
25+
".. ..",
26+
".. ..",
27+
".. ..",
28+
".. ..",
29+
".. ..",
30+
".. ..",
31+
".. ..",
32+
"............................",
33+
"............................"};

0 commit comments

Comments
 (0)