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

This reverts commit b5cf1a2e4e.

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;
 }

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

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);
+    $js_set_private_object
-    s.thisObject()->setPrivateObject(ptr);
     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);
+    $js_set_private_object
-    s.thisObject()->setPrivateObject(ptr);
     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) %}

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

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);
+    $js_set_private_object
-    s.thisObject()->setPrivateObject(ptr);
     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);
+    $js_set_private_object
-    s.thisObject()->setPrivateObject(ptr);
     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) %}

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 )
+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 )
-    win64:      cocos-v1.1.6 (commit: f52be17)
+    all:      cocos-v1.1.7 (commit: 7969da2)
-    mac:        cocos-v1.1.6 (commit: f52be17)
-    linux:      cocos-v1.1.6 (commit: f52be17)

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

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);
+    $js_set_private_object
-    s.thisObject()->setPrivateObject(ptr);
     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);
+    $js_set_private_object
-    s.thisObject()->setPrivateObject(ptr);
     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) %}