Merge pull request cocos2d#385 from flyingpacer/master

minggo · minggo · commit 6aa129bc9f89 · 2011-07-12T01:16:52.000-07:00
fixed cocos2d#602 and update lua support
diff --git a/cocos2dx/CCDirector.cpp b/cocos2dx/CCDirector.cpp
@@ -328,7 +328,7 @@ void CCDirector::setProjection(ccDirectorProjection kProjection)
         }
 		glMatrixMode(GL_PROJECTION);
 		glLoadIdentity();
-		gluPerspective(60, (GLfloat)size.width/size.height, zeye - size.height / 2, zeye + size.height / 2);
+		gluPerspective(60, (GLfloat)size.width/size.height, 0.5f, 1500.0f);
 			
 		glMatrixMode(GL_MODELVIEW);	
 		glLoadIdentity();
diff --git a/lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id b/lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id
@@ -1 +1 @@
-8fff23baca30b951a8b0de639e0b811e6a19db76
+75d73beef78b7e5bc9914fbb67ad560fec73d6a4
diff --git a/tools/tolua++/ccConfig.pkg b/tools/tolua++/ccConfig.pkg
@@ -64,9 +64,6 @@
 
 #define CC_ENABLE_PROFILERS 0
 
-
-#define CC_COMPATIBILITY_WITH_0_8 0
-
 #if CC_RETINA_DISPLAY_SUPPORT
 #define CC_IS_RETINA_DISPLAY_SUPPORTED 1
 #else

Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ void CCDirector::setProjection(ccDirectorProjection kProjection)`
`328`	`328`	`}`
`329`	`329`	`glMatrixMode(GL_PROJECTION);`
`330`	`330`	`glLoadIdentity();`
`331`		`- gluPerspective(60, (GLfloat)size.width/size.height, zeye - size.height / 2, zeye + size.height / 2);`
	`331`	`+ gluPerspective(60, (GLfloat)size.width/size.height, 0.5f, 1500.0f);`
`332`	`332`
`333`	`333`	`glMatrixMode(GL_MODELVIEW);`
`334`	`334`	`glLoadIdentity();`