From 70641435ccc501635d34696e717dab7bfc6e24d3 Mon Sep 17 00:00:00 2001
From: Swann <swann.martinez@protonmail.com>
Date: Wed, 14 Apr 2021 12:25:16 +0200
Subject: [PATCH] feat: initial rigid body supports

---
 multi_user/bl_types/bl_object.py | 67 +++++++++-----------------------
 1 file changed, 18 insertions(+), 49 deletions(-)

diff --git a/multi_user/bl_types/bl_object.py b/multi_user/bl_types/bl_object.py
index dc84433..e625cac 100644
--- a/multi_user/bl_types/bl_object.py
+++ b/multi_user/bl_types/bl_object.py
@@ -54,17 +54,6 @@ def get_node_group_inputs(node_group):
     return inputs
     # return [inpt.identifer for inpt in node_group.inputs if  inpt.type not in IGNORED_SOCKETS]
 
-def get_rigid_body_scenes(target: bpy.types.Object)->[str]:
-    """ Find the list of scene using the rigid body
-    """
-    scenes = []
-    for scene in bpy.data.scenes:
-        if scene.rigidbody_world:
-            for obj in scene.rigidbody_world.collection.objects:
-                if obj == target:
-                    scenes.append((scene.name, scene.rigidbody_world.collection.name))
-                    break
-    return scenes
 
 def dump_physics(target: bpy.types.Object)->dict:
     """ 
@@ -85,14 +74,11 @@ def dump_physics(target: bpy.types.Object)->dict:
 
     # Rigid Body (rigid_body)
     if target.rigid_body:
-        logging.warning("Rigid body not synced yet. ")
-    #     physics_data['rigid_body_scenes'] = get_rigid_body_scenes(target)
-    #     physics_data['rigid_body'] = dumper.dump(target.rigid_body)
+        physics_data['rigid_body'] = dumper.dump(target.rigid_body)
 
     # Rigid Body constraint (rigid_body_constraint)
     if target.rigid_body_constraint:
-        logging.warning("Rigid body constraints not synced yet. ")
-        # physics_data['rigid_body_constraint'] = dumper.dump(target.rigid_body_constraint)
+        physics_data['rigid_body_constraint'] = dumper.dump(target.rigid_body_constraint)
 
     return physics_data
 
@@ -108,38 +94,19 @@ def load_physics(dumped_settings: dict, target: bpy.types.Object):
     if 'field' in dumped_settings:
         loader.load(target.field, dumped_settings['field'])
 
-    # if 'rigid_body' in dumped_settings:
-    #     # ugly fix to link the rigid body to the scene
-    #     for scene, physics_collection in dumped_settings['rigid_body_scenes']:
-    #         scene = bpy.data.scenes[scene]
-    #         phys_collection = bpy.data.collections.get(physics_collection)
-
-    #         # Create the scene physics settings
-    #         if not scene.rigidbody_world:
-    #             ctx_override = {'scene': scene}
-    #             bpy.ops.rigidbody.world_add(ctx_override)
-
-    #         if not phys_collection:
-    #             phys_collection = bpy.data.collections.new(physics_collection)
-
-    #         if not scene.rigidbody_world.collection \
-    #             or  scene.rigidbody_world.collection != phys_collection :
-    #             scene.rigidbody_world.collection = phys_collection
-
-    #         if target.name not in phys_collection.objects:
-    #             phys_collection.objects.link(target)
-
-    #     loader.load(target.rigid_body, dumped_settings['rigid_body'])
-    # elif target.rigid_body:
-    #     scenes = get_rigid_body_scenes(target)
-    #     for scene, collection in scenes:
-    #         phys_collection = bpy.data.collections.get(collection)
-    #         if phys_collection and target.name in phys_collection.objects:
-    #             phys_collection.objects.unlink(target)
-
-    # if 'rigid_body_constraint' in dumped_settings:
-    #     loader.load(target.rigid_body_constraint, dumped_settings['rigid_body_constraint'])
+    if 'rigid_body' in dumped_settings:
+        if not target.rigid_body:
+            bpy.ops.rigidbody.object_add({"object": target})
+        loader.load(target.rigid_body, dumped_settings['rigid_body'])
+    elif target.rigid_body:
+        bpy.ops.rigidbody.object_remove({"object": target})
 
+    if 'rigid_body_constraint' in dumped_settings:
+        if not target.rigid_body_constraint:
+            bpy.ops.rigidbody.constraint_add({"object": target})
+        loader.load(target.rigid_body_constraint, dumped_settings['rigid_body_constraint'])
+    elif target.rigid_body_constraint:
+        bpy.ops.rigidbody.constraint_remove({"object": target})
     
 def dump_modifier_geometry_node_inputs(modifier: bpy.types.Modifier) -> list:
     """ Dump geometry node modifier input properties
@@ -479,6 +446,9 @@ class BlObject(BlDatablock):
                 # Hack to remove the default generated particle settings
                 # bpy.data.particles.remove(default_settings)
 
+        # PHYSICS
+        load_physics(data, target)
+
         transform = data.get('transforms', None)
         if transform:
             target.matrix_parent_inverse = mathutils.Matrix(
@@ -486,8 +456,7 @@ class BlObject(BlDatablock):
             target.matrix_basis = mathutils.Matrix(transform['matrix_basis'])
             target.matrix_local = mathutils.Matrix(transform['matrix_local'])
 
-        # PHYSICS
-        load_physics(data, target)
+        
 
     def _dump_implementation(self, data, instance=None):
         assert(instance)