QQ

diff --git a/src/game/Game.h b/src/game/Game.h
deleted file mode 100644 (file)
index 3232ced..0000000
--- a/src/game/Game.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#import "Sparrow.h"
-
-#import "game/actor/Unit.h"
-#import "physics/World.h"
-
-
-@interface Game : SPStage {
-    
-    long ticks;
-    
-@private
-    Unit*  _unit;
-    World* _world;
-}
-
-@property (nonatomic, retain) World* world;
-
-- (void) onEnterFrame:(SPEnterFrameEvent*)event;
-
-+ (Game*) current;
-
-@end

diff --git a/src/game/Active.h b/src/game/QQActive.h
similarity index 54%
rename from src/game/Active.h
rename to src/game/QQActive.h
index b9514a1..62a0681 100644 (file)
--- a/src/game/Active.h
+++ b/src/game/QQActive.h
@@ -1,8 +1,8 @@
 
 /**
- * Anything that takes a turn is Active.
+ * Anything that takes a turn is QQActive.
  */
-@protocol Active
+@protocol QQActive
 
 @property (nonatomic, getter=isActive) BOOL active;
 

diff --git a/src/game/Displayable.h b/src/game/QQDisplayable.h
similarity index 75%
rename from src/game/Displayable.h
rename to src/game/QQDisplayable.h
index 852bf95..ef6f1ef 100644 (file)
--- a/src/game/Displayable.h
+++ b/src/game/QQDisplayable.h
@@ -1,7 +1,7 @@
 #import "Sparrow.h"
 
 
-@protocol Displayable
+@protocol QQDisplayable
 
 @property (nonatomic, retain, readonly) SPDisplayObject* shape;
 

diff --git a/src/game/QQGame.h b/src/game/QQGame.h
new file mode 100644 (file)
index 0000000..0857ebc
--- /dev/null
+++ b/src/game/QQGame.h
@@ -0,0 +1,22 @@
+#import "Sparrow.h"
+
+#import "game/actor/QQUnit.h"
+#import "physics/QQWorld.h"
+
+
+@interface QQGame : SPStage {
+    
+    long ticks;
+    
+@private
+    QQUnit*  _unit;
+    QQWorld* _world;
+}
+
+@property (nonatomic, retain) QQWorld* world;
+
+- (void) onEnterFrame:(SPEnterFrameEvent*)event;
+
++ (QQGame*) current;
+
+@end

diff --git a/src/game/Game.mm b/src/game/QQGame.mm
similarity index 72%
rename from src/game/Game.mm
rename to src/game/QQGame.mm
index 9f8aa0b..a43d26a 100644 (file)
--- a/src/game/Game.mm
+++ b/src/game/QQGame.mm
@@ -1,18 +1,18 @@
-#import "Game.h"
-#import "game/actor/Unit.h"
+#import "QQGame.h"
+#import "game/actor/QQUnit.h"
 
 
 
-static Game* _currentGame = NULL;
+static QQGame* _currentGame = NULL;
 
 
 
-@interface Game ()
-@property (nonatomic, retain) Unit* unit;
+@interface QQGame ()
+@property (nonatomic, retain) QQUnit* unit;
 @end
 
 
-@implementation Game
+@implementation QQGame
 @synthesize world = _world;
 @synthesize unit  = _unit;
 
@@ -20,17 +20,17 @@ static Game* _currentGame = NULL;
 - (id) init {
     if (_currentGame) {
         [self release];
-        [NSException raise:@"TooManyGames" format:@"cannot instantiate more than one Game at a time!"];
+        [NSException raise:@"TooManyGames" format:@"cannot instantiate more than one QQGame at a time!"];
     }
     
     if ( (self = [super init]) ){
         _currentGame = self;
         ticks = 0l;
         
-        _world = [[World alloc] init];
+        _world = [[QQWorld alloc] init];
         [self addEventListener:@selector(onEnterFrame:) atObject:self forType:SP_EVENT_TYPE_ENTER_FRAME];
         
-        _unit = [[Unit alloc] init];
+        _unit = [[QQUnit alloc] init];
         // [self addEventListener:@selector(onTouch:) atObject:_unit forType:SP_EVENT_TYPE_TOUCH];
         // if (_unit.shape) [self addChild:_unit.shape];
     }
@@ -53,9 +53,9 @@ static Game* _currentGame = NULL;
     [self.world step];
 }
 
-+ (Game*) current {
++ (QQGame*) current {
     if (!_currentGame)
-        [[[Game alloc] init]    // init assigns to singleton, but singleton is a weakref,
+        [[[QQGame alloc] init]    // init assigns to singleton, but singleton is a weakref,
             autorelease];       // XXX: so game will still be released if not retained...
     return _currentGame;
 }

diff --git a/src/game/actor/Actor.h b/src/game/actor/Actor.h
deleted file mode 100644 (file)
index ab2f513..0000000
--- a/src/game/actor/Actor.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#import "game/Active.h"
-#import "game/Displayable.h"
-#import "physics/World.h"
-
-@class Game;
-
-
-@interface Actor : NSObject <Active, Displayable> {
-    
-@private
-    BOOL   _active;
-}
-
-@property (nonatomic, readonly) Game*  game;
-@property (nonatomic, readonly) World* world;
-
-
-
-@end

diff --git a/src/game/actor/Actor.mm b/src/game/actor/Actor.mm
deleted file mode 100644 (file)
index ba63e62..0000000
--- a/src/game/actor/Actor.mm
+++ /dev/null
@@ -1,18 +0,0 @@
-#import "Actor.h"
-#import "game/Game.h"
-
-
-@implementation Actor
-
-@synthesize active;
-
-- (Game*)  game  { return Game.current; }
-- (World*) world { return self.game.world; }
-
-- (SPDisplayObject*) shape { return nil; }
-
-- (void) act {
-    // stub
-}
-
-@end

diff --git a/src/game/actor/QQActor.h b/src/game/actor/QQActor.h
new file mode 100644 (file)
index 0000000..abe284c
--- /dev/null
+++ b/src/game/actor/QQActor.h
@@ -0,0 +1,19 @@
+#import "game/QQActive.h"
+#import "game/QQDisplayable.h"
+#import "physics/QQWorld.h"
+
+@class QQGame;
+
+
+@interface QQActor : NSObject <QQActive, QQDisplayable> {
+    
+@private
+    BOOL _active;
+}
+
+@property (nonatomic, readonly) QQGame*  game;
+@property (nonatomic, readonly) QQWorld* world;
+
+
+
+@end

diff --git a/src/game/actor/QQActor.mm b/src/game/actor/QQActor.mm
new file mode 100644 (file)
index 0000000..944b26c
--- /dev/null
+++ b/src/game/actor/QQActor.mm
@@ -0,0 +1,18 @@
+#import "QQActor.h"
+#import "game/QQGame.h"
+
+
+@implementation QQActor
+
+@synthesize active;
+
+- (QQGame*)  game  { return QQGame.current; }
+- (QQWorld*) world { return self.game.world; }
+
+- (SPDisplayObject*) shape { return nil; }
+
+- (void) act {
+    // stub
+}
+
+@end

diff --git a/src/game/actor/Unit.h b/src/game/actor/QQUnit.h
similarity index 78%
rename from src/game/actor/Unit.h
rename to src/game/actor/QQUnit.h
index c6650c2..710e1e9 100644 (file)
--- a/src/game/actor/Unit.h
+++ b/src/game/actor/QQUnit.h
@@ -1,11 +1,11 @@
 #import "Sparrow.h"
 #import "render/QQSparrowExtensions.h"
 
-#import "game/actor/Actor.h"
-#import "physics/World.h"
+#import "game/actor/QQActor.h"
+#import "physics/QQWorld.h"
 
 
-@interface Unit : Actor {
+@interface QQUnit : QQActor {
 
 @private
     SPDisplayObject* _shape;

diff --git a/src/game/actor/Unit.mm b/src/game/actor/QQUnit.mm
similarity index 97%
rename from src/game/actor/Unit.mm
rename to src/game/actor/QQUnit.mm
index f37dd31..0ea8b62 100644 (file)
--- a/src/game/actor/Unit.mm
+++ b/src/game/actor/QQUnit.mm
@@ -1,8 +1,8 @@
 #import "Sparrow.h"
-#import "Unit.h"
+#import "QQUnit.h"
 
 
-@implementation Unit
+@implementation QQUnit
 
 @synthesize shape = _shape;
 

diff --git a/src/physics/World.h b/src/physics/QQWorld.h
similarity index 63%
rename from src/physics/World.h
rename to src/physics/QQWorld.h
index c0663fa..6087703 100644 (file)
--- a/src/physics/World.h
+++ b/src/physics/QQWorld.h
@@ -1,8 +1,8 @@
 #include <Box2D/Box2D.h>
-#import "physics/debug/GLESDebugDraw.h"
+#import "physics/debug/QQGLESDebugDraw.h"
 
 
-@interface World : NSObject {
+@interface QQWorld : NSObject {
 
 @private
     float _timestep;
@@ -10,7 +10,7 @@
     int _positionIterations;
     
     b2World* _world;
-    GLESDebugDraw debugDraw;
+    QQGLESDebugDraw debugDraw;
 }
 
 @property (nonatomic, readonly) b2World* world;
@@ -19,9 +19,9 @@
 @property (nonatomic, assign) int positionIterations;
 
 
-- (World*) init;
-- (World*) initWithTimestep:(float)hz;
-- (World*) initWithTimestep:(float)hz gravityX:(float)x y:(float)y;
+- (QQWorld*) init;
+- (QQWorld*) initWithTimestep:(float)hz;
+- (QQWorld*) initWithTimestep:(float)hz gravityX:(float)x y:(float)y;
 
 - (void) setGravityX:(float)x y:(float)y;
 

diff --git a/src/physics/World.mm b/src/physics/QQWorld.mm
similarity index 84%
rename from src/physics/World.mm
rename to src/physics/QQWorld.mm
index 0beb32b..e6c3d71 100644 (file)
--- a/src/physics/World.mm
+++ b/src/physics/QQWorld.mm
@@ -1,8 +1,8 @@
-#import "World.h"
+#import "QQWorld.h"
 
 
 
-@implementation World
+@implementation QQWorld
 
 @synthesize world = _world;
 @synthesize timestep = _timestep;
@@ -10,15 +10,15 @@
 @synthesize positionIterations = _positionIterations;
 
 
-- (World*) init {
+- (QQWorld*) init {
     return [self initWithTimestep:60.0f];
 }
 
-- (World*) initWithTimestep:(float)hz {
+- (QQWorld*) initWithTimestep:(float)hz {
     return [self initWithTimestep:hz gravityX:0.0f y:0.0f];
 }
 
-- (World*) initWithTimestep:(float)hz gravityX:(float)x y:(float)y {
+- (QQWorld*) initWithTimestep:(float)hz gravityX:(float)x y:(float)y {
     if ((self = [super init])) {
         _timestep = 1.0f/hz;
         _velocityIterations = 10;

diff --git a/src/physics/debug/GLESDebugDraw.h b/src/physics/debug/QQGLESDebugDraw.h
similarity index 97%
rename from src/physics/debug/GLESDebugDraw.h
rename to src/physics/debug/QQGLESDebugDraw.h
index 6131196..058ac90 100644 (file)
--- a/src/physics/debug/GLESDebugDraw.h
+++ b/src/physics/debug/QQGLESDebugDraw.h
@@ -32,7 +32,7 @@ struct b2AABB;
 
 // This class implements debug drawing callbacks that are invoked
 // inside b2World::Step.
-class GLESDebugDraw : public b2DebugDraw
+class QQGLESDebugDraw : public b2DebugDraw
 {
 public:
        void DrawPolygon(const b2Vec2* vertices, int32 vertexCount, const b2Color& color);

diff --git a/src/physics/debug/GLESDebugDraw.mm b/src/physics/debug/QQGLESDebugDraw.mm
similarity index 81%
rename from src/physics/debug/GLESDebugDraw.mm
rename to src/physics/debug/QQGLESDebugDraw.mm
index ab02a83..674f60e 100644 (file)
--- a/src/physics/debug/GLESDebugDraw.mm
+++ b/src/physics/debug/QQGLESDebugDraw.mm
@@ -18,7 +18,7 @@
 * 3. This notice may not be removed or altered from any source distribution.
 */
 
-#include "GLESDebugDraw.h"
+#include "QQGLESDebugDraw.h"
 
 
 #include <cstdio>
@@ -26,14 +26,14 @@
 
 #include <cstring>
 
-void GLESDebugDraw::DrawPolygon(const b2Vec2* vertices, int32 vertexCount, const b2Color& color)
+void QQGLESDebugDraw::DrawPolygon(const b2Vec2* vertices, int32 vertexCount, const b2Color& color)
 {
        glColor4f(color.r, color.g, color.b,1);
        glVertexPointer(2, GL_FLOAT, 0, vertices);
        glDrawArrays(GL_LINE_LOOP, 0, vertexCount);
 }
 
-void GLESDebugDraw::DrawSolidPolygon(const b2Vec2* vertices, int32 vertexCount, const b2Color& color)
+void QQGLESDebugDraw::DrawSolidPolygon(const b2Vec2* vertices, int32 vertexCount, const b2Color& color)
 {
        glVertexPointer(2, GL_FLOAT, 0, vertices);
        
@@ -44,7 +44,7 @@ void GLESDebugDraw::DrawSolidPolygon(const b2Vec2* vertices, int32 vertexCount,
        glDrawArrays(GL_LINE_LOOP, 0, vertexCount);
 }
 
-void GLESDebugDraw::DrawCircle(const b2Vec2& center, float32 radius, const b2Color& color)
+void QQGLESDebugDraw::DrawCircle(const b2Vec2& center, float32 radius, const b2Color& color)
 {
        const float32 k_segments = 16.0f;
        int vertexCount=16;
@@ -66,7 +66,7 @@ void GLESDebugDraw::DrawCircle(const b2Vec2& center, float32 radius, const b2Col
        glDrawArrays(GL_TRIANGLE_FAN, 0, vertexCount);
 }
 
-void GLESDebugDraw::DrawSolidCircle(const b2Vec2& center, float32 radius, const b2Vec2& axis, const b2Color& color)
+void QQGLESDebugDraw::DrawSolidCircle(const b2Vec2& center, float32 radius, const b2Vec2& axis, const b2Color& color)
 {
        const float32 k_segments = 16.0f;
        int vertexCount=16;
@@ -92,7 +92,7 @@ void GLESDebugDraw::DrawSolidCircle(const b2Vec2& center, float32 radius, const
        DrawSegment(center,center+radius*axis,color);
 }
 
-void GLESDebugDraw::DrawSegment(const b2Vec2& p1, const b2Vec2& p2, const b2Color& color)
+void QQGLESDebugDraw::DrawSegment(const b2Vec2& p1, const b2Vec2& p2, const b2Color& color)
 {
        glColor4f(color.r, color.g, color.b,1);
        GLfloat                         glVertices[] = {
@@ -102,7 +102,7 @@ void GLESDebugDraw::DrawSegment(const b2Vec2& p1, const b2Vec2& p2, const b2Colo
        glDrawArrays(GL_LINES, 0, 2);
 }
 
-void GLESDebugDraw::DrawTransform(const b2Transform& xf)
+void QQGLESDebugDraw::DrawTransform(const b2Transform& xf)
 {
        b2Vec2 p1 = xf.position, p2;
        const float32 k_axisScale = 0.4f;
@@ -114,7 +114,7 @@ void GLESDebugDraw::DrawTransform(const b2Transform& xf)
        DrawSegment(p1,p2,b2Color(0,1,0));
 }
 
-void GLESDebugDraw::DrawPoint(const b2Vec2& p, float32 size, const b2Color& color)
+void QQGLESDebugDraw::DrawPoint(const b2Vec2& p, float32 size, const b2Color& color)
 {
        glColor4f(color.r, color.g, color.b,1);
        glPointSize(size);
@@ -126,13 +126,13 @@ void GLESDebugDraw::DrawPoint(const b2Vec2& p, float32 size, const b2Color& colo
        glPointSize(1.0f);
 }
 
-void GLESDebugDraw::DrawString(int x, int y, const char *string, ...)
+void QQGLESDebugDraw::DrawString(int x, int y, const char *string, ...)
 {
 
        /* Unsupported as yet. Could replace with bitmap font renderer at a later date */
 }
 
-void GLESDebugDraw::DrawAABB(b2AABB* aabb, const b2Color& c)
+void QQGLESDebugDraw::DrawAABB(b2AABB* aabb, const b2Color& c)
 {
        
        glColor4f(c.r, c.g, c.b,1);

diff --git a/src/physics/debug/PhysicsDebugView.h b/src/physics/debug/QQPhysicsDebugView.h
similarity index 94%
rename from src/physics/debug/PhysicsDebugView.h
rename to src/physics/debug/QQPhysicsDebugView.h
index 57209d7..a8f63b6 100644 (file)
--- a/src/physics/debug/PhysicsDebugView.h
+++ b/src/physics/debug/QQPhysicsDebugView.h
@@ -5,14 +5,14 @@
 
 #include <Box2D/Box2D.h>
 
-#import "physics/PhysicsView.h"
+#import "physics/QQPhysicsView.h"
 
 /*
 This class wraps the CAEAGLLayer from CoreAnimation into a convenient UIView subclass.
 The view content is basically an EAGL surface you render your OpenGL scene into.
 Note that setting the view non-opaque will only work if the EAGL surface has an alpha channel.
 */
-@interface PhysicsDebugView : PhysicsView {}
+@interface QQPhysicsDebugView : QQPhysicsView {}
 
 @property (nonatomic, readonly, getter=isRunning) BOOL running;
 @property (nonatomic, assign) NSTimeInterval animationInterval;

diff --git a/src/physics/debug/PhysicsDebugView.mm b/src/physics/debug/QQPhysicsDebugView.mm
similarity index 98%
rename from src/physics/debug/PhysicsDebugView.mm
rename to src/physics/debug/QQPhysicsDebugView.mm
index be4444b..6c48262 100644 (file)
--- a/src/physics/debug/PhysicsDebugView.mm
+++ b/src/physics/debug/QQPhysicsDebugView.mm
@@ -1,7 +1,7 @@
 #import <QuartzCore/QuartzCore.h>
 #import <OpenGLES/EAGLDrawable.h>
 
-#import "PhysicsDebugView.h"
+#import "QQPhysicsDebugView.h"
 
 
 #define USE_DEPTH_BUFFER 0
@@ -11,10 +11,10 @@
 
 
 // A class extension to declare private methods
-@interface PhysicsDebugView () {
+@interface QQPhysicsDebugView () {
 
 @private
-    World* _world;
+    QQWorld* _world;
     BOOL _running;
     
     NSTimer* animationTimer;
@@ -60,7 +60,7 @@
 
 
 
-@implementation PhysicsDebugView
+@implementation QQPhysicsDebugView
 
 @synthesize world = _world;
 @synthesize running = _running;

diff --git a/src/render/animation/AnimationContainer.h b/src/render/animation/QQAnimationContainer.h
similarity index 90%
rename from src/render/animation/AnimationContainer.h
rename to src/render/animation/QQAnimationContainer.h
index 4b4d16c..80c0f84 100644 (file)
--- a/src/render/animation/AnimationContainer.h
+++ b/src/render/animation/QQAnimationContainer.h
@@ -1,7 +1,7 @@
 #import "SPTextureAtlas.h"
 
 ////////////////////////////////////////////////////////////////////////////////////
-@interface AnimationContainer : NSObject <NSXMLParserDelegate> {
+@interface QQAnimationContainer : NSObject <NSXMLParserDelegate> {
 }
 
 ////////////////////////////////////////////////////////////////////////////////////

diff --git a/src/render/animation/AnimationContainer.mm b/src/render/animation/QQAnimationContainer.mm
similarity index 97%
rename from src/render/animation/AnimationContainer.mm
rename to src/render/animation/QQAnimationContainer.mm
index 9f278ec..321929e 100644 (file)
--- a/src/render/animation/AnimationContainer.mm
+++ b/src/render/animation/QQAnimationContainer.mm
@@ -1,11 +1,11 @@
-#import "AnimationContainer.h"
+#import "QQAnimationContainer.h"
 
 #import "SPMovieClip.h"
 
 
 ////////////////////////////////////////////////////////////////////////////////////
 // private method
-@interface AnimationContainer()
+@interface QQAnimationContainer()
 
 -(void)parseContentXml:(NSString *)contentPath;
 
@@ -13,7 +13,7 @@
 
 
 ////////////////////////////////////////////////////////////////////////////////////
-@implementation AnimationContainer
+@implementation QQAnimationContainer
 
 ////////////////////////////////////////////////////////////////////////////////////
 @synthesize mAnimationLookup;

diff --git a/src/ui/AppDelegate.h b/src/ui/QQAppDelegate.h
similarity index 55%
rename from src/ui/AppDelegate.h
rename to src/ui/QQAppDelegate.h
index 7e85122..f868fe1 100644 (file)
--- a/src/ui/AppDelegate.h
+++ b/src/ui/QQAppDelegate.h
@@ -1,16 +1,16 @@
 #import "Sparrow.h"
-#import "game/Game.h"
+#import "game/QQGame.h"
 
 
-@interface AppDelegate : NSObject <UIApplicationDelegate>
+@interface QQAppDelegate : NSObject <UIApplicationDelegate>
 {
     UIWindow* window;
     SPView* sparrowView;
-    Game* _game;
+    QQGame* _game;
 }
 
 @property (nonatomic, retain) IBOutlet UIWindow* window;
 @property (nonatomic, retain) IBOutlet SPView* sparrowView;
-@property (nonatomic, retain) Game* game;
+@property (nonatomic, retain) QQGame* game;
 
 @end
\ No newline at end of file

diff --git a/src/ui/AppDelegate.mm b/src/ui/QQAppDelegate.mm
similarity index 87%
rename from src/ui/AppDelegate.mm
rename to src/ui/QQAppDelegate.mm
index 78f81dc..7eaeb17 100644 (file)
--- a/src/ui/AppDelegate.mm
+++ b/src/ui/QQAppDelegate.mm
@@ -1,15 +1,15 @@
 //
-//  AppDelegate.m
+//  QQAppDelegate.m
 //  tanks
 //
 //  Created by dsc on 4/27/11.
 //  Copyright 2011 lttlst.com. All rights reserved.
 //
 
-#import "AppDelegate.h"
-#import "game/Game.h"
+#import "QQAppDelegate.h"
+#import "game/QQGame.h"
 
-@implementation AppDelegate
+@implementation QQAppDelegate
 
 @synthesize window;
 @synthesize sparrowView;
@@ -25,7 +25,7 @@
         sparrowView.frameRate = 60.0f;
     // sparrowView.stage = [[[SPStage alloc] init] autorelease];
     
-    _game = [[Game alloc] init];
+    _game = [[QQGame alloc] init];
     sparrowView.stage = _game;
     
     [window makeKeyAndVisible];

diff --git a/src/ui/Viewport.h b/src/ui/QQViewport.h
similarity index 75%
rename from src/ui/Viewport.h
rename to src/ui/QQViewport.h
index 456b5e2..f8123fa 100644 (file)
--- a/src/ui/Viewport.h
+++ b/src/ui/QQViewport.h
@@ -1,15 +1,15 @@
 #import "Sparrow.h"
 
-#import "physics/World.h"
+#import "physics/QQWorld.h"
 
 
 /**
  * View subclass which optionally tracks user input gestures that would zoom
  * or pan the viewport.
  */
-@interface Viewport : SPView <UIAccelerometerDelegate>
+@interface QQViewport : SPView <UIAccelerometerDelegate>
 
-@property (nonatomic, retain) World* world;
+@property (nonatomic, retain) QQWorld* world;
 
 @property (nonatomic, assign, getter=isZoomable) BOOL zoomable;
 @property (nonatomic, assign) float viewportZoom;

diff --git a/src/ui/Viewport.mm b/src/ui/QQViewport.mm
similarity index 87%
rename from src/ui/Viewport.mm
rename to src/ui/QQViewport.mm
index f0c4eac..a3a6cdf 100644 (file)
--- a/src/ui/Viewport.mm
+++ b/src/ui/QQViewport.mm
@@ -4,11 +4,11 @@
 
 #import "Sparrow.h"
 
-#import "Viewport.h"
-#import "physics/World.h"
+#import "QQViewport.h"
+#import "physics/QQWorld.h"
 
 
-@implementation Viewport
+@implementation QQViewport
 
 @synthesize zoomable;
 @synthesize viewportZoom;

diff --git a/src/ui/iPhone/AppDelegate_iPhone.h b/src/ui/iPad/QQAppDelegate_iPad.h
similarity index 58%
rename from src/ui/iPhone/AppDelegate_iPhone.h
rename to src/ui/iPad/QQAppDelegate_iPad.h
index f18a22d..559c9ac 100644 (file)
--- a/src/ui/iPhone/AppDelegate_iPhone.h
+++ b/src/ui/iPad/QQAppDelegate_iPad.h
@@ -1,5 +1,5 @@
 //
-//  AppDelegate_iPhone.h
+//  QQAppDelegate_iPad.h
 //  tanks
 //
 //  Created by dsc on 4/27/11.
@@ -7,9 +7,9 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "ui/AppDelegate.h"
+#import "ui/QQAppDelegate.h"
 
-@interface AppDelegate_iPhone : AppDelegate {
+@interface QQAppDelegate_iPad : QQAppDelegate {
     
 }
 

diff --git a/src/ui/iPhone/AppDelegate_iPhone.mm b/src/ui/iPad/QQAppDelegate_iPad.mm
similarity index 62%
rename from src/ui/iPhone/AppDelegate_iPhone.mm
rename to src/ui/iPad/QQAppDelegate_iPad.mm
index 250dd71..d4d5226 100644 (file)
--- a/src/ui/iPhone/AppDelegate_iPhone.mm
+++ b/src/ui/iPad/QQAppDelegate_iPad.mm
@@ -1,14 +1,14 @@
 //
-//  AppDelegate_iPhone.m
+//  QQAppDelegate_iPad.m
 //  tanks
 //
 //  Created by dsc on 4/27/11.
 //  Copyright 2011 lttlst.com. All rights reserved.
 //
 
-#import "AppDelegate_iPhone.h"
+#import "QQAppDelegate_iPad.h"
 
-@implementation AppDelegate_iPhone
+@implementation QQAppDelegate_iPad
 
 - (void)dealloc
 {

diff --git a/src/ui/iPad/en.lproj/MainWindow_iPad.xib b/src/ui/iPad/en.lproj/MainWindow_iPad.xib
index eafdb9b..f0d386c 100644 (file)
--- a/src/ui/iPad/en.lproj/MainWindow_iPad.xib
+++ b/src/ui/iPad/en.lproj/MainWindow_iPad.xib
@@ -173,7 +173,7 @@
                                <string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="2.IBEditorWindowLastContentRect">{{202, 84}, {783, 772}}</string>
                                <string key="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-                               <string key="6.CustomClassName">AppDelegate_iPad</string>
+                               <string key="6.CustomClassName">QQAppDelegate_iPad</string>
                                <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                        </dictionary>
                        <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
@@ -185,7 +185,7 @@
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <array class="NSMutableArray" key="referencedPartialClassDescriptions">
                                <object class="IBPartialClassDescription">
-                                       <string key="className">AppDelegate</string>
+                                       <string key="className">QQAppDelegate</string>
                                        <string key="superclassName">NSObject</string>
                                        <dictionary class="NSMutableDictionary" key="outlets">
                                                <string key="sparrowView">SPView</string>
@@ -203,15 +203,15 @@
                                        </dictionary>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/AppDelegate.h</string>
+                                               <string key="minorKey">./Classes/QQAppDelegate.h</string>
                                        </object>
                                </object>
                                <object class="IBPartialClassDescription">
-                                       <string key="className">AppDelegate_iPad</string>
-                                       <string key="superclassName">AppDelegate</string>
+                                       <string key="className">QQAppDelegate_iPad</string>
+                                       <string key="superclassName">QQAppDelegate</string>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/AppDelegate_iPad.h</string>
+                                               <string key="minorKey">./Classes/QQAppDelegate_iPad.h</string>
                                        </object>
                                </object>
                                <object class="IBPartialClassDescription">

diff --git a/src/ui/iPad/AppDelegate_iPad.h b/src/ui/iPhone/QQAppDelegate_iPhone.h
similarity index 57%
rename from src/ui/iPad/AppDelegate_iPad.h
rename to src/ui/iPhone/QQAppDelegate_iPhone.h
index 0fa5aee..1c0e787 100644 (file)
--- a/src/ui/iPad/AppDelegate_iPad.h
+++ b/src/ui/iPhone/QQAppDelegate_iPhone.h
@@ -1,5 +1,5 @@
 //
-//  AppDelegate_iPad.h
+//  QQAppDelegate_iPhone.h
 //  tanks
 //
 //  Created by dsc on 4/27/11.
@@ -7,9 +7,9 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "ui/AppDelegate.h"
+#import "ui/QQAppDelegate.h"
 
-@interface AppDelegate_iPad : AppDelegate {
+@interface QQAppDelegate_iPhone : QQAppDelegate {
     
 }
 

diff --git a/src/ui/iPad/AppDelegate_iPad.mm b/src/ui/iPhone/QQAppDelegate_iPhone.mm
similarity index 60%
rename from src/ui/iPad/AppDelegate_iPad.mm
rename to src/ui/iPhone/QQAppDelegate_iPhone.mm
index ec4518d..6993c4d 100644 (file)
--- a/src/ui/iPad/AppDelegate_iPad.mm
+++ b/src/ui/iPhone/QQAppDelegate_iPhone.mm
@@ -1,14 +1,14 @@
 //
-//  AppDelegate_iPad.m
+//  QQAppDelegate_iPhone.m
 //  tanks
 //
 //  Created by dsc on 4/27/11.
 //  Copyright 2011 lttlst.com. All rights reserved.
 //
 
-#import "AppDelegate_iPad.h"
+#import "QQAppDelegate_iPhone.h"
 
-@implementation AppDelegate_iPad
+@implementation QQAppDelegate_iPhone
 
 - (void)dealloc
 {

diff --git a/src/ui/iPhone/en.lproj/MainWindow_iPhone.xib b/src/ui/iPhone/en.lproj/MainWindow_iPhone.xib
index b9ee674..32443c1 100644 (file)
--- a/src/ui/iPhone/en.lproj/MainWindow_iPhone.xib
+++ b/src/ui/iPhone/en.lproj/MainWindow_iPhone.xib
@@ -170,7 +170,7 @@
                                <string key="2.IBEditorWindowLastContentRect">{{520, 376}, {320, 480}}</string>
                                <string key="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <integer value="1" key="2.UIWindow.visibleAtLaunch"/>
-                               <string key="4.CustomClassName">AppDelegate_iPhone</string>
+                               <string key="4.CustomClassName">QQAppDelegate_iPhone</string>
                                <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
                                <string key="9.CustomClassName">SPView</string>
@@ -185,7 +185,7 @@
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <array class="NSMutableArray" key="referencedPartialClassDescriptions">
                                <object class="IBPartialClassDescription">
-                                       <string key="className">AppDelegate</string>
+                                       <string key="className">QQAppDelegate</string>
                                        <string key="superclassName">NSObject</string>
                                        <dictionary class="NSMutableDictionary" key="outlets">
                                                <string key="sparrowView">SPView</string>
@@ -203,15 +203,15 @@
                                        </dictionary>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/AppDelegate.h</string>
+                                               <string key="minorKey">./Classes/QQAppDelegate.h</string>
                                        </object>
                                </object>
                                <object class="IBPartialClassDescription">
-                                       <string key="className">AppDelegate_iPhone</string>
-                                       <string key="superclassName">AppDelegate</string>
+                                       <string key="className">QQAppDelegate_iPhone</string>
+                                       <string key="superclassName">QQAppDelegate</string>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/AppDelegate_iPhone.h</string>
+                                               <string key="minorKey">./Classes/QQAppDelegate_iPhone.h</string>
                                        </object>
                                </object>
                                <object class="IBPartialClassDescription">

diff --git a/tanks.xcodeproj/project.pbxproj b/tanks.xcodeproj/project.pbxproj
index b865a98..5e4aa20 100644 (file)
--- a/tanks.xcodeproj/project.pbxproj
+++ b/tanks.xcodeproj/project.pbxproj
@@ -8,8 +8,8 @@
 
 /* Begin PBXBuildFile section */
                494DE9971376927C00FDB3D7 /* libBox2D.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 494DE9961376927C00FDB3D7 /* libBox2D.a */; };
-               4995ABB213816CCE00334646 /* Game.h in Headers */ = {isa = PBXBuildFile; fileRef = 49E834A513812427007A6598 /* Game.h */; };
-               4995ABB313816CD400334646 /* Unit.h in Headers */ = {isa = PBXBuildFile; fileRef = 49E834A213812427007A6598 /* Unit.h */; };
+               4995ABB213816CCE00334646 /* QQGame.h in Headers */ = {isa = PBXBuildFile; fileRef = 49E834A513812427007A6598 /* QQGame.h */; };
+               4995ABB313816CD400334646 /* QQUnit.h in Headers */ = {isa = PBXBuildFile; fileRef = 49E834A213812427007A6598 /* QQUnit.h */; };
                499668C713692E2D006E8125 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 499668C613692E2D006E8125 /* UIKit.framework */; };
                499668C913692E2D006E8125 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 499668C813692E2D006E8125 /* Foundation.framework */; };
                499668CB13692E2D006E8125 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 499668CA13692E2D006E8125 /* CoreGraphics.framework */; };
@@ -18,26 +18,26 @@
                49966919136930E8006E8125 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 49966914136930E8006E8125 /* OpenAL.framework */; };
                4996691A136930E8006E8125 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 49966915136930E8006E8125 /* OpenGLES.framework */; };
                4996691B136930E8006E8125 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 49966916136930E8006E8125 /* QuartzCore.framework */; };
-               49DA67D4137847A7004841E9 /* World.h in Headers */ = {isa = PBXBuildFile; fileRef = 49DA67D2137847A7004841E9 /* World.h */; };
-               49DA67D5137847A7004841E9 /* World.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49DA67D3137847A7004841E9 /* World.mm */; };
-               49E834A713812427007A6598 /* Active.h in Headers */ = {isa = PBXBuildFile; fileRef = 49E8349E13812427007A6598 /* Active.h */; };
-               49E834A813812427007A6598 /* Actor.h in Headers */ = {isa = PBXBuildFile; fileRef = 49E834A013812427007A6598 /* Actor.h */; };
-               49E834A913812427007A6598 /* Actor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49E834A113812427007A6598 /* Actor.mm */; };
-               49E834AB13812427007A6598 /* Unit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49E834A313812427007A6598 /* Unit.mm */; };
-               49E834AC13812427007A6598 /* Displayable.h in Headers */ = {isa = PBXBuildFile; fileRef = 49E834A413812427007A6598 /* Displayable.h */; };
-               49E834AE13812427007A6598 /* Game.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49E834A613812427007A6598 /* Game.mm */; };
-               49E834BE13812555007A6598 /* AppDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 49E834B013812555007A6598 /* AppDelegate.h */; };
-               49E834BF13812555007A6598 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49E834B113812555007A6598 /* AppDelegate.mm */; };
-               49E834C013812555007A6598 /* AppDelegate_iPad.h in Headers */ = {isa = PBXBuildFile; fileRef = 49E834B313812555007A6598 /* AppDelegate_iPad.h */; };
-               49E834C113812555007A6598 /* AppDelegate_iPad.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49E834B413812555007A6598 /* AppDelegate_iPad.mm */; };
+               49DA67D4137847A7004841E9 /* QQWorld.h in Headers */ = {isa = PBXBuildFile; fileRef = 49DA67D2137847A7004841E9 /* QQWorld.h */; };
+               49DA67D5137847A7004841E9 /* QQWorld.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49DA67D3137847A7004841E9 /* QQWorld.mm */; };
+               49E834A713812427007A6598 /* QQActive.h in Headers */ = {isa = PBXBuildFile; fileRef = 49E8349E13812427007A6598 /* QQActive.h */; };
+               49E834A813812427007A6598 /* QQActor.h in Headers */ = {isa = PBXBuildFile; fileRef = 49E834A013812427007A6598 /* QQActor.h */; };
+               49E834A913812427007A6598 /* QQActor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49E834A113812427007A6598 /* QQActor.mm */; };
+               49E834AB13812427007A6598 /* QQUnit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49E834A313812427007A6598 /* QQUnit.mm */; };
+               49E834AC13812427007A6598 /* QQDisplayable.h in Headers */ = {isa = PBXBuildFile; fileRef = 49E834A413812427007A6598 /* QQDisplayable.h */; };
+               49E834AE13812427007A6598 /* QQGame.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49E834A613812427007A6598 /* QQGame.mm */; };
+               49E834BE13812555007A6598 /* QQAppDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 49E834B013812555007A6598 /* QQAppDelegate.h */; };
+               49E834BF13812555007A6598 /* QQAppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49E834B113812555007A6598 /* QQAppDelegate.mm */; };
+               49E834C013812555007A6598 /* QQAppDelegate_iPad.h in Headers */ = {isa = PBXBuildFile; fileRef = 49E834B313812555007A6598 /* QQAppDelegate_iPad.h */; };
+               49E834C113812555007A6598 /* QQAppDelegate_iPad.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49E834B413812555007A6598 /* QQAppDelegate_iPad.mm */; };
                49E834C213812555007A6598 /* MainWindow_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 49E834B513812555007A6598 /* MainWindow_iPad.xib */; };
-               49E834C313812555007A6598 /* AppDelegate_iPhone.h in Headers */ = {isa = PBXBuildFile; fileRef = 49E834B813812555007A6598 /* AppDelegate_iPhone.h */; };
-               49E834C413812555007A6598 /* AppDelegate_iPhone.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49E834B913812555007A6598 /* AppDelegate_iPhone.mm */; };
+               49E834C313812555007A6598 /* QQAppDelegate_iPhone.h in Headers */ = {isa = PBXBuildFile; fileRef = 49E834B813812555007A6598 /* QQAppDelegate_iPhone.h */; };
+               49E834C413812555007A6598 /* QQAppDelegate_iPhone.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49E834B913812555007A6598 /* QQAppDelegate_iPhone.mm */; };
                49E834C513812555007A6598 /* MainWindow_iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 49E834BA13812555007A6598 /* MainWindow_iPhone.xib */; };
-               49E834C613812555007A6598 /* Viewport.h in Headers */ = {isa = PBXBuildFile; fileRef = 49E834BC13812555007A6598 /* Viewport.h */; };
-               49E834C713812555007A6598 /* Viewport.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49E834BD13812555007A6598 /* Viewport.mm */; };
-               49E834CD13814F7D007A6598 /* GLESDebugDraw.h in Headers */ = {isa = PBXBuildFile; fileRef = 49E834C913814F7D007A6598 /* GLESDebugDraw.h */; };
-               49E834CE13814F7D007A6598 /* GLESDebugDraw.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49E834CA13814F7D007A6598 /* GLESDebugDraw.mm */; };
+               49E834C613812555007A6598 /* QQViewport.h in Headers */ = {isa = PBXBuildFile; fileRef = 49E834BC13812555007A6598 /* QQViewport.h */; };
+               49E834C713812555007A6598 /* QQViewport.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49E834BD13812555007A6598 /* QQViewport.mm */; };
+               49E834CD13814F7D007A6598 /* QQGLESDebugDraw.h in Headers */ = {isa = PBXBuildFile; fileRef = 49E834C913814F7D007A6598 /* QQGLESDebugDraw.h */; };
+               49E834CE13814F7D007A6598 /* QQGLESDebugDraw.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49E834CA13814F7D007A6598 /* QQGLESDebugDraw.mm */; };
                49E834D3138166A6007A6598 /* QQSparrowExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 49E834D1138166A6007A6598 /* QQSparrowExtensions.h */; };
                49E834D4138166A6007A6598 /* QQSparrowExtensions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49E834D2138166A6007A6598 /* QQSparrowExtensions.mm */; };
                49F2D9C413764666000B6B8C /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49F2D9B013764666000B6B8C /* main.mm */; };
@@ -137,8 +137,8 @@
                49F2DADE13764ED6000B6B8C /* SPUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 49F2DA8113764ED6000B6B8C /* SPUtils.m */; };
                49F2DADF13764ED6000B6B8C /* Sparrow.h in Headers */ = {isa = PBXBuildFile; fileRef = 49F2DA1D13764ED5000B6B8C /* Sparrow.h */; };
                4B8B2A3213784D2D00CA4076 /* tank-pink.png in Resources */ = {isa = PBXBuildFile; fileRef = 4B8B2A3113784D2D00CA4076 /* tank-pink.png */; };
-               4B8B2A50137D098500CA4076 /* AnimationContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B8B2A4E137D098500CA4076 /* AnimationContainer.h */; };
-               4B8B2A51137D098500CA4076 /* AnimationContainer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B8B2A4F137D098500CA4076 /* AnimationContainer.mm */; };
+               4B8B2A50137D098500CA4076 /* QQAnimationContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B8B2A4E137D098500CA4076 /* QQAnimationContainer.h */; };
+               4B8B2A51137D098500CA4076 /* QQAnimationContainer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B8B2A4F137D098500CA4076 /* QQAnimationContainer.mm */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -169,30 +169,30 @@
                49966914136930E8006E8125 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
                49966915136930E8006E8125 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
                49966916136930E8006E8125 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
-               49DA67D2137847A7004841E9 /* World.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = World.h; sourceTree = "<group>"; };
-               49DA67D3137847A7004841E9 /* World.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = World.mm; sourceTree = "<group>"; };
-               49E8349E13812427007A6598 /* Active.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Active.h; sourceTree = "<group>"; };
-               49E834A013812427007A6598 /* Actor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Actor.h; sourceTree = "<group>"; };
-               49E834A113812427007A6598 /* Actor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Actor.mm; sourceTree = "<group>"; };
-               49E834A213812427007A6598 /* Unit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Unit.h; sourceTree = "<group>"; };
-               49E834A313812427007A6598 /* Unit.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Unit.mm; sourceTree = "<group>"; };
-               49E834A413812427007A6598 /* Displayable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Displayable.h; sourceTree = "<group>"; };
-               49E834A513812427007A6598 /* Game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Game.h; sourceTree = "<group>"; };
-               49E834A613812427007A6598 /* Game.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Game.mm; sourceTree = "<group>"; };
-               49E834B013812555007A6598 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
-               49E834B113812555007A6598 /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppDelegate.mm; sourceTree = "<group>"; };
-               49E834B313812555007A6598 /* AppDelegate_iPad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate_iPad.h; sourceTree = "<group>"; };
-               49E834B413812555007A6598 /* AppDelegate_iPad.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppDelegate_iPad.mm; sourceTree = "<group>"; };
+               49DA67D2137847A7004841E9 /* QQWorld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QQWorld.h; sourceTree = "<group>"; };
+               49DA67D3137847A7004841E9 /* QQWorld.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QQWorld.mm; sourceTree = "<group>"; };
+               49E8349E13812427007A6598 /* QQActive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QQActive.h; sourceTree = "<group>"; };
+               49E834A013812427007A6598 /* QQActor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QQActor.h; sourceTree = "<group>"; };
+               49E834A113812427007A6598 /* QQActor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QQActor.mm; sourceTree = "<group>"; };
+               49E834A213812427007A6598 /* QQUnit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QQUnit.h; sourceTree = "<group>"; };
+               49E834A313812427007A6598 /* QQUnit.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QQUnit.mm; sourceTree = "<group>"; };
+               49E834A413812427007A6598 /* QQDisplayable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QQDisplayable.h; sourceTree = "<group>"; };
+               49E834A513812427007A6598 /* QQGame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QQGame.h; sourceTree = "<group>"; };
+               49E834A613812427007A6598 /* QQGame.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QQGame.mm; sourceTree = "<group>"; };
+               49E834B013812555007A6598 /* QQAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QQAppDelegate.h; sourceTree = "<group>"; };
+               49E834B113812555007A6598 /* QQAppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QQAppDelegate.mm; sourceTree = "<group>"; };
+               49E834B313812555007A6598 /* QQAppDelegate_iPad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QQAppDelegate_iPad.h; sourceTree = "<group>"; };
+               49E834B413812555007A6598 /* QQAppDelegate_iPad.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QQAppDelegate_iPad.mm; sourceTree = "<group>"; };
                49E834B613812555007A6598 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainWindow_iPad.xib; sourceTree = "<group>"; };
-               49E834B813812555007A6598 /* AppDelegate_iPhone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate_iPhone.h; sourceTree = "<group>"; };
-               49E834B913812555007A6598 /* AppDelegate_iPhone.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppDelegate_iPhone.mm; sourceTree = "<group>"; };
+               49E834B813812555007A6598 /* QQAppDelegate_iPhone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QQAppDelegate_iPhone.h; sourceTree = "<group>"; };
+               49E834B913812555007A6598 /* QQAppDelegate_iPhone.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QQAppDelegate_iPhone.mm; sourceTree = "<group>"; };
                49E834BB13812555007A6598 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainWindow_iPhone.xib; sourceTree = "<group>"; };
-               49E834BC13812555007A6598 /* Viewport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Viewport.h; sourceTree = "<group>"; };
-               49E834BD13812555007A6598 /* Viewport.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Viewport.mm; sourceTree = "<group>"; };
-               49E834C913814F7D007A6598 /* GLESDebugDraw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GLESDebugDraw.h; sourceTree = "<group>"; };
-               49E834CA13814F7D007A6598 /* GLESDebugDraw.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GLESDebugDraw.mm; sourceTree = "<group>"; };
-               49E834CB13814F7D007A6598 /* PhysicsDebugView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhysicsDebugView.h; sourceTree = "<group>"; };
-               49E834CC13814F7D007A6598 /* PhysicsDebugView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PhysicsDebugView.mm; sourceTree = "<group>"; };
+               49E834BC13812555007A6598 /* QQViewport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QQViewport.h; sourceTree = "<group>"; };
+               49E834BD13812555007A6598 /* QQViewport.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QQViewport.mm; sourceTree = "<group>"; };
+               49E834C913814F7D007A6598 /* QQGLESDebugDraw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QQGLESDebugDraw.h; sourceTree = "<group>"; };
+               49E834CA13814F7D007A6598 /* QQGLESDebugDraw.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QQGLESDebugDraw.mm; sourceTree = "<group>"; };
+               49E834CB13814F7D007A6598 /* QQPhysicsDebugView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QQPhysicsDebugView.h; sourceTree = "<group>"; };
+               49E834CC13814F7D007A6598 /* QQPhysicsDebugView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QQPhysicsDebugView.mm; sourceTree = "<group>"; };
                49E834D1138166A6007A6598 /* QQSparrowExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QQSparrowExtensions.h; sourceTree = "<group>"; };
                49E834D2138166A6007A6598 /* QQSparrowExtensions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QQSparrowExtensions.mm; sourceTree = "<group>"; };
                49F2D99B137645DF000B6B8C /* box2d-ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "box2d-ios.xcodeproj"; path = "libs/box2d/box2d-ios.xcodeproj"; sourceTree = "<group>"; };
@@ -295,8 +295,8 @@
                49F2DA8013764ED6000B6B8C /* SPUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUtils.h; sourceTree = "<group>"; };
                49F2DA8113764ED6000B6B8C /* SPUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUtils.m; sourceTree = "<group>"; };
                4B8B2A3113784D2D00CA4076 /* tank-pink.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "tank-pink.png"; path = "textures/tank-pink.png"; sourceTree = "<group>"; };
-               4B8B2A4E137D098500CA4076 /* AnimationContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AnimationContainer.h; path = animation/AnimationContainer.h; sourceTree = "<group>"; };
-               4B8B2A4F137D098500CA4076 /* AnimationContainer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AnimationContainer.mm; path = animation/AnimationContainer.mm; sourceTree = "<group>"; };
+               4B8B2A4E137D098500CA4076 /* QQAnimationContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QQAnimationContainer.h; path = animation/QQAnimationContainer.h; sourceTree = "<group>"; };
+               4B8B2A4F137D098500CA4076 /* QQAnimationContainer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = QQAnimationContainer.mm; path = animation/QQAnimationContainer.mm; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -359,10 +359,10 @@
                        isa = PBXGroup;
                        children = (
                                49E8349F13812427007A6598 /* actor */,
-                               49E8349E13812427007A6598 /* Active.h */,
-                               49E834A413812427007A6598 /* Displayable.h */,
-                               49E834A513812427007A6598 /* Game.h */,
-                               49E834A613812427007A6598 /* Game.mm */,
+                               49E8349E13812427007A6598 /* QQActive.h */,
+                               49E834A413812427007A6598 /* QQDisplayable.h */,
+                               49E834A513812427007A6598 /* QQGame.h */,
+                               49E834A613812427007A6598 /* QQGame.mm */,
                        );
                        path = game;
                        sourceTree = "<group>";
@@ -370,10 +370,10 @@
                49E8349F13812427007A6598 /* actor */ = {
                        isa = PBXGroup;
                        children = (
-                               49E834A013812427007A6598 /* Actor.h */,
-                               49E834A113812427007A6598 /* Actor.mm */,
-                               49E834A213812427007A6598 /* Unit.h */,
-                               49E834A313812427007A6598 /* Unit.mm */,
+                               49E834A013812427007A6598 /* QQActor.h */,
+                               49E834A113812427007A6598 /* QQActor.mm */,
+                               49E834A213812427007A6598 /* QQUnit.h */,
+                               49E834A313812427007A6598 /* QQUnit.mm */,
                        );
                        path = actor;
                        sourceTree = "<group>";
@@ -383,10 +383,10 @@
                        children = (
                                49E834B213812555007A6598 /* iPad */,
                                49E834B713812555007A6598 /* iPhone */,
-                               49E834B013812555007A6598 /* AppDelegate.h */,
-                               49E834B113812555007A6598 /* AppDelegate.mm */,
-                               49E834BC13812555007A6598 /* Viewport.h */,
-                               49E834BD13812555007A6598 /* Viewport.mm */,
+                               49E834B013812555007A6598 /* QQAppDelegate.h */,
+                               49E834B113812555007A6598 /* QQAppDelegate.mm */,
+                               49E834BC13812555007A6598 /* QQViewport.h */,
+                               49E834BD13812555007A6598 /* QQViewport.mm */,
                        );
                        path = ui;
                        sourceTree = "<group>";
@@ -394,8 +394,8 @@
                49E834B213812555007A6598 /* iPad */ = {
                        isa = PBXGroup;
                        children = (
-                               49E834B313812555007A6598 /* AppDelegate_iPad.h */,
-                               49E834B413812555007A6598 /* AppDelegate_iPad.mm */,
+                               49E834B313812555007A6598 /* QQAppDelegate_iPad.h */,
+                               49E834B413812555007A6598 /* QQAppDelegate_iPad.mm */,
                                49E834B513812555007A6598 /* MainWindow_iPad.xib */,
                        );
                        path = iPad;
@@ -404,8 +404,8 @@
                49E834B713812555007A6598 /* iPhone */ = {
                        isa = PBXGroup;
                        children = (
-                               49E834B813812555007A6598 /* AppDelegate_iPhone.h */,
-                               49E834B913812555007A6598 /* AppDelegate_iPhone.mm */,
+                               49E834B813812555007A6598 /* QQAppDelegate_iPhone.h */,
+                               49E834B913812555007A6598 /* QQAppDelegate_iPhone.mm */,
                                49E834BA13812555007A6598 /* MainWindow_iPhone.xib */,
                        );
                        path = iPhone;
@@ -414,10 +414,10 @@
                49E834C813814F7C007A6598 /* debug */ = {
                        isa = PBXGroup;
                        children = (
-                               49E834C913814F7D007A6598 /* GLESDebugDraw.h */,
-                               49E834CA13814F7D007A6598 /* GLESDebugDraw.mm */,
-                               49E834CB13814F7D007A6598 /* PhysicsDebugView.h */,
-                               49E834CC13814F7D007A6598 /* PhysicsDebugView.mm */,
+                               49E834C913814F7D007A6598 /* QQGLESDebugDraw.h */,
+                               49E834CA13814F7D007A6598 /* QQGLESDebugDraw.mm */,
+                               49E834CB13814F7D007A6598 /* QQPhysicsDebugView.h */,
+                               49E834CC13814F7D007A6598 /* QQPhysicsDebugView.mm */,
                        );
                        path = debug;
                        sourceTree = "<group>";
@@ -447,8 +447,8 @@
                        isa = PBXGroup;
                        children = (
                                49E834C813814F7C007A6598 /* debug */,
-                               49DA67D2137847A7004841E9 /* World.h */,
-                               49DA67D3137847A7004841E9 /* World.mm */,
+                               49DA67D2137847A7004841E9 /* QQWorld.h */,
+                               49DA67D3137847A7004841E9 /* QQWorld.mm */,
                        );
                        path = physics;
                        sourceTree = "<group>";
@@ -706,8 +706,8 @@
                4B8B2A4D137D090D00CA4076 /* animation */ = {
                        isa = PBXGroup;
                        children = (
-                               4B8B2A4E137D098500CA4076 /* AnimationContainer.h */,
-                               4B8B2A4F137D098500CA4076 /* AnimationContainer.mm */,
+                               4B8B2A4E137D098500CA4076 /* QQAnimationContainer.h */,
+                               4B8B2A4F137D098500CA4076 /* QQAnimationContainer.mm */,
                        );
                        name = animation;
                        sourceTree = "<group>";
@@ -769,18 +769,18 @@
                                49F2DADB13764ED6000B6B8C /* SPPoolObject.h in Headers */,
                                49F2DADD13764ED6000B6B8C /* SPUtils.h in Headers */,
                                49F2DADF13764ED6000B6B8C /* Sparrow.h in Headers */,
-                               49DA67D4137847A7004841E9 /* World.h in Headers */,
-                               4B8B2A50137D098500CA4076 /* AnimationContainer.h in Headers */,
-                               49E834A713812427007A6598 /* Active.h in Headers */,
-                               49E834A813812427007A6598 /* Actor.h in Headers */,
-                               49E834AC13812427007A6598 /* Displayable.h in Headers */,
-                               4995ABB213816CCE00334646 /* Game.h in Headers */,
-                               4995ABB313816CD400334646 /* Unit.h in Headers */,
-                               49E834BE13812555007A6598 /* AppDelegate.h in Headers */,
-                               49E834C013812555007A6598 /* AppDelegate_iPad.h in Headers */,
-                               49E834C313812555007A6598 /* AppDelegate_iPhone.h in Headers */,
-                               49E834C613812555007A6598 /* Viewport.h in Headers */,
-                               49E834CD13814F7D007A6598 /* GLESDebugDraw.h in Headers */,
+                               49DA67D4137847A7004841E9 /* QQWorld.h in Headers */,
+                               4B8B2A50137D098500CA4076 /* QQAnimationContainer.h in Headers */,
+                               49E834A713812427007A6598 /* QQActive.h in Headers */,
+                               49E834A813812427007A6598 /* QQActor.h in Headers */,
+                               49E834AC13812427007A6598 /* QQDisplayable.h in Headers */,
+                               4995ABB213816CCE00334646 /* QQGame.h in Headers */,
+                               4995ABB313816CD400334646 /* QQUnit.h in Headers */,
+                               49E834BE13812555007A6598 /* QQAppDelegate.h in Headers */,
+                               49E834C013812555007A6598 /* QQAppDelegate_iPad.h in Headers */,
+                               49E834C313812555007A6598 /* QQAppDelegate_iPhone.h in Headers */,
+                               49E834C613812555007A6598 /* QQViewport.h in Headers */,
+                               49E834CD13814F7D007A6598 /* QQGLESDebugDraw.h in Headers */,
                                49E834D3138166A6007A6598 /* QQSparrowExtensions.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
@@ -911,17 +911,17 @@
                                49F2DADA13764ED6000B6B8C /* SPNSExtensions.m in Sources */,
                                49F2DADC13764ED6000B6B8C /* SPPoolObject.m in Sources */,
                                49F2DADE13764ED6000B6B8C /* SPUtils.m in Sources */,
-                               49DA67D5137847A7004841E9 /* World.mm in Sources */,
-                               4B8B2A51137D098500CA4076 /* AnimationContainer.mm in Sources */,
+                               49DA67D5137847A7004841E9 /* QQWorld.mm in Sources */,
+                               4B8B2A51137D098500CA4076 /* QQAnimationContainer.mm in Sources */,
                                49F2D9C413764666000B6B8C /* main.mm in Sources */,
-                               49E834A913812427007A6598 /* Actor.mm in Sources */,
-                               49E834AB13812427007A6598 /* Unit.mm in Sources */,
-                               49E834AE13812427007A6598 /* Game.mm in Sources */,
-                               49E834BF13812555007A6598 /* AppDelegate.mm in Sources */,
-                               49E834C113812555007A6598 /* AppDelegate_iPad.mm in Sources */,
-                               49E834C413812555007A6598 /* AppDelegate_iPhone.mm in Sources */,
-                               49E834C713812555007A6598 /* Viewport.mm in Sources */,
-                               49E834CE13814F7D007A6598 /* GLESDebugDraw.mm in Sources */,
+                               49E834A913812427007A6598 /* QQActor.mm in Sources */,
+                               49E834AB13812427007A6598 /* QQUnit.mm in Sources */,
+                               49E834AE13812427007A6598 /* QQGame.mm in Sources */,
+                               49E834BF13812555007A6598 /* QQAppDelegate.mm in Sources */,
+                               49E834C113812555007A6598 /* QQAppDelegate_iPad.mm in Sources */,
+                               49E834C413812555007A6598 /* QQAppDelegate_iPhone.mm in Sources */,
+                               49E834C713812555007A6598 /* QQViewport.mm in Sources */,
+                               49E834CE13814F7D007A6598 /* QQGLESDebugDraw.mm in Sources */,
                                49E834D4138166A6007A6598 /* QQSparrowExtensions.mm in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;