feat: remove xr library since version 3.7.2 (#337 )

Merge pull request #334 from bravetwo/v3.7.1
[v3.7.1] fix iOS plane polygon drift error
2023-03-02 10:21:49 +08:00 · 2023-02-07 14:58:58 +08:00 · 2023-02-07 14:06:42 +08:00 · 2023-02-07 11:51:41 +08:00 · 2023-02-05 11:32:05 +08:00 · 2023-02-03 21:00:49 +08:00
24 changed files with 7 additions and 150 deletions
@@ -63,35 +63,6 @@ target_include_directories(android_platform PUBLIC
 #   android log dl
 # )

-if(USE_XR)
-  include(${CMAKE_CURRENT_LIST_DIR}/xr.cmake)
-  if(BUILD_XR_NATIVE)
-    list(APPEND XR_EXTERNAL_SOURCES ${CMAKE_CURRENT_LIST_DIR}/../../cocos/xr/Xr.h)
-    list(APPEND XR_EXTERNAL_SOURCES ${CMAKE_CURRENT_LIST_DIR}/../../cocos/platform/interfaces/modules/XRCommon.h)
-    list(APPEND XR_EXTERNAL_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/../../cocos/xr)
-    list(APPEND XR_EXTERNAL_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/../../cocos/platform/interfaces/modules)
-    include(${CMAKE_CURRENT_LIST_DIR}/../../../../CCOpenXR/internal/CMakeLists.txt)
-  else()
-    add_library(xr STATIC IMPORTED GLOBAL)
-    set_target_properties(xr PROPERTIES
-      IMPORTED_LOCATION ${platform_spec_path}/xr/${XR_FOLDER}/libxr.a
-      INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/../../cocos/xr
-    )
-
-    set_property(TARGET xr APPEND PROPERTY
-      INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/../../cocos/platform/interfaces/modules
-    )
-
-    target_link_libraries(xr INTERFACE
-      ${XR_EXTERNAL_LIBS}
-    )
-  endif()
-
-  list(APPEND CC_EXTERNAL_LIBS
-      xr
-  )
-endif()
-
 set(se_libs_name)

 if(USE_SE_V8)
@@ -1,117 +0,0 @@
-
-
-################################# options ############################################
-# default fallback options
-cc_set_if_undefined(BUILD_XR_NATIVE               OFF)
-cc_set_if_undefined(XR_OEM_META                   OFF)
-cc_set_if_undefined(XR_OEM_HUAWEIVR               OFF)
-cc_set_if_undefined(XR_OEM_PICO                   OFF)
-cc_set_if_undefined(XR_OEM_ROKID                  OFF)
-cc_set_if_undefined(XR_OEM_SEED                   OFF)
-cc_set_if_undefined(XR_OEM_SNAPDRAGON_SPACES      OFF)
-cc_set_if_undefined(XR_USE_GRAPHICS_API_OPENGL_ES ON)
-cc_set_if_undefined(XR_USE_GRAPHICS_API_VULKAN    ON)
-cc_set_if_undefined(XR_USE_GRAPHICS_API_OPENGL    OFF)
-cc_set_if_undefined(XR_USE_GRAPHICS_API_D3D11     OFF)
-cc_set_if_undefined(XR_USE_GRAPHICS_API_D3D12     OFF)
-
-
-# Several files use these compile time platform switches
-if(WIN32)
-    cc_set_if_undefined(XR_USE_PLATFORM_WIN32     ON)
-elseif(ANDROID)
-    cc_set_if_undefined(XR_USE_PLATFORM_ANDROID   ON)
-elseif(PRESENTATION_BACKEND MATCHES "xlib")
-    cc_set_if_undefined(XR_USE_PLATFORM_XLIB      ON)
-elseif(PRESENTATION_BACKEND MATCHES "xcb")
-    cc_set_if_undefined(XR_USE_PLATFORM_XCB       ON)
-elseif(PRESENTATION_BACKEND MATCHES "wayland")
-    cc_set_if_undefined(XR_USE_PLATFORM_WAYLAND   ON)
-endif()
-
-
-################################# list all option values ##############################
-cc_inspect_values(
-    BUILD_XR_NATIVE
-    XR_OEM_META
-    XR_OEM_HUAWEIVR
-    XR_OEM_PICO
-    XR_OEM_ROKID
-    XR_OEM_SEED
-    XR_OEM_SNAPDRAGON_SPACES
-    XR_USE_GRAPHICS_API_OPENGL_ES
-    XR_USE_GRAPHICS_API_VULKAN
-    XR_USE_GRAPHICS_API_OPENGL
-    XR_USE_GRAPHICS_API_D3D11
-    XR_USE_GRAPHICS_API_D3D12
-    XR_USE_PLATFORM_WIN32
-    XR_USE_PLATFORM_ANDROID
-    XR_USE_PLATFORM_XLIB
-    XR_USE_PLATFORM_XCB
-    XR_USE_PLATFORM_WAYLAND
-)
-
-
-################################# cc_xr_apply_definations ###################################
-function(cc_xr_apply_definations target)
-    target_compile_definitions(${target} PUBLIC
-        $<IF:$<BOOL:${XR_OEM_META}>,XR_OEM_META=1,XR_OEM_META=0>
-        $<IF:$<BOOL:${XR_OEM_HUAWEIVR}>,XR_OEM_HUAWEIVR=1,XR_OEM_HUAWEIVR=0>
-        $<IF:$<BOOL:${XR_OEM_PICO}>,XR_OEM_PICO=1,XR_OEM_PICO=0>
-        $<IF:$<BOOL:${XR_OEM_ROKID}>,XR_OEM_ROKID=1,XR_OEM_ROKID=0>
-        $<IF:$<BOOL:${XR_OEM_SEED}>,XR_OEM_SEED=1,XR_OEM_SEED=0>
-        $<IF:$<BOOL:${XR_OEM_SNAPDRAGON_SPACES}>,XR_OEM_SNAPDRAGON_SPACES=1,XR_OEM_SNAPDRAGON_SPACES=0>
-        $<$<BOOL:${XR_USE_GRAPHICS_API_OPENGL_ES}>:XR_USE_GRAPHICS_API_OPENGL_ES=1>
-        $<$<BOOL:${XR_USE_GRAPHICS_API_VULKAN}>:XR_USE_GRAPHICS_API_VULKAN=1>
-        $<$<BOOL:${XR_USE_GRAPHICS_API_OPENGL}>:XR_USE_GRAPHICS_API_OPENGL=1>
-        $<$<BOOL:${XR_USE_GRAPHICS_API_D3D11}>:XR_USE_GRAPHICS_API_D3D11=1>
-        $<$<BOOL:${XR_USE_GRAPHICS_API_D3D12}>:XR_USE_GRAPHICS_API_D3D12=1>
-        $<$<BOOL:${XR_USE_PLATFORM_WIN32}>:XR_USE_PLATFORM_WIN32=1>
-        $<$<BOOL:${XR_USE_PLATFORM_ANDROID}>:XR_USE_PLATFORM_ANDROID=1>
-        $<$<BOOL:${XR_USE_PLATFORM_XLIB}>:XR_USE_PLATFORM_XLIB=1>
-        $<$<BOOL:${XR_USE_PLATFORM_XCB}>:XR_USE_PLATFORM_XCB=1>
-        $<$<BOOL:${XR_USE_PLATFORM_WAYLAND}>:XR_USE_PLATFORM_WAYLAND=1>
-    )
-endfunction()
-
-set(XR_EXTERNAL_LIBS)
-set(XR_EXTERNAL_INCLUDES)
-set(XR_EXTERNAL_SOURCES)
-
-list(APPEND XR_EXTERNAL_INCLUDES
-        ${CMAKE_CURRENT_LIST_DIR}
-)
-
-set(XR_OEM_LOADER_NAME openxr_loader)
-if(XR_OEM_META)
-    set(XR_OEM_FOLDER meta)
-    set(XR_FOLDER meta)
-elseif(XR_OEM_HUAWEIVR)
-    set(XR_OEM_FOLDER huaweivr)
-    set(XR_OEM_LOADER_NAME xr_loader)
-    set(XR_FOLDER huaweivr)
-elseif(XR_OEM_PICO)
-    set(XR_OEM_FOLDER pico)
-    set(XR_FOLDER pico)
-elseif(XR_OEM_ROKID)
-    set(XR_OEM_FOLDER rokid)
-    set(XR_FOLDER rokid)
-elseif(XR_OEM_SEED)
-    set(XR_OEM_FOLDER monado)
-    set(XR_FOLDER seed)
-elseif(XR_OEM_SNAPDRAGON_SPACES)
-    set(XR_OEM_FOLDER spaces)
-    set(XR_FOLDER spaces)
-else()
-    set(XR_OEM_FOLDER monado)
-    set(XR_FOLDER monado)
-endif()
-
-add_library(openxr SHARED IMPORTED GLOBAL)
-set_target_properties(openxr PROPERTIES
-  IMPORTED_LOCATION ${platform_spec_path}/xr/${XR_OEM_FOLDER}/lib${XR_OEM_LOADER_NAME}.so
-)
-
-list(APPEND XR_EXTERNAL_LIBS
-    openxr
-)
@@ -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
@@ -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.2 )
+    win64:      cocos-v1.1.2 (commit: 5c7c430)
+    mac:        cocos-v1.1.2 (commit: 5c7c430)
+    linux:      cocos-v1.1.2 (commit: 5c7c430)
@@ -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
Author	SHA1	Message	Date
fqamicandGitHub	88b32a1cdf	feat: remove xr library since version 3.7.2 (#337 )	2023-03-02 10:21:49 +08:00
江战andGitHub	a17aa187c4	Merge pull request #334 from bravetwo/v3.7.1 [v3.7.1] fix iOS plane polygon drift error	2023-02-07 14:58:58 +08:00
MoHai	bb9d872f65	fix plane polygon drift error	2023-02-07 14:06:42 +08:00
MoHaiandGitHub	67df64a9ae	Merge branch 'cocos:v3.7.1' into v3.7.1	2023-02-07 11:51:41 +08:00
MoHaiandGitHub	06933d0a6a	[v3.7.1] update ar .a libs (#333 ) * update ar android .a lib * update ar ios .a lib	2023-02-05 11:32:05 +08:00
MoHai	152aa6bf9c	update ar ios .a lib	2023-02-03 21:00:49 +08:00
MoHai	346ae8f18e	update ar android .a lib	2023-02-03 20:47:28 +08:00
MoHaiandGitHub	1a834a63c6	update ar ios lib (#329 )	2022-12-30 11:11:18 +08:00
江战andGitHub	c6a8715ad2	Merge pull request #328 from dumganhar/license-year Update the license info for the files generated by swig	2022-12-29 13:22:50 +08:00
James Chen	d38351ef50	Update versions.txt	2022-12-29 12:45:33 +08:00
James Chen	8942d8ab78	Update the license info for the files genereated by swig	2022-12-29 12:44:30 +08:00
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
fqamic GitHub MoHai	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