Merge pull request #252 from yangws/master

chipmunk test ok.
This commit is contained in:
Walzer 2011-05-05 22:42:41 -07:00
commit 9e41eb310c
3 changed files with 3 additions and 5 deletions

View File

@ -1 +1 @@
2d1b5e984c1b11de103d72fd1219a7adfa9c4baa
9d64949d940f3601af63ef349967d1853680ef81

View File

@ -444,9 +444,9 @@ void ChipmunkTestLayer::onEnter()
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
// portraint
glOrthof(-320/factor, 320/factor, -480/factor, 480/factor, -1.0f, 1.0f);
// glOrthof(-320/factor, 320/factor, -480/factor, 480/factor, -1.0f, 1.0f);
// landscape
// glOrthof(-480/factor, 480/factor, -320/factor, 320/factor, 1.0f, -1.0f);
glOrthof(-480/factor, 480/factor, -320/factor, 320/factor, 1.0f, -1.0f);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();

View File

@ -67,12 +67,10 @@ static TestScene* CreateTestScene(int nIdx)
pScene = new IntervalTestScene(); break;
case TEST_CHIPMUNK:
#if (CC_TARGET_PLATFORM != CC_PLATFORM_AIRPLAY)
ChangeOrientation(CCDeviceOrientationLandscapeLeft);
pScene = new ChipmunkTestScene(); break;
#else
#ifdef AIRPLAYUSECHIPMUNK
#if (AIRPLAYUSECHIPMUNK == 1)
ChangeOrientation(CCDeviceOrientationLandscapeLeft);
pScene = new ChipmunkTestScene(); break;
#endif
#endif