Android project fixes. Still something wrong with linking the CCNoARC.m file.

Author: slembcke

cocos2d-ios.xcodeproj/project.pbxproj

@@ -70,6 +70,7 @@ typedef NS_ENUM(NSUInteger, CCDirectorProjection) {
 
 #elif __CC_PLATFORM_ANDROID
 #define CC_VIEWCONTROLLER NSObject
+#define CC_VIEW CCGLView
 
 #endif
 

cocos2d-osx.xcodeproj/project.pbxproj

@@ -393,7 +393,7 @@ -(void) setView:(CC_VIEW<CCDirectorView> *)view
 #if __CC_PLATFORM_IOS
 		CGFloat scale = self.view.layer.contentsScale ?: 1.0;
 #elif __CC_PLATFORM_ANDROID
-        CGFloat scale = __view.contentScaleFactor;
+        CGFloat scale = _view.contentScaleFactor;
 #else
 		//self.view.wantsBestResolutionOpenGLSurface = YES;
 		CGFloat scale = self.view.window.backingScaleFactor;

cocos2d-tests-ios.xcodeproj/project.pbxproj

@@ -633,7 +633,6 @@ -(void) generateMipmap
 		glGenerateMipmap(GL_TEXTURE_2D);
 		_hasMipmaps = YES;
 
-		glPopGroupMarkerEXT();
 		CCGL_DEBUG_POP_GROUP_MARKER();
 	});
 }

cocos2d/CCDirector.h

@@ -52,46 +52,6 @@ - (id) init
 }
 
 
-//
-// Draw the Scene
-//
-- (void) drawScene
-{
-    /* calculate "global" dt */
-	[self calculateDeltaTime];
-    
-	CCGLView *openGLview = (CCGLView*)self.view;
-
-	/* tick before glClear: issue #533 */
-	if( ! _isPaused ) [_scheduler update: _dt];
-    
-	/* to avoid flickr, nextScene MUST be here: after tick and before draw.
-	 XXX: Which bug is this one. It seems that it can't be reproduced with v0.9 */
-	if( _nextScene ) [self setNextScene];
-	
-	GLKMatrix4 projection = self.projectionMatrix;
-	_renderer.globalShaderUniforms = [self updateGlobalShaderUniforms];
-	
-	[CCRenderer bindRenderer:_renderer];
-	[_renderer invalidateState];
-	
-	[_renderer enqueueClear:(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT) color:_runningScene.colorRGBA.glkVector4 depth:1.0f stencil:0 globalSortOrder:NSIntegerMin];
-	
-	// Render
-	[_runningScene visit:_renderer parentTransform:&projection];
-	[_notificationNode visit:_renderer parentTransform:&projection];
-	if( _displayStats ) [self showStats];
-	
-	[_renderer flush];
-	[CCRenderer bindRenderer:nil];
-	
-	[openGLview swapBuffers];
-    
-	_totalFrames++;
-    
-	if( _displayStats ) [self calculateMPF];
-}
-
 -(void) setViewport
 {
 	CGSize size = _winSizeInPixels;
@@ -158,15 +118,13 @@ -(void)end
 
 -(void) setView:(CCGLView *)view
 {
-	if( view != __view) {
 		[super setView:view];
 		if( view ) {
 			// set size
 			CGFloat scale = view.contentScaleFactor;
 			CGSize size = view.bounds.size;
 			_winSizeInPixels = CGSizeMake(size.width * scale, size.height * scale);
 		}
-	}
 }
 
 - (void)runBlock:(dispatch_block_t)block

cocos2d/CCDirector.m

@@ -16,6 +16,7 @@
 #import <BridgeKitV3/BridgeKit.h>
 
 #import "../../Platforms/CCGL.h"
+#import "CCDirectorView.h"
 
 enum CCAndroidScreenMode {
 
@@ -39,7 +40,7 @@ enum CCAndroidScreenMode {
 };
 
 BRIDGE_CLASS("org.cocos2d.CCGLView")
-@interface CCGLView : AndroidSurfaceView
+@interface CCGLView : AndroidSurfaceView <CCDirectorView>
 
 - (id)initWithContext:(AndroidContext *)context;
 - (id)initWithContext:(AndroidContext *)context screenMode:(enum CCAndroidScreenMode)screenMode scaleFactor:(float)scaleFactor;

cocos2d/CCTexture.m

@@ -561,6 +561,20 @@ - (void)swapBuffers
     eglSwapBuffers(_eglDisplay, _eglSurface);
 }
 
+#warning TODO temporary
+-(void)addFrameCompletionHandler:(dispatch_block_t)handler
+{
+	handler();
+}
+
+-(void)beginFrame {}
+
+#warning TODO temporary
+-(void)presentFrame
+{
+	[self swapBuffers];
+}
+
 @end
 #endif // __CC_PLATFORM_ANDROID