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

Merge branch 'iss1177_platform' of https://github.com/dumganhar/cocos2d-x into iss1177_platform

This commit is contained in:
James Chen 2012-04-23 15:41:01 +08:00
parent af86a52f27 8fd3518160
commit 5e0682ed77
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cocos2dx/CCDirector.cpp
View File

@ -328,7 +328,7 @@ void CCDirector::setNextDeltaTimeZero(bool bNextDeltaTimeZero)
void CCDirector::setProjection(ccDirectorProjection kProjection) void CCDirector::setProjection(ccDirectorProjection kProjection)
{ {
CCSize size = m_obWinSizeInPixels; CCSize size = m_obWinSizeInPixels;
//CCSize sizePoint = m_obWinSizeInPoints; CCSize sizePoint = m_obWinSizeInPoints;
//glViewport(0, 0, size.width * CC_CONTENT_SCALE_FACTOR(), size.height * CC_CONTENT_SCALE_FACTOR() ); //glViewport(0, 0, size.width * CC_CONTENT_SCALE_FACTOR(), size.height * CC_CONTENT_SCALE_FACTOR() );
if (m_pobOpenGLView) if (m_pobOpenGLView)
@ -354,6 +354,12 @@ void CCDirector::setProjection(ccDirectorProjection kProjection)
case kCCDirectorProjection3D: case kCCDirectorProjection3D:
{ {
// reset the viewport if 3d proj & retina display
if( CC_CONTENT_SCALE_FACTOR() != 1.0f )
{
glViewport(-size.width/2, -size.height/2, size.width * CC_CONTENT_SCALE_FACTOR(), size.height * CC_CONTENT_SCALE_FACTOR() );
}
float zeye = this->getZEye(); float zeye = this->getZEye();
kmMat4 matrixPerspective, matrixLookup; kmMat4 matrixPerspective, matrixLookup;
@ -377,8 +383,8 @@ void CCDirector::setProjection(ccDirectorProjection kProjection)
kmGLMatrixMode(KM_GL_MODELVIEW); kmGLMatrixMode(KM_GL_MODELVIEW);
kmGLLoadIdentity(); kmGLLoadIdentity();
kmVec3 eye, center, up; kmVec3 eye, center, up;
kmVec3Fill( &eye, size.width/2, size.height/2, zeye ); kmVec3Fill( &eye, sizePoint.width/2, sizePoint.height/2, zeye );
kmVec3Fill( &center, size.width/2, size.height/2, 0.0f ); kmVec3Fill( &center, sizePoint.width/2, sizePoint.height/2, 0.0f );
kmVec3Fill( &up, 0.0f, 1.0f, 0.0f); kmVec3Fill( &up, 0.0f, 1.0f, 0.0f);
kmMat4LookAt(&matrixLookup, &eye, &center, &up); kmMat4LookAt(&matrixLookup, &eye, &center, &up);
kmGLMultMatrix(&matrixLookup); kmGLMultMatrix(&matrixLookup);

2
cocos2dx/platform/win32/CCEGLView_win32.cpp
View File

@ -503,7 +503,7 @@ void CCEGLView::setContentScaleFactor(float contentScaleFactor)
{ {
CCEGLViewProtocol::setContentScaleFactor(contentScaleFactor); CCEGLViewProtocol::setContentScaleFactor(contentScaleFactor);
resize((int)(m_sSizeInPoint.width * contentScaleFactor), (int)(m_sSizeInPoint.height * contentScaleFactor)); resize((int)(m_sSizeInPixel.width * contentScaleFactor), (int)(m_sSizeInPixel.height * contentScaleFactor));
centerWindow(); centerWindow();
} }