Rebuild spine.wasm with -s MIN_SAFARI_VERSION=110000 (#370)

* Rebuild spine.wasm with -s MIN_SAFARI_VERSION=110000

* Remove execute permission

emscripten/bullet/bullet.d.ts

@@ -44,12 +44,12 @@ declare namespace Bullet {
         TypedConstraint_getFixedBody(): ptr;
         HingeConstraint_new(ptr0: ptr, ptr1: ptr, ptr2: ptr, ptr3: ptr): ptr;
         HingeConstraint_setFrames(ptr0: ptr, ptr1: ptr, ptr2: ptr): void;
-        HingeConstraint_setLimit(ptr: ptr, low: number, upper: number, softness: number, biasFactor: number, relaxationFactor: number): void;
-        HingeConstraint_setAngularOnly(ptr: ptr, angular: number): void;
-        HingeConstraint_enableMotor(ptr: ptr, enable: boolean): void;
-        HingeConstraint_setMotorVelocity(ptr: ptr, velocity: number): void;
-        HingeConstraint_setMaxMotorImpulse(ptr: ptr, maxImpulse: number): void;
-        HingeConstraint_setMotorTarget(ptr: ptr, target: number, dt: number): void;
+        HingeConstraint_setLimit(p: ptr, low: number, upper: number, softness: number, biasFactor: number, relaxationFactor: number): void;
+        HingeConstraint_setAngularOnly(p: ptr, angular: number): void;
+        HingeConstraint_enableMotor(p: ptr, enable: boolean): void;
+        HingeConstraint_setMotorVelocity(p: ptr, velocity: number): void;
+        HingeConstraint_setMaxMotorImpulse(p: ptr, maxImpulse: number): void;
+        HingeConstraint_setMotorTarget(p: ptr, target: number, dt: number): void;
         P2PConstraint_new(ptr0: ptr, ptr1: ptr, ptr2: ptr, ptr3: ptr): ptr;
         P2PConstraint_setPivotA(ptr0: ptr, ptr1: ptr): void;
         P2PConstraint_setPivotB(ptr0: ptr, ptr1: ptr): void;
@@ -255,13 +255,13 @@ declare namespace Bullet {
         // CharacterController
         ControllerHitReport_new(): ptr;
         CharacterController_getGhostObject(ptrCCT: ptr): ptr;
-        ControllerHit_getCurrentController(ptr: ptr): ptr;
-        ControllerHit_getHitWorldPos(ptr: ptr): ptr;
-        ControllerHit_getHitWorldNormal(ptr: ptr): ptr;
-        ControllerHit_getHitMotionDir(ptr: ptr): ptr;         //CCT hit Motion direction
-        ControllerHit_getHitMotionLength(ptr: ptr): number;   //CCT hit Motion length
-        ControllerShapeHit_getHitShape(ptr: ptr): ptr;
-        ControllerShapeHit_getHitCollisionObject(ptr: ptr): ptr;
+        ControllerHit_getCurrentController(p: ptr): ptr;
+        ControllerHit_getHitWorldPos(p: ptr): ptr;
+        ControllerHit_getHitWorldNormal(p: ptr): ptr;
+        ControllerHit_getHitMotionDir(p: ptr): ptr;         //CCT hit Motion direction
+        ControllerHit_getHitMotionLength(p: ptr): number;   //CCT hit Motion length
+        ControllerShapeHit_getHitShape(p: ptr): ptr;
+        ControllerShapeHit_getHitCollisionObject(p: ptr): ptr;
         CharacterController_move(ptrCCT: ptr, ptrMovement: ptr, minDist: number, deltaTime: number):number;
         CharacterController_getPosition(ptrCCT: ptr);
         CharacterController_setContactOffset(ptrCCT: ptr, v: number);

emscripten/external-wasm.d.ts

@@ -1,7 +1,23 @@
 declare module 'external:emscripten/*.wasm' {
     /**
-     * This is a url relative from build output chunk.
+     * This is a wasm url relative from build output chunk.
      */
     const wasmPath: string;
     export default wasmPath;
 }
+
+declare module 'external:emscripten/*.wasm.fallback' {
+    /**
+     * This is a wasm fallback url relative from build output chunk.
+     */
+    const wasmFallbackPath: string;
+    export default wasmFallbackPath;
+}
+
+declare module 'external:emscripten/*.js.mem' {
+    /**
+     * This is a js.mem url relative from build output chunk.
+     */
+    const jsMemPath: string;
+    export default jsMemPath;
+}

emscripten/spine/spine.d.ts

@@ -2,45 +2,20 @@ declare module 'external:emscripten/spine/spine.asm.js' {
     export default SpineWasm;
 }
 
+declare module 'external:emscripten/spine/spine.wasm.js' {
+    export default SpineWasm;
+}
+
+declare module 'external:emscripten/spine/spine.wasm.fallback.js' {
+    export default SpineWasm;
+}
+
+// tslint:disable
 declare function SpineWasm (moduleOptions?: any): Promise<void>;
 
 declare namespace SpineWasm {
-    type ptr = number;
     interface instance {
-        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,7 +143,8 @@ 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
 )
-set(glslang_libs_name glslang OGLCompiler OSDependent SPIRV glslang-default-resource-limits MachineIndependent GenericCodeGen)
+# Unable to link MachineIndependent with GenericCodeGen
+set(glslang_libs_name glslang OGLCompiler OSDependent SPIRV glslang-default-resource-limits)
 
 if(USE_PHYSICS_PHYSX)
   set(PhysXSDK PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXExtensions PhysX PhysXPvdSDK PhysXCommon PhysXFoundation)
@@ -214,7 +215,8 @@ list(APPEND CC_EXTERNAL_INCLUDES
   ${platform_spec_path}/include/v8
   ${platform_spec_path}/include/sqlite
   ${platform_spec_path}/include/png16
-  ${platform_spec_path}/include/uv
+  # Will conflict with the header file of harmonyos' standard library (error.h).
+  # ${platform_spec_path}/include/uv
 )
 
 #TODO: remove in future version