Merge pull request #357 from dumganhar/v3.8.0-hmi

v3.8.0-hmi branch merges v3.7.2-hmi

android/CMakeLists.txt

@@ -84,7 +84,8 @@ if(USE_SE_V8)
       IMPORTED_LOCATION ${platform_spec_path}/v8/libinspector.a
       INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/v8
     )
-    set(se_libs_name v8_monolith v8_inspector)
+    set(se_libs_name v8_monolith)
+    set(se_libs_include ${platform_spec_path}/include/v8)
 endif()
 
 if(USE_WEBSOCKET_SERVER)
@@ -160,7 +161,9 @@ endif()
 
 set(ZLIB z)
 if(NOT USE_MODULES)
-  list(APPEND CC_EXTERNAL_LIBS ${ZLIB}  ${se_libs_name})
+  list(APPEND CC_EXTERNAL_LIBS ${ZLIB} 
+   ${se_libs_name}
+   )
 endif()
 
 

emscripten/spine/spine.d.ts

@@ -2,19 +2,45 @@ declare module 'external:emscripten/spine/spine.asm.js' {
     export default SpineWasm;
 }
 
-declare module 'external:emscripten/spine/spine.js' {
-    export default SpineWasm;
-}
-
-// tslint:disable
 declare function SpineWasm (moduleOptions?: any): Promise<void>;
 
 declare namespace SpineWasm {
     type ptr = number;
     interface instance {
-        spine: any;
+        spineWasmInstanceInit(): number;
+        spineWasmInstanceDestroy(): number;
+        queryStoreMemory(): ptr;
+        createSkeletonObject (): ptr;
+        setSkeletonData(objPtr: ptr, datPtr: ptr);
+        setAnimation(objPtr: ptr, length: number, trackIndex: number, loop: boolean): boolean;
+        clearTrack(objPtr: ptr, trackIndex: number): void;
+        clearTracks(objPtr: ptr): void;
+        setToSetupPose(objPtr: ptr): void;
+        setSlotsToSetupPose(objPtr: ptr): void;
+        setBonesToSetupPose(objPtr: ptr): void;
+        setTimeScale(objPtr: ptr, timeScale: number): number;
+        setSkin(objPtr: ptr, length: number): number;
+        updateAnimation(objPtr: ptr, dltTime: number): number;
+        setMix(objPtr: ptr, start: number, fromLength: number, toLength: number, duration: number);
+        setAttachment(objPtr: ptr, start: number, length1: number, length2: number);
+        updateRenderData(objPtr: ptr): number;
+        getDrawOrderSize(objPtr: ptr): number;
+        getSlotNameByOrder(objPtr: ptr, index: number): number;
+        getBoneMatrix(objPtr: ptr, index: number): number;
+        queryMemory(size: number): number;
+        freeMemory(data: ptr);
+        setDefaultScale(objPtr: ptr, scale: number): boolean;
+        setVertexEffect(objPtr: ptr, effect: number, effectType: number);
+        setPremultipliedAlpha(objPtr: ptr, premultipliedAlpha: boolean);
+        setColor(objPtr: ptr, r: number, g: number, b: number, a: number);
+        destroyInstance(objPtr: ptr);
+        retainSkeletonDataByUUID(length: number): number;
+        initSkeletonData(length: number, isJosn: boolean): number;
+        recordSkeletonDataUUID(length: number, datPtr: number);
+        createJitterVertexEffect(x: number, y: number): number;
+        updateJitterParameters(handle: number, x: number, y: number);
+        createSwirlVertexEffect(radius: number, power: number, usePowerOut: boolean): number;
+        updateSwirlParameters(handle: number, centerX: number, centerY: number, radius: number, angle: number);
         memory: any;
-        spineWasmInit(): void;
-        spineWasmDestroy(): void;
     }
 }

ohos/CMakeLists.txt

@@ -143,8 +143,7 @@ add_library(glslang-default-resource-limits STATIC IMPORTED GLOBAL)
 set_target_properties(glslang-default-resource-limits PROPERTIES
   IMPORTED_LOCATION ${ohos_lib_dir}/libglslang-default-resource-limits.a
 )
-# Unable to link MachineIndependent with GenericCodeGen
-set(glslang_libs_name glslang OGLCompiler OSDependent SPIRV glslang-default-resource-limits)
+set(glslang_libs_name glslang OGLCompiler OSDependent SPIRV glslang-default-resource-limits MachineIndependent GenericCodeGen)
 
 if(USE_PHYSICS_PHYSX)
   set(PhysXSDK PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXExtensions PhysX PhysXPvdSDK PhysXCommon PhysXFoundation)
@@ -215,8 +214,7 @@ list(APPEND CC_EXTERNAL_INCLUDES
   ${platform_spec_path}/include/v8
   ${platform_spec_path}/include/sqlite
   ${platform_spec_path}/include/png16
-  # Will conflict with the header file of harmonyos' standard library (error.h).
-  # ${platform_spec_path}/include/uv
+  ${platform_spec_path}/include/uv
 )
 
 #TODO: remove in future version

sources/CMakeLists.txt

@@ -54,7 +54,7 @@ add_definitions(-DCC_SWAPPY_ENABLED)
 endif()
 
 
-if(ANDROID)
+if(ANDROID AND (NOT SURFACE_LESS_SERVICE))
     set(CC_GAME_ACTIVITY_SOURCES
         ${CMAKE_CURRENT_LIST_DIR}/android-gamesdk/GameActivity/game-activity/include/game-activity/GameActivity.cpp
         ${CMAKE_CURRENT_LIST_DIR}/android-gamesdk/GameActivity/game-activity/include/game-activity/system_utils.cpp