Update to v1.4.0-R

## [1.4.0-R] - 2018-03-27
### Added
* Toolbar with different tools including: drag, fire, drop, rope, delete, and info. (Issue #5)
* Currently finished tools: fire, drag, drop, delete, and info. (Rope tool is present, but rope equations need more work, so I disabled it for now).
* SDL Licenses.
* Credits to Docs.
* More Doxygen stuff.
* Debug message that prints ball mass when created.
* Ability to pause the simulation.
* Changable Ratio of meters to Pixels (default is 10 pixels/meter)

### Changed
* Moved Docs to Doc folder.
* Moved various items out of main.cpp into core.cpp to avoid main becoming too large.
* How balls are updated (order and a few equations) to make it hopefully more realistic.
* Increased ball size from 10x10 pixels to 25x25 pixels.
* Various code improvements.
* Disabled rope tool, still need to work on some of the equations. (Issue #4)
* Reduced kVelocityScalar from 1 -> 0.1
* Floors to casts (due to large number of calls of the floor functions).

### Removed
* Interia/engergy from spins, because it did nothing.

### Fixed
* Bug of balls getting stuck in walls.
* Bug of balls velocity becoming NaN. (Issue #3)

Author: GamerMan7799

README.md

@@ -56,7 +56,7 @@ The first time you run the program a "Config.ini" will be created it should look
 
 ```
 Config File for the Cannon.exe
-1.4.0
+1.4.0-R
 Screen Width: 640
 Screen Height: 480
 Log Ball's path: 0
@@ -113,7 +113,7 @@ Right Arrow = Select next tool
 Left Arrow = Select previous tool
 1 = Select Fire tool
 2 = Select Drop tool
-3 = Select Rope tool
+3 = Select Rope tool - DISABLED ATM
 4 = Select Delete tool
 5 = Select Drag tool
 6 = Select Info tool
@@ -131,7 +131,7 @@ The mass of the ball will be proportional to the length of time that the mouse w
 
 Clicking on the screen will cause a ball to be created at selected location. The ball will have no velocity and its mass will be proportional to the length of time the mouse is held down for.
 
-### Rope tool - WIP
+### Rope tool - DISABLED ATM
 
 Clicking on a ball will cause it to be attached to one end of a rope. The rope can then be attached to another ball, or pinned to background. 
 

docs/ChangesLog.md

@@ -3,10 +3,10 @@
 All notable changes to this project will be documented here.
 This project adheres to [Semantic Versioning](http://semver.org/)
 
-## [1.4.0-RC.1] - WIP
+## [1.4.0-R] - 2018-03-27
 ### Added
 * Toolbar with different tools including: drag, fire, drop, rope, delete, and info. (Issue #5)
-* Currently finished tools: fire, drag, drop, delete, and info.
+* Currently finished tools: fire, drag, drop, delete, and info. (Rope tool is present, but rope equations need more work, so I disabled it for now).
 * SDL Licenses.
 * Credits to Docs.
 * More Doxygen stuff.

src/cannonball.cpp

@@ -511,3 +511,12 @@ void clsCannonball::updateForces() {
 
 }
 /*****************************************************************************/
+dblXY clsCannonball::getdbLOC() {
+  return dblLOC_;
+}
+/*****************************************************************************/
+void clsCannonball::setdbLOC(dblXY newplace) {
+  dblLOC_ = newplace;
+  updateCollisionBox();
+}
+/*****************************************************************************/

src/cannonball.h

@@ -95,6 +95,8 @@ class clsCannonball {
                                 so that when looping through all of the balls, it doesn't mark
                                 the same collision twice */
     void addForce(dblXY);
+    dblXY getdbLOC(void);
+    void  setdbLOC(dblXY);
   private:
 
     uint ballID_;  /**< The ball ID which is basically just its number in the array */

src/core.cpp

@@ -77,13 +77,21 @@ void cannonballs::checkCollisons(uint j) {
   /////////////////////////////////////////////////
 
   BOX A, B;
+  dblXY ball_b_loc;
   A = balls[j].getBOX();
   if (balls[j].blncheckphysics_) {
     for (int i = 0; i < balls.size(); ++i) {
       if (balls[i].blncheckphysics_ && balls[j].blncheckphysics_ &&  i != j) {
         B = balls[i].getBOX();
         if ( checkOverlap(A, B) ) {
           doCollide(j, i);
+          /* ball_b_loc = balls[i].getdbLOC();
+           do {
+            ball_b_loc.x++;
+            ball_b_loc.y++;
+            balls[i].setdbLOC(ball_b_loc);
+            B = balls[i].getBOX();
+          } while (checkOverlap(A,B)); */
           balls[i].blncheckphysics_ = false;
           balls[j].blncheckphysics_ = false;
         } // end if overlap
@@ -423,7 +431,7 @@ char core::handleEvent(SDL_Event* e ) {
       core::toolbar.setTool(ToolDrop);
       return 0;
     case SDLK_3:
-      core::toolbar.setTool(ToolRope);
+      //core::toolbar.setTool(ToolRope);
       return 0;
     case SDLK_4:
       core::toolbar.setTool(ToolDele);

src/main.cpp

@@ -4,7 +4,7 @@
 /// @brief      Holds all the main functions.
 /// @author     GamerMan7799
 /// @author     xPUREx
-/// @version    1.4.0-RC.1
+/// @version    1.4.0-R
 /// @date       2018
 /// @copyright  Public Domain Unlicense.
 /////////////////////////////////////////////////
@@ -20,12 +20,12 @@
 /**< If this is defined, then program will use unrealistic method that will
      increase the velocity of two colliding balls the closer they are together
      it will reduce the number of times that the balls stick together,
-     but also causes them to get unrealistically high velocities*/
+     but also causes them to get unrealistically high velocities. */
 /*****************************************************************************/
 #define DEFINED_COLLISION_NORMAL_FORCE 0
 /**< If this is defined, then program will use apply a normal force to any
      colliding balls. The forces are along the same direction as the velocities
-     are. It doesn't make sense in the real world.*/
+     are. It doesn't make sense in the real world. */
 /*****************************************************************************/
 #include "version.h"
 #include "core.h"

src/rope.h

@@ -1,5 +1,5 @@
-#ifndef __ROPE_HEADER__
-#define __ROPE_HEADER__
+#ifndef __MY_ROPE_HEADER__
+#define __MY_ROPE_HEADER__
 /*****************************************************************************/
 #include "cannonball.h"
 /*****************************************************************************/

src/screen.h

@@ -43,7 +43,6 @@ typedef struct stcLocation LOC;
 /// @}
 /*****************************************************************************/
 // It is likely bad practice to hold values like this...
-/** @todo (GamerMan7799#9#): Find a better method */
 namespace screen {
   extern WINATT screenatt;
 }

src/tick.h

@@ -1,5 +1,5 @@
-#ifndef __TICK__HEADER__
-#define __TICK__HEADER__
+#ifndef __MY_TICK_HEADER__
+#define __MY_TICK_HEADER__
 /*****************************************************************************/
 #include <time.h>
 #include <cmath>

src/version.h

@@ -15,7 +15,7 @@
 /*****************************************************************************/
 //Date Version Types
 /** The day of the last build of the program, currently not used. */
-#define DEFINED_VER_DATE "26"
+#define DEFINED_VER_DATE "27"
 
 /** The month of the last build of the program, currently not used. */
 #define DEFINED_VER_MONTH "03"
@@ -37,13 +37,13 @@
 /*****************************************************************************/
 /** The version number in a format used by Boilerplate.rc, It is in the following format
     [MAJOR].[MINOR].[PATCH].[BUILDNUMBER] */
-#define DEFINED_VER_RC_FILEVERSION 1,4,0,7
+#define DEFINED_VER_RC_FILEVERSION 1,4,0,8
 
 /** Is the same as DEFINED_VER_RC_FILEVERSION but is a null terminated string */
-#define DEFINED_VER_RC_FILEVERSION_STRING "1, 4, 0, 7\0"
+#define DEFINED_VER_RC_FILEVERSION_STRING "1, 4, 0, 8\0"
 
 /** A more specific string of the file version */
-#define DEFINED_VER_FULLVERSION_STRING  "1.4.0-RC.1\0"
+#define DEFINED_VER_FULLVERSION_STRING  "1.4.0-R\0"
 
 //Software Status
 /**
@@ -55,10 +55,10 @@ Software Status can be the following:
 | Beta | b | This version will compile and / or run but does not work as expected (or crashes often). |
 | Alpha | a | This version does not work at all; it usually won't compile at all or crashes more times than it works; best not to use versions in this state. |
 */
-#define DEFINED_VER_STATUS 	"Release Candidate"
+#define DEFINED_VER_STATUS 	"Release"
 
 /** See the table for DEFINED_VER_STATUS */
-#define DEFINED_VER_STATUS_SHORT  "rc"
+#define DEFINED_VER_STATUS_SHORT  "r"
 /// @}
 /*****************************************************************************/
 #endif //__VERSION_HEADER__