From: chsieh Date: Tue, 17 May 2011 05:06:15 +0000 (-0700) Subject: Pulling from master. X-Git-Url: http://git.less.ly:3516/?a=commitdiff_plain;h=431d8378496b5db16e43e0eeac2799544cacd04b;p=tanks-ios.git Pulling from master. --- 431d8378496b5db16e43e0eeac2799544cacd04b diff --cc src/game/actor/QQUnit.h index 3fffdaa,710e1e9..97c9b68 --- a/src/game/actor/QQUnit.h +++ b/src/game/actor/QQUnit.h @@@ -1,26 -1,18 +1,26 @@@ #import "Sparrow.h" + #import "render/QQSparrowExtensions.h" - #import "game/actor/Actor.h" + #import "game/actor/QQActor.h" +#import "game/actor/UnitDelegate.h" + - #import "physics/World.h" + #import "physics/QQWorld.h" +//////////////////////////////////////////////////////////////////////////////////// - @interface Unit : Actor { + @interface QQUnit : QQActor { @private - SPDisplayObject* _shape; + SPDisplayObject* _shape; + id _delegate; } +//////////////////////////////////////////////////////////////////////////////////// @property (nonatomic, retain, readwrite) SPDisplayObject* shape; +@property (nonatomic, retain, readwrite) id delegate; +//////////////////////////////////////////////////////////////////////////////////// - (id) initWithFile:(NSString*)fileName atX:(float)x y:(float)y; - (id) initWithShape:(SPDisplayObject*)aShape; diff --cc src/game/actor/QQUnit.mm index 2c6b4d5,11c619e..646e064 --- a/src/game/actor/QQUnit.mm +++ b/src/game/actor/QQUnit.mm @@@ -1,15 -1,11 +1,15 @@@ #import "Sparrow.h" - #import "Unit.h" + #import "QQUnit.h" +//////////////////////////////////////////////////////////////////////////////////// - @implementation Unit + @implementation QQUnit +//////////////////////////////////////////////////////////////////////////////////// @synthesize shape = _shape; +@synthesize delegate = _delegate; +//////////////////////////////////////////////////////////////////////////////////// - (id) init { return [self initWithShape:[[SPQuad quadWithWidth:32 height:32 color:0xff0000] setPositionX:50 y:50]]; } @@@ -46,9 -38,7 +46,8 @@@ } } +//////////////////////////////////////////////////////////////////////////////////// - (void) onTouch:(SPTouchEvent*)event { - NSLog(@"%@ onTouch! shape=%@ parent=%@", self, self.shape, self.shape.parent); SPTouch* touch = [[event touchesWithTarget:self.shape.parent] anyObject]; if (touch) { SPPoint* touchPosition = [touch locationInSpace:self.shape.parent]; diff --cc src/render/animation/QQAnimationContainer.h index 8cb0020,80c0f84..8a3973f --- a/src/render/animation/QQAnimationContainer.h +++ b/src/render/animation/QQAnimationContainer.h @@@ -1,8 -1,7 +1,8 @@@ #import "SPTextureAtlas.h" + //////////////////////////////////////////////////////////////////////////////////// - @interface AnimationContainer : NSObject { + @interface QQAnimationContainer : NSObject { } //////////////////////////////////////////////////////////////////////////////////// diff --cc src/render/animation/QQAnimationContainer.mm index f96504c,321929e..34c066e --- a/src/render/animation/QQAnimationContainer.mm +++ b/src/render/animation/QQAnimationContainer.mm @@@ -5,7 -5,7 +5,7 @@@ //////////////////////////////////////////////////////////////////////////////////// // private method - @interface AnimationContainer (Private) -@interface QQAnimationContainer() ++@interface QQAnimationContainer (Private) -(void)parseContentXml:(NSString *)contentPath; diff --cc tanks.xcodeproj/project.pbxproj index 28a517a,d7df70e..9629bf1 --- a/tanks.xcodeproj/project.pbxproj +++ b/tanks.xcodeproj/project.pbxproj @@@ -136,10 -139,8 +139,9 @@@ 49F2DADD13764ED6000B6B8C /* SPUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 49F2DA8013764ED6000B6B8C /* SPUtils.h */; }; 49F2DADE13764ED6000B6B8C /* SPUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 49F2DA8113764ED6000B6B8C /* SPUtils.m */; }; 49F2DADF13764ED6000B6B8C /* Sparrow.h in Headers */ = {isa = PBXBuildFile; fileRef = 49F2DA1D13764ED5000B6B8C /* Sparrow.h */; }; + 4B609D3213822FC700B02CE7 /* UnitDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B609D3113822FC700B02CE7 /* UnitDelegate.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 */ @@@ -295,10 -322,8 +323,9 @@@ 49F2DA7F13764ED6000B6B8C /* SPPoolObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPPoolObject.m; sourceTree = ""; }; 49F2DA8013764ED6000B6B8C /* SPUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUtils.h; sourceTree = ""; }; 49F2DA8113764ED6000B6B8C /* SPUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUtils.m; sourceTree = ""; }; + 4B609D3113822FC700B02CE7 /* UnitDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnitDelegate.h; sourceTree = ""; }; - 4B8B2A3113784D2D00CA4076 /* tank-pink.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "tank-pink.png"; path = "textures/tank-pink.png"; sourceTree = ""; }; - 4B8B2A4E137D098500CA4076 /* AnimationContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AnimationContainer.h; path = animation/AnimationContainer.h; sourceTree = ""; }; - 4B8B2A4F137D098500CA4076 /* AnimationContainer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AnimationContainer.mm; path = animation/AnimationContainer.mm; sourceTree = ""; }; + 4B8B2A4E137D098500CA4076 /* QQAnimationContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QQAnimationContainer.h; path = animation/QQAnimationContainer.h; sourceTree = ""; }; + 4B8B2A4F137D098500CA4076 /* QQAnimationContainer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = QQAnimationContainer.mm; path = animation/QQAnimationContainer.mm; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@@ -372,11 -471,10 +473,11 @@@ 49E8349F13812427007A6598 /* actor */ = { isa = PBXGroup; children = ( + 4B609D3113822FC700B02CE7 /* UnitDelegate.h */, - 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 = ""; @@@ -772,20 -861,19 +864,20 @@@ 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 */, + 4B609D3213822FC700B02CE7 /* UnitDelegate.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; };