Revert "Add update PhysX workflow (#426 )" (#428 )

This reverts commit b5cf1a2e4e.
Add update PhysX workflow (#426 )
2023-10-09 17:54:18 +08:00 · 2023-10-09 17:24:50 +08:00 · 2023-09-21 10:45:01 +08:00 · 2023-09-13 16:23:10 +08:00 · 2023-09-11 17:42:03 +08:00 · 2023-09-08 16:33:10 +08:00
22 changed files with 8206 additions and 7901 deletions
--- a/emscripten/box2d/b2.d.ts
+++ b/emscripten/box2d/b2.d.ts
@ -185,6 +185,7 @@ declare namespace B2 {
        GetFilterData(): Filter;
        Refilter(): void;
        GetBody(): Body;
+        GetNext(): Fixture;
        TestPoint(p: Vec2): boolean;
        RayCast(output: RayCastOutput, input: RayCastInput, childIndex: number): boolean;
        GetMassData(massData: MassData): void;
@ -272,6 +273,8 @@ declare namespace B2 {
        IsEnabled(): boolean;
        SetFixedRotation(flag: boolean): void;
        IsFixedRotation(): boolean;
+        GetFixtureList(): Fixture;
+        GetJointList(): number;
        GetWorld(): World;
        Dump(): void;
    }
@ -572,4 +575,10 @@ declare namespace B2 {
    function ContactImpulseGetNormalImpulse(contactImpulsePtr: number, index: number): number;
    function ContactImpulseGetTangentImpulse(contactImpulsePtr: number, index: number): number;
    function ContactImpulseGetCount(contactImpulsePtr: number): number;
+
+    //JointEdge
+    function JointEdgeGetOther(jointEdgePtr: number): number;
+    function JointEdgeGetJoint(jointEdgePtr: number): number;
+    function JointEdgeGetPrev(jointEdgePtr: number): number;
+    function JointEdgeGetNext(jointEdgePtr: number): number;
 }
--- a/emscripten/box2d/box2d.debug.asm.js
+++ b/emscripten/box2d/box2d.debug.asm.js
--- a/emscripten/box2d/box2d.debug.wasm.wasm
+++ b/emscripten/box2d/box2d.debug.wasm.wasm
--- a/emscripten/box2d/box2d.release.asm.js
+++ b/emscripten/box2d/box2d.release.asm.js
--- a/emscripten/box2d/box2d.release.wasm.js
+++ b/emscripten/box2d/box2d.release.wasm.js
--- a/emscripten/box2d/box2d.release.wasm.wasm
+++ b/emscripten/box2d/box2d.release.wasm.wasm
--- a/emscripten/bullet/bullet.asm.js
+++ b/emscripten/bullet/bullet.asm.js
--- a/emscripten/bullet/bullet.wasm
+++ b/emscripten/bullet/bullet.wasm
--- a/emscripten/spine/spine.asm.js
+++ b/emscripten/spine/spine.asm.js
--- a/emscripten/spine/spine.js.mem
+++ b/emscripten/spine/spine.js.mem
--- a/emscripten/spine/spine.wasm
+++ b/emscripten/spine/spine.wasm
--- a/emscripten/webgpu/webgpu_wasm.wasm
+++ b/emscripten/webgpu/webgpu_wasm.wasm
--- a/linux/bin/swig/bin/swig
+++ b/linux/bin/swig/bin/swig
--- a/linux/bin/swig/share/swig/4.1.0/javascript/cocos/javascript.swg
+++ b/linux/bin/swig/share/swig/4.1.0/javascript/cocos/javascript.swg
@ -21,4 +21,11 @@
 %include <javascriptinit.swg>

 #define %module_macro(m) %feature("module_macro","m")
-#define %release_returned_cpp_object_in_gc(method)  %feature("release_returned_cpp_object_in_gc", "1") method
+#define %release_returned_cpp_object_in_gc(method)  %feature("release_returned_cpp_object_in_gc", "1") method
+
+%define %virtual_inherit(klass) 
+%feature("virtual_inherit", "1") klass;
+%typemap(in) klass *self
+%{ $1 = SE_THIS_OBJECT_VIRTUAL<$*ltype, cc::VirtualInheritBase>(s);
+if (nullptr == $1) return true;%}
+%enddef
--- a/linux/bin/swig/share/swig/4.1.0/javascript/cocos/javascriptcode.swg
+++ b/linux/bin/swig/share/swig/4.1.0/javascript/cocos/javascriptcode.swg
@ -22,8 +22,7 @@ static bool $jswrapper(se::State& s) // NOLINT(readability-identifier-naming)
    $js_check_arg_count
    $jslocals
    $jscode
-    auto *ptr = JSB_MAKE_PRIVATE_OBJECT_WITH_INSTANCE(result);
-    s.thisObject()->setPrivateObject(ptr);
+    $js_set_private_object
    return true;
 }
 SE_BIND_CTOR($jswrapper, __jsb_$jsmangledname_class, js_delete_$jsdtor)%}
@ -62,8 +61,7 @@ static bool $jswrapper(se::State& s) // NOLINT(readability-identifier-naming)
    CC_UNUSED bool ok = true;
    $jslocals
    $jscode
-    auto *ptr = JSB_MAKE_PRIVATE_OBJECT_WITH_INSTANCE(result);
-    s.thisObject()->setPrivateObject(ptr);
+    $js_set_private_object
    return true;
 }
 %}
@ -86,19 +84,20 @@ static bool $jswrapper(se::State& s) // NOLINT(readability-identifier-naming)

 /* -----------------------------------------------------------------------------
 * js_dtor:  template for a destructor wrapper
- *   - $jsmangledname:  mangled class name
+ *   - $classname_mangled:  mangled class name
 *   - $jstype:         class type
 * ----------------------------------------------------------------------------- */
 %fragment ("js_dtor", "templates")
 %{
 static bool $jswrapper(se::State& s) {
+  cc::invokeOnGarbageCollectMethod<$jsclass_type>(s);
  return true;
 }
 SE_BIND_FINALIZE_FUNC($jswrapper) %}

 /* -----------------------------------------------------------------------------
 * js_dtor:  template for a destructor wrapper
- *   - $jsmangledname:  mangled class name
+ *   - $classname_mangled:  mangled class name
 *   - $jstype:         class type
 *   - ${destructor_action}: The custom destructor action to invoke.
 * ----------------------------------------------------------------------------- */
@ -106,6 +105,7 @@ SE_BIND_FINALIZE_FUNC($jswrapper) %}
 %{
 static bool $jswrapper(se::State& s)
 {
+  cc::invokeOnGarbageCollectMethod<$jsclass_type>(s);
  return true;
 }
 SE_BIND_FINALIZE_FUNC($jswrapper) %}
--- a/mac/bin/swig/bin/swig
+++ b/mac/bin/swig/bin/swig
--- a/mac/bin/swig/share/swig/4.1.0/javascript/cocos/javascript.swg
+++ b/mac/bin/swig/share/swig/4.1.0/javascript/cocos/javascript.swg
@ -21,4 +21,11 @@
 %include <javascriptinit.swg>

 #define %module_macro(m) %feature("module_macro","m")
-#define %release_returned_cpp_object_in_gc(method)  %feature("release_returned_cpp_object_in_gc", "1") method
+#define %release_returned_cpp_object_in_gc(method)  %feature("release_returned_cpp_object_in_gc", "1") method
+
+%define %virtual_inherit(klass) 
+%feature("virtual_inherit", "1") klass;
+%typemap(in) klass *self
+%{ $1 = SE_THIS_OBJECT_VIRTUAL<$*ltype, cc::VirtualInheritBase>(s);
+if (nullptr == $1) return true;%}
+%enddef
--- a/mac/bin/swig/share/swig/4.1.0/javascript/cocos/javascriptcode.swg
+++ b/mac/bin/swig/share/swig/4.1.0/javascript/cocos/javascriptcode.swg
@ -22,8 +22,7 @@ static bool $jswrapper(se::State& s) // NOLINT(readability-identifier-naming)
    $js_check_arg_count
    $jslocals
    $jscode
-    auto *ptr = JSB_MAKE_PRIVATE_OBJECT_WITH_INSTANCE(result);
-    s.thisObject()->setPrivateObject(ptr);
+    $js_set_private_object
    return true;
 }
 SE_BIND_CTOR($jswrapper, __jsb_$jsmangledname_class, js_delete_$jsdtor)%}
@ -62,8 +61,7 @@ static bool $jswrapper(se::State& s) // NOLINT(readability-identifier-naming)
    CC_UNUSED bool ok = true;
    $jslocals
    $jscode
-    auto *ptr = JSB_MAKE_PRIVATE_OBJECT_WITH_INSTANCE(result);
-    s.thisObject()->setPrivateObject(ptr);
+    $js_set_private_object
    return true;
 }
 %}
@ -86,19 +84,20 @@ static bool $jswrapper(se::State& s) // NOLINT(readability-identifier-naming)

 /* -----------------------------------------------------------------------------
 * js_dtor:  template for a destructor wrapper
- *   - $jsmangledname:  mangled class name
+ *   - $classname_mangled:  mangled class name
 *   - $jstype:         class type
 * ----------------------------------------------------------------------------- */
 %fragment ("js_dtor", "templates")
 %{
 static bool $jswrapper(se::State& s) {
+  cc::invokeOnGarbageCollectMethod<$jsclass_type>(s);
  return true;
 }
 SE_BIND_FINALIZE_FUNC($jswrapper) %}

 /* -----------------------------------------------------------------------------
 * js_dtor:  template for a destructor wrapper
- *   - $jsmangledname:  mangled class name
+ *   - $classname_mangled:  mangled class name
 *   - $jstype:         class type
 *   - ${destructor_action}: The custom destructor action to invoke.
 * ----------------------------------------------------------------------------- */
@ -106,6 +105,7 @@ SE_BIND_FINALIZE_FUNC($jswrapper) %}
 %{
 static bool $jswrapper(se::State& s)
 {
+  cc::invokeOnGarbageCollectMethod<$jsclass_type>(s);
  return true;
 }
 SE_BIND_FINALIZE_FUNC($jswrapper) %}
--- a/versions.txt
+++ b/versions.txt
@ -139,7 +139,5 @@ glslang (Built using https://github.com/YunHsiao/glslang/tree/build)
    linux:      11.5.0
    openharmony:11.5.0 (commit: 1978c76)
    
-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.6 )
-    win64:      cocos-v1.1.6 (commit: f52be17)
-    mac:        cocos-v1.1.6 (commit: f52be17)
-    linux:      cocos-v1.1.6 (commit: f52be17)
+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.7 )
+    all:      cocos-v1.1.7 (commit: 7969da2)
--- a/win64/bin/swig/bin/swig.exe
+++ b/win64/bin/swig/bin/swig.exe
--- a/win64/bin/swig/share/swig/4.1.0/javascript/cocos/javascript.swg
+++ b/win64/bin/swig/share/swig/4.1.0/javascript/cocos/javascript.swg
@ -21,4 +21,11 @@
 %include <javascriptinit.swg>

 #define %module_macro(m) %feature("module_macro","m")
-#define %release_returned_cpp_object_in_gc(method)  %feature("release_returned_cpp_object_in_gc", "1") method
+#define %release_returned_cpp_object_in_gc(method)  %feature("release_returned_cpp_object_in_gc", "1") method
+
+%define %virtual_inherit(klass) 
+%feature("virtual_inherit", "1") klass;
+%typemap(in) klass *self
+%{ $1 = SE_THIS_OBJECT_VIRTUAL<$*ltype, cc::VirtualInheritBase>(s);
+if (nullptr == $1) return true;%}
+%enddef
--- a/win64/bin/swig/share/swig/4.1.0/javascript/cocos/javascriptcode.swg
+++ b/win64/bin/swig/share/swig/4.1.0/javascript/cocos/javascriptcode.swg
@ -22,8 +22,7 @@ static bool $jswrapper(se::State& s) // NOLINT(readability-identifier-naming)
    $js_check_arg_count
    $jslocals
    $jscode
-    auto *ptr = JSB_MAKE_PRIVATE_OBJECT_WITH_INSTANCE(result);
-    s.thisObject()->setPrivateObject(ptr);
+    $js_set_private_object
    return true;
 }
 SE_BIND_CTOR($jswrapper, __jsb_$jsmangledname_class, js_delete_$jsdtor)%}
@ -62,8 +61,7 @@ static bool $jswrapper(se::State& s) // NOLINT(readability-identifier-naming)
    CC_UNUSED bool ok = true;
    $jslocals
    $jscode
-    auto *ptr = JSB_MAKE_PRIVATE_OBJECT_WITH_INSTANCE(result);
-    s.thisObject()->setPrivateObject(ptr);
+    $js_set_private_object
    return true;
 }
 %}
@ -86,19 +84,20 @@ static bool $jswrapper(se::State& s) // NOLINT(readability-identifier-naming)

 /* -----------------------------------------------------------------------------
 * js_dtor:  template for a destructor wrapper
- *   - $jsmangledname:  mangled class name
+ *   - $classname_mangled:  mangled class name
 *   - $jstype:         class type
 * ----------------------------------------------------------------------------- */
 %fragment ("js_dtor", "templates")
 %{
 static bool $jswrapper(se::State& s) {
+  cc::invokeOnGarbageCollectMethod<$jsclass_type>(s);
  return true;
 }
 SE_BIND_FINALIZE_FUNC($jswrapper) %}

 /* -----------------------------------------------------------------------------
 * js_dtor:  template for a destructor wrapper
- *   - $jsmangledname:  mangled class name
+ *   - $classname_mangled:  mangled class name
 *   - $jstype:         class type
 *   - ${destructor_action}: The custom destructor action to invoke.
 * ----------------------------------------------------------------------------- */
@ -106,6 +105,7 @@ SE_BIND_FINALIZE_FUNC($jswrapper) %}
 %{
 static bool $jswrapper(se::State& s)
 {
+  cc::invokeOnGarbageCollectMethod<$jsclass_type>(s);
  return true;
 }
 SE_BIND_FINALIZE_FUNC($jswrapper) %}
Author	SHA1	Message	Date
minggo	d5512eca74	Revert "Add update PhysX workflow (#426 )" (#428 ) This reverts commit `b5cf1a2e4e`.	2023-10-09 17:54:18 +08:00
Leslie Leigh (李的序)	b5cf1a2e4e	Add update PhysX workflow (#426 )	2023-10-09 17:24:50 +08:00
minggo	82856c0d85	Merge pull request #422 from cocos/v3.8.2 V3.8.2	2023-09-21 10:45:01 +08:00
minggo	1a551ab783	Revert "update bullet, physx for debug draw (#419 )" (#421 ) This reverts commit `fce5974adb`.	2023-09-13 16:23:10 +08:00
Zeqiang Li	ab01b1e0af	update webgpu was, (#420 )	2023-09-11 17:42:03 +08:00
Ling Zhan	fce5974adb	update bullet, physx for debug draw (#419 )	2023-09-08 16:33:10 +08:00
minggo	8e329d5897	Merge pull request #418 from cocos/v3.8.1 V3.8.1	2023-09-08 14:32:59 +08:00
Ling Zhan	e0776e986f	update bullet wasm: [fix] cct scaling causes trigger event missing (#416 )	2023-09-01 11:44:04 +08:00
Canvas	c634ab5511	update spine wasm & asm, fix event data bind. (#410 ) * update spine wasm & asm, fix event data bind. * update spine wasm & asm to fix event data. * update spine wasm & asm api. * update spine wasm & asm to fix const string.	2023-09-01 11:22:43 +08:00
Ling Zhan	e1afa91277	update box2dwasm (#413 )	2023-08-31 14:19:19 +08:00
minggo	47d19ad2fe	Merge pull request #412 from cocos/v3.8.2 V3.8.2	2023-08-31 13:51:59 +08:00
James Chen	edc75f8839	Update swig, supports virtual inheritance (#395 )	2023-08-09 11:35:04 +08:00
Santy-Wang	9b5264d916	Merge pull request #394 from cocos/v3.8.1 sync V3.8.1 to develop	2023-08-03 18:31:41 +08:00
minggo	7983e5d777	Merge pull request #387 from minggo/develop-merge-v3.8.1 Develop merge v3.8.1	2023-07-13 14:12:52 +08:00
minggo	109587f1dd	Merge branch 'v3.8.1' into develop-merge-v3.8.1	2023-07-13 11:59:22 +08:00
zhakesi	6e292f061a	update spine wasm (#374 )	2023-06-30 14:45:08 +08:00
minggo	161b2ca59a	Merge pull request #372 from cocos/v3.8.0 V3.8.0	2023-06-27 11:02:50 +08:00
minggo	998ab5a93c	Merge pull request #362 from cocos/v3.8.0 V3.8.0	2023-06-13 10:08:14 +08:00
qiuguohua	bc4dcfbabe	Fix harmonyos platform compilation failure. (#356 )	2023-06-02 14:55:25 +08:00