Abstracted a lot of GameLayer's functionality out

In order to prepare for tutorial mode (and eventually, the other game modes), a lot of GameLayer's functionality (reading the accelerometer, moving the cart, moving falling objects, reacting to collisions…) has been abstracted out to FallingObject and subclasses of FallingObject, as well as a new Cart class, and GameMode, a new superclass of GameLayer. The only things that were not abstracted out that probably will be in the future are the pause functionality and the tutorial bubble functionality (which will in fact be moved to the tutorial mode class).

A lot of work was also done to cut down on compiler warnings and a lot of #imports were moved from header files to implementation files because I realized THAT'S HOW YOU'RE SUPPOSED TO DO IT.

Refs #193

1 files changed, 49 insertions, 1 deletions

@@ -7,7 +7,7 @@
 //
 
 #import "FallingObject.h"
-
+#import "GameMode.h"
 
 @implementation FallingObject
 
@@ -25,6 +25,54 @@
         return self;
 }
 
+- (BOOL)tick
+{
+    GameMode* gameLayer = ((GameMode*) sprite.parent);
+    
+    // Move objects down
+    sprite.position = ccp(sprite.position.x, sprite.position.y-weight);
+        
+    // Cart collision detection
+    CGSize first = [gameLayer.cart.sprite boundingBox].size;
+    CGSize second = [sprite boundingBox].size;
+    
+    if (gameLayer.cart.sprite.position.x > (sprite.position.x - second.width/2 - first.width/2))
+    {
+        if (gameLayer.cart.sprite.position.x < (sprite.position.x + second.width/2 + first.width/2))
+        {
+            if (gameLayer.cart.sprite.position.y > (sprite.position.y - second.height/2 - first.height/2))
+            {
+                if (gameLayer.cart.sprite.position.y < (sprite.position.y + second.height/2 + first.height/2))
+                {
+                    [self collideWithCart];
+                    
+                    return YES;
+                }
+            }
+        }
+    }
+    
+    // Collision detection with floor
+    if (sprite.position.y - (sprite.contentSize.height/2) < 0)
+    {
+        [self collideWithFloor];
+        
+        return YES;
+    }
+    
+    return NO;
+}
+
+- (void)collideWithCart
+{
+
+}
+
+- (void)collideWithFloor
+{
+
+}
+
 - (void)dealloc
 {
     [sprite release];