Temporary checkin.

diff --git a/src/render/animation/AnimationContainer.h b/src/render/animation/AnimationContainer.h
index 8e7c8c3..21a6e53 100644 (file)
--- a/src/render/animation/AnimationContainer.h
+++ b/src/render/animation/AnimationContainer.h
@@ -7,8 +7,10 @@
 //
 
 #import <Foundation/Foundation.h>
+
 #import "SPTextureAtlas.h"
 
+
 ////////////////////////////////////////////////////////////////////////////////////
 @interface AnimationContainer : NSObject <NSXMLParserDelegate> {
 }

diff --git a/src/render/animation/AnimationContainer.m b/src/render/animation/AnimationContainer.m
index 2fe625f..97a8873 100644 (file)
--- a/src/render/animation/AnimationContainer.m
+++ b/src/render/animation/AnimationContainer.m
@@ -10,6 +10,7 @@
 
 #import "SPMovieClip.h"
 
+
 ////////////////////////////////////////////////////////////////////////////////////
 // private method
 @interface AnimationContainer()
@@ -98,22 +99,19 @@
                                      namespaceURI:   (NSString *)namespaceURI 
                                      qualifiedName:  (NSString *)qName 
                                      attributes:     (NSDictionary *)attributeDict {
-  if ([elementName isEqualToString:@"AnimationClips"])
-  {
+  if ([elementName isEqualToString:@"AnimationClips"]) {
     mAnimationLookup    = [[NSMutableDictionary alloc] init];
     self.mAnimationName = [attributeDict valueForKey:@"name"];
     self.mAtlasPath     = [attributeDict valueForKey:@"xmlPath"];
     mAtlas              = [[SPTextureAtlas alloc] initWithContentsOfFile:mAtlasPath];
   }
-  else if ([elementName isEqualToString:@"Clip"])
-  {
+  else if ([elementName isEqualToString:@"Clip"]) {
     NSString* name = [attributeDict valueForKey:@"name"];
     int numFrames  = [[attributeDict valueForKey:@"frames"] intValue];
     SPMovieClip* movieClip = [[SPMovieClip alloc] initWithFrames:[mAtlas texturesStartingWith:name] fps:15];
     [mAnimationLookup setValue:movieClip forKey:name]; // add our clip to the dictionary so we can reference it in the future
     
-    if (movieClip.numFrames != numFrames)
-    {
+    if (movieClip.numFrames != numFrames) {
       NSLog(@"Number of frames (%d) in XML does not match number of frames (%d) in atlas!", numFrames, movieClip.numFrames);
     }
   }

diff --git a/src/tanks/unit/Unit.h b/src/tanks/unit/Unit.h
index 4a9b4fa..d09220f 100644 (file)
--- a/src/tanks/unit/Unit.h
+++ b/src/tanks/unit/Unit.h
@@ -7,14 +7,23 @@
 //
 
 #import <Foundation/Foundation.h>
+
 #import "Sparrow.h"
 
+#import "UnitDelegate.h"
+
 
+////////////////////////////////////////////////////////////////////////////////////
 @interface Unit : NSObject {
 }
 
-@property(nonatomic, retain) SPQuad* quad;
+////////////////////////////////////////////////////////////////////////////////////
+//@property(nonatomic,retain) UnitDelegate* mDriver;
+
+//@@@ HACK FOR TESTING
+@property(nonatomic,retain) SPQuad* quad;
 
+////////////////////////////////////////////////////////////////////////////////////
 -(void)dealloc;
 
 -(Unit*)initWithWidth:(float)width height:(float)height X:(float)x Y:(float)y color:(int)color;

diff --git a/src/tanks/unit/Unit.m b/src/tanks/unit/Unit.m
index 7fed915..dc997e3 100644 (file)
--- a/src/tanks/unit/Unit.m
+++ b/src/tanks/unit/Unit.m
@@ -11,13 +11,17 @@
 
 @implementation Unit
 
+////////////////////////////////////////////////////////////////////////////////////
 @synthesize quad;
+//@synthesize mDriver;
 
+////////////////////////////////////////////////////////////////////////////////////
 -(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;
@@ -27,6 +31,7 @@
   return self;
 }
 
+////////////////////////////////////////////////////////////////////////////////////
 -(Unit*)initWithFile:(NSString*)fileName atX:(float)x andY:(float)y {
   quad = [[SPImage alloc] initWithContentsOfFile:fileName];
   quad.x = x;
@@ -35,6 +40,7 @@
   return self;
 }
 
+////////////////////////////////////////////////////////////////////////////////////
 -(void)onTouch:(SPTouchEvent*)event {
   SPTouch* touch = [[event touchesWithTarget:quad.parent] anyObject];
   if (touch) {

diff --git a/src/tanks/unit/UnitDelegate.h b/src/tanks/unit/UnitDelegate.h
new file mode 100644 (file)
index 0000000..4002d36
--- /dev/null
+++ b/src/tanks/unit/UnitDelegate.h
@@ -0,0 +1,14 @@
+//
+//  UnitDelegate.h
+//  tanks
+//
+//  Created by Doris Chen on 5/14/11.
+//  Copyright 2011 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+
+@protocol UnitDelegate <NSObject>
+-(void)updateWithTick:(float)time;
+@end

diff --git a/tanks.xcodeproj/project.pbxproj b/tanks.xcodeproj/project.pbxproj
index e892b79..47d602d 100644 (file)
--- a/tanks.xcodeproj/project.pbxproj
+++ b/tanks.xcodeproj/project.pbxproj
@@ -139,6 +139,7 @@
                4B8B2A4C1378E74700CA4076 /* TestEntriesViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B8B2A401378E74700CA4076 /* TestEntriesViewController.mm */; };
                4B8B2A50137D098500CA4076 /* AnimationContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B8B2A4E137D098500CA4076 /* AnimationContainer.h */; };
                4B8B2A51137D098500CA4076 /* AnimationContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B8B2A4F137D098500CA4076 /* AnimationContainer.m */; };
+               4B8B2A5B137F610400CA4076 /* UnitDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B8B2A5A137F610300CA4076 /* UnitDelegate.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -295,6 +296,7 @@
                4B8B2A401378E74700CA4076 /* TestEntriesViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TestEntriesViewController.mm; path = references/TestEntriesViewController.mm; sourceTree = "<group>"; };
                4B8B2A4E137D098500CA4076 /* AnimationContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AnimationContainer.h; path = animation/AnimationContainer.h; sourceTree = "<group>"; };
                4B8B2A4F137D098500CA4076 /* AnimationContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AnimationContainer.m; path = animation/AnimationContainer.m; sourceTree = "<group>"; };
+               4B8B2A5A137F610300CA4076 /* UnitDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnitDelegate.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -676,6 +678,7 @@
                        children = (
                                49F2DB321376632E000B6B8C /* Unit.h */,
                                49F2DB331376632E000B6B8C /* Unit.m */,
+                               4B8B2A5A137F610300CA4076 /* UnitDelegate.h */,
                        );
                        path = unit;
                        sourceTree = "<group>";
@@ -785,6 +788,7 @@
                                4B8B2A481378E74700CA4076 /* iPhoneTest.h in Headers */,
                                4B8B2A4B1378E74700CA4076 /* TestEntriesViewController.h in Headers */,
                                4B8B2A50137D098500CA4076 /* AnimationContainer.h in Headers */,
+                               4B8B2A5B137F610400CA4076 /* UnitDelegate.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };