CCScrollLayer: implemented fix from cjkeeme. Fixes cocos2d#23

farukcank · Jun 10, 2011 · 6f88fd4 · 6f88fd4
1 parent 410b873
commit 6f88fd4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/AUTHORS.cocos2d-extensions b/AUTHORS.cocos2d-extensions
@@ -14,6 +14,9 @@ People/companies who were/are contributing code to cocos2d-iphone-extensions (al
 
 	* Israel Roth (http://srooltheknife.blogspot.com/)
 		CCSliderControl author
+
+	* Jeff Keeme (cjkeeme) (http://www.myblackdogbooks.com/)
+		Fix for issue #23 (CCScrollLayer page indicator artifacts)
 
 	* Simon Skinner (twitter: @vultuk) (http://www.dk101.net/)
 		CCScrollLayer original author

diff --git a/Extensions/CCScrollLayer/CCScrollLayer.m b/Extensions/CCScrollLayer/CCScrollLayer.m
@@ -133,8 +133,10 @@ - (void) visit
 
 		// Set GL Values
 		glEnable(GL_POINT_SMOOTH);
-		glHint(GL_POINT_SMOOTH_HINT, GL_NICEST);
-		glPointSize(6.0f * CC_CONTENT_SCALE_FACTOR());
+		GLboolean blendWasEnabled = glIsEnabled( GL_BLEND );
+		glEnable(GL_BLEND);
+		glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
+		glPointSize( 6.0 * CC_CONTENT_SCALE_FACTOR() );
 
 		// Draw Gray Points
 		glColor4ub(0x96,0x96,0x96,0xFF);
@@ -146,8 +148,9 @@ - (void) visit
 
 		// Restore GL Values
 		glPointSize(1.0f);
-		glHint(GL_POINT_SMOOTH_HINT,GL_FASTEST);
 		glDisable(GL_POINT_SMOOTH);
+		if (! blendWasEnabled)
+			glDisable(GL_BLEND);
 	}
 }
 

diff --git a/Tests/CCScrollLayerTest/CCScrollLayerTestLayer.m b/Tests/CCScrollLayerTest/CCScrollLayerTestLayer.m
@@ -48,9 +48,6 @@ -(id) init
 		// get screen size
 		CGSize screenSize = [CCDirector sharedDirector].winSize;
 
-		//  Use 2D Projection to avoid issue #23
-		[[CCDirector sharedDirector] setProjection: kCCDirectorProjection2D];
-
 		/////////////////////////////////////////////////
 		// PAGE 1
 		////////////////////////////////////////////////