Merge pull request #309 from soupday/Dev

Dev

Author: soupday

README.md

@@ -35,7 +35,10 @@ Links
 
 ### 2.2.4
 - Rigify face rig fallback to envelope weights if auto weights fail.
-- DataLink Import motion will optionally import motion to active character if no matching character.
+- DataLink Import motion will optionally (confirmation dialog) import motion to active character if no matching character.
+- Rigify head turn expression driver corrected.
+- Fixed collision objects being included in export.
+- Fixed displacement strength export.
 
 ### 2.2.3
 - Wrinkle map region strength controls added.

exporter.py

@@ -1143,30 +1143,20 @@ def get_export_objects(chr_cache, include_selected = True, only_objects=None):
                     if obj.parent == arm:
                         utils.unhide(obj)
                         if obj not in objects:
+                            utils.log_info(f"   Found Character Object: {obj.name}")
                             objects.append(obj)
 
             child_objects = utils.get_child_objects(arm)
             for obj in child_objects:
                 if utils.object_exists_is_mesh(obj):
-                    # exclude rigid body colliders (parented to armature)
-                    if collider_collection and obj.name in collider_collection.objects:
-                        utils.log_info(f"   Excluding Rigidbody Collider Object: {obj.name}")
-                        continue
-                    # exclude collider proxies
-                    if chr_cache.is_collision_object(obj):
-                        utils.log_info(f"   Excluding Collider Proxy Object: {obj.name}")
-                        continue
-                    # exclude sculpt objects
-                    if chr_cache.is_sculpt_object(obj):
-                        utils.log_info(f"   Excluding Sculpt Object: {obj.name}")
-                        continue
                     # add child mesh objects
                     if obj not in objects:
-                        utils.log_info(f"   Including Child Mesh Object: {obj.name}")
+                        utils.log_info(f"   Found Child Mesh Object: {obj.name}")
                         objects.append(obj)
                 elif utils.object_exists_is_empty(obj):
-                    utils.log_info(f"   Including Child Empty Transform: {obj.name}")
+                    utils.log_info(f"   Found Child Empty Transform: {obj.name}")
                     objects.append(obj)
+
     else:
         arm = utils.get_armature_from_objects(objects)
         if arm:
@@ -1178,14 +1168,10 @@ def get_export_objects(chr_cache, include_selected = True, only_objects=None):
             for obj in child_objects:
                 if utils.object_exists_is_mesh(obj):
                     if obj not in objects:
-                        # exclude rigid body colliders (parented to armature)
-                        if collider_collection and obj.name in collider_collection.objects:
-                            utils.log_info(f"   Excluding Rigidbody Collider Object: {obj.name}")
-                            continue
-                        utils.log_info(f"   Including Child Object: {obj.name}")
+                        utils.log_info(f"   Found Child Object: {obj.name}")
                         objects.append(obj)
                 elif utils.object_exists_is_empty(obj):
-                    utils.log_info(f"   Including Child Empty Transform: {obj.name}")
+                    utils.log_info(f"   Found Child Empty Transform: {obj.name}")
                     objects.append(obj)
 
     # include selected objects last
@@ -1194,6 +1180,27 @@ def get_export_objects(chr_cache, include_selected = True, only_objects=None):
             if obj not in objects:
                 objects.append(obj)
 
+    # exclude non-exportable objects
+    to_remove = []
+    for obj in objects:
+        # exclude rigid body colliders (parented to armature)
+        if collider_collection and obj.name in collider_collection.objects:
+            utils.log_info(f"   Excluding Rigidbody Collider Object: {obj.name}")
+            to_remove.append(obj)
+            continue
+        # exclude collider proxies
+        if chr_cache and chr_cache.is_collision_object(obj):
+            utils.log_info(f"   Excluding Collider Proxy Object: {obj.name}")
+            to_remove.append(obj)
+            continue
+        # exclude sculpt objects
+        if chr_cache and chr_cache.is_sculpt_object(obj):
+            utils.log_info(f"   Excluding Sculpt Object: {obj.name}")
+            to_remove.append(obj)
+            continue
+    for o in to_remove:
+        objects.remove(o)
+
     # make sure all export objects are valid
     clean_objects = [ obj for obj in objects
                         if utils.object_exists(obj) and
@@ -1775,6 +1782,7 @@ def export_standard(self, context, chr_cache, file_path, include_selected):
 
     # store mode state
     mode_selection_state = utils.store_mode_selection_state()
+    rv_state = utils.store_render_visibility_state()
 
     utils.log_info("Export to: " + file_path)
     utils.log_info("Exporting as: " + ext)
@@ -1885,6 +1893,7 @@ def export_standard(self, context, chr_cache, file_path, include_selected):
 
     # restore mode state
     utils.restore_mode_selection_state(mode_selection_state)
+    utils.restore_render_visibility_state(rv_state)
 
     utils.log_recess()
     utils.log_timer("Done Character Export.")
@@ -1911,6 +1920,7 @@ def export_non_standard(self, context, file_path, include_selected):
 
     # store mode state
     mode_selection_state = utils.store_mode_selection_state()
+    rv_state = utils.store_render_visibility_state()
 
     # export objects
     objects = get_export_objects(None, include_selected)
@@ -1969,6 +1979,7 @@ def export_non_standard(self, context, file_path, include_selected):
 
     # restore mode state
     utils.restore_mode_selection_state(mode_selection_state)
+    utils.restore_render_visibility_state(rv_state)
 
     utils.log_recess()
     if arp_export:
@@ -2004,6 +2015,7 @@ def export_to_unity(self, context, chr_cache, export_anim, file_path, include_se
 
     # store mode state
     mode_selection_state = utils.store_mode_selection_state()
+    rv_state = utils.store_render_visibility_state()
 
     utils.log_info("Export to: " + file_path)
     utils.log_info("Exporting as: " + ext)
@@ -2117,6 +2129,7 @@ def export_to_unity(self, context, chr_cache, export_anim, file_path, include_se
         bones.restore_armature_settings(arm, armature_settings, include_pose=True)
         # restore mode state
         utils.restore_mode_selection_state(mode_selection_state)
+        utils.restore_render_visibility_state(rv_state)
 
     utils.log_recess()
     utils.log_timer("Done Character Export.")
@@ -2220,6 +2233,7 @@ def export_rigify(self, context, chr_cache, export_anim, file_path, include_sele
 
     # store mode state
     mode_selection_state = utils.store_mode_selection_state()
+    rv_state = utils.store_render_visibility_state()
 
     utils.log_info("Export to: " + file_path)
     utils.log_info("Exporting as: " + ext)
@@ -2337,6 +2351,7 @@ def export_rigify(self, context, chr_cache, export_anim, file_path, include_sele
 
     # restore mode state
     utils.restore_mode_selection_state(mode_selection_state)
+    utils.restore_render_visibility_state(rv_state)
 
     utils.log_recess()
     utils.log_timer("Done Rigify Export.")
@@ -2603,7 +2618,9 @@ def invoke(self, context, event):
         require_valid_export = (self.param == "EXPORT_CC3" or
                                 self.param == "EXPORT_NON_STANDARD")
         if require_export_check:
+            rv_state = utils.store_render_visibility_state()
             objects = get_export_objects(chr_cache, self.include_selected)
+            utils.restore_render_visibility_state(rv_state)
             if export_format == "fbx":
                 self.check_valid, self.check_warn, self.check_report = check_valid_export_fbx(chr_cache, objects)
             if require_valid_export:

jsonutils.py

@@ -435,7 +435,7 @@ def set_pbr_var(mat_json, var_name, paths, value):
                 mat_json["Textures"][var_name][paths[2]] = value
             else:
                 # metallic and roughness don't have controllable strength settings, so always set to max
-                if var_name == "Metallic" or var_name != "Roughness":
+                if var_name == "Metallic" or var_name == "Roughness":
                     value = 1.0
                 mat_json["Textures"][var_name]["Strength"] = value * 100.0
         except:
@@ -484,16 +484,16 @@ def get_shader_var_color(mat_json, var_name):
         return None
 
 
-def get_json(json_data, path: str):
+def get_json(json_data, path: str, default=None):
     if json_data:
         keys = path.split("/")
         for key in keys:
             if key in json_data:
                 json_data = json_data[key]
             else:
-                return None
+                return default
         return json_data
-    return None
+    return default
 
 
 def set_json(json_data, path: str, value):
@@ -634,3 +634,11 @@ def get_meshes_images(meshes_json, filter=None):
                         images.add(os.path.normpath(tex_path))
     return images
 
+
+def get_displacement_data(mat_json):
+    texture_path = get_json(mat_json, "Textures/Displacement/Texture Path", "")
+    strength = get_json(mat_json, "Textures/Displacement/Strength", 0.0)
+    level = int(get_json(mat_json, "Textures/Displacement/Tessellation Level", 0))
+    multiplier = get_json(mat_json, "Textures/Displacement/Multiplier", 1.0)
+    base = get_json(mat_json, "Textures/Displacement/Gray-scale Base Value", 0.0)
+    return texture_path, strength, level, multiplier, base

link.py

@@ -623,7 +623,7 @@ def remove_datalink_import_rig(actor: LinkActor, apply_contraints=False):
 
 def set_actor_expression_weight(objects, expression_name, weight):
     global LINK_DATA
-    if objects and LINK_DATA.preview_shape_keys:
+    if objects:
         obj: bpy.types.Object
         for obj in objects:
             if expression_name in obj.data.shape_keys.key_blocks:
@@ -719,6 +719,14 @@ def prep_rig(actor: LinkActor, start_frame, end_frame):
             utils.log_info(f"Preparing Character Rig: {actor.name} {rig_id} / {len(actor.bones)} bones")
 
             # set data
+
+            if not LINK_DATA.set_keyframes:
+                # when not setting keyframes remove all actions from the rig
+                # and let the DataLink set the pose and shape keys directly
+                utils.safe_set_action(rig, None)
+                for obj in objects:
+                    utils.safe_set_action(obj.data.shape_keys, None)
+
             if LINK_DATA.set_keyframes:
 
                 if LINK_DATA.sequence_type == "POSE":
@@ -1263,10 +1271,14 @@ def recv(self):
                 # parse may have received a disconnect notice
                 if not self.has_client_sock():
                     return
-                # if preview sync every frame in sequence
+                # if preview frame sync update every frame in sequence
                 if op_code == OpCodes.SEQUENCE_FRAME and prefs.datalink_frame_sync:
                     self.is_data = True
                     return
+                # if not key framing, update every frame
+                if not LINK_DATA.set_keyframes:
+                    self.is_data = True
+                    return
                 if op_code == OpCodes.CHARACTER or op_code == OpCodes.PROP:
                     # give imports time to process, otherwise bad things happen
                     self.is_data = False
@@ -2272,7 +2284,7 @@ def decode_pose_frame_data(self, pose_data):
             for i in range(0, num_weights):
                 weight = struct.unpack_from("!f", pose_data, offset)[0]
                 offset += 4
-                if actor and objects and prefs.datalink_preview_shape_keys:
+                if actor and objects and (prefs.datalink_preview_shape_keys or not LINK_DATA.set_keyframes):
                     expression_name = actor.expressions[i]
                     set_actor_expression_weight(objects, expression_name, weight)
                 expression_weights[i] = weight
@@ -2284,7 +2296,7 @@ def decode_pose_frame_data(self, pose_data):
             for i in range(0, num_weights):
                 weight = struct.unpack_from("!f", pose_data, offset)[0]
                 offset += 4
-                if actor and objects and prefs.datalink_preview_shape_keys:
+                if actor and objects and (prefs.datalink_preview_shape_keys or not LINK_DATA.set_keyframes):
                     viseme_name = actor.visemes[i]
                     set_actor_viseme_weight(objects, viseme_name, weight)
                 viseme_weights[i] = weight
@@ -2925,7 +2937,8 @@ def receive_sequence_end(self, data):
         bpy.context.scene.frame_current = LINK_DATA.sequence_start_frame
 
         # play the recorded sequence
-        bpy.ops.screen.animation_play()
+        if LINK_DATA.set_keyframes:
+            bpy.ops.screen.animation_play()
 
     def receive_sequence_ack(self, data):
         prefs = vars.prefs()

modifiers.py

@@ -311,16 +311,34 @@ def add_tearline_modifiers(obj):
     utils.log_info("Tearline Displacement modifiers applied to: " + obj.name)
 
 
-def add_decimate_modifier(obj, ratio):
-    mod : bpy.types.DecimateModifier
-    mod = get_object_modifier(obj, "DECIMATE", "Decimate_Collision_Body")
+def add_decimate_modifier(obj, ratio, name):
+    mod: bpy.types.DecimateModifier
+    mod = get_object_modifier(obj, "DECIMATE", name)
     if not mod:
-        mod = obj.modifiers.new(utils.unique_name("Decimate_Collision_Body"), "DECIMATE")
+        mod = obj.modifiers.new(utils.unique_name(name), "DECIMATE")
     mod.decimate_type = 'COLLAPSE'
     mod.ratio = ratio
     return mod
 
 
+def add_subdivision(obj: bpy.types.Object, level, name, max_level=3, view_level=1):
+    mod: bpy.types.SubsurfModifier
+    mod = get_object_modifier(obj, "SUBSURF", name)
+    if not mod:
+        mod = obj.modifiers.new(utils.unique_name(name), "SUBSURF")
+    level = min(max_level, level)
+    view_level = min(view_level, level)
+    mod.render_levels = level
+    mod.levels = view_level
+    mod.subdivision_type = "CATMULL_CLARK"
+    mod.show_only_control_edges = True
+    mod.uv_smooth = 'PRESERVE_BOUNDARIES'
+    mod.boundary_smooth = 'PRESERVE_CORNERS'
+    mod.use_creases = True
+    mod.use_custom_normals = True
+    return mod
+
+
 def add_multi_res_modifier(obj, subdivisions, use_custom_normals = False, uv_smooth = "PRESERVE_BOUNDARIES", quality = 4):
     if utils.set_active_object(obj):
         mod : bpy.types.MultiresModifier

physics.py

@@ -515,7 +515,9 @@ def create_collision_proxy(chr_cache, obj_cache, obj):
         utils.object_mode_to(collision_proxy)
         if obj_cache.collision_proxy_decimate < 1.0:
             # add decimate modifier
-            mod = modifiers.add_decimate_modifier(collision_proxy, obj_cache.collision_proxy_decimate)
+            mod = modifiers.add_decimate_modifier(collision_proxy,
+                                                  obj_cache.collision_proxy_decimate,
+                                                  "Decimate_Collision_Body")
             modifiers.move_mod_first(collision_proxy, mod)
             # apply decimate modifier
             bpy.ops.object.modifier_apply(modifier=mod.name)

properties.py

@@ -1859,7 +1859,8 @@ def is_sculpt_object(self, obj):
 
     def is_collision_object(self, obj):
         source, proxy, is_proxy = self.get_related_physics_objects(obj)
-        return ("rl_collision_proxy" in obj or obj.name.endswith(".Collision_Proxy") or is_proxy)
+        result = ("rl_collision_proxy" in obj or obj.name.endswith("_Collision_Proxy") or is_proxy)
+        return result
 
     def get_all_objects(self,
                         include_armature=True,

rigify_mapping_data.py

@@ -624,8 +624,8 @@ def OODTR(a):
     ["Bfr", "Eye_L_Look_Down", ["SCRIPTED", f"min(var, 0)*{-OODTR(22)}"], ["var", "TRANSFORMS", "MCH-eye.L", "ROT_X", "LOCAL_SPACE"]],
     ["Bfr", "Eye_R_Look_Down", ["SCRIPTED", f"min(var, 0)*{-OODTR(22)}"], ["var", "TRANSFORMS", "MCH-eye.R", "ROT_X", "LOCAL_SPACE"]],
     # Head rotation expressions
-    ["", "Head_Turn_Up", ["SCRIPTED", f"max(var, 0)*{-OODTR(-30)}"], ["var", "TRANSFORMS", "ORG-spine.006", "ROT_X", "LOCAL_SPACE"]],
-    ["", "Head_Turn_Down", ["SCRIPTED", f"min(var, 0)*{-OODTR(18)}"], ["var", "TRANSFORMS", "ORG-spine.006", "ROT_X", "LOCAL_SPACE"]],
+    ["", "Head_Turn_Up", ["SCRIPTED", f"min(var, 0)*{OODTR(-30)}"], ["var", "TRANSFORMS", "ORG-spine.006", "ROT_X", "LOCAL_SPACE"]],
+    ["", "Head_Turn_Down", ["SCRIPTED", f"max(var, 0)*{OODTR(18)}"], ["var", "TRANSFORMS", "ORG-spine.006", "ROT_X", "LOCAL_SPACE"]],
     ["", "Head_Turn_L", ["SCRIPTED", f"max(var, 0)*{OODTR(51)}"], ["var", "TRANSFORMS", "ORG-spine.006", "ROT_Y", "LOCAL_SPACE"]],
     ["", "Head_Turn_R", ["SCRIPTED", f"min(var, 0)*{OODTR(-51)}"], ["var", "TRANSFORMS", "ORG-spine.006", "ROT_Y", "LOCAL_SPACE"]],
     ["", "Head_Tilt_L", ["SCRIPTED", f"min(var, 0)*{OODTR(-23.4)}"], ["var", "TRANSFORMS", "ORG-spine.006", "ROT_Z", "LOCAL_SPACE"]],

shaders.py

@@ -19,7 +19,7 @@
 import os
 from mathutils import Vector, Color
 
-from . import imageutils, jsonutils, meshutils, materials, wrinkle, nodeutils, params, utils, vars
+from . import imageutils, jsonutils, meshutils, materials, modifiers, wrinkle, nodeutils, params, utils, vars
 
 
 def get_prop_value(mat_cache, prop_name):
@@ -1245,7 +1245,7 @@ def connect_hair_shader(obj_cache, obj, mat, mat_json, processed_images):
         mat.use_sss_translucency = True
 
 
-def connect_pbr_shader(obj_cache, obj, mat, mat_json, processed_images):
+def connect_pbr_shader(obj_cache, obj, mat: bpy.types.Material, mat_json, processed_images):
     props = vars.props()
     prefs = vars.prefs()
 
@@ -1282,6 +1282,20 @@ def connect_pbr_shader(obj_cache, obj, mat, mat_json, processed_images):
     else:
         fix_sss_method(bsdf)
 
+    texture_path, strength, level, multiplier, base = jsonutils.get_displacement_data(mat_json)
+    if texture_path and strength > 0 and level > 0:
+        # add a subdivision modifer but set it to zero.
+        # lots of clothing in CC/iC uses tesselation and displacement, but
+        # subdividing all of it would significantly slow down blender.
+        # so the modifiers are added, but the user must then set their levels.
+        mod = modifiers.add_subdivision(obj, level, "Displacement_Subdiv", max_level=0, view_level=0)
+        if mod:
+            modifiers.move_mod_first(obj, mod)
+        if utils.B410():
+            mat.displacement_method = "BOTH"
+        else:
+            mat.cycles.displacement_method = "BOTH"
+
 
 def connect_sss_shader(obj_cache, obj, mat, mat_json, processed_images):
     props = vars.props()