From 39c64f2f5c62d13f34df73c9e77280624b49ad14 Mon Sep 17 00:00:00 2001
From: chsieh <chester.developer@hotmail.com>
Date: Mon, 9 May 2011 09:31:17 -0700
Subject: [PATCH] Adding texture/image support.

---
 etc/textures/tank-pink.png      |  Bin 0 -> 3903 bytes
 src/tanks/Game.h                |    2 +-
 src/tanks/Game.m                |   16 ++++++++--------
 src/tanks/unit/Unit.h           |    6 +++++-
 src/tanks/unit/Unit.m           |   20 +++++++++++++++++---
 tanks.xcodeproj/project.pbxproj |   12 ++++++++++++
 6 files changed, 43 insertions(+), 13 deletions(-)
 create mode 100644 etc/textures/tank-pink.png

diff --git a/etc/textures/tank-pink.png b/etc/textures/tank-pink.png
new file mode 100644
index 0000000000000000000000000000000000000000..27e2aac3f5cb896649b4753254c7a6f6244f0b1e
GIT binary patch
literal 3903
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
N002ovPDHLkV1nd*QG);g

literal 0
HcmV?d00001

diff --git a/src/tanks/Game.h b/src/tanks/Game.h
index 625d40e..ca3e13a 100644
--- a/src/tanks/Game.h
+++ b/src/tanks/Game.h
@@ -12,6 +12,6 @@
 
 @interface Game : SPStage
 
-@property(retain) Unit* unit;
+@property(nonatomic,retain) Unit* unit;
 
 @end
diff --git a/src/tanks/Game.m b/src/tanks/Game.m
index 377fb6d..cda28c0 100644
--- a/src/tanks/Game.m
+++ b/src/tanks/Game.m
@@ -14,17 +14,17 @@
 @synthesize unit;
 
 - (id)initWithWidth:(float)width height:(float)height {
-    if ( (self = [super initWithWidth:width height:height]) ){
-        unit = [[Unit alloc] initWithWidth:100 height:100 X:50 Y:50];
-        [self addEventListener:@selector(onTouch:) atObject:unit forType:SP_EVENT_TYPE_TOUCH];
-        [self addChild:unit.quad];
-    }
-    return self;
+  if ( (self = [super initWithWidth:width height:height]) ){
+    unit = [[Unit alloc] initWithFile:@"tank-pink.png" atX: 50.0f andY:50.0f];
+    [self addEventListener:@selector(onTouch:) atObject:unit forType:SP_EVENT_TYPE_TOUCH];
+    [self addChild:unit.quad];
+  }
+  return self;
 }
 
 - (void)dealloc {
-    [self setUnit:nil];
-    [super dealloc];
+  [self setUnit:nil];
+  [super dealloc];
 }
 
 @end
\ No newline at end of file
diff --git a/src/tanks/unit/Unit.h b/src/tanks/unit/Unit.h
index 1c8fea5..f9a776f 100644
--- a/src/tanks/unit/Unit.h
+++ b/src/tanks/unit/Unit.h
@@ -15,6 +15,10 @@
 
 @property(nonatomic, retain) SPQuad* quad;
 
--(Unit*)initWithWidth:(int)width height:(int)height X:(int)x Y:(int)y;
+-(void)dealloc;
+-(Unit*)initWithWidth:(float)width height:(float)height X:(float)x Y:(float)y color:(int)color;
+-(Unit*)initWithFile:(NSString*)fileName atX:(float)x andY:(float)y;
+
 -(void)onTouch:(SPTouchEvent*)event;
+
 @end
diff --git a/src/tanks/unit/Unit.m b/src/tanks/unit/Unit.m
index 66da593..aab7f6c 100644
--- a/src/tanks/unit/Unit.m
+++ b/src/tanks/unit/Unit.m
@@ -13,9 +13,23 @@
 
 @synthesize quad;
 
--(Unit*)initWithWidth:(int)width height:(int)height X:(int)x Y:(int)y {
-  quad = [SPQuad quadWithWidth:width height:height];
-  quad.color = 0xff0000;
+-(void)dealloc {
+  [quad release];
+  [super dealloc];
+}
+
+-(Unit*)initWithWidth:(float)width height:(float)height X:(float)x Y:(float)y color:(int)color {
+  quad = [[SPQuad alloc] initWithWidth:width height:height];
+  quad.color = color;
+  quad.x = x;
+  quad.y = y;
+  
+  return self;
+}
+
+-(Unit*)initWithFile:(NSString*)fileName atX:(float)x andY:(float)y
+{
+  quad = [[SPImage alloc] initWithContentsOfFile:fileName];
   quad.x = x;
   quad.y = y;
   
diff --git a/tanks.xcodeproj/project.pbxproj b/tanks.xcodeproj/project.pbxproj
index 559abcf..14c0a97 100644
--- a/tanks.xcodeproj/project.pbxproj
+++ b/tanks.xcodeproj/project.pbxproj
@@ -126,6 +126,7 @@
 		49F2DAF313765004000B6B8C /* GLES-Render.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49F2DAE713765004000B6B8C /* GLES-Render.mm */; };
 		49F2DB341376632E000B6B8C /* Unit.h in Headers */ = {isa = PBXBuildFile; fileRef = 49F2DB321376632E000B6B8C /* Unit.h */; };
 		49F2DB351376632E000B6B8C /* Unit.m in Sources */ = {isa = PBXBuildFile; fileRef = 49F2DB331376632E000B6B8C /* Unit.m */; };
+		4B8B2A3213784D2D00CA4076 /* tank-pink.png in Resources */ = {isa = PBXBuildFile; fileRef = 4B8B2A3113784D2D00CA4076 /* tank-pink.png */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -279,6 +280,7 @@
 		49F2DAEC13765004000B6B8C /* TestEntriesViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TestEntriesViewController.mm; sourceTree = "<group>"; };
 		49F2DB321376632E000B6B8C /* Unit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Unit.h; sourceTree = "<group>"; };
 		49F2DB331376632E000B6B8C /* Unit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Unit.m; sourceTree = "<group>"; };
+		4B8B2A3113784D2D00CA4076 /* tank-pink.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "tank-pink.png"; path = "textures/tank-pink.png"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -436,6 +438,7 @@
 		49F2D9D313764A9B000B6B8C /* etc */ = {
 			isa = PBXGroup;
 			children = (
+				4B8B2A3313784D3400CA4076 /* textures */,
 				49F2D9D413764A9B000B6B8C /* InfoPlist.strings */,
 				49F2D9D613764A9B000B6B8C /* tanks-Info.plist */,
 			);
@@ -673,6 +676,14 @@
 			path = unit;
 			sourceTree = "<group>";
 		};
+		4B8B2A3313784D3400CA4076 /* textures */ = {
+			isa = PBXGroup;
+			children = (
+				4B8B2A3113784D2D00CA4076 /* tank-pink.png */,
+			);
+			name = textures;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -807,6 +818,7 @@
 				49F2D9C713764666000B6B8C /* MainWindow_iPad.xib in Resources */,
 				49F2D9C913764666000B6B8C /* MainWindow_iPhone.xib in Resources */,
 				49F2D9D713764A9B000B6B8C /* InfoPlist.strings in Resources */,
+				4B8B2A3213784D2D00CA4076 /* tank-pink.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-- 
1.7.0.4