From 210840a22a1b7e7fab2363260d01b8530885642e Mon Sep 17 00:00:00 2001 From: minggo Date: Mon, 4 Jul 2011 14:21:03 +0800 Subject: [PATCH] fixed #555: upgrade effects to 1.0.0-rc3 --- cocos2dx/effects/CCGrid.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cocos2dx/effects/CCGrid.cpp b/cocos2dx/effects/CCGrid.cpp index 3a5b3d061d..1ecbfabfeb 100644 --- a/cocos2dx/effects/CCGrid.cpp +++ b/cocos2dx/effects/CCGrid.cpp @@ -110,8 +110,8 @@ namespace cocos2d CCDirector *pDirector = CCDirector::sharedDirector(); CCSize s = pDirector->getWinSizeInPixels(); - unsigned int POTWide = ccNextPOT((unsigned int)s.width); - unsigned int POTHigh = ccNextPOT((unsigned int)s.height); + unsigned long POTWide = ccNextPOT((unsigned int)s.width); + unsigned long POTHigh = ccNextPOT((unsigned int)s.height); CCTexture2DPixelFormat format = pDirector->getPiexFormat() == kCCPixelFormatRGB565 ? kCCTexture2DPixelFormat_RGB565 : kCCTexture2DPixelFormat_RGBA8888; @@ -346,7 +346,7 @@ namespace cocos2d glVertexPointer(3, GL_FLOAT, 0, m_pVertices); glTexCoordPointer(2, GL_FLOAT, 0, m_pTexCoordinates); - glDrawElements(GL_TRIANGLES, n * 6, GL_UNSIGNED_SHORT, m_pIndices); + glDrawElements(GL_TRIANGLES, (GLsizei)n * 6, GL_UNSIGNED_SHORT, m_pIndices); // restore GL default state glEnableClientState(GL_COLOR_ARRAY); @@ -521,7 +521,7 @@ namespace cocos2d glVertexPointer(3, GL_FLOAT, 0, m_pVertices); glTexCoordPointer(2, GL_FLOAT, 0, m_pTexCoordinates); - glDrawElements(GL_TRIANGLES, n*6, GL_UNSIGNED_SHORT, m_pIndices); + glDrawElements(GL_TRIANGLES, (GLsizei)n*6, GL_UNSIGNED_SHORT, m_pIndices); // restore default GL state glEnableClientState(GL_COLOR_ARRAY);