Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into minggo-upto-0.99.5

cocos2dx/include/CCDirector.h

@@ -35,6 +35,7 @@ THE SOFTWARE.
 #include "CCXEGLView.h"
 #include "ccxCommon.h"
 #include "CCGL.h"
+#include "platform/CCNS.h"
 
 #include <assert.h>
 namespace   cocos2d {
@@ -181,6 +182,8 @@ class CCLabelTTF;
 class CCScene;
 class cocos2d::CCXEGLView;
 class NSEvent;
+class CCNode;
+class CCProjectionProtocol;
 
 /**
 @brief Class that creates and handle the main Window and manages how
@@ -264,7 +267,7 @@ public:
 	/** returns the display size of the OpenGL view in pixels.
 	It doesn't take into account any possible rotation of the window.
 	*/
-	CGSize getDisplaySizeInPiXels(void);
+	CGSize getDisplaySizeInPixels(void);
 
 	/** changes the projection size */
 	void reshapeProjection(CGSize newWindowSize);

cocos2dx/platform/CCDirector_mobile.cpp

@@ -474,7 +474,7 @@ CGSize CCDirector::getWinSizeInPixels()
 }
 
 // return the current frame size
-CGSize CCDirector::getDisplaySizeInPiXels(void)
+CGSize CCDirector::getDisplaySizeInPixels(void)
 {
 	return m_obWinSizeInPixels;
 }

cocos2dx/platform/CCGrid_mobile.cpp

@@ -22,9 +22,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 #include "ccMacros.h"
-#include "CCGrid.h"
+#include "effects/CCGrid.h"
 #include "CCDirector.h"
-#include "CCGrabber.h"
+#include "effects/CCGrabber.h"
+#include "support/ccUtils.h"
 
 #include "CCGL.h"
 #include "CGPointExtension.h"
@@ -108,8 +109,8 @@ namespace cocos2d
     	CCDirector *pDirector = CCDirector::sharedDirector();
 		CGSize s = pDirector->getWinSizeInPixels();
 		
-		unsigned int POTWide = ccNextPOT(s.width);
+		unsigned int POTWide = ccNextPOT((unsigned int)s.width);
-		unsigned int POTHigh = ccNextPOT(s.height);
+		unsigned int POTHigh = ccNextPOT((unsigned int)s.height);
 
 		CCTexture2DPixelFormat format = pDirector->getPiexFormat() == kCCPixelFormatRGB565 ? kCCTexture2DPixelFormat_RGB565 : kCCTexture2DPixelFormat_RGBA8888;
 
@@ -122,7 +123,7 @@ namespace cocos2d
 		}
 
 		CCTexture2D *pTexture = new CCTexture2D();
-		pTexture->initWithData(data, format, textureSize, textureSize, s);
+		pTexture->initWithData(data, format, POTWide, POTHigh, s);
 
 		free(data);
 
@@ -133,10 +134,7 @@ namespace cocos2d
 			return false;
 		}
 
-		if (initWithSize(gridSize, pTexture, false))
+		initWithSize(gridSize, pTexture, false);
-		{
-			// do something
-		}
 
 		pTexture->release();
 
@@ -178,7 +176,7 @@ namespace cocos2d
 	{
 		CCDirector *pDirector = CCDirector::sharedDirector();
 
-		CGSize winSize = pDirector->getDisplaySize();
+		CGSize winSize = pDirector->getDisplaySizeInPixels();
 		float w = winSize.width / 2;
 		float h = winSize.height / 2;
 

cocos2dx/platform/mac/CCDirector_mac.mm

@@ -456,7 +456,7 @@ CGSize CCDirector::getWinSizeInPixels()
 }
 
 // return the current frame size
-CGSize CCDirector::getDisplaySizeInPiXels(void)
+CGSize CCDirector::getDisplaySizeInPixels(void)
 {
 	return m_obWinSizeInPixels;
 }

cocos2dx/platform/mac/CCGrid_mac.cpp

@@ -22,9 +22,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 #include "ccMacros.h"
-#include "CCGrid.h"
+#include "effects/CCGrid.h"
 #include "CCDirector.h"
-#include "CCGrabber.h"
+#include "effects/CCGrabber.h"
+#include "support/ccUtils.h"
 
 #include "CCGL.h"
 #include "CGPointExtension.h"
@@ -108,8 +109,8 @@ namespace cocos2d
     	CCDirector *pDirector = CCDirector::sharedDirector();
 		CGSize s = pDirector->getWinSizeInPixels();
 		
-		unsigned int POTWide = ccNextPOT(s.width);
+		unsigned int POTWide = ccNextPOT((unsigned int)s.width);
-		unsigned int POTHigh = ccNextPOT(s.height);
+		unsigned int POTHigh = ccNextPOT((unsigned int)s.height);
 
 		// on mac, it use kCCTexture2DPixelFormat_RGBA8888
 		CCTexture2DPixelFormat format = kCCTexture2DPixelFormat_RGBA8888;
@@ -123,7 +124,7 @@ namespace cocos2d
 		}
 
 		CCTexture2D *pTexture = new CCTexture2D();
-		pTexture->initWithData(data, format, textureSize, textureSize, s);
+		pTexture->initWithData(data, format, POTWide, POTHigh, s);
 
 		free(data);
 
@@ -134,10 +135,7 @@ namespace cocos2d
 			return false;
 		}
 
-		if (initWithSize(gridSize, pTexture, false))
+		initWithSize(gridSize, pTexture, false);
-		{
-			// do something
-		}
 
 		pTexture->release();
 
@@ -177,6 +175,7 @@ namespace cocos2d
 	// mac can not applay land space
 	void CCGridBase::applyLandscape(void)
 	{	
+		CCLOG("unsupported");
 	}
 
 	void CCGridBase::set2DProjection()

cocos2dx/proj.uphone/cocos2d-uphone.vcproj

@@ -232,6 +232,14 @@
 				RelativePath="..\actions\CCActionTiledGrid.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\platform\mac\CCDirectorDisplayLinkMacWrapper.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\platform\mac\CCDirectorDisplayLinkMacWrapper.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="base_nodes"
@@ -252,10 +260,6 @@
 				RelativePath="..\effects\CCGrabber.h"
 				>
 			</File>
-			<File
-				RelativePath="..\effects\CCGrid.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\effects\CCGrid.h"
 				>
@@ -336,6 +340,10 @@
 				RelativePath="..\include\CCDrawingPrimitives.h"
 				>
 			</File>
+			<File
+				RelativePath="..\include\CCGL.h"
+				>
+			</File>
 			<File
 				RelativePath="..\include\CCKeypadDelegate.h"
 				>