Update to v1.2.6-Beta

## [1.2.6-Beta] - 2015-09-24
### Updated
* Cleanup.bat to include doxygen files (also added wildcard support for
some files)
* Readme for the slight change to the config file

### Changed
* Makefile (it should now work)
* Doxygen now uses DOT to make graphs
* Functions that were in main.cpp have been renamed and moved into a
namespace
* All line seprators from 170 charaters long to 80 to allow me to see if
I am breaking Google's recommended 80 charaters length
see [here]
(https://google-styleguide.googlecode.com/svn/trunk/cppguide.html#Line_Length)
* Made most lines to be less than 80 charaters

### Cleaned
* Depencies on header files
* Depencies on exteral libraries

### Added
* More doxygen comments that I missed before

Author: Patrick Rye

ChangesLog.md

@@ -3,6 +3,27 @@
 All notable changes to this project will be documented here.
 This project adheres to [Semantic Versioning](http://semver.org/)
 
+## [1.2.6-Beta] - 2015-09-24
+### Updated
+* Cleanup.bat to include doxygen files (also added wildcard support for some files)
+* Readme for the slight change to the config file
+
+### Changed
+* Makefile (it should now work)
+* Doxygen now uses DOT to make graphs
+* Functions that were in main.cpp have been renamed and moved into a namespace
+* All line seprators from 170 charaters long to 80 to allow me to see if I am breaking Google's recommended 80 charaters length 
+	see [here] (https://google-styleguide.googlecode.com/svn/trunk/cppguide.html#Line_Length)
+* Made most lines to be less than 80 charaters
+
+### Cleaned
+* Depencies on header files
+* Depencies on exteral libraries
+
+### Added
+* More doxygen comments that I missed before
+
+
 ## [1.2.5-Beta] - 2015-09-23
 ### Added
 * Doxygen Support

Cleanup.bat

@@ -3,35 +3,47 @@
 :: Really just for personal use
 :: There are a lot of random files that get throw about, this batch file will delete them if they are there.
 :: because I'm too lazy to go searching for them myself, but I want to keep my folders clean.
+set MAINDIR = %~dp0
+set PROJECTDIR = %MAINDIR%Project\
+set DOXYGENDIR = %PROJECTDIR%doxygen\
+set RESDIR = %MAINDIR%res\
+set SRCDIR = %MAINDIR%src\
 
 echo Cleaning Project Folder...
-IF EXIST %~dp0Project\bin RMDIR /S /Q %~dp0Project\bin
-IF EXIST %~dp0Project\obj RMDIR /S /Q %~dp0Project\obj
-IF EXIST %~dp0Project\SDL-Cannon-Simulation.depend del /F %~dp0Project\SDL-Cannon-Simulation.depend
-IF EXIST %~dp0Project\SDL-Cannon-Simulation.layout del /F %~dp0Project\SDL-Cannon-Simulation.layout
+IF EXIST %PROJECTDIR%SDL-Cannon-Simulation.depend del /F %PROJECTDIR%SDL-Cannon-Simulation.depend
+IF EXIST %PROJECTDIR%SDL-Cannon-Simulation.layout del /F %PROJECTDIR%SDL-Cannon-Simulation.layout
 echo.
 
-echo Cleaning res Folder...
-IF EXIST %~dp0res\boilerplate.res del /F %~dp0res\boilerplate.res
+echo Cleaning Doxygen Folder...
+IF EXIST %DOXYGENDIR%html RMDIR /S /Q %DOXYGENDIR%html
+IF EXIST %DOXYGENDIR%latex RMDIR /S /Q %DOXYGENDIR%latex
+IF EXIST %DOXYGENDIR%man RMDIR /S /Q %DOXYGENDIR%man
+IF EXIST %DOXYGENDIR%rtf RMDIR /S /Q %DOXYGENDIR%rtf
+IF EXIST %DOXYGENDIR%xml RMDIR /S /Q %DOXYGENDIR%xml
+IF EXIST %DOXYGENDIR%doxygen.log del /F %DOXYGENDIR%doxygen.log
 echo.
 
-echo Cleaning src Folder...
-IF EXIST %~dp0src\main.o del /F %~dp0src\main.o
-IF EXIST %~dp0src\cannonball.o del /F %~dp0src\cannonball.o
-IF EXIST %~dp0src\config.o del /F %~dp0src\config.o
-IF EXIST %~dp0src\tick.o del /F %~dp0src\tick.o
-IF EXIST %~dp0src\screen.o del /F %~dp0src\screen.o
+echo Cleaning res Folder...
+IF EXIST %RESDIR%boilerplate.res del /F %RESDIR%boilerplate.res
 echo.
 
 echo Cleaning Main Folder...
-IF EXIST %~dp0Config.ini del /F %~dp0Config.ini
-IF EXIST %~dp0gmon.out del /F %~dp0gmon.out
-IF EXIST %~dp0Cannon.exe del /F %~dp0Cannon.exe
-IF EXIST %~dp0Cannon-PRIVATE.exe del /F %~dp0Cannon-PRIVATE.exe
-IF EXIST %~dp0Cannon del /F %~dp0Cannon
-IF EXIST %~dp0Cannon-PRIVATE del /F %~dp0Cannon-PRIVATE
-IF EXIST %~dp0logfile.log del /F %~dp0logfile.log
-IF EXIST %~dp0time-log.log del /F %~dp0time-log.log 
+IF EXIST %MAINDIR%Config.ini del /F %MAINDIR%Config.ini
+IF EXIST %MAINDIR%gmon.out del /F %MAINDIR%gmon.out
+IF EXIST %MAINDIR%Cannon.exe del /F %MAINDIR%Cannon.exe
+IF EXIST %MAINDIR%Cannon-PRIVATE.exe del /F %MAINDIR%Cannon-PRIVATE.exe
+IF EXIST %MAINDIR%Cannon del /F %MAINDIR%Cannon
+IF EXIST %MAINDIR%Cannon-PRIVATE del /F %MAINDIR%Cannon-PRIVATE
+IF EXIST %MAINDIR%logfile.log del /F %MAINDIR%logfile.log
+IF EXIST %MAINDIR%time-log.log del /F %MAINDIR%time-log.log 
+IF EXIST %MAINDIR%*.stackdump del /F %MAINDIR%*.stackdump
+echo.
+
+echo Cleaning .o files where they might exist...
+IF EXIST %MAINDIR%*.o del /F %MAINDIR%*.o
+IF EXIST %SRCDIR%*.o del /F %SRCDIR%*.o
+IF EXIST %DIR%Project\bin RMDIR /S /Q %DIR%Project\bin
+IF EXIST %DIR%Project\obj RMDIR /S /Q %DIR%Project\obj
 echo.
 
 echo All cleaning done.

Makefile

@@ -1,36 +1,38 @@
+# Set the Prefix of each line from \t (default) to >
+.RECIPEPREFIX = >
 # Basic Make file (haven't tested it yet)
 CC=g++
 # Flags to be used 
 CFLAGS=-w -s -Os -std=c++11
 # Linked libraries
-LDFLAGS=-lSDL2main -lSDL2 -lSDL2_image
+LDFLAGS=-L./SDL2Stuff/lib -lSDL2main -lSDL2 -lSDL2_image
 # Path to .cpp files
 SRCPATH = ./src/
 # Name of the executable made
 EXECUTABLE=cannon
 # Include Flags to look in Src folder
-INCLUDEFLAGS=-I. -I$(SRCPATH)
+INCLUDEFLAGS=-I. -I$(SRCPATH) -I./SDL2Stuff/include
 
 all: project
 
 project: main.o cannonball.o config.o screen.o tick.o
-    $(CC) $(CFLAGS) main.o cannonball.o config.o screen.o tick.o -o $(EXECUTABLE) $(LDFLAGS)
+> $(CC) $(CFLAGS) main.o cannonball.o config.o screen.o tick.o -o $(EXECUTABLE) $(LDFLAGS)
 
 main.o: $(SRCPATH)main.cpp $(SRCPATH)version.h $(SRCPATH)global.h $(SRCPATH)screen.h $(SRCPATH)cannonball.h $(SRCPATH)tick.h $(SRCPATH)config.h
-    $(CC) $(CFLAGS) $(INCLUDEFLAGS) $(SRCPATH)main.cpp -c main.o
+> $(CC) $(CFLAGS) $(INCLUDEFLAGS) -c $(SRCPATH)main.cpp
 
 cannonball.o: $(SRCPATH)cannonball.cpp $(SRCPATH)cannonball.h $(SRCPATH)screen.h
-    $(CC) $(CFLAGS) $(INCLUDEFLAGS) $(SRCPATH)cannonball.cpp -c cannonball.o
+> $(CC) $(CFLAGS) $(INCLUDEFLAGS) -c $(SRCPATH)cannonball.cpp
 
 config.o: $(SRCPATH)config.cpp $(SRCPATH)config.h $(SRCPATH)version.h
-    $(CC) $(CFLAGS) $(INCLUDEFLAGS) $(SRCPATH)config.cpp -c config.o
+> $(CC) $(CFLAGS) $(INCLUDEFLAGS) -c $(SRCPATH)config.cpp
 
 screen.o: $(SRCPATH)screen.cpp $(SRCPATH)screen.h $(SRCPATH)image_ball.xpm $(SRCPATH)image_pixel.xpm
-    $(CC) $(CFLAGS) $(INCLUDEFLAGS) $(SRCPATH)screen.cpp -c screen.o
+> $(CC) $(CFLAGS) $(INCLUDEFLAGS) -c $(SRCPATH)screen.cpp
 
 tick.o: $(SRCPATH)tick.cpp $(SRCPATH)tick.h
-    $(CC) $(CFLAGS) $(INCLUDEFLAGS) $(SRCPATH)tick.cpp -c tick.o
+> $(CC) $(CFLAGS) $(INCLUDEFLAGS) -c $(SRCPATH)tick.cpp
 
 clean:
-    rm *o $(EXECUTABLE)
+> rm *o $(EXECUTABLE)
 

README.md

@@ -1,12 +1,23 @@
 # Cannon-Simulation
 
-A really simple program that uses SDL library to simulate a cannon ball being fired.
+A really simple program that uses SDL library to simulate cannonballs being fired and colliding and bouncing off of each other.
 
-I used to to test the waters on using SDL for graphics. Putting it on GitHub so that I may easily reference it later.
+I used it to test the waters on using SDL for graphics, and collisions. Putting it on GitHub so that I may easily reference it later.
 
 There are a few branches of this that use different programming languages.
 
-It has been released in the Public Domain meaning you can use it however you wish.
+# License
+
+This program has been released in the Public Domain meaning you can use it however you wish, read the license file [here](https://github.com/GamerMan7799/Cannon-Simulation/blob/master/LICENSE.md) 
+or you can read [here](http://unlicense.org) for infomation of the Unlicense in general.
+
+## Summary of what license means
+
+* First and foremost, this code is "AS IS", meaning we cannot be sued if it doesn't work
+
+* You can modify this code any way you wish without credit (but we would certainty appreciate it)
+
+* You can any/all of this code for private and/or commerical use
 
 # Running the program
 
@@ -31,11 +42,11 @@ Let me know if I am missing a dependences that I might have forgotten about due
 
 # Using the Program
 
-The first time you run the program a Config.ini will be created it should look something like below:
+The first time you run the program a "Config.ini" will be created it should look something like below:
 
 ```
 Config File for the Cannon.exe
-1.2.4.60-b
+1.2.5-Beta
 Screen Width: 640
 Screen Height: 480
 Log Ball's path: 0
@@ -52,10 +63,13 @@ online and I cannot verify how accurate it is.
 
 "Draw Ball path on Screen" (if enabled with a 1 instead of 0), will cause small pixels to trail after each ball.
 
-Once you start the program you will be greeted with a beautiful white screen. To create a new cannonball you click (and hold down the button) 
+Once you start the program you will be greeted with a beautiful black screen. To create a new cannonball you click (and hold down the button) 
 you can now move your move around to change the angle that the new cannonball will be fired at; as well as the longer the line the faster it will go. 
 When you are happy with the angle and speed simply release the mouse button and it will be created at the point where you clicked the mouse button down.
 
+The longer you hold down the mouse button the larger the radius of the ball will be and as a result, the more mass the ball will have. You can get an 
+idea of how much mass a ball has based on how transparent it is, the more transparent it is the lighter its mass.
+
 You can also press the following keys to yield effects
 
 ```

project/SDL-Cannon-Simulation.cbp

@@ -153,7 +153,7 @@
 				<doxyfile_build extract_all="1" />
 				<doxyfile_warnings />
 				<doxyfile_output />
-				<doxyfile_dot class_diagrams="1" />
+				<doxyfile_dot class_diagrams="1" have_dot="1" />
 				<general use_at_in_tags="1" />
 			</DoxyBlocks>
 		</Extensions>

project/doxygen/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = Cannon-Simulation
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = v1.2.5-Beta
+PROJECT_NUMBER         = v1.2.6-Beta
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -765,16 +765,7 @@ WARN_LOGFILE           = C:\Users\Patrick.Rye\Documents\GitHub\Cannon-Simulation
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = "..\..\src\screen.h" \
-                         "..\..\src\cannonball.h" \
-                         "..\..\src\version.h" \
-                         "..\..\src\config.cpp" \
-                         "..\..\src\cannonball.cpp" \
-                         "..\..\src\main.cpp" \
-                         "..\..\src\screen.cpp" \
-                         "..\..\src\global.h" \
-                         "..\..\src\tick.h" \
-                         "..\..\src\config.h" \
+INPUT                  = ../../src \
                          ../../ChangesLog.md \
                          ../../README.md \
                          ../../LICENSE.md
@@ -2143,7 +2134,7 @@ HIDE_UNDOC_RELATIONS   = YES
 # set to NO
 # The default value is: NO.
 
-HAVE_DOT               = NO
+HAVE_DOT               = YES
 
 # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
 # to run in parallel. When set to 0 doxygen will base this on the number of
@@ -2272,7 +2263,7 @@ CALL_GRAPH             = YES
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-CALLER_GRAPH           = NO
+CALLER_GRAPH           = YES
 
 # If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
 # hierarchy of all classes instead of a textual one.
@@ -2321,7 +2312,7 @@ INTERACTIVE_SVG        = NO
 # found. If left blank, it is assumed the dot tool can be found in the path.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_PATH               = 
+DOT_PATH               = "../../../../../../../Program Files (x86)/Graphviz2.38/bin"
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that
 # contain dot files that are included in the documentation (see the \dotfile