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

Merge pull request #252 from yangws/master 

chipmunk test ok.
This commit is contained in:
Walzer 2011-05-05 22:42:41 -07:00
parent 8e4cfec708 b95ef2f242
commit 9e41eb310c
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test.ios/test.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
2d1b5e984c1b11de103d72fd1219a7adfa9c4baa 9d64949d940f3601af63ef349967d1853680ef81

4
tests/tests/ChipmunkTest/cocos2dChipmunkDemo.cpp
View File

@ -444,9 +444,9 @@ void ChipmunkTestLayer::onEnter()
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glLoadIdentity(); glLoadIdentity();
// portraint // 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 // 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); glMatrixMode(GL_MODELVIEW);
glLoadIdentity(); glLoadIdentity();

2
tests/tests/controller.cpp
View File

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