Permalink
Browse files

Merge pull request #330 from yangws/master

fixed #544 #543
  • Loading branch information...
2 parents 5117844 + 9e48033 commit b1fae51a597f7db97385f7dad27e2e122e832443 @walzer walzer committed Jun 28, 2011
Showing with 7 additions and 4 deletions.
  1. +7 −4 cocos2dx/effects/CCGrid.cpp
@@ -210,8 +210,9 @@ namespace cocos2d
CCSize winSize = CCDirector::sharedDirector()->getWinSizeInPixels();
glLoadIdentity();
-// glViewport((GLsizei)0, (GLsizei)0, (GLsizei)winSize.width, (GLsizei)winSize.height);
- CCDirector::sharedDirector()->getOpenGLView()->setViewPortInPoints(0, 0, winSize.width, winSize.height);
+
+ // set view port for user FBO, fixed bug #543 #544
+ glViewport((GLsizei)0, (GLsizei)0, (GLsizei)winSize.width, (GLsizei)winSize.height);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
ccglOrtho(0, winSize.width, 0, winSize.height, -1024, 1024);
@@ -223,8 +224,8 @@ namespace cocos2d
{
CCSize winSize = CCDirector::sharedDirector()->getDisplaySizeInPixels();
-// glViewport(0, 0, (GLsizei)winSize.width, (GLsizei)winSize.height);
- CCDirector::sharedDirector()->getOpenGLView()->setViewPortInPoints(0, 0, winSize.width, winSize.height);
+ // set view port for user FBO, fixed bug #543 #544
+ glViewport(0, 0, (GLsizei)winSize.width, (GLsizei)winSize.height);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
gluPerspective(60, (GLfloat)winSize.width/winSize.height, 0.5f, 1500.0f);
@@ -264,6 +265,8 @@ namespace cocos2d
glBindTexture(GL_TEXTURE_2D, m_pTexture->getName());
+ // restore projection for default FBO .fixed bug #543 #544
+ CCDirector::sharedDirector()->setProjection(CCDirector::sharedDirector()->getProjection());
blit();
}

0 comments on commit b1fae51

Please sign in to comment.