Merge pull request #1 from soupday/Dev

Dev

Author: soupday

README.md

@@ -46,6 +46,8 @@ Changelog
 
 ### 2.2.1
 - Spotlight error fix.
+- Send buttons disabled when waiting for remote response.
+- Relink will sync selected characters Link ID back to CC/iC.
 
 ### 2.2.0
 - Shader name fix.

utp/link.py

@@ -1509,6 +1509,10 @@ class DataLink(QObject):
     service: LinkService = None
     # Data
     data = LinkData()
+    #
+    enable_request_type_actors = True
+    enable_request_type_motions = True
+    enable_request_type_scene = True
 
 
     def __init__(self):
@@ -1844,6 +1848,13 @@ def update_ui(self):
             qt.enable(self.button_sync_lights, self.button_sync_cameras,
                       self.button_sync_viewport, self.button_sync_scene)
 
+        if not self.enable_request_type_actors:
+            qt.disable(self.button_send)
+        if not self.enable_request_type_motions:
+            qt.disable(self.button_animation)
+        if not self.enable_request_type_scene:
+            qt.disable(self.button_sync_scene)
+
         # context info
 
         if avatar:
@@ -1928,6 +1939,21 @@ def update_combo_ccic_export_mode(self):
             OPTS.IC_EXPORT_MODE = self.combo_ccic_export_mode.currentText()
         OPTS.write_state()
 
+    def allow_request_type(self, request_type, enable):
+        if request_type == "ACTORS":
+            self.enable_request_type_actors = enable
+        elif request_type == "MOTIONS":
+            self.enable_request_type_motions = enable
+        elif request_type == "SCENE":
+            self.enable_request_type_scene = enable
+        self.update_ui()
+        return
+
+    def reset_request_types(self, enable=True):
+        self.enable_request_type_actors = enable
+        self.enable_request_type_motions = enable
+        self.enable_request_type_scene = enable
+
     def show_link_state(self):
         link_service = self.get_link_service()
         if self.is_connected():
@@ -1994,6 +2020,7 @@ def link_stop(self):
         link_service = self.get_link_service()
         if link_service:
             link_service.service_stop()
+            self.reset_request_types()
 
     def link_disconnect(self):
         link_service = self.get_link_service()
@@ -2048,10 +2075,14 @@ def parse(self, op_code, data):
         if op_code == OpCodes.CONFIRM:
             self.receive_confirm(data)
 
+        if op_code == OpCodes.RELINK:
+            self.receive_relink(data)
+
         error_show()
 
     def on_connected(self):
         self.update_ui()
+        self.reset_request_types()
         self.send_notify("Connected")
 
     def send(self, op_code, data=None):
@@ -2394,6 +2425,17 @@ def send_relink(self):
         self.send(OpCodes.RELINK, relink_data)
         self.update_link_status(f"Relink Sent: {actor.name} {actor.get_link_id()}")
 
+    def receive_relink(self, data):
+        relink_data = decode_to_json(data)
+        utils.log_info(f"relink reply: {relink_data}")
+        from_link_id = relink_data.get("link_id")
+        to_link_id = relink_data.get("to_link_id")
+        source_name = relink_data.get("name")
+        actor = LinkActor.find_actor(from_link_id, search_name=source_name)
+        if actor:
+            actor.set_link_id(to_link_id)
+            self.update_link_status(f"LinkId Sync: {actor.name} {to_link_id}")
+
     def send_actors_request(self):
         cc.deduplicate_scene_objects()
         self.send_request("ACTORS")
@@ -2487,9 +2529,9 @@ def send_motions(self, actors=None):
         actor: LinkActor
         for actor in actors:
             if self.motion_prefix:
-                motion_name = actor.name + "_" + self.motion_prefix + "_motion"
+                motion_name = actor.name + "_" + self.motion_prefix + "_Motion"
             else:
-                motion_name = actor.name + "_motion"
+                motion_name = actor.name + "_Motion"
             self.update_link_status(f"Exporting Motion: {motion_name}", True)
             self.send_notify(f"Exporting Motion: {motion_name}")
             # Determine export path
@@ -3233,14 +3275,16 @@ def send_request(self, request_type):
         # get actors
         actors = self.get_selected_actors()
         if actors:
-            self.update_link_status(f"Sending Request")
+            self.update_link_status(f"Sending Request, waiting for response ...")
             self.send_notify(f"Request")
             # send request
             request_data = self.encode_request_data(actors, request_type)
             self.send(OpCodes.REQUEST, request_data)
             # store the actors
             self.data.sequence_actors = actors
             self.data.sequence_type = request_type
+            # disable buttons for further requests ...
+            self.allow_request_type(request_type, False)
 
     def receive_request(self, data):
         self.update_link_status(f"Receiving Request ...")
@@ -3275,6 +3319,7 @@ def receive_confirm(self, data):
             id_tree = actor_data.get("id_tree")
         if request_type in ["SCENE", "MOTIONS", "ACTORS"]:
             self.do_send_update_actors(actors_data, request_type)
+            self.allow_request_type(request_type, True)
         error_show()
         return
 

utp/options.py

@@ -23,12 +23,12 @@ class Options():
     MATCH_CLIENT_RATE: bool = True
     DATALINK_FRAME_SYNC: bool = False
     CC_DELETE_HIDDEN_FACES: bool = True
-    CC_BAKE_TEXTURES: bool = True
+    CC_BAKE_TEXTURES: bool = False
     CC_EXPORT_MODE: str = "Animation"
     CC_EXPORT_MAX_SUB_LEVEL: int = -1
     CC_EXPORT_FPS: float = 0.0
     IC_DELETE_HIDDEN_FACES: bool = True
-    IC_BAKE_TEXTURES: bool = True
+    IC_BAKE_TEXTURES: bool = False
     IC_EXPORT_MODE: str = "Animation"
     IC_EXPORT_MAX_SUB_LEVEL: int = -1
     IC_EXPORT_FPS: float = 0.0