Compare commits

...
6 Commits
Author SHA1 Message Date
fqamicandGitHub 8e78d49253 improve: update xr platform library (#327) 2022-12-28 13:36:09 +08:00
James ChenandGitHub bc1c652c93 Update swig repo url (#324)
* Update swig repo url

* Update swig version
2022-12-19 14:10:04 +08:00
MoHaiandGitHub 9dd70571cf update ar ios lib (#323) 2022-12-09 14:20:21 +08:00
12c8d3051c improve: update xr platform library (#322)
* improve: update xr platform library

* update ar android lib

* update ios ar lib, plane polygon and lib image size parameter

* update ar ios lib

Co-authored-by: MoHai <1192652394@qq.com>
2022-12-09 09:28:30 +08:00
James ChenandGitHub b1d2c74774 Add Constructor.__isJSB for JSB classes. (#321) 2022-12-07 14:07:53 +08:00
fqamicandGitHub 23cbc65185 feat: update xr platform library and add ar platform library (#319) 2022-11-23 18:02:43 +08:00
19 changed files with 31 additions and 4 deletions
+12
View File
@@ -160,6 +160,17 @@ else()
set(PhysXSDK)
endif()
if(USE_AR_MODULE)
set(ARSDK libAR)
add_library(libAR STATIC IMPORTED GLOBAL)
set_target_properties(libAR PROPERTIES
IMPORTED_LOCATION ${platform_spec_path}/ar/libar.a
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/../../cocos/xr
)
else()
set(ARSDK)
endif()
if (USE_DEBUG_RENDERER)
list(APPEND CC_EXTERNAL_LIBS
freetype
@@ -173,6 +184,7 @@ list(APPEND CC_EXTERNAL_LIBS
uv
android_platform
${PhysXSDK}
${ARSDK}
)
if(USE_JOB_SYSTEM_TBB OR CC_USE_VULKAN) ## VKDevice.cpp use tbb_allocator.h
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+12
View File
@@ -206,6 +206,17 @@ else()
set(PhysXSDK)
endif()
if(USE_AR_MODULE)
set(ARSDK libAR)
add_library(libAR STATIC IMPORTED GLOBAL)
set_target_properties(libAR PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/ar/libar.a
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/../../cocos/xr
)
else()
set(ARSDK)
endif()
list(APPEND CC_EXTERNAL_INCLUDES
${CMAKE_CURRENT_LIST_DIR}/include
)
@@ -224,6 +235,7 @@ list(APPEND CC_EXTERNAL_LIBS
${spirv-cross_libs_name}
${tbb_libs_name}
${PhysXSDK}
${ARSDK}
)
set(ZLIB z)
Binary file not shown.
@@ -278,6 +278,7 @@ SE_DECLARE_FINALIZE_FUNC(js_delete_$jsdtor) %}
%{
bool js_register_$jsmangledname(se::Object* obj) {
$jsclass_inheritance
cls->defineStaticProperty("__isJSB", se::Value(true), se::PropertyAttribute::READ_ONLY | se::PropertyAttribute::DONT_ENUM | se::PropertyAttribute::DONT_DELETE);
$jsclassvariables
$jsclassfunctions
$jsstaticclassvariables
@@ -278,6 +278,7 @@ SE_DECLARE_FINALIZE_FUNC(js_delete_$jsdtor) %}
%{
bool js_register_$jsmangledname(se::Object* obj) {
$jsclass_inheritance
cls->defineStaticProperty("__isJSB", se::Value(true), se::PropertyAttribute::READ_ONLY | se::PropertyAttribute::DONT_ENUM | se::PropertyAttribute::DONT_DELETE);
$jsclassvariables
$jsclassfunctions
$jsstaticclassvariables
+4 -4
View File
@@ -131,7 +131,7 @@ glslang (Built using https://github.com/YunHsiao/glslang/tree/build)
ios: 11.5.0 (commit: 1978c76)
linux: 11.5.0
swig (Built using https://github.com/dumganhar/swig/tree/cocos-se)
win64: cocos-v1.1.0 (commit: fac0dbb)
mac: cocos-v1.1.0 (commit: fac0dbb)
linux: cocos-v1.1.0 (commit: fac0dbb)
swig ( Built using https://github.com/cocos/swig/tree/cocos-se, executable files are downloaded from https://github.com/cocos/swig/releases/tag/cocos-v1.1.1 )
win64: cocos-v1.1.1 (commit: 7736311)
mac: cocos-v1.1.1 (commit: 7736311)
linux: cocos-v1.1.1 (commit: 7736311)
@@ -278,6 +278,7 @@ SE_DECLARE_FINALIZE_FUNC(js_delete_$jsdtor) %}
%{
bool js_register_$jsmangledname(se::Object* obj) {
$jsclass_inheritance
cls->defineStaticProperty("__isJSB", se::Value(true), se::PropertyAttribute::READ_ONLY | se::PropertyAttribute::DONT_ENUM | se::PropertyAttribute::DONT_DELETE);
$jsclassvariables
$jsclassfunctions
$jsstaticclassvariables