Update to v1.4.0-beta.5

### Updated
* Finished Drag tool
* Various code improvements

Author: GamerMan7799

README.md

@@ -38,7 +38,7 @@ FolderName\SDL2.dll
 FolderName\SDL2_image.dll
 ```
 
-If you are using the verision I complie, which can be found in the [release tab](https://github.com/Dragon-Wonder/Physics-Collision-Simulator/releases) 
+If you are using the verision I compile, which can be found in the [release tab](https://github.com/Dragon-Wonder/Physics-Collision-Simulator/releases) 
 you will also need the following binaries. 
 
 ```
@@ -143,6 +143,6 @@ Clicking on a ball will delete it.
 
 Clicking and dragging on a ball will allow you to move a ball where the mouse is. When released the ball will still have its inital velocity.
 
-### Info Tool - WIP
+### Info Tool
 
 Clicking on a ball will write infomation about it to the console

docs/ChangesLog.md

@@ -3,14 +3,14 @@
 All notable changes to this project will be documented here.
 This project adheres to [Semantic Versioning](http://semver.org/)
 
-## [1.4.0-beta.4] - WIP
+## [1.4.0-beta.5] - WIP
 ### Added
 * Toolbar with different tools including: drag, fire, drop, rope, delete, and info. Not all are fully working at the moment. 
-* Currently finished tools: fire, drop, delete, info
+* Currently finished tools: fire, drag, drop, delete, and info.
 * SDL Licenses.
 * Credits to Docs.
 * More Doxygen stuff.
-* Debug message that prints ball mass. 
+* Debug message that prints ball mass when created. 
 * Ability to pause the simulation.
 
 ### Changed

project/Physics-Simulator.cbp

@@ -9,7 +9,7 @@
 		<Build>
 			<Target title="Debug-Windows">
 				<Option platforms="Windows;" />
-				<Option output="../Physics-Simulator-PRIVATE" prefix_auto="1" extension_auto="1" />
+				<Option output="../Physics-Simulator-DEBUG" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="../" />
 				<Option object_output="obj/Debug/" />
 				<Option type="1" />
@@ -65,7 +65,7 @@
 			</Target>
 			<Target title="Debug-Linux">
 				<Option platforms="Unix;" />
-				<Option output="../Physics-Simulator-PRIVATE" prefix_auto="1" extension_auto="1" />
+				<Option output="../Physics-Simulator-DEBUG" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="../" />
 				<Option object_output="obj/Debug/" />
 				<Option type="1" />

res/boilerplate.rc

@@ -2,23 +2,23 @@
 id ICON "Icon_App.ico"
 /**********************************************************************************************************************************************/
 #include <windows.h>
-//#include <string>
 #include "../src/version.h"
 /**********************************************************************************************************************************************/
 //General stuff that should need to be changed
 #define VER_COMPANYNAME_STR "Public Domain"
 #define VER_FILEDESCRIPTION_STR "A simple program that stimulates collisions between different objects"
 #define VER_FILENAME_STR "SDL Physics Simulation"
-#define VER_ORIGINALFILENAME_STR "Physics-Simulation.exe"
 #define VER_LEGALCOPYRIGHT_STR "http://unlicense.org"
 #define VER_COMMENTS_STR "Source Code found at: https://github.com/Dragon-Wonder/Physics-Collision-Simulator"
 /**********************************************************************************************************************************************/
 //If Private is define above, indicting that it was a build not meant to be released define these variables
 #ifndef DEFINED_BUILD_MODE_PRIVATE
+  #define VER_ORIGINALFILENAME_STR "Physics-Simulation.exe"
 	#define VER_DEBUG 0
 	#define VER_PRIVATEBUILD 0
 	#define VER_PRERELEASE 0
 #else
+  #define VER_ORIGINALFILENAME_STR "Physics-Simulation-DEBUG.exe"
 	#define VER_DEBUG VS_FF_DEBUG
 	#define VER_PRIVATEBUILD VS_FF_PRIVATEBUILD
 	#define VER_PRERELEASE VS_FF_PRERELEASE

src/cannonball.cpp

@@ -151,61 +151,63 @@ void clsCannonball::update(double newdeltat) {
   ///
   /////////////////////////////////////////////////
 
+  blncheckphysics_ = true; // enable on update
   if (!paused_) {
-    blncheckphysics_ = true; // enable on update
+
     deltat_ = newdeltat;
 
     // reset the forces so strange things don't happen
     forces_ = {0.0, props_.mass * global::physics::kGravity};
 
-    if (blndragenabled_) {
-      doMagnusEffect();
-      dragUpdateAcc();
-    }
-    doFriction();
-
-    acc_.x = forces_.x / props_.mass;
-    acc_.y = forces_.y / props_.mass;
-
-    vel_.x = (vel_.x + acc_.x * deltat_);
-    vel_.y = (vel_.y + acc_.y * deltat_);
-
     // get new velocities if collision with edges
     double coefres = (global::config.values.uchrCollisionMethod == CollideInelastic) ?
                      global::physics::kCoefficientRestitution : 1.0;
 
     if (collisionbox_.left < screen_place_.w / 2) {
       vel_.x *= -1 * coefres;
       vel_.y *= coefres;
+      forces_.x -= props_.mass * global::physics::kGravity;
       dblLOC_.x = screen_place_.w;
     }
 
     if (collisionbox_.right > (screen::screenatt.width)) {
       vel_.x *= -1 * coefres;
       vel_.y *= coefres;
+      forces_.x += props_.mass * global::physics::kGravity;
       dblLOC_.x = screen::screenatt.width - screen_place_.w / 2;
     }
 
     if (collisionbox_.bottom > (screen::screenatt.height)) {
       vel_.x *= coefres;
       vel_.y *= -1 * coefres;
+      forces_.y -= props_.mass * global::physics::kGravity;
       dblLOC_.y = screen_place_.h / 2;
     }
 
     if (collisionbox_.top < 0 ) {
       vel_.x *= coefres;
       vel_.y *= -1 * coefres;
+      forces_.y += props_.mass * global::physics::kGravity;
       dblLOC_.y = (screen::screenatt.height) - screen_place_.h / 2;
     }
 
+    if (blndragenabled_) {
+      doMagnusEffect();
+      dragUpdateAcc();
+    }
+    doFriction();
+
+    acc_.x = forces_.x / props_.mass;
+    acc_.y = forces_.y / props_.mass;
+
+    vel_.x = (vel_.x + acc_.x * deltat_);
+    vel_.y = (vel_.y + acc_.y * deltat_);
+
+
+
     dblLOC_.x = dblLOC_.x + vel_.x * deltat_ /*+ 0.5 * acc_.x * pow(deltat_,2)*/;
     dblLOC_.y = dblLOC_.y + vel_.y * deltat_ /*+ 0.5 * acc_.y * pow(deltat_,2)*/;
 
-    // update place and collision box again in case something changed
-    place_.x = round(dblLOC_.x);
-    place_.y = round(dblLOC_.y);
-    updateCollisionBox();
-
     if (global::config.values.blnLogging) {
       FILE* logfile = fopen("logfile.log","a");
       fprintf(logfile,"Ball %3u \t (%.3f, %.3f)\n",ballID_, dblLOC_.x,dblLOC_.y);
@@ -222,6 +224,7 @@ void clsCannonball::update(double newdeltat) {
       } //end if debug mode
     } //end if should kill
   } // end if not paused
+  updateCollisionBox();
 	show(); //show the ball on the screen
 }
 /*****************************************************************************/
@@ -299,6 +302,7 @@ void clsCannonball::setValues(double r, LOC init_place,
 	blnstarted_ = true;
 
   dragCalcValues();
+  updateCollisionBox();
 
 
   forces_ = {0.00, global::physics::kGravity * props_.mass};
@@ -394,6 +398,10 @@ void clsCannonball::updateCollisionBox() {
   /// @brief Updates the collision box
   /////////////////////////////////////////////////
 
+  // update place and collision box again in case something changed
+  place_.x = round(dblLOC_.x);
+  place_.y = round(dblLOC_.y);
+
 	//Update the collision box for the new location
 	collisionbox_.left = place_.x - floor(screen_place_.w / 2);
 	collisionbox_.top = screen::screenatt.height - (place_.y + floor(screen_place_.h / 2));
@@ -417,24 +425,10 @@ void clsCannonball::doFriction() {
                     normal_force;
   updateCollisionBox();
   //Update acc for Friction values
-  if ( collisionbox_.bottom <= screen_place_.h ||
-       collisionbox_.top >= screen::screenatt.height ) {
-    //Ball is in contact with floor or ceiling update x acc
+  if ( collisionbox_.bottom <= screen_place_.h ) {
+    //Ball is in contact with floor
     forces_.x += friction * (vel_.x < 0.0 ? -1.0 : 1.0);
-  } // end if touching top/bottom
-
-
-  // Since there really isn't a normal force when the ball contacts
-  // the edges, this section is commented out.
-  /*
-  if ( collisionbox_.left < (screen_place_.w /2 ) ||
-       collisionbox_.right > screen::screenatt.width ) {
-    // Ball is in contact with the wall update y acc.
-    forces_.y += friction * (vel_.y < 0.0 ? -1.0 : 1.0);
-    // add normal force
-    forces_.x += normal_force * (collisionbox_.right > screen::screenatt.width) ?
-                  1.0 : -1.0;
-  } // end if touching side edges */
+  }
 }
 /*****************************************************************************/
 void clsCannonball::doMagnusEffect() {
@@ -493,3 +487,11 @@ void clsCannonball::togglePause() {
   paused_ = !(paused_);
 }
 /*****************************************************************************/
+bool clsCannonball::isPaused() {
+  /////////////////////////////////////////////////
+  /// @brief Returns if paused or not
+  /////////////////////////////////////////////////
+
+  return paused_;
+}
+/*****************************************************************************/

src/cannonball.h

@@ -84,6 +84,7 @@ class clsCannonball {
     double getSpin(void);
     void writeInfo(void);
     void togglePause(void);
+    bool isPaused(void);
     bool blnstarted_; /**< Whether or not the ball is "started" if it is, the program will update
         it and won't let a new ball replace it in its array spot. */