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

Merge pull request #946 from minggo/gles20 

fix some bug
This commit is contained in:
minggo 2012-05-30 03:33:19 -07:00
parent 89ea703dad a698f9bf69
commit 5ad2bec3d8
10 changed files with 9 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
HelloLua/proj.android/gen/org/cocos2dx/hellolua/R.java
View File

@ -1,26 +0,0 @@
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* aapt tool from the resource data it found. It
* should not be modified by hand.
*/
package org.cocos2dx.hellolua;
public final class R {
public static final class attr {
}
public static final class drawable {
public static final int icon=0x7f020000;
}
public static final class id {
public static final int test_demo_gl_surfaceview=0x7f050001;
public static final int textField=0x7f050000;
}
public static final class layout {
public static final int game_demo=0x7f030000;
}
public static final class string {
public static final int app_name=0x7f040000;
}
}

2
HelloLua/proj.android/jni/helloworld/main.cpp
View File

@ -27,7 +27,7 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi
CCEGLView *view = &CCEGLView::sharedOpenGLView();
view->setFrameSize(w, h);
// set the design resolution screen size, if you want to use Design Resoulution scaled to current screen, please uncomment next line.
// view.setDesignResolutionSize(480, 320);
view->setDesignResolutionSize(480, 320);
AppDelegate *pAppDelegate = new AppDelegate();
CCApplication::sharedApplication().run();

2
HelloLua/proj.android/project.properties
View File

@ -8,4 +8,4 @@
# project structure.
# Project target.
target=android-10
target=android-8

26
HelloWorld/proj.android/gen/org/cocos2dx/application/R.java
View File

@ -1,26 +0,0 @@
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* aapt tool from the resource data it found. It
* should not be modified by hand.
*/
package org.cocos2dx.application;
public final class R {
public static final class attr {
}
public static final class drawable {
public static final int icon=0x7f020000;
}
public static final class id {
public static final int helloworld_gl_surfaceview=0x7f050001;
public static final int textField=0x7f050000;
}
public static final class layout {
public static final int helloworld_demo=0x7f030000;
}
public static final class string {
public static final int app_name=0x7f040000;
}
}

2
HelloWorld/proj.android/project.properties
View File

@ -8,4 +8,4 @@
# project structure.
# Project target.
target=android-10
target=android-8

1
cocos2dx/platform/ios/CCEGLView.h
View File

@ -43,6 +43,7 @@ public:
bool canSetContentScaleFactor();
bool isIpad();
void setContentScaleFactor(float contentScaleFactor);
virtual CCSize getFrameSize();
// keep compatible
void end();

4
cocos2dx/platform/ios/CCEGLView.mm
View File

@ -83,6 +83,10 @@ void CCEGLView::swapBuffers()
[[EAGLView sharedEGLView] swapBuffers];
}
CCSize CCEGLView::getFrameSize()
{
assert(false);
}
void CCEGLView::setIMEKeyboardState(bool bOpen)
{

2
cocos2dx/touch_dispatcher/CCTouchHandler.cpp
View File

@ -40,8 +40,6 @@ void CCTouchHandler::setDelegate(CCTouchDelegate *pDelegate)
dynamic_cast<CCObject*>(pDelegate)->retain();
}
dynamic_cast<CCObject*>(pDelegate)->retain();
if (m_pDelegate)
{
dynamic_cast<CCObject*>(m_pDelegate)->release();

26
tests/proj.android/gen/org/cocos2dx/tests/R.java
View File

@ -1,26 +0,0 @@
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* aapt tool from the resource data it found. It
* should not be modified by hand.
*/
package org.cocos2dx.tests;
public final class R {
public static final class attr {
}
public static final class drawable {
public static final int icon=0x7f020000;
}
public static final class id {
public static final int test_demo_gl_surfaceview=0x7f050001;
public static final int textField=0x7f050000;
}
public static final class layout {
public static final int test_demo=0x7f030000;
}
public static final class string {
public static final int app_name=0x7f040000;
}
}

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

@ -1 +1 @@
6a7a307611b24e912fd48f6075ceab240a16305a
14a32fb3ba86f267841b87b9a63e906ce7a64969