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

Merge pull request #1640 from minggo/gles20 

modify lua project setting
This commit is contained in:
minggo 2012-11-22 18:42:45 -08:00
parent 91b370e0f0 226b10a9e2
commit f82e800695
3 changed files with 20 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java
View File

@ -55,7 +55,7 @@ public abstract class Cocos2dxActivity extends Activity implements Cocos2dxHelpe
this.mHandler = new Cocos2dxHandler(this);
this.mGLSurfaceView = onCreateView();
this.init();
Cocos2dxHelper.init(this, this);
}
@ -108,9 +108,7 @@ public abstract class Cocos2dxActivity extends Activity implements Cocos2dxHelpe
// ===========================================================
// Methods
// ===========================================================
public Cocos2dxGLSurfaceView onCreateView() {
// Init handler
public void init() {
// FrameLayout
ViewGroup.LayoutParams framelayout_params =
@ -130,18 +128,20 @@ public abstract class Cocos2dxActivity extends Activity implements Cocos2dxHelpe
framelayout.addView(edittext);
// Cocos2dxGLSurfaceView
Cocos2dxGLSurfaceView gLSurfaceView = new Cocos2dxGLSurfaceView(this);
this.mGLSurfaceView = this.onCreateView();
// ...add to FrameLayout
framelayout.addView(gLSurfaceView);
framelayout.addView(this.mGLSurfaceView);
gLSurfaceView.setCocos2dxRenderer(new Cocos2dxRenderer());
gLSurfaceView.setCocos2dxEditText(edittext);
this.mGLSurfaceView.setCocos2dxRenderer(new Cocos2dxRenderer());
this.mGLSurfaceView.setCocos2dxEditText(edittext);
// Set framelayout as the content view
setContentView(framelayout);
}
return gLSurfaceView;
public Cocos2dxGLSurfaceView onCreateView() {
return new Cocos2dxGLSurfaceView(this);
}
// ===========================================================

32
samples/HelloLua/proj.ios/HelloLua.xcodeproj/project.pbxproj
View File

@ -79,8 +79,6 @@
F2837A6915B9606900A5707B /* lvm.c in Sources */ = {isa = PBXBuildFile; fileRef = F2837A3715B9606900A5707B /* lvm.c */; };
F2837A6A15B9606900A5707B /* lzio.c in Sources */ = {isa = PBXBuildFile; fileRef = F2837A3915B9606900A5707B /* lzio.c */; };
F2837A6B15B9606900A5707B /* print.c in Sources */ = {isa = PBXBuildFile; fileRef = F2837A3B15B9606900A5707B /* print.c */; };
F2837A6C15B9606900A5707B /* Android.mk in Resources */ = {isa = PBXBuildFile; fileRef = F2837A3E15B9606900A5707B /* Android.mk */; };
F2837A6D15B9606900A5707B /* liblua.vcproj in Resources */ = {isa = PBXBuildFile; fileRef = F2837A4015B9606900A5707B /* liblua.vcproj */; };
F2837A6E15B9606900A5707B /* tolua_event.c in Sources */ = {isa = PBXBuildFile; fileRef = F2837A4315B9606900A5707B /* tolua_event.c */; };
F2837A6F15B9606900A5707B /* tolua_is.c in Sources */ = {isa = PBXBuildFile; fileRef = F2837A4515B9606900A5707B /* tolua_is.c */; };
F2837A7015B9606900A5707B /* tolua_map.c in Sources */ = {isa = PBXBuildFile; fileRef = F2837A4615B9606900A5707B /* tolua_map.c */; };
@ -217,8 +215,6 @@
F2837A3915B9606900A5707B /* lzio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lzio.c; sourceTree = "<group>"; };
F2837A3A15B9606900A5707B /* lzio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lzio.h; sourceTree = "<group>"; };
F2837A3B15B9606900A5707B /* print.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = print.c; sourceTree = "<group>"; };
F2837A3E15B9606900A5707B /* Android.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Android.mk; sourceTree = "<group>"; };
F2837A4015B9606900A5707B /* liblua.vcproj */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = liblua.vcproj; sourceTree = "<group>"; };
F2837A4215B9606900A5707B /* tolua++.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "tolua++.h"; sourceTree = "<group>"; };
F2837A4315B9606900A5707B /* tolua_event.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tolua_event.c; sourceTree = "<group>"; };
F2837A4415B9606900A5707B /* tolua_event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tolua_event.h; sourceTree = "<group>"; };
@ -386,8 +382,6 @@
children = (
F28379FC15B9606900A5707B /* cocos2dx_support */,
F2837A0515B9606900A5707B /* lua */,
F2837A3C15B9606900A5707B /* proj.android */,
F2837A3F15B9606900A5707B /* proj.win32 */,
F2837A4115B9606900A5707B /* tolua */,
);
name = lua;
@ -470,30 +464,6 @@
path = lua;
sourceTree = "<group>";
};
F2837A3C15B9606900A5707B /* proj.android */ = {
isa = PBXGroup;
children = (
F2837A3D15B9606900A5707B /* jni */,
);
path = proj.android;
sourceTree = "<group>";
};
F2837A3D15B9606900A5707B /* jni */ = {
isa = PBXGroup;
children = (
F2837A3E15B9606900A5707B /* Android.mk */,
);
path = jni;
sourceTree = "<group>";
};
F2837A3F15B9606900A5707B /* proj.win32 */ = {
isa = PBXGroup;
children = (
F2837A4015B9606900A5707B /* liblua.vcproj */,
);
path = proj.win32;
sourceTree = "<group>";
};
F2837A4115B9606900A5707B /* tolua */ = {
isa = PBXGroup;
children = (
@ -588,8 +558,6 @@
78947C7814EBB9B100DBD5A6 /* menu1.png in Resources */,
78947C7914EBB9B100DBD5A6 /* menu2.png in Resources */,
78DC4C9A15490B9500317402 /* Default.png in Resources */,
F2837A6C15B9606900A5707B /* Android.mk in Resources */,
F2837A6D15B9606900A5707B /* liblua.vcproj in Resources */,
D4EF94D715BD311700D803EB /* Icon-57.png in Resources */,
D4EF94D915BD311A00D803EB /* Icon-114.png in Resources */,
D4EF94DB15BD311E00D803EB /* Icon-72.png in Resources */,

9
samples/TestCpp/proj.android/src/org/cocos2dx/testcpp/TestCpp.java
View File

@ -24,6 +24,7 @@ THE SOFTWARE.
package org.cocos2dx.testcpp;
import org.cocos2dx.lib.Cocos2dxActivity;
import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
import android.os.Bundle;
@ -33,6 +34,14 @@ public class TestCpp extends Cocos2dxActivity{
super.onCreate(savedInstanceState);
}
public Cocos2dxGLSurfaceView onCreateView() {
Cocos2dxGLSurfaceView glSurfaceView = new Cocos2dxGLSurfaceView(this);
// TestCpp should create stencil buffer
glSurfaceView.setEGLConfigChooser(5, 6, 5, 0, 16, 8);
return glSurfaceView;
}
static {
System.loadLibrary("testcpp");
}