Proof of concept -- tank fires bullet, bullet interacts with other physical objects.

diff --git a/libs/sparrow/src/Extras/BEParallaxSprite.h b/libs/sparrow/src/Extras/BEParallaxSprite.h
index b25c72d..3a0ec1a 100644 (file)
--- a/libs/sparrow/src/Extras/BEParallaxSprite.h
+++ b/libs/sparrow/src/Extras/BEParallaxSprite.h
@@ -6,6 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "Sparrow.h"
 
 #define BE_PARALLAX_DIRECTION_LEFT 1
 #define BE_PARALLAX_DIRECTION_RIGHT 2

diff --git a/libs/sparrow/src/Extras/BEParallaxSprite.m b/libs/sparrow/src/Extras/BEParallaxSprite.m
index 7c01729..6e4995c 100644 (file)
--- a/libs/sparrow/src/Extras/BEParallaxSprite.m
+++ b/libs/sparrow/src/Extras/BEParallaxSprite.m
@@ -13,21 +13,21 @@
 @synthesize running = mRunning;
 
 - (id)initWithTexture:(SPTexture *)texture {
-       if (self = [super init]) {
+       if ((self = [super init])) {
                [self initWithTexture:texture speed:1 direction:BE_PARALLAX_DIRECTION_LEFT];
        }
        return self;
 }
 
 - (id)initWithTexture:(SPTexture *)texture speed:(float)speed {
-       if (self = [super init]) {
+       if ((self = [super init])) {
                [self initWithTexture:texture speed:speed direction:BE_PARALLAX_DIRECTION_LEFT];
        }
        return self;
 }
 
 - (id)initWithTexture:(SPTexture *)texture speed:(float)speed direction:(int)direction {
-       if (self = [super init]) {
+       if ((self = [super init])) {
                mRunning = YES;
                mDirection = direction;
                if (direction < 1 || direction > 4) {

diff --git a/libs/sparrow/src/Extras/SparrowExtras.h b/libs/sparrow/src/Extras/SparrowExtras.h
index a597333..a53eaab 100644 (file)
--- a/libs/sparrow/src/Extras/SparrowExtras.h
+++ b/libs/sparrow/src/Extras/SparrowExtras.h
@@ -3,6 +3,6 @@
 #import "SHCircle.h"
 #import "SHLine.h"
 #import "SHPolygon.h"
-#import "BEParallaxSprite.h"
+//import "BEParallaxSprite.h"
 #import "SXFPSMeter.h"
 

diff --git a/src/Tanks.h b/src/Tanks.h
new file mode 100644 (file)
index 0000000..5234a2e
--- /dev/null
+++ b/src/Tanks.h
@@ -0,0 +1,2 @@
+
+#import "render/QQSparrowExtensions.h"

diff --git a/src/TanksMacros.h b/src/TanksMacros.h
new file mode 100644 (file)
index 0000000..2a9ef11
--- /dev/null
+++ b/src/TanksMacros.h
@@ -0,0 +1,7 @@
+#ifndef TANKS_MACROS_H
+#define TANKS_MACROS_H
+
+
+
+
+#endif
\ No newline at end of file

diff --git a/src/game/QQActive.h b/src/game/QQActive.h
index ec6fe08..9335dab 100644 (file)
--- a/src/game/QQActive.h
+++ b/src/game/QQActive.h
@@ -7,6 +7,7 @@
 
 @property (nonatomic, getter=isActive) BOOL active;
 
+- (void) tick:(float)elapsed;
 - (void) act;
 
 @end
\ No newline at end of file

diff --git a/src/game/QQDisplayable.h b/src/game/QQDisplayable.h
index a559892..ab60dbf 100644 (file)
--- a/src/game/QQDisplayable.h
+++ b/src/game/QQDisplayable.h
@@ -6,7 +6,13 @@
  */
 @protocol QQDisplayable
 
-@property (nonatomic, retain, readonly) SPDisplayObject* shape;
+@property (nonatomic, readwrite, assign, getter=isDirty) BOOL dirty; // TODO: implement this and fix various [shape setPosition] calls
+@property (nonatomic, readwrite, retain) SPDisplayObject* shape;
+
+/**
+ * Called to setup the Sparrow shape.
+ */
+- (SPDisplayObject*) setupShape;
 
 /**
  * Called to update appearance after game actions have occurred

diff --git a/src/game/QQGame.h b/src/game/QQGame.h
index 98e4cc4..835b132 100644 (file)
--- a/src/game/QQGame.h
+++ b/src/game/QQGame.h
@@ -1,7 +1,7 @@
 #import "Sparrow.h"
 
-#import "game/actor/QQUnit.h"
 #import "physics/QQWorld.h"
+#import "game/actor/QQActor.h"
 
 
 @interface QQGame : SPStage {
@@ -16,16 +16,15 @@
     NSMutableSet* _bullets;
 }
 
+@property (nonatomic, assign, readonly) long ticks;
+
 @property (nonatomic, retain) QQWorld* world;
 @property (nonatomic, retain) NSSet* actors;
-@property (nonatomic, assign, readonly) long ticks;
 
 - (QQGame*) addActor:(QQActor*)actor;
 - (QQGame*) removeActor:(QQActor*)actor;
 
 
-- (void) onEnterFrame:(SPEnterFrameEvent*)event;
-
 + (QQGame*) current;
 
 @end

diff --git a/src/game/QQGame.mm b/src/game/QQGame.mm
index 512e165..51b05b4 100644 (file)
--- a/src/game/QQGame.mm
+++ b/src/game/QQGame.mm
@@ -1,5 +1,6 @@
 #import "QQGame.h"
 #import "game/actor/unit/QQTank.h"
+#import <Box2D/Box2D.h>
 
 
 
@@ -8,6 +9,7 @@ static QQGame* _CurrentGame = NULL;
 
 
 @interface QQGame ()
+- (void) onEnterFrame:(SPEnterFrameEvent*)event;
 @end
 
 
@@ -21,16 +23,20 @@ static QQGame* _CurrentGame = NULL;
 - (id) init {
     if (_CurrentGame) {
         [self release];
-        [NSException raise:@"TooManyGames" format:@"cannot instantiate more than one QQGame at a time!"];
+        #ifdef DEBUG
+            [NSException raise:@"TooManyGames" format:@"cannot instantiate more than one QQGame at a time!"];
+        #else
+            return _CurrentGame;
+        #endif
     }
     
     if ( (self = [super init]) ){
         _CurrentGame = self;
-        _ticks = 0l;
+        _ticks = 0;
         _actors = [[NSMutableArray alloc] initWithCapacity:10];
         _world = [[QQWorld alloc] init];
         
-        [self addActor:[[[QQTank alloc] init] autorelease]];
+        [[[QQTank alloc] init] autorelease];
         
         [self addEventListener:@selector(onEnterFrame:) atObject:self forType:SP_EVENT_TYPE_ENTER_FRAME];
     }
@@ -38,6 +44,7 @@ static QQGame* _CurrentGame = NULL;
 }
 
 - (void) dealloc {
+    [self removeEventListener:@selector(onEnterFrame:) atObject:self forType:SP_EVENT_TYPE_ENTER_FRAME];
     [_actors removeAllObjects];
     [_actors release];
     [_world release];
@@ -58,10 +65,15 @@ static QQGame* _CurrentGame = NULL;
 
 - (void) onEnterFrame:(SPEnterFrameEvent*)event {
     _ticks++;
-    if ((_ticks % 100) == 0)
+    if ((_ticks % 100) == 0) {
         NSLog(@"[%ld] Time passed since last 100 frames: %f", _ticks, event.passedTime);
+        for (QQActor* actor in self.actors) {
+            b2Vec2 v = actor.body->GetLinearVelocity();
+            NSLog(@"[%@ pos:(%f,%f) impulse:(%f,%f)]", actor, actor.x,actor.y, v.x,v.y);
+        }
+    }
     
-    for (QQActor* actor in self.actors) [actor act];     // XXX: self.awakeAgents
+    for (QQActor* actor in self.actors) [actor tick:event.passedTime]; // XXX: self.awakeAgents
     [self.world step];
     for (QQActor* actor in self.actors) [actor draw];    // XXX: self.drawableAgents
 }

diff --git a/src/game/QQPhysical.h b/src/game/QQPhysical.h
index 0dd0ce3..ec83ded 100644 (file)
--- a/src/game/QQPhysical.h
+++ b/src/game/QQPhysical.h
@@ -5,13 +5,21 @@
  */
 @protocol QQPhysical
 
-// @property (nonatomic, readwrite, assign) float x;
-// @property (nonatomic, readwrite, assign) float y;
+@property (nonatomic, readwrite, assign) float x;
+@property (nonatomic, readwrite, assign) float y;
+@property (nonatomic, readwrite) CGPoint position;
+
+- (void) setPositionX:(float)x y:(float)y;
 
 
 // FIXME: don't expose these, instead aggregate properties from body & fixtures/shapes
 @property (nonatomic, readonly) b2Body* body;
 @property (nonatomic, readonly) b2Fixture* fixture;
 
+/**
+ * Called after initialization to create the various bodies, fixtures, and shapes
+ * that represent the Unit in Box2D.
+ */
+- (void) setupPhysics;
 
 @end
\ No newline at end of file

diff --git a/src/game/ability/QQAbility.h b/src/game/ability/QQAbility.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/game/ability/QQAbility.mm b/src/game/ability/QQAbility.mm
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/game/ability/QQCooldown.h b/src/game/ability/QQCooldown.h
index f58e0a8..490a473 100644 (file)
--- a/src/game/ability/QQCooldown.h
+++ b/src/game/ability/QQCooldown.h
@@ -16,13 +16,13 @@
 @property (nonatomic, readwrite, assign) float elapsed;
 
 /** Whether Cooldown timer is ready to be activated. */
-@property (nonatomic, readwrite, getter=isReady) BOOL ready;
+@property (nonatomic, readwrite) BOOL ready;
 
 /** Percent completed (elapsed / duration), clamped [0, 1.0]. */
 @property (nonatomic, readwrite) float ratio;
 
 /**
- * Implies ready=NO.
+ * Implies ready=YES.
  */
 - (id) initWithDuration:(float)duration;
 - (id) initWithDuration:(float)duration andReady:(BOOL)ready;

diff --git a/src/game/ability/QQCooldown.mm b/src/game/ability/QQCooldown.mm
index 9bf369a..72d9934 100644 (file)
--- a/src/game/ability/QQCooldown.mm
+++ b/src/game/ability/QQCooldown.mm
@@ -32,7 +32,7 @@
 /// initializers
 
 - (id) initWithDuration:(float)duration {
-    return [self initWithDuration:duration andReady:NO];
+    return [self initWithDuration:duration andReady:YES];
 }
 
 - (id) initWithDuration:(float)duration andReady:(BOOL)ready {

diff --git a/src/game/ability/QQStat.h b/src/game/ability/QQStat.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/game/ability/QQStat.mm b/src/game/ability/QQStat.mm
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/game/actor/QQActor.h b/src/game/actor/QQActor.h
index 3aefbe4..c638de6 100644 (file)
--- a/src/game/actor/QQActor.h
+++ b/src/game/actor/QQActor.h
@@ -3,6 +3,7 @@
 #import "game/QQActive.h"
 #import "game/QQPhysical.h"
 #import "game/QQDisplayable.h"
+#import "game/actor/QQActorDelegate.h"
 #import "physics/QQWorld.h"
 
 @class QQGame;
@@ -15,10 +16,13 @@
 
 @private
     BOOL _active;
+    BOOL _dirty;
+    id<QQActorDelegate> _delegate;
 }
 
 @property (nonatomic, readonly) QQGame*  game;
 @property (nonatomic, readonly) QQWorld* world;
+@property (nonatomic, readwrite, retain) id<QQActorDelegate> delegate;
 
 - (id) initAtX:(float)x y:(float)y;
 - (id) initType:(b2BodyType)type atX:(float)x y:(float)y;

diff --git a/src/game/actor/QQActor.mm b/src/game/actor/QQActor.mm
index 03529f9..ee0876b 100644 (file)
--- a/src/game/actor/QQActor.mm
+++ b/src/game/actor/QQActor.mm
@@ -1,26 +1,56 @@
 #import "QQActor.h"
+#import "render/QQSparrowExtensions.h"
 #import "game/QQGame.h"
 
 
 @implementation QQActor
 
-@synthesize active;
+/// properties
+
+@synthesize active   = _active;
+@synthesize dirty    = _dirty;
+@synthesize delegate = _delegate;
 
 - (QQGame*)  game  { return QQGame.current; }
 - (QQWorld*) world { return self.game.world; }
 
 - (SPDisplayObject*) shape { return nil; }
+- (void) setShape:(SPDisplayObject*)newShape {}
 
 - (b2Body*) body { return _body; }
 - (b2Fixture*) fixture { return nil; }
 
 
+- (CGPoint) position {
+    b2Vec2 pos = self.body->GetPosition();
+    return CGPointMake(pos.x, pos.y);
+}
+- (void) setPosition:(CGPoint)pos {
+    [self setPositionX:pos.x y:pos.y];
+}
+- (void) setPositionX:(float)x y:(float)y {
+    self.body->SetTransform(b2Vec2(x,y), self.body->GetAngle());
+    float px = self.world.scale;
+    [self.shape setPositionX:x*px y:y*px];
+}
+
+- (float) x             { return self.body->GetPosition().x;    }
+- (void) setX:(float)x  { [self setPositionX:x y:self.y];       }
+
+- (float) y             { return self.body->GetPosition().y;    }
+- (void) setY:(float)y  { [self setPositionX:self.x y:y];       }
+
+
+/// initializers
+
 - (id) initAtX:(float)x y:(float)y {
     return [self initType:b2_dynamicBody atX:x y:y];
 }
 
 - (id) initType:(b2BodyType)type atX:(float)x y:(float)y {
     if ((self = [super init])) {
+        [self.game addActor:self];
+        
         b2BodyDef bd;
         bd.type = type;
         bd.position = b2Vec2(x, y);
@@ -30,12 +60,25 @@
     return self;
 }
 
-- (void) act {
-    // stub
+
+/// methods
+
+- (void) tick:(float)elapsed {
+    [self act];
+}
+
+- (void) act {}
+
+- (SPDisplayObject*) setupShape {
+    return self.shape;
 }
 
 - (void) draw {
-    // stub
+    float px = self.world.scale;
+    b2Vec2 pos = self.body->GetPosition();
+    [self.shape setPositionX:pos.x*px y:pos.y*px];
 }
 
+- (void) setupPhysics {}
+
 @end

diff --git a/src/game/actor/QQUnitDelegate.h b/src/game/actor/QQActorDelegate.h
similarity index 63%
rename from src/game/actor/QQUnitDelegate.h
rename to src/game/actor/QQActorDelegate.h
index d52c081..bae4a18 100644 (file)
--- a/src/game/actor/QQUnitDelegate.h
+++ b/src/game/actor/QQActorDelegate.h
@@ -1,5 +1,5 @@
 
-@protocol QQUnitDelegate
+@protocol QQActorDelegate
 
 - (void) updateWithTick:(float)time;
 

diff --git a/src/game/actor/QQIUnit.h b/src/game/actor/QQIUnit.h
new file mode 100644 (file)
index 0000000..15878ea
--- /dev/null
+++ b/src/game/actor/QQIUnit.h
@@ -0,0 +1,16 @@
+#import "game/actor/QQActor.h"
+#import "game/QQThing.h"
+
+
+@protocol QQUnit <QQThing>
+
+@property (nonatomic, readonly) BOOL canAttack;
+
+- (void) attackTarget:(QQActor*)actor;
+- (void) attackToward:(CGPoint)point;
+- (void) attackTowardX:(float)x y:(float)y;
+
+
+@end
+
+//typedef id<QQUnit> QQUnit;

diff --git a/src/game/actor/QQUnit.h b/src/game/actor/QQUnit.h
index 15878ea..e1b509d 100644 (file)
--- a/src/game/actor/QQUnit.h
+++ b/src/game/actor/QQUnit.h
@@ -1,16 +1,31 @@
+#include <Box2D/Box2D.h>
+#import "Sparrow.h"
+
+#import "physics/QQWorld.h"
 #import "game/actor/QQActor.h"
-#import "game/QQThing.h"
+#import "game/actor/QQActorDelegate.h"
+#import "render/QQSparrowExtensions.h"
+
 
+@interface QQUnit : QQActor {
 
-@protocol QQUnit <QQThing>
+@private
+    SPDisplayObject* _shape;
+}
 
+/// properties
 @property (nonatomic, readonly) BOOL canAttack;
+- (void) setShapeFromFile:(NSString*)filename;
+
+/// initializers
+- (id) initAtX:(float)x y:(float)y withShape:(SPDisplayObject*)shape;
 
-- (void) attackTarget:(QQActor*)actor;
+
+/// methods
+
+- (void) attack:(QQActor*)actor;
 - (void) attackToward:(CGPoint)point;
 - (void) attackTowardX:(float)x y:(float)y;
 
 
 @end
-
-//typedef id<QQUnit> QQUnit;

diff --git a/src/game/actor/QQUnitBase.mm b/src/game/actor/QQUnit.mm
similarity index 54%
rename from src/game/actor/QQUnitBase.mm
rename to src/game/actor/QQUnit.mm
index 2c52e58..1687b13 100644 (file)
--- a/src/game/actor/QQUnitBase.mm
+++ b/src/game/actor/QQUnit.mm
@@ -1,64 +1,56 @@
 #include <Box2D/Box2D.h>
 #import "Sparrow.h"
-#import "QQUnit.h"
-#import "QQUnitBase.h"
 
-// private interface
-@interface QQUnitBase ()
+#import "QQUnit.h"
+#import "render/QQSparrowExtensions.h"
 
 
-@end
 
 
-////////////////////////////////////////////////////////////////////////////////////
-@implementation QQUnitBase
+@implementation QQUnit
 
 @dynamic world; // Eliminates compiler warnings due to inheritance (!)
 @dynamic game;
 
-////////////////////////////////////////////////////////////////////////////////////
 @synthesize shape = _shape;
-@synthesize delegate = _delegate;
 
 - (BOOL) canAttack { return NO; }
 
 
-////////////////////////////////////////////////////////////////////////////////////
+/// initializers
+
 - (id) init {
-    return [self initAtX:15 y:15 withShape:[SPQuad quadWithWidth:50 height:50 color:0xff0000]];
+    return [self initAtX:50 y:50 withShape:[SPQuad quadWithWidth:50 height:50 color:0xff0000]];
 }
 
 - (id) initAtX:(float)x y:(float)y withShape:(SPDisplayObject*)shape {
     if ((self = [super initAtX:x y:y])) {
-        float px = self.world.scale;
-        self.shape = [shape setPositionX:x*px y:y*px];
+        self.shape = shape;
         
+        float px = self.world.scale;
         b2PolygonShape box;
         box.SetAsBox(shape.width/px, shape.height/px);
         self.body->CreateFixture(&box, 5.0f);
-        
-        [self.game addEventListener:@selector(onTouch:) atObject:self forType:SP_EVENT_TYPE_TOUCH];
     }
     return self;
 }
 
-////////////////////////////////////////////////////////////////////////////////////
 - (void) dealloc {
-    [self.game removeEventListener:@selector(onTouch:) atObject:self forType:SP_EVENT_TYPE_TOUCH];
     [self.game removeChild:_shape];
     [_shape release];
     [super dealloc];
 }
 
-////////////////////////////////////////////////////////////////////////////////////
+/// methods
+
 - (void) setShape:(SPDisplayObject*)newShape {
     if (_shape != newShape) {
         [self.game removeChild:_shape];
         [_shape release];
         
         _shape = [newShape retain];
-        // float px = self.world.scale;
-        // [_shape setPositionX:x*px y:y*px]
+        float px = self.world.scale;
+        [_shape setPositionX:self.x*px y:self.y*px];
         [self.game addChild:_shape];
     }
 }
@@ -69,14 +61,12 @@
 
 
 
-- (void) attackTarget:(QQActor*)actor {
-    
+- (void) attack:(QQActor*)actor {
+    [self attackTowardX:actor.x y:actor.y];
 }
-
 - (void) attackToward:(CGPoint)pt {
     [self attackTowardX:pt.x y:pt.y];
 }
-
 - (void) attackTowardX:(float)x y:(float)y {
     
 }

diff --git a/src/game/actor/QQUnitBase.h b/src/game/actor/QQUnitBase.h
deleted file mode 100644 (file)
index 6af3e83..0000000
--- a/src/game/actor/QQUnitBase.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <Box2D/Box2D.h>
-#import "Sparrow.h"
-
-#import "render/QQSparrowExtensions.h"
-
-#import "game/actor/QQActor.h"
-#import "game/actor/QQUnit.h"
-#import "game/actor/QQUnitDelegate.h"
-
-#import "physics/QQWorld.h"
-
-
-////////////////////////////////////////////////////////////////////////////////////
-@interface QQUnitBase : QQActor <QQUnit> {
-
-@private
-    SPDisplayObject* _shape;
-    id<QQUnitDelegate> _delegate;
-}
-
-////////////////////////////////////////////////////////////////////////////////////
-@property (nonatomic, retain, readwrite) SPDisplayObject* shape;
-@property (nonatomic, retain, readwrite) id<QQUnitDelegate> delegate;
-
-////////////////////////////////////////////////////////////////////////////////////
-- (id) initAtX:(float)x y:(float)y withShape:(SPDisplayObject*)shape;
-
-- (void) setShapeFromFile:(NSString*)filename;
-
-@end

diff --git a/src/game/actor/bullet/QQBullet.h b/src/game/actor/bullet/QQBullet.h
index e3bcfa3..6d66f6b 100644 (file)
--- a/src/game/actor/bullet/QQBullet.h
+++ b/src/game/actor/bullet/QQBullet.h
@@ -1,15 +1,15 @@
-#import "game/actor/QQUnitBase.h"
 #import "game/actor/QQUnit.h"
 
 
-@interface QQBullet : QQUnitBase {
+@interface QQBullet : QQUnit {
 @private
-    id<QQUnit>* _owner;
+    QQUnit* _owner;
 }
 
-@property (nonatomic, readonly) id<QQUnit>* owner;
+@property (nonatomic, readonly) QQUnit* owner;
 
-- (id) initAtX:(float)x y:(float)y withOwner:(id<QQUnit>*)owner;
+- (id) init:(QQUnit*)owner x:(float)x y:(float)y;
 
+- (void) applyLinearImpulseX:(float)xNs y:(float)yNs;
 
 @end

diff --git a/src/game/actor/bullet/QQBullet.mm b/src/game/actor/bullet/QQBullet.mm
index 7c489bc..3297852 100644 (file)
--- a/src/game/actor/bullet/QQBullet.mm
+++ b/src/game/actor/bullet/QQBullet.mm
@@ -1,22 +1,36 @@
-#import "QQBullet.h"
-
+#include <Box2D/Box2D.h>
+#import "SparrowExtras.h"
 
-// private interface
-@interface QQBullet ()
+#import "QQBullet.h"
 
-@end
 
 
 @implementation QQBullet
 
 @synthesize owner = _owner;
 
-- (id) initAtX:(float)x y:(float)y withOwner:(id<QQUnit>*)owner {
-    if ((self = [super init])){
+- (id) init:(QQUnit*)owner x:(float)x y:(float)y {
+    if ((self = [super initAtX:x y:y])){
+        _owner = owner;
         
+        float px = self.world.scale;
+        float radius = 1.5f;
+        self.shape = [SHCircle circleWithWidth:2*radius*px height:2*radius*px];
+        
+        b2CircleShape circle;
+        circle.m_radius = radius;
+        b2FixtureDef fix;
+        fix.shape = &circle;
+        fix.restitution =&nb