Update to v1.1.9-Beta

16 September 2015
   Released version 1.1.9-Beta

     Change log:

-Added: Cannonballs now keep track of ID for logging purposes
  -Fixed:
Log file is now cleared at start
  -Added: Clearer Debug Message if a
ball was killed because of speed or NaN
  -Added: Unrealistic method
where velocity is modified with the inverse root of the distance between
the points
    (this was an attempt to prevent the balls from sticking
together as they have been)

Author: Patrick Rye

ChangesLog.txt

@@ -1,8 +1,19 @@
+16 September 2015
+   Released version 1.1.9-Beta
+
+     Change log:
+        -Added: Cannonballs now keep track of ID for logging purposes
+		-Fixed: Log file is now cleared at start
+		-Added: Clearer Debug Message if a ball was killed because of speed or NaN
+		-Added: Unrealistic method where velocity is modified with the inverse root of the distance between the points
+				(this was an attempt to prevent the balls from sticking together as they have been)
+		
+
 16 September 2015
    Released version 1.1.8-Beta
 
      Change log:
-        -Added: More collision methods (Inelastic, Elastic, Perfect Inelastic, and No Collisons)
+        -Added: More collision methods (Inelastic, Elastic, Perfect Inelastic, and No Collisions)
 		-Improved: Collision equations
 		-Fixed: You can now properly fire a cannonball in all directions
 		-Fixed: Balls that have velocity as NaN will be removed 
@@ -12,7 +23,7 @@
    Released version 1.1.7-Beta
 
      Change log:
-        -Added: Collisons
+        -Added: Collisions
 		-Fixed: Bug with mouse keeping old coordinates
 		-Fixed: X Fire velocity not being right
 
@@ -25,7 +36,7 @@
 		-Note: Currently the array holding multiple cannonball is NOT dynamic I still have to figure that out.
 		-Removed: Ball position updating on debug mode (too many balls)
 		-Fixed: Bug with balls not correctly bouncing at certain velocities
-		-Updated: Ball will now be removed if thier velocity drops below a certain value.
+		-Updated: Ball will now be removed if their velocity drops below a certain value.
 
 15 September 2015
    Released version 1.1.5-Beta
@@ -99,7 +110,7 @@
 
      Change log:
         -Added: Config file
-        -Applied: Software state being added to boilerplater
+        -Applied: Software state being added to boilerplate
         -Added: Logging of ball location to a file
         -Applied: Easier way to change images path (config file)
 

src/cannonball.cpp

@@ -61,16 +61,16 @@ void clsCannonball::update(double newdeltat) {
     dblLOC.x = dblLOC.x + vel.x * deltat + 0.5 * acc.x * pow(deltat,2);
 	vel.x = (vel.x + acc.x * deltat);
 	if (dblLOC.x <= 0.0 || dblLOC.x >= window.width - dst.w) {
-            vel.x *= Global::Physics::fRecoil;
-            if (dblLOC.x <= 0.0) {dblLOC.x++;}
-            else {dblLOC.x--;}
+        vel.x *= Global::Physics::fRecoil;
+        if (dblLOC.x <= 0.0) {dblLOC.x++;}
+        else {dblLOC.x--;}
     } //end if hitting x edges
 	dblLOC.y = dblLOC.y + vel.y * deltat + 0.5 * acc.y * pow(deltat,2);
 	vel.y = (vel.y + acc.y * deltat);
 	if (dblLOC.y <= dst.h || dblLOC.y >= window.height) {
-            vel.y *= Global::Physics::fRecoil;
-            if (dblLOC.y <= dst.h) {dblLOC.y++;}
-            else {dblLOC.y--;}
+        vel.y *= Global::Physics::fRecoil;
+        if (dblLOC.y <= dst.h) {dblLOC.y++;}
+        else {dblLOC.y--;}
     }//end if hitting y edges
 
     if (dblLOC.x < 0.0) {place.x = 0;}
@@ -82,16 +82,19 @@ void clsCannonball::update(double newdeltat) {
 	//if (Global::blnDebugMode) {printf("Ball updated, new position (%f, %f)\n",dblLOC.x,dblLOC.y);}
 	if (Global::Config.values.blnLogging) {
         FILE* logfile = fopen("logfile.log","a");
-        fprintf(logfile,"(%.5f, %.5f)\n",dblLOC.x,dblLOC.y);
+        fprintf(logfile,"Ball %3u \t (%.3f, %.3f)\n",ballID, dblLOC.x,dblLOC.y);
         fclose(logfile);
 	}
 
     double total_v;
     total_v = sqrt( pow(vel.x,2) + pow(vel.y,2) );
     if (total_v < Global::Physics::fMinVelocity || isnan(total_v) ) {
-            blnstarted = false;
-            if (Global::blnDebugMode) {printf("Ball moving too slow; killing it\n");}
-    }
+        blnstarted = false;
+        if (Global::blnDebugMode) {
+            if ( isnan(total_v) ) {printf("Ball vel is Nan; killing it\n");}
+            else {printf("Ball moving too slow; killing it\n");}
+        } //end if debug mode
+    } //end if should kill
 	show();
 }
 /**********************************************************************************************************************************************/
@@ -109,7 +112,7 @@ void clsCannonball::show() {
     SDL_RenderCopy(window.ren,ball,NULL,&dst);
 }
 /**********************************************************************************************************************************************/
-void clsCannonball::setValues(double r, LOC init_place, double init_vel, double init_angle) {
+void clsCannonball::setValues(double r, LOC init_place, double init_vel, double init_angle, uint ID) {
     props.radius = r; //in meters
     props.density = Global::Physics::uBallDensity; //density of steel in kg/m^3
 
@@ -119,8 +122,11 @@ void clsCannonball::setValues(double r, LOC init_place, double init_vel, double
 
     vel.x = (double)(init_vel) * (cos(init_angle * Rad_Convert));
 	vel.y = (double)(init_vel) * (sin(init_angle * Rad_Convert));
+
+	ballID = ID;
 	blnstarted = true;
 
+
 	if (Global::Config.values.blnDragMode) { enableDrag(); }
 }
 /**********************************************************************************************************************************************/

src/cannonball.h

@@ -30,7 +30,7 @@ class clsCannonball {
     public:
         /** Default constructor */
         clsCannonball();
-        void setValues(double, LOC, double, double);
+        void setValues(double, LOC, double, double, uint);
         LOC getplace(void);
         void setplace(LOC);
 
@@ -43,6 +43,7 @@ class clsCannonball {
 
         bool blnstarted;
     private:
+        uint ballID;
         bool blnDragEnabled;
 
         SDL_Texture* ball;

src/main.cpp

@@ -60,6 +60,10 @@ SDL_Texture* tempball;
 /**********************************************************************************************************************************************************************/
 int main(int argc, char *argv[]) {
     Global::Config.Check(); //Load Config file and all its values.
+    if (Global::Config.values.blnLogging) { //Open log file to clear it, if it exists
+        FILE* logfile = fopen("logfile.log","w");
+        fclose(logfile);
+	}
 
     if (Global::blnDebugMode) {printf("OS: %s\n",Global::Config.values.OperatingSystem);}
     clsTick Tick; //create tick object
@@ -139,7 +143,7 @@ void addNewCannonball(LOC mouseC, LOC mouseO ) {
     //loop through array to find next available cannonball slot
     for (uint i = 0; i < DEFINED_CANNONBALL_LIMIT; i++) {
         if (!Cannonballs[i].blnstarted) {
-            Cannonballs[i].setValues(2.0, mouseO, fire_v, angle);
+            Cannonballs[i].setValues(2.0, mouseO, fire_v, angle, i);
             Cannonballs[i].setSDLScreen(tempball, tempwin);
             return;
         } //end if not started
@@ -179,6 +183,32 @@ void doCollision(uint numA, uint numB) {
     Aprops = Cannonballs[numA].getPhysicalProps();
     Bprops = Cannonballs[numB].getPhysicalProps();
 
+    //This part here has no actual basis on real life,
+    //it is just my attempt at preventing the cannonballs from sticking together
+    LOC CenterA, CenterB, DeltaCenters;
+    double VelModder;
+    CenterA = Cannonballs[numA].getplace();
+    CenterB = Cannonballs[numB].getplace();
+
+    CenterA.x += 5;
+    CenterA.y += 5;
+    CenterB.x += 5;
+    CenterB.y += 5;
+
+    DeltaCenters.x = abs(CenterA.x - CenterB.x);
+    DeltaCenters.y = abs(CenterA.y - CenterB.y);
+    //Since it is r^2 and the sqrt of this give us r, we just drop the sqrt part to save time
+    VelModder = pow((double)DeltaCenters.x,2) + pow((double)DeltaCenters.y,2);
+    VelModder = 200.0 / VelModder; //200 is the highest value possible
+    if (VelModder < 1.0) {VelModder = 1.0;}
+    //else if (VelModder > 0.05) {VelModder = 0.05;}
+
+    Avel.x *= (double) VelModder;
+    Avel.y *= (double) VelModder;
+    Bvel.x *= (double) VelModder;
+    Bvel.y *= (double) VelModder;
+    //End of non real stuff
+
     double Aangle, Bangle, ContactAngle;
     double Atotal_v, Btotal_v;
 

src/version.h

@@ -14,14 +14,14 @@
 	//Standard Version Type
 	#define DEFINED_VER_MAJOR  1
 	#define DEFINED_VER_MINOR  1
-	#define DEFINED_VER_BUILD  8
+	#define DEFINED_VER_BUILD  9
 	#define DEFINED_VER_REVISION  1
 
 	//Miscellaneous Version Types
-	#define DEFINED_VER_BUILDS_COUNT  0
-	#define DEFINED_VER_RC_FILEVERSION 1,1,8,1
-	#define DEFINED_VER_RC_FILEVERSION_STRING "1, 1, 8, 1\0"
-	#define DEFINED_VER_FULLVERSION_STRING  "1.1.8.1"
+	#define DEFINED_VER_BUILDS_COUNT  22
+	#define DEFINED_VER_RC_FILEVERSION 1,1,9,1
+	#define DEFINED_VER_RC_FILEVERSION_STRING "1, 1, 9, 1\0"
+	#define DEFINED_VER_FULLVERSION_STRING  "1.1.9.1"
 
 	//These values are to keep track of your versioning state, don't modify them.
 	#define DEFINED_VER_BUILD_HISTORY  1