jayden/LayaNative2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

同步

Browse Source
This commit is contained in:
lvfulong
2021-03-22 19:32:28 +08:00
parent e32ab4cd9f
commit 1f6af9ab2a
30 changed files with 137 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Conch/build/conch/proj.ios/LayaBox.xcodeproj/project.pbxproj
+4 -4
View File
@@ -801,7 +801,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 17;
CURRENT_PROJECT_VERSION = 19;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = MH4ZKZTS68;
ENABLE_BITCODE = NO;
@@ -823,7 +823,7 @@
../../../../ThirdParty/curl/lib/ios,
../../../../ThirdParty/bullet/lib/ios,
);
MARKETING_VERSION = "release-2.9.0";
MARKETING_VERSION = "release-2.11.0";
OTHER_CFLAGS = "-I../../../include/conchRuntime";
OTHER_LDFLAGS = (
"-lcurl",
@@ -859,7 +859,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 17;
CURRENT_PROJECT_VERSION = 19;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = MH4ZKZTS68;
ENABLE_BITCODE = NO;
@@ -882,7 +882,7 @@
../../../../ThirdParty/curl/lib/ios,
../../../../ThirdParty/bullet/lib/ios,
);
MARKETING_VERSION = "release-2.9.0";
MARKETING_VERSION = "release-2.11.0";
OTHER_CFLAGS = "-I../../../include/conchRuntime";
OTHER_LDFLAGS = (
"-lcurl",
Conch/build/conch/proj.ios/LayaBox/ViewController.mm
+2 -2
View File
@@ -26,12 +26,12 @@ static ViewController* g_pIOSMainViewController = nil;
[super viewDidLoad];
//保持屏幕常亮，可以通过脚本设置
[[UIApplication sharedApplication] setIdleTimerDisabled:YES];
self->m_pGLContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3];
/*self->m_pGLContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3];
if (self->m_pGLContext)
{
NSLog(@"iOS OpenGL ES 3.0 context created");
}
else
else*/
{
self->m_pGLContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
if (self->m_pGLContext)
Conch/build/conch/proj.ios/resource/scripts/apploader.js
+8 -4
View File
@@ -2835,6 +2835,7 @@ class GLCommandEncoder {
}
getExtension(name) {
var extention = this._layagl._nativeObj.getStringEx(0x1F03);
let version = this._layagl._nativeObj.getStringEx(0x1F02);
let extentions = extention.split(' ');
function supports(extention) {
for (let ext of extentions) {
@@ -2860,7 +2861,7 @@ class GLCommandEncoder {
(extention.indexOf('GL_EXT_shader_texture_lod') != -1 || extention.indexOf('GL_ARB_shader_texture_lod') != -1)) {
return {};
}
else if (name === 'OES_element_index_uint' && extention.indexOf('GL_OES_element_index_uint') != -1) {
else if (name === 'OES_element_index_uint' && (extention.indexOf('GL_OES_element_index_uint') != -1)) {
return {};
}
else if (name === 'EXT_sRGB' && extention.indexOf('GL_EXT_sRGB') != -1) {
@@ -2915,13 +2916,16 @@ class GLCommandEncoder {
TEXTURE_MAX_ANISOTROPY_EXT: 34046,
};
}
else if (name.indexOf('ANGLE_instanced_arrays') != -1 && (conchConfig.glCaps & GL_CAPS.INSTANCEING)) {
else if (name.indexOf('ANGLE_instanced_arrays') != -1 && ((extention.indexOf('_instanced_arrays') != -1) || version.indexOf("OpenGL ES 3.") != -1)) {
return new ANGLEInstancedArrays(this);
}
else if (name.indexOf('OES_vertex_array_object') != -1 && extention.indexOf('GL_OES_vertex_array_object') != -1) {
else if (name.indexOf('OES_vertex_array_object') != -1 && (extention.indexOf('GL_OES_vertex_array_object') != -1)) {
return new OESVertexArrayObject(this);
}
else if (name.indexOf('OES_texture_half_float') != -1 && extention.indexOf('GL_OES_texture_half_float') != -1) {
else if (name.indexOf('OES_texture_float') != -1 && extention.indexOf('GL_OES_texture_float') != -1) {
return {};
}
else if (name.indexOf('OES_texture_half_float') != -1 && (extention.indexOf('GL_OES_texture_half_float') != -1)) {
return { HALF_FLOAT_OES: 36193 };
}
else if (name.indexOf('OES_texture_half_float_linear') != -1 && extention.indexOf('GL_OES_texture_half_float_linear') != -1) {