Update to v1.1.6-beta.2

Started work on adding collison dection unfinsihed at the moment

Author: Patrick Rye

ChangesLog.txt

@@ -1,3 +1,9 @@
+15 September 2015
+   UNFINISHED Released version 1.1.7-Beta
+
+     Change log:
+        -Added: Collisons
+
 15 September 2015
    Released version 1.1.6-Beta
 

project/SDL-Cannon-Simulation.cbp

@@ -130,8 +130,9 @@
 		<Unit filename="../src/cannonball.h" />
 		<Unit filename="../src/config.cpp" />
 		<Unit filename="../src/config.h" />
+		<Unit filename="../src/global.h" />
 		<Unit filename="../src/image_ball.xpm" />
-		<Unit filename="../src/image_cannon.xpm" />
+		<Unit filename="../src/image_pixel.xpm" />
 		<Unit filename="../src/image_sky.xpm" />
 		<Unit filename="../src/main.cpp" />
 		<Unit filename="../src/screen.cpp" />

src/cannonball.cpp

@@ -123,4 +123,8 @@ void clsCannonball::setValues(double r, LOC init_place, double init_vel, double
 	if (Global::Config.values.blnDragMode) { enableDrag(); }
 }
 /**********************************************************************************************************************************************/
+LOC clsCannonball::getplace() {
+    return place;
+}
+/**********************************************************************************************************************************************/
 

src/cannonball.h

@@ -30,6 +30,7 @@ class clsCannonball {
         clsCannonball();
         bool blnstarted;
         void setValues(double, LOC, double, double);
+        LOC getplace(void);
 
         void enableDrag(void);
         void update(double);

src/main.cpp

@@ -10,7 +10,19 @@
 #include "tick.h"
 #include "config.h"
 /**********************************************************************************************************************************************************************/
+struct stcBox {
+    uint left;
+    uint right;
+    uint top;
+    uint bottom;
+};
+typedef struct stcBox BOX;
+/**********************************************************************************************************************************************************************/
 void addNewCannonball(LOC, LOC);
+void checkForCollisons(void);
+bool checkCollide(BOX, BOX);
+void doCollision(uint, uint);
+BOX boxMaker(LOC);
 /**********************************************************************************************************************************************************************/
 namespace Global {
 #ifdef DEFINED_BUILD_MODE_PRIVATE
@@ -83,7 +95,7 @@ int main(int argc, char *argv[]) {
                 Cannonballs[i].update(tempdeltat);
             } //end if started
 		} //end for loop
-
+        checkForCollisons();
 		CannonWindow.update();
 	} while (!quit);
 	return 0;
@@ -124,11 +136,38 @@ void addNewCannonball(LOC mouseC, LOC mouseO ) {
     printf("You cannot add more cannonballs, please wait for some to decay.\n");
 }
 /**********************************************************************************************************************************************************************/
-void checkCollide(LOC place1, LOC place2) {
-
+void checkForCollisons() { //Checks every cannonball against every other cannonball to see if they collide
+    BOX A, B;
+    for(uint j = 0; j < DEFINED_CANNONBALL_LIMIT; j++) {
+        A = boxMaker( Cannonballs[j].getplace() );
+        for (uint i = 0; i < DEFINED_CANNONBALL_LIMIT; i++) {
+            if (Cannonballs[i].blnstarted && i != j) {
+                B = boxMaker( Cannonballs[i].getplace() );
+                if ( checkCollide(A, B) ) { doCollision(j, i); }
+            } //end if started and not same ball
+        } //end for loop inner
+    } //end for loop outer
+}
+/**********************************************************************************************************************************************************************/
+bool checkCollide(BOX A, BOX B) { //checks if two objects (made with the BOXES collide)
+    if( A.bottom <= B.top ){return false;}
+    if( A.top >= B.bottom ){return false;}
+    if( A.right <= B.left ){return false;}
+    if( A.left >= B.right ){return false;}
+    //If none of the sides from A are outside B
+    return true;
 }
 /**********************************************************************************************************************************************************************/
 void doCollision(uint num1, uint num2) {
 
 }
 /**********************************************************************************************************************************************************************/
+BOX boxMaker(LOC place) {
+    BOX tempBOX;
+    tempBOX.left = place.x;
+    tempBOX.top = place.y;
+    tempBOX.bottom = tempBOX.top + 10;
+    tempBOX.right = tempBOX.left + 10;
+    return tempBOX;
+}
+/**********************************************************************************************************************************************************************/

src/version.h

@@ -14,17 +14,17 @@
 	//Standard Version Type
 	#define DEFINED_VER_MAJOR  1
 	#define DEFINED_VER_MINOR  1
-	#define DEFINED_VER_BUILD  6
-	#define DEFINED_VER_REVISION  5
+	#define DEFINED_VER_BUILD  7
+	#define DEFINED_VER_REVISION  6
 
 	//Miscellaneous Version Types
-	#define DEFINED_VER_BUILDS_COUNT  142
-	#define DEFINED_VER_RC_FILEVERSION 1,1,6,5
-	#define DEFINED_VER_RC_FILEVERSION_STRING "1, 1, 6, 5\0"
-	#define DEFINED_VER_FULLVERSION_STRING  "1.1.6.5"
+	#define DEFINED_VER_BUILDS_COUNT  160
+	#define DEFINED_VER_RC_FILEVERSION 1,1,7,6
+	#define DEFINED_VER_RC_FILEVERSION_STRING "1, 1, 7, 6\0"
+	#define DEFINED_VER_FULLVERSION_STRING  "1.1.7.6"
 
 	//These values are to keep track of your versioning state, don't modify them.
-	#define DEFINED_VER_BUILD_HISTORY  3
+	#define DEFINED_VER_BUILD_HISTORY  4
 
 
 #endif //__VERSION_HEADER__