CCDirector Refactoring and un-singletoning

CCRendererGLSupport.m

@@ -395,10 +395,10 @@ -(void)bindWithClear:(GLbitfield)mask color:(GLKVector4)color4 depth:(GLclampf)d
 	}
 }
 
--(void)syncWithView:(CC_VIEW<CCDirectorView> *)view;
+-(void)syncWithView:(CC_VIEW<CCView> *)view;
 {
 	[super syncWithView:view];
-	_fbo = [(CCGLView *)view fbo];
+	_fbo = [view fbo];
 }
 
 @end

UnitTests/CCActionTest.m

@@ -26,6 +26,7 @@ - (void)setUp
     [super setUp];
 
     scene = [CCScene node];
+    [scene onEnter];
 
     startPos = ccp(0,0);
     endPos = ccp(2.0f,1.0f);
@@ -83,7 +84,7 @@ - (void)testSimpleAction
     [action step: 0.5f];
     XCTAssertEqualWithAccuracy(action.elapsed, 0.5f, accuracy, @"Elapsed time incorrect after stepping.");
 
-    XCTAssertTrue( (ccpDistance(node.position, startPos) - ccpDistance(startPos, endPos)) / 2.0f < accuracy, @"Node should have moved half the distance between start and end.");
+    XCTAssertEqualWithAccuracy( ccpDistance(node.position, startPos), ccpDistance(startPos, endPos) / 2.0f, accuracy, @"Node should have moved half the distance between start and end.");
 
     //Step the action to completion.
     [action step: 0.5f];

UnitTests/CCEffectTests.m

@@ -9,16 +9,31 @@
 #import <XCTest/XCTest.h>
 #import "cocos2d.h"
 #import "CCEffectUtils.h"
+#import "CCDirector_Private.h"
 
 @interface CCEffectTests : XCTestCase
 @end
 
 @implementation CCEffectTests
 
+
+-(void) setUp
+{
+    CCDirector *director = [CCDirector director];
+    //director.
+    [CCDirector bindDirector: director];
+}
+
+-(void)tearDown
+{
+    [CCDirector bindDirector:nil];
+}
+
+
 -(void)testNodeAncestry
 {
-    CCSprite *s1 = [CCSprite spriteWithImageNamed:@"f1.png"];
-    CCSprite *s2 = [CCSprite spriteWithImageNamed:@"f1.png"];
+    CCRenderableNode *s1 = [CCRenderableNode node];
+    CCRenderableNode *s2 = [CCRenderableNode node];
 
     BOOL commonAncestor = NO;
 
@@ -31,7 +46,7 @@ -(void)testNodeAncestry
 
 -(void)testSameNode
 {
-    CCSprite *s1 = [CCSprite spriteWithImageNamed:@"f1.png"];
+    CCRenderableNode *s1 = [CCRenderableNode node];
 
     BOOL commonAncestor = NO;
     GLKMatrix4 transform;
@@ -62,25 +77,25 @@ -(void)testSameNode
 
 -(void)testSiblingTransforms
 {
-    CCSprite *root = [CCSprite spriteWithImageNamed:@"f1.png"];
+    CCRenderableNode *root =  [CCRenderableNode node];
     root.name = @"root";
     root.positionType = CCPositionTypePoints;
     root.position = ccp(0.0f, 0.0f);
     root.anchorPoint = ccp(0.0f, 0.0f);
 
-    CCSprite *s1 = [CCSprite spriteWithImageNamed:@"f1.png"];
+    CCRenderableNode *s1 =  [CCRenderableNode node];
     s1.name = @"s1";
     s1.positionType = CCPositionTypePoints;
     s1.position = ccp(10.0f, 10.0f);
     s1.anchorPoint = ccp(0.0f, 0.0f);
 
-    CCSprite *s2 = [CCSprite spriteWithImageNamed:@"f1.png"];
+    CCRenderableNode *s2 =  [CCRenderableNode node];
     s2.name = @"s2";
     s2.positionType = CCPositionTypePoints;
     s2.position = ccp(100.0f, 100.0f);
     s2.anchorPoint = ccp(0.0f, 0.0f);
 
-    CCSprite *s3 = [CCSprite spriteWithImageNamed:@"f1.png"];
+    CCRenderableNode *s3 =  [CCRenderableNode node];
     s3.name = @"s3";
     s3.positionType = CCPositionTypePoints;
     s3.position = ccp(1000.0f, 1000.0f);
@@ -176,25 +191,25 @@ -(void)testSiblingTransforms
 
 - (void)testAncestorTransforms
 {
-    CCSprite *root = [CCSprite spriteWithImageNamed:@"f1.png"];
+    CCSprite *root =  [CCRenderableNode node];
     root.name = @"root";
     root.positionType = CCPositionTypePoints;
     root.position = ccp(0.0f, 0.0f);
     root.anchorPoint = ccp(0.0f, 0.0f);
 
-    CCSprite *s1 = [CCSprite spriteWithImageNamed:@"f1.png"];
+    CCSprite *s1 =  [CCRenderableNode node];
     s1.name = @"s1";
     s1.positionType = CCPositionTypePoints;
     s1.position = ccp(10.0f, 10.0f);
     s1.anchorPoint = ccp(0.0f, 0.0f);
 
-    CCSprite *s2 = [CCSprite spriteWithImageNamed:@"f1.png"];
+    CCSprite *s2 =  [CCRenderableNode node];
     s2.name = @"s2";
     s2.positionType = CCPositionTypePoints;
     s2.position = ccp(100.0f, 100.0f);
     s2.anchorPoint = ccp(0.0f, 0.0f);
 
-    CCSprite *s3 = [CCSprite spriteWithImageNamed:@"f1.png"];
+    CCSprite *s3 =  [CCRenderableNode node];
     s3.name = @"s3";
     s3.positionType = CCPositionTypePoints;
     s3.position = ccp(1000.0f, 1000.0f);

UnitTests/CCNodeTests.m

@@ -9,21 +9,23 @@
 #import "cocos2d.h"
 #import "CCDirector_Private.h"
 #import "CCNode_Private.h"
+#import "CCScheduler_Private.h"
 
 @interface CCNodeTests : XCTestCase
 
 @end
 
-@interface  CCDirector()
-+(void) resetSingleton;
-@end
 
 @implementation CCNodeTests
 
 -(void) setUp
 {
-	// force creation of a new sharedDirector or state will leak between each test.
-	[CCDirector resetSingleton];
+    [CCDirector bindDirector: [CCDirector director]];
+}
+
+-(void)tearDown
+{
+    [CCDirector bindDirector:nil];
 }
 
 -(void)testGetChildByName
@@ -137,7 +139,7 @@ -(void)testNodeCleanupUnschedulesBlocks{
 
 	XCTAssertTrue(!firstActionOccured, @"No action should happen yet!");
 
-	[[[CCDirector sharedDirector] scheduler] update: 1.0];
+	[scene.scheduler update: 1.0];
 
 	XCTAssertTrue(!firstActionOccured, @"Should not occur since this node had cleanup called on it.");
 }
@@ -172,7 +174,7 @@ -(void)testRemovingScheduledNodes
 	[scene removeChild:first cleanup:NO];
 	[scene removeChild:second cleanup:YES];
 
-	[[[CCDirector sharedDirector] scheduler] update: 1.0];
+	[scene.scheduler update: 1.0];
 
 	XCTAssertTrue(firstActionOccured);
 	XCTAssertTrue(!secondActionOccured, @"Cleaned up action should have unscheduled itself and should not occur.");
@@ -233,7 +235,7 @@ -(void)testCCNodePositionTypeUIPointsUnscaled
 -(void)testCCNodePositionTypePointsScaled
 {
 	// let's say our scale was set the same way since we launched the app.
-	[CCDirector sharedDirector].UIScaleFactor = 2.0;
+	[CCDirector currentDirector].UIScaleFactor = 2.0;
 
 	CCScene *scene = [CCScene node];
 
@@ -260,7 +262,7 @@ -(void)testCCNodePositionTypePointsScaled
 -(void)testCCNodePositionTypeUIPointsScaled
 {
 	// let's say our scale was set the same way since we launched the app.
-	[CCDirector sharedDirector].UIScaleFactor = 2.0;
+	[CCDirector currentDirector].UIScaleFactor = 2.0;
 
 	CCScene *scene = [CCScene node];
 
@@ -330,7 +332,7 @@ -(void)testCCNodeUIScaleFactorShouldDoNothingToMeasurementsInPoints
 	XCTAssertEqual(first.contentSizeInPoints.width, (CGFloat) 1.0, @"");
 	XCTAssertEqual(first.contentSizeInPoints.height, (CGFloat) 2.0, @"");
 
-	[CCDirector sharedDirector].UIScaleFactor = 2.0;
+	[CCDirector currentDirector].UIScaleFactor = 2.0;
 	// Since our positionInPoints are not UIPoints (we didn't change the position type), changing the UIScaleFactor has no effect.
 
 	XCTAssertEqual(first.position.x, (CGFloat) 10.0f, @"");
@@ -368,7 +370,7 @@ -(void)testCCNodePositionTypeChangeToUIPoints
 	XCTAssertEqual(first.contentSizeInPoints.width, (CGFloat) 1.0, @"");
 	XCTAssertEqual(first.contentSizeInPoints.height, (CGFloat) 2.0, @"");
 
-	[CCDirector sharedDirector].UIScaleFactor = 2.0;
+	[CCDirector currentDirector].UIScaleFactor = 2.0;
 
 	XCTAssertEqual(first.positionInPoints.x, (CGFloat) 20.0, @"");
 	XCTAssertEqual(first.positionInPoints.y, (CGFloat) 30.0, @"");
@@ -403,7 +405,7 @@ -(void)testCCNodeChangingPositionType
 	XCTAssertEqual(first.contentSizeInPoints.width, (CGFloat) 1.0, @"");
 	XCTAssertEqual(first.contentSizeInPoints.height, (CGFloat) 2.0, @"");
 
-	[CCDirector sharedDirector].UIScaleFactor = 2.0;
+	[CCDirector currentDirector].UIScaleFactor = 2.0;
 
 	XCTAssertEqual(first.positionInPoints.x, (CGFloat) 20.0, @"");
 	XCTAssertEqual(first.positionInPoints.y, (CGFloat) 30.0, @"");
@@ -445,7 +447,7 @@ -(void)testCCNodeChangingScaleType
 	XCTAssertEqual(first.scaleXInPoints, (CGFloat) 1.0, @"");
 	XCTAssertEqual(first.scaleYInPoints, (CGFloat) 1.0, @"");
 
-	[CCDirector sharedDirector].UIScaleFactor = 2.0;
+	[CCDirector currentDirector].UIScaleFactor = 2.0;
 
 	XCTAssertEqual(first.positionInPoints.x, (CGFloat) 10.0, @"");
 	XCTAssertEqual(first.positionInPoints.y, (CGFloat) 15.0, @"");

UnitTests/CCPackageDownloadManagerTests.m

@@ -71,7 +71,7 @@ - (void)setUp
 
     [(AppController *)[UIApplication sharedApplication].delegate configureCocos2d];
     // Stop the normal cocos2d main loop from happening during the tests. We will step it manually.
-    [[CCDirector sharedDirector] stopAnimation];
+    [[CCDirector currentDirector] stopRunLoop];
 
     [NSURLProtocol registerClass:[CCPackageDownloadManagerTestURLProtocol class]];
 

UnitTests/CCPackageDownloadTests.m

@@ -134,7 +134,7 @@ - (void)setUp
 
     [(AppController *)[UIApplication sharedApplication].delegate configureCocos2d];
     // Stop the normal cocos2d main loop from happening during the tests. We will step it manually.
-    [[CCDirector sharedDirector] stopAnimation];
+    [[CCDirector currentDirector] stopRunLoop];
 
     [NSURLProtocol registerClass:[CCPackageDownloadTestURLProtocol class]];
 
@@ -162,7 +162,7 @@ - (void)tearDown
 {
     [NSURLProtocol unregisterClass:[CCPackageDownloadTestURLProtocol class]];
 
-    [[CCDirector sharedDirector] startAnimation];
+    [[CCDirector currentDirector] startRunLoop];
 
     [super tearDown];
 }

UnitTests/CCPackageManagerTests.m

@@ -96,7 +96,7 @@ - (void)setUp
 
     [(AppController *)[UIApplication sharedApplication].delegate configureCocos2d];
     // Stop the normal cocos2d main loop from happening during the tests. We will step it manually.
-    [[CCDirector sharedDirector] stopAnimation];
+    [[CCDirector currentDirector] stopRunLoop];
 
     self.packageManager = [[CCPackageManager alloc] init];
     _packageManager.delegate = self;

UnitTests/CCPhysicsTests.m

@@ -11,6 +11,7 @@
 
 #import "CCPhysics+ObjectiveChipmunk.h"
 #import "CCDirector_Private.h"
+#import "CCScheduler_Private.h"
 #import "AppDelegate.h"
 
 @interface CCScheduler(Test)
@@ -31,7 +32,7 @@ - (void)setUp
     [super setUp];
 
     [(AppController *)[UIApplication sharedApplication].delegate configureCocos2d];
-    [[CCDirector sharedDirector] startAnimation];
+    [[CCDirector currentDirector] startRunLoop];
 }
 
 static void
@@ -911,6 +912,8 @@ -(void)testKineticBodyBasic2
 //it subsuquently posesses are changed to fixed scheduled.
 -(void)testKineticNodeActionsBasic1
 {
+    CCScene *scene = [CCScene node];
+
     CCPhysicsNode *physicsNode = [CCPhysicsNode node];
 	physicsNode.collisionDelegate = self;
 	physicsNode.gravity = ccp(0, 0);
@@ -940,9 +943,9 @@ -(void)testKineticNodeActionsBasic1
 	[node1 runAction:[CCActionMoveBy actionWithDuration:10 position:ccp(100, 0)]];
 
 	// Force entering the scene to set up the physics objects.
-	[physicsNode onEnter];
+    [scene addChild:physicsNode];
 
-	CCScheduler * scheduler =  [CCDirector sharedDirector].scheduler;
+	CCScheduler * scheduler =  physicsNode.scene.scheduler;
     scheduler.fixedUpdateInterval = 0.1f;
 	[scheduler update:0.10f];// first tick
 	const float accuracy = 1e-4;
@@ -951,7 +954,7 @@ -(void)testKineticNodeActionsBasic1
 	{
 		float desired  = (float)i * 0.1f * 100.0f/10.0f + (float)i * 0.1f * 200.0f/10.0f;
 		//NSLog(@"node1.position.x=  %0.2f   desired = %0.2f",body1.absolutePosition.x, desired);
-		XCTAssertEqualWithAccuracy(body1.absolutePosition.x, desired , accuracy, @"Not in the write position");
+		XCTAssertEqualWithAccuracy(body1.absolutePosition.x, desired , accuracy, @"Not in the right position");
 		[scheduler update:0.10f];
 	}
 }

UnitTests/CCRendererTests.m

@@ -1,15 +1,9 @@
-//
-//  CCFileUtilTests
-//
-//  Created by Andy Korth on December 6th, 2013.
-//
-//
 
 #import <XCTest/XCTest.h>
 #import "cocos2d.h"
 
 #import "CCRenderer_private.h"
-
+#import "CCDirector_Private.h"
 
 @interface NSValue()
 -(size_t)CCRendererSizeOf;
@@ -21,6 +15,17 @@ @interface CCRendererTests : XCTestCase
 
 @implementation CCRendererTests
 
+-(void) setUp
+{
+    [CCDirector bindDirector: [CCDirector director]];
+}
+
+-(void)tearDown
+{
+    [CCDirector bindDirector:nil];
+}
+
+
 -(void)testBlendModeCacheInterning
 {
 	NSDictionary *options = @{