Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #330 from yangws/master 

fixed #544 #543
This commit is contained in:
Walzer 2011-06-27 23:40:05 -07:00
parent 7761ab374c 9d4c4b5cb6
commit 3e92c7dcac
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cocos2dx/effects/CCGrid.cpp
View File

@ -210,8 +210,9 @@ namespace cocos2d
CCSize winSize = CCDirector::sharedDirector()->getWinSizeInPixels(); CCSize winSize = CCDirector::sharedDirector()->getWinSizeInPixels();
glLoadIdentity(); 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); glMatrixMode(GL_PROJECTION);
glLoadIdentity(); glLoadIdentity();
ccglOrtho(0, winSize.width, 0, winSize.height, -1024, 1024); ccglOrtho(0, winSize.width, 0, winSize.height, -1024, 1024);
@ -223,8 +224,8 @@ namespace cocos2d
{ {
CCSize winSize = CCDirector::sharedDirector()->getDisplaySizeInPixels(); CCSize winSize = CCDirector::sharedDirector()->getDisplaySizeInPixels();
// glViewport(0, 0, (GLsizei)winSize.width, (GLsizei)winSize.height); // set view port for user FBO, fixed bug #543 #544
CCDirector::sharedDirector()->getOpenGLView()->setViewPortInPoints(0, 0, winSize.width, winSize.height); glViewport(0, 0, (GLsizei)winSize.width, (GLsizei)winSize.height);
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glLoadIdentity(); glLoadIdentity();
gluPerspective(60, (GLfloat)winSize.width/winSize.height, 0.5f, 1500.0f); gluPerspective(60, (GLfloat)winSize.width/winSize.height, 0.5f, 1500.0f);
@ -264,6 +265,8 @@ namespace cocos2d
glBindTexture(GL_TEXTURE_2D, m_pTexture->getName()); glBindTexture(GL_TEXTURE_2D, m_pTexture->getName());
// restore projection for default FBO .fixed bug #543 #544
CCDirector::sharedDirector()->setProjection(CCDirector::sharedDirector()->getProjection());
blit(); blit();
} }