Update to v1.4.1-beta.3

## [1.4.1-beta.3] - Unreleased
### Added
* Math function specifically to deal with vector math.

### Fixed
* Spelling mistakes
* Various Code mistakes
* Drag tool not un-pausing correctly

### Changed
* Updated Doxygen file
* Info tool now displays if ball is paused

Author: CoderMonad

docs/ChangesLog.md

@@ -3,12 +3,18 @@
 All notable changes to this project will be documented here.
 This project adheres to [Semantic Versioning](http://semver.org/)
 
-## [1.4.1-beta.2] - Unreleased
+## [1.4.1-beta.3] - Unreleased
 ### Added
 * Math function specifically to deal with vector math.
 
 ### Fixed
 * Spelling mistakes
+* Various Code mistakes
+* Drag tool not un-pausing correctly
+
+### Changed
+* Updated Doxygen file
+* Info tool now displays if ball is paused
 
 ## [1.4.0-R] - 2018-03-27
 ### Added

project/Physics-Simulator.cbp

@@ -164,10 +164,6 @@
 		<Unit filename="../src/vector_math.h" />
 		<Unit filename="../src/version.h" />
 		<Extensions>
-			<code_completion />
-			<envvars />
-			<debugger />
-			<lib_finder disable_auto="1" />
 			<DoxyBlocks>
 				<comment_style block="5" line="0" />
 				<doxyfile_project project_number="v1.4.0-R" output_directory="gh-pages" />
@@ -177,6 +173,7 @@
 				<doxyfile_dot class_diagrams="1" have_dot="1" />
 				<general use_at_in_tags="1" />
 			</DoxyBlocks>
+			<lib_finder disable_auto="1" />
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>

project/doxygen/Doxyfile

@@ -163,10 +163,10 @@ void clsCannonball::update(double newdeltat) {
 
     double total_v;
     total_v = math::getVectorLength(vel_);
-    if (total_v < global::physics::kMinVelocity || isnan(total_v) ) {
+    if (total_v < global::physics::kMinVelocity || std::isnan(total_v) ) {
       blnstarted_ = false;
       if (global::blnDebugMode) {
-        if ( isnan(total_v) ) { printf("Ball velocity is NaN; killing it.\n"); }
+        if ( std::isnan(total_v) ) { printf("Ball velocity is NaN; killing it.\n"); }
         else { printf("Ball moving too slow; killing it.\n"); }
       } //end if debug mode
     } //end if should kill
@@ -385,6 +385,11 @@ void clsCannonball::writeInfo() {
   printf("Velocity: \t \t (%5.5f, %5.5f)\n",vel_.x,vel_.y);
   printf("Acceleration: \t \t (%5.5f, %5.5f)\n",acc_.x,acc_.y);
   printf("Forces: \t \t (%5.5f, %5.5f)\n", forces_.x, forces_.y);
+  if (paused_) {
+    printf("Ball is paused.\n");
+  } else {
+    printf("Ball is not paused.\n");
+  }
 
 }
 /*****************************************************************************/

src/cannonball.cpp

@@ -5,6 +5,7 @@
 #include <cstdlib>
 #include <vector>
 #include <time.h>
+#include <cmath>
 #include "screen.h"
 /*****************************************************************************/
 /////////////////////////////////////////////////

src/cannonball.h

@@ -57,7 +57,7 @@ void cannonballs::addNew(LOC mouseC, LOC mouseO, double HoldTime ) {
   mouseO.y = global::config.values.uintScreenHeight - mouseO.y;
   intCannonBallNum++;
   clsCannonball tempBall;
-  tempBall.setValues(radius, mouseO,fire_v, angle, intCannonBallNum);
+  tempBall.setValues(radius, mouseO, fire_v, angle, intCannonBallNum);
   if (intCannonBallNum > 1) {
     if(balls[0].isPaused()) { tempBall.togglePause(); }
   }
@@ -85,8 +85,9 @@ void cannonballs::checkCollisons(uint j) {
         B = balls[i].getBOX();
         if ( checkOverlap(A, B) ) {
           doCollide(j, i);
-          /* ball_b_loc = balls[i].getdbLOC();
-           do {
+          ball_b_loc = balls[i].getdbLOC();
+          /** @todo (GamerMan7799#9#): This might work for stopping the balls from overlapping, just need to add a check on which way they are colliding */
+           /*do {
             ball_b_loc.x++;
             ball_b_loc.y++;
             balls[i].setdbLOC(ball_b_loc);
@@ -243,7 +244,7 @@ void cannonballs::doCollide(uint numA, uint numB) {
     break;
   case CollideInelastic:
     //uses the same equations as below but some energy is lost.
-    
+
     TotalAMomentum = math::vectorMul(TotalAMomentum,
                                     (double)global::physics::kCoefficientRestitution);
     TotalBMomentum = math::vectorMul(TotalAMomentum,
@@ -329,6 +330,7 @@ void core::fireRandom() {
   LOC mouseo, mousec;
   // time delay can be anywhere from 0.25 to 10 seconds
   double time_delay = ((rand() % (10000-250) + 250) / 1000);
+  if (time_delay <= 0.25) { time_delay = 0.25; }
 
   mouseo.x = rand() % cnfg.uintScreenWidth;
   mouseo.y = rand() % cnfg.uintScreenHeight;
@@ -361,8 +363,8 @@ char core::handleEvent(SDL_Event* e ) {
   if ( e->type == SDL_QUIT ) { return 'q'; }
 
   if ( e->type == SDL_MOUSEBUTTONDOWN || e->type == SDL_MOUSEBUTTONUP ) {
-    if (e->type == SDL_MOUSEBUTTONDOWN) {holding = true;}
-    else if (e->type == SDL_MOUSEBUTTONUP) {holding = false;}
+    if (e->type == SDL_MOUSEBUTTONDOWN) { holding = true; }
+    else if (e->type == SDL_MOUSEBUTTONUP) { holding = false; }
     // there is a mouse-based event, so now we have to check what tool we are using.
     //if (global::blnDebugMode) { printf("Mouse event found.\n"); }
     switch ( toolbar.getTool() ) {
@@ -500,7 +502,7 @@ void core::doDeleTool(SDL_Event* e) {
   if( e->type == SDL_MOUSEBUTTONDOWN ){
     SDL_GetMouseState(&currentmouse.x, &currentmouse.y);
     ball_num = findSelectedBall(currentmouse);
-    if (ball_num == -1) {return;}
+    if (ball_num == -1) { return; }
     cannonballs::balls[ball_num].blnstarted_ = false;
   }
 }
@@ -534,7 +536,7 @@ void core::doDragTool(SDL_Event* e) {
   if (e->type == SDL_MOUSEBUTTONDOWN) { ball_num = findSelectedBall(currentmouse); }
   //else if (e->type == SDL_MOUSEBUTTONUP) { ball_num = -1; }
 
-  if (ball_num == -1) {return;}
+  if (ball_num == -1) { return; }
 
   if (e->type == SDL_MOUSEMOTION && holding) {
     currentmouse.y = global::config.values.uintScreenHeight - currentmouse.y;
@@ -544,14 +546,21 @@ void core::doDragTool(SDL_Event* e) {
   //if(global::blnDebugMode) { printf("Tool Drag event\n"); }
   if ( holding && !(cannonballs::balls[ball_num].isPaused()) ) {
     cannonballs::balls[ball_num].togglePause();
-  } else if (!(holding) && cannonballs::balls[ball_num].isPaused()
-             && !(cannonballs::balls.back().isPaused()) &&
-                !(cannonballs::balls.front().isPaused())) {
-      // will only unpause the dragged ball if the other balls are also
-      // unpaused. I check the first and last balls to avoid the chance
-      // that the selected ball is the first or last.
-    cannonballs::balls[ball_num].togglePause();
-    ball_num = -1;
+  } else if ( !(holding) ) {
+    // check if the ball is the first or last
+    if (&cannonballs::balls[ball_num] == &cannonballs::balls.front()) {
+      if (!(cannonballs::balls.back().isPaused()) &&
+          cannonballs::balls[ball_num].isPaused()) {
+            cannonballs::balls[ball_num].togglePause();
+            ball_num = -1;
+          }
+    } else {
+      if (!(cannonballs::balls.front().isPaused()) &&
+          cannonballs::balls[ball_num].isPaused()) {
+            cannonballs::balls[ball_num].togglePause();
+            ball_num = -1;
+          }
+    }
   }
 }
 /*****************************************************************************/

src/core.cpp

@@ -171,11 +171,11 @@ int main(int argc, char *argv[]) {
   } while (!quit); //keep looping until we get a quit
 
   // clear vectors is not empty
-  if(!cannonballs::ropes.empty()) {cannonballs::ropes = VectorRope();}
-  if(global::blnDebugMode) {printf("Ropes cleared.\n");}
+  if(!cannonballs::ropes.empty()) { cannonballs::ropes = VectorRope(); }
+  if(global::blnDebugMode) { printf("Ropes cleared.\n"); }
 
-  if(!cannonballs::balls.empty()) {cannonballs::balls = VectorCannon();}
-  if(global::blnDebugMode) {printf("Balls cleared.\n");}
+  if(!cannonballs::balls.empty()) { cannonballs::balls = VectorCannon(); }
+  if(global::blnDebugMode) { printf("Balls cleared.\n"); }
   return 0;
 }
 /*****************************************************************************/

src/main.cpp

@@ -173,7 +173,7 @@ dblXY clsRope::ballWallForces(dblXY ball_one_forces, double angle) {
   if (angle == M_PI / 2 || angle == 3/2 * M_PI ) {
     tension.x = 0;
     tension.y = ball_one_forces.y;
-    if (!(signbit((double)spot_.one.y-(double)spot_.two.y) ^ signbit(ball_one_forces.y))) {
+    if (!(std::signbit((double)spot_.one.y-(double)spot_.two.y) ^ std::signbit(ball_one_forces.y))) {
       // force and direction to spot two are both positive or both negative, therefore
       // reverse the force for tension
       tension.y *= -1;
@@ -187,7 +187,7 @@ dblXY clsRope::ballWallForces(dblXY ball_one_forces, double angle) {
   } else {
     tension.y = 0;
     tension.x = ball_one_forces.x;
-    if ((signbit((double)spot_.one.x-(double)spot_.two.x) ^ signbit(ball_one_forces.x))) {
+    if ((std::signbit((double)spot_.one.x-(double)spot_.two.x) ^ std::signbit(ball_one_forces.x))) {
       // force and direction to spot two are both positive or both negative, therefore
       // reverse the force for tension
       tension.x *= -1;

src/rope.cpp

@@ -2,6 +2,7 @@
 #define __VECTOR_MATH_HEADER__
 /*****************************************************************************/
 #include <math.h>
+#include <cmath>
 #include "global.h"
 /*****************************************************************************/
 /////////////////////////////////////////////////

src/vector_math.h

@@ -15,16 +15,16 @@
 /*****************************************************************************/
 //Date Version Types
 /** The day of the last build of the program, currently not used. */
-#define DEFINED_VER_DATE "21"
+#define DEFINED_VER_DATE "28"
 
 /** The month of the last build of the program, currently not used. */
-#define DEFINED_VER_MONTH "03"
+#define DEFINED_VER_MONTH "05"
 
 /** The year of the last build of the program, currently not used. */
-#define DEFINED_VER_YEAR "2019"
+#define DEFINED_VER_YEAR "2020"
 
 /** The Ubuntu style of the date of the last build. It is in YY.MM format. */
-#define DEFINED_VER_UBUNTU_VERSION_STYLE  "19.03"
+#define DEFINED_VER_UBUNTU_VERSION_STYLE  "20.05"
 /*****************************************************************************/
 /** The Major number of the version number */
 #define DEFINED_VER_MAJOR  1
@@ -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,1,2
+#define DEFINED_VER_RC_FILEVERSION 1,4,1,3
 
 /** Is the same as DEFINED_VER_RC_FILEVERSION but is a null terminated string */
-#define DEFINED_VER_RC_FILEVERSION_STRING "1, 4, 1, 2\0"
+#define DEFINED_VER_RC_FILEVERSION_STRING "1, 4, 1, 3\0"
 
 /** A more specific string of the file version */
-#define DEFINED_VER_FULLVERSION_STRING  "1.4.1-beta.2\0"
+#define DEFINED_VER_FULLVERSION_STRING  "1.4.1-beta.3\0"
 
 //Software Status
 /**