Fix signal enter bug (#299)

When the `body_set_max_contacts_reported` is called, we don't update the
shapes. Recreate them so they have that flag(a bit excessive, maybe in
future we can just iterate and change that flag.

- Fixes #298

Author: Ughuuu

.github/workflows/module_builds.yml

@@ -20,5 +20,5 @@ jobs:
         with:
           name: static-rapier-${{ matrix.dimensions }}-${{ matrix.precision }}-${{ matrix.features }}-module
           path: |
-            module
+            module${{ matrix.dimensions }}
           if-no-files-found: error

module/register_types.h

@@ -17,17 +17,17 @@ def get_sufix():
 
 # Libraries
 if env["platform"] == "macos" or env["platform"] == "ios":
-    base_path = "#modules/rapier/bin/addons/my_library/bin/libmy_library{}.framework".format(get_sufix())
+    base_path = "#modules/rapier_2d/bin/addons/rapier_2d/bin/librapier_2d{}.framework".format(get_sufix())
     base_file = "libgodot_riscv{}".format(get_sufix())
 else:
-    base_path = "#modules/rapier/bin/addons/my_library/bin"
+    base_path = "#modules/rapier_2d/bin/addons/rapier_2d/bin"
     base_file = "libgodot_riscv{}".format(get_sufix())
 
 env.Append(LIBS=[base_file])
 env.Append(LIBPATH=[base_path])
 
 # Godot-cpp
-base_path = "#modules/rapier/ext/godot-cpp/bin"
+base_path = "#modules/rapier_2d/ext/godot-cpp/bin"
 base_file = "libgodot-cpp{}".format(get_sufix())
 
 env.Append(LIBS=[base_file])

module/SCsub module2d/SCsub

@@ -21,7 +21,7 @@ void initialize_sandbox_module(ModuleInitializationLevel p_level) {
 	Ref<GDExtensionStaticLibraryLoader> loader;
 	loader.instantiate();
 	loader->set_entry_funcptr((void*)&gdext_rust_init);
-	GDExtensionManager::get_singleton()->load_extension_with_loader("rapier", loader);
+	GDExtensionManager::get_singleton()->load_extension_with_loader("rapier_2d", loader);
 }
 
 void uninitialize_sandbox_module(ModuleInitializationLevel p_level) {

module/config.py module2d/config.py

@@ -0,0 +1,9 @@
+#ifndef RAPIER_2D_REGISTER_TYPES_H
+#define RAPIER_2D_REGISTER_TYPES_H
+
+#include "modules/register_module_types.h"
+
+void initialize_rapier_2d_module(ModuleInitializationLevel p_level);
+void uninitialize_rapier_2d_module(ModuleInitializationLevel p_level);
+
+#endif // RAPIER_2D_REGISTER_TYPES_H

module/gdextension_static_library_loader.cpp module2d/gdextension_static_library_loader.cpp

@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+from misc.utility.scons_hints import *
+
+Import("env")
+Import("env_modules")
+
+def get_sufix():
+    suffix = ".{}.{}".format(env["platform"], env["target"])
+    if env.dev_build:
+        suffix += ".dev"
+    if env["precision"] == "double":
+        suffix += ".double"
+    suffix += "." + env["arch"]
+    if not env["threads"]:
+        suffix += ".nothreads"
+    return suffix.replace("editor", "template_release")
+
+# Libraries
+if env["platform"] == "macos" or env["platform"] == "ios":
+    base_path = "#modules/rapier_3d/bin/addons/rapier_3d/bin/librapier_3d{}.framework".format(get_sufix())
+    base_file = "libgodot_riscv{}".format(get_sufix())
+else:
+    base_path = "#modules/rapier_3d/bin/addons/rapier_3d/bin"
+    base_file = "libgodot_riscv{}".format(get_sufix())
+
+env.Append(LIBS=[base_file])
+env.Append(LIBPATH=[base_path])
+
+# Godot-cpp
+base_path = "#modules/rapier_3d/ext/godot-cpp/bin"
+base_file = "libgodot-cpp{}".format(get_sufix())
+
+env.Append(LIBS=[base_file])
+env.Append(LIBPATH=[base_path])
+
+# Sources
+env_gdextension = env_modules.Clone()
+
+env_gdextension.add_source_files(env.modules_sources, "*.cpp")

module/gdextension_static_library_loader.h module2d/gdextension_static_library_loader.h

@@ -0,0 +1,6 @@
+def can_build(env, platform):
+    return True
+
+
+def configure(env):
+    pass

module/register_types.cpp module2d/register_types.cpp

@@ -0,0 +1,41 @@
+#include "gdextension_static_library_loader.h"
+
+#include "core/config/project_settings.h"
+#include "core/io/dir_access.h"
+#include "core/version.h"
+#include "core/extension/gdextension.h"
+
+Error GDExtensionStaticLibraryLoader::open_library(const String &p_path) {
+	library_path = p_path;
+	return OK;
+}
+
+Error GDExtensionStaticLibraryLoader::initialize(GDExtensionInterfaceGetProcAddress p_get_proc_address, const Ref<GDExtension> &p_extension, GDExtensionInitialization *r_initialization) {
+	
+	GDExtensionInitializationFunction initialization_function = (GDExtensionInitializationFunction)entry_funcptr;
+	if (initialization_function == nullptr) {
+	}
+	GDExtensionBool ret = initialization_function(p_get_proc_address, p_extension.ptr(), r_initialization);
+
+	if (ret) {
+		return OK;
+	} else {
+		ERR_PRINT("GDExtension initialization function '" + library_path + "' returned an error.");
+		return FAILED;
+	}
+}
+
+void GDExtensionStaticLibraryLoader::close_library() {
+}
+
+bool GDExtensionStaticLibraryLoader::is_library_open() const {
+	return true;
+}
+
+bool GDExtensionStaticLibraryLoader::has_library_changed() const {
+	return false;
+}
+
+bool GDExtensionStaticLibraryLoader::library_exists() const {
+	return true;
+}

module2d/register_types.h

@@ -0,0 +1,32 @@
+#ifndef GDEXTENSION_STATIC_LIBRARY_LOADER_H
+#define GDEXTENSION_STATIC_LIBRARY_LOADER_H
+
+#include <functional>
+
+#include "core/extension/gdextension_loader.h"
+#include "core/io/config_file.h"
+#include "core/os/shared_object.h"
+
+class GDExtensionStaticLibraryLoader : public GDExtensionLoader {
+	friend class GDExtensionManager;
+	friend class GDExtension;
+
+private:
+	String resource_path;
+	void *entry_funcptr = nullptr;
+	String library_path;
+	Vector<SharedObject> library_dependencies;
+
+	HashMap<String, String> class_icon_paths;
+
+public:
+	void set_entry_funcptr(void *p_entry_funcptr) { entry_funcptr = p_entry_funcptr; }
+	virtual Error open_library(const String &p_path) override;
+	virtual Error initialize(GDExtensionInterfaceGetProcAddress p_get_proc_address, const Ref<GDExtension> &p_extension, GDExtensionInitialization *r_initialization) override;
+	virtual void close_library() override;
+	virtual bool is_library_open() const override;
+	virtual bool has_library_changed() const override;
+	virtual bool library_exists() const override;
+};
+
+#endif // GDEXTENSION_STATIC_LIBRARY_LOADER_H

module3d/SCsub

@@ -0,0 +1,28 @@
+#include "register_types.h"
+#include "core/object/object.h"
+#include "core/extension/gdextension_interface.h"
+#include "core/extension/gdextension_manager.h"
+#include "./gdextension_static_library_loader.h"
+#include "core/object/ref_counted.h"
+
+extern "C" {
+    GDExtensionBool gdext_rust_init(
+        GDExtensionInterfaceGetProcAddress p_get_proc_address,
+        GDExtensionClassLibraryPtr p_library,
+        GDExtensionInitialization *r_initialization
+    );
+}
+
+void initialize_sandbox_module(ModuleInitializationLevel p_level) {
+	if (p_level != MODULE_INITIALIZATION_LEVEL_SERVERS) {
+		return;
+	}
+
+	Ref<GDExtensionStaticLibraryLoader> loader;
+	loader.instantiate();
+	loader->set_entry_funcptr((void*)&gdext_rust_init);
+	GDExtensionManager::get_singleton()->load_extension_with_loader("rapier_3d", loader);
+}
+
+void uninitialize_sandbox_module(ModuleInitializationLevel p_level) {
+}

module3d/config.py

@@ -0,0 +1,9 @@
+#ifndef RAPIER_3D_REGISTER_TYPES_H
+#define RAPIER_3D_REGISTER_TYPES_H
+
+#include "modules/register_module_types.h"
+
+void initialize_rapier_3d_module(ModuleInitializationLevel p_level);
+void uninitialize_rapier_3d_module(ModuleInitializationLevel p_level);
+
+#endif // RAPIER_3D_REGISTER_TYPES_H

module3d/gdextension_static_library_loader.cpp

@@ -836,11 +836,19 @@ impl RapierBody {
         );
     }
 
-    pub fn set_max_contacts_reported(&mut self, size: i32) {
+    pub fn set_max_contacts_reported(
+        &mut self,
+        size: i32,
+        physics_engine: &mut PhysicsEngine,
+        physics_spaces: &mut PhysicsSpaces,
+        physics_ids: &PhysicsIds,
+    ) {
         self.state
             .contacts
             .resize(size as usize, Contact::default());
         self.state.contact_count = 0;
+        // update all contact forces
+        self.recreate_shapes(physics_engine, physics_spaces, physics_ids);
     }
 
     pub fn reset_contact_count(&mut self) {

module3d/gdextension_static_library_loader.h

@@ -1447,7 +1447,12 @@ impl RapierPhysicsServerImpl {
         let physics_data = physics_data();
         if let Some(body) = physics_data.collision_objects.get_mut(&body) {
             if let Some(body) = body.get_mut_body() {
-                body.set_max_contacts_reported(amount);
+                body.set_max_contacts_reported(
+                    amount,
+                    &mut physics_data.physics_engine,
+                    &mut physics_data.spaces,
+                    &physics_data.ids,
+                );
             }
         }
     }