diff --git a/client.py b/client.py index 2d24f77..19c6e6d 100644 --- a/client.py +++ b/client.py @@ -71,7 +71,7 @@ class RCFClient(object): # Database and connexion agent self.net_agent = threading.Thread( - target=rcf_client_agent, args=(self.ctx, self.store, peer, self.serial_product,self.serial_feed), name="net-agent") + target=rcf_client_worker, args=(self.ctx, self.store, peer, self.serial_product,self.serial_feed), name="net-agent") self.net_agent.daemon = True self.net_agent.start() @@ -81,7 +81,7 @@ class RCFClient(object): for a in range(0, DUMP_AGENTS_NUMBER): serial_agent = threading.Thread( - target=dumper_agent, args=(self.serial_product, self.serial_feed), name="serial-agent") + target=serial_worker, args=(self.serial_product, self.serial_feed), name="serial-agent") serial_agent.daemon = True serial_agent.start() self.serial_agents.append(serial_agent) @@ -373,7 +373,7 @@ class RCFClientAgent(object): self.pipe.send(umsgpack.packb(self.state.value)) -def rcf_client_agent(ctx,store, pipe, serial_product, serial_feed): +def rcf_client_worker(ctx,store, pipe, serial_product, serial_feed): agent = RCFClientAgent(ctx,store, pipe) server = None net_feed = serial_product @@ -473,7 +473,7 @@ def rcf_client_agent(ctx,store, pipe, serial_product, serial_feed): # agent.state = State.INITIAL -def dumper_agent(product, feed): +def serial_worker(product, feed): while True: command,key,value = feed.get() @@ -487,4 +487,4 @@ def dumper_agent(product, feed): elif command == 'LOAD': if value: helpers.load(key, value) - \ No newline at end of file + \ No newline at end of file diff --git a/draw.py b/draw.py index a7c9f72..0116ce2 100644 --- a/draw.py +++ b/draw.py @@ -7,6 +7,8 @@ import mathutils from bpy_extras import view3d_utils from gpu_extras.batch import batch_for_shader +global renderer + def view3d_find(): for area in bpy.data.window_managers[0].windows[0].screen.areas: @@ -80,7 +82,7 @@ def get_client_2d(coords): return (0, 0) -class HUD(object): +class DrawFactory(object): def __init__(self): self.d3d_items = {} @@ -92,9 +94,11 @@ class HUD(object): self.active_object = None - # self.draw_clients() + def run(self): self.register_handlers() - + + def stop(self): + self.unregister_handlers() def register_handlers(self): self.draw3d_handle = bpy.types.SpaceView3D.draw_handler_add( self.draw3d_callback, (), 'WINDOW', 'POST_VIEW') @@ -115,55 +119,50 @@ class HUD(object): self.d3d_items.clear() self.d2d_items.clear() - def draw_selected_object(self): - clients = self.client.get("Client") + def draw_client_selected_objects(self, client): + if client: + name = client['id'] + local_username = bpy.context.scene.session_settings.username - if clients: - for client in clients: - name = client[0].split('/')[1] - local_username = bpy.context.scene.session_settings.username - - if name != local_username: - if client[1]['active_objects']: - for select_ob in client[1]['active_objects']: - indices = ( - (0, 1), (1, 2), (2, 3), (0, 3), - (4, 5), (5, 6), (6, 7), (4, 7), - (0, 4), (1, 5), (2, 6), (3, 7) - ) + if name != local_username: + if client['active_objects']: + for select_ob in client['active_objects']: + indices = ( + (0, 1), (1, 2), (2, 3), (0, 3), + (4, 5), (5, 6), (6, 7), (4, 7), + (0, 4), (1, 5), (2, 6), (3, 7) + ) - if select_ob in bpy.data.objects.keys(): - ob = bpy.data.objects[select_ob] - else: - return + if select_ob in bpy.data.objects.keys(): + ob = bpy.data.objects[select_ob] + else: + return - bbox_corners = [ob.matrix_world @ mathutils.Vector(corner) for corner in ob.bound_box] + bbox_corners = [ob.matrix_world @ mathutils.Vector(corner) for corner in ob.bound_box] - coords = [(point.x, point.y, point.z) - for point in bbox_corners] + coords = [(point.x, point.y, point.z) + for point in bbox_corners] - shader = gpu.shader.from_builtin('3D_UNIFORM_COLOR') + shader = gpu.shader.from_builtin('3D_UNIFORM_COLOR') - color = client[1]['color'] + color = client['color'] - batch = batch_for_shader( - shader, 'LINES', {"pos": coords}, indices=indices) + batch = batch_for_shader( + shader, 'LINES', {"pos": coords}, indices=indices) - self.d3d_items["{}/{}".format(client[0], - select_ob)] = (shader, batch, color) - else: - key_to_remove = [] - for k in self.d3d_items.keys(): - if "{}/".format(client[0]) in k: - key_to_remove.append(k) - - for k in key_to_remove: - del self.d3d_items[k] + self.d3d_items["{}/{}".format(client['id'], + select_ob)] = (shader, batch, color) + else: + key_to_remove = [] + for k in self.d3d_items.keys(): + if "{}/".format(client['id']) in k: + key_to_remove.append(k) + + for k in key_to_remove: + del self.d3d_items[k] def draw_client(self, client): - clients = self.client.get("Client") - if client: name = client['id'] local_username = bpy.context.scene.session_settings.username @@ -181,8 +180,8 @@ class HUD(object): batch = batch_for_shader( shader, 'LINES', {"pos": position}, indices=indices) - self.d3d_items[client[0]] = (shader, batch, color) - self.d2d_items[client[0]] = (position[1], name, color) + self.d3d_items[name] = (shader, batch, color) + self.d2d_items[name] = (position[1], name, color) except Exception as e: print("Draw client exception {}".format(e)) @@ -210,3 +209,14 @@ class HUD(object): except Exception as e: print("2D EXCEPTION") + +def register(): + global renderer + renderer = DrawFactory() + + +def unregister(): + global renderer + renderer.unregister_handlers() + + del renderer \ No newline at end of file diff --git a/helpers.py b/helpers.py index 03e6ecb..de244e8 100644 --- a/helpers.py +++ b/helpers.py @@ -4,6 +4,7 @@ import mathutils from .libs import dump_anything from uuid import uuid4 import logging +from . import draw CORRESPONDANCE = {'Collection': 'collections', 'Mesh': 'meshes', 'Object': 'objects', 'Material': 'materials', 'Texture': 'textures', 'Scene': 'scenes', 'Light': 'lights', 'Camera': 'cameras', 'Action': 'actions', 'Armature': 'armatures', 'Grease Pencil': 'grease_pencils'} @@ -91,12 +92,17 @@ def resolve_bpy_path(path): def load_client(client=None, data=None): C = bpy.context D = bpy.data + net_settings = C.scene.session_settings + if client and data: + if net_settings.enable_draw: + draw.renderer.draw_client(data) + draw.renderer.draw_client_selected_objects(data) # localy_selected = get_selected_objects(C.scene) # Draw client - client_data = data + # Load selected object # for obj in C.scene.objects: # if obj.id == client: diff --git a/operators.py b/operators.py index 979ebb8..b48cc72 100644 --- a/operators.py +++ b/operators.py @@ -25,7 +25,6 @@ client_keys = None client_state = 1 server = None context = None -drawer = None update_list = {} SUPPORTED_DATABLOCKS = ['collections', 'meshes', 'objects', @@ -160,6 +159,7 @@ def init_datablocks(): def default_tick(): bpy.ops.session.refresh() + upload_client_instance_position() # global client_instance # if not client_instance.queue.empty(): @@ -169,22 +169,9 @@ def default_tick(): return 1 -def draw_tick(): - # drawing - global drawer - - - # drawer.draw() - - # Upload - upload_client_instance_position() - - - return .2 - def sync(): global client_instance - + if client_instance: for datatype in SUPPORTED_TYPES: for item in getattr(bpy.data, helpers.CORRESPONDANCE[datatype]): @@ -198,21 +185,17 @@ def sync(): def register_ticks(): # REGISTER Updaters - # bpy.app.timers.register(draw_tick) bpy.app.timers.register(sync) bpy.app.timers.register(default_tick) pass def unregister_ticks(): # REGISTER Updaters - global drawer - drawer.unregister_handlers() - # bpy.app.timers.unregister(draw_tick) bpy.app.timers.unregister(sync) bpy.app.timers.unregister(default_tick) pass -# OPERATORS +# OPERATORS class session_join(bpy.types.Operator): bl_idname = "session.join" @@ -225,7 +208,7 @@ class session_join(bpy.types.Operator): return True def execute(self, context): - global client_instance, drawer + global client_instance net_settings = context.scene.session_settings # Scene setup @@ -247,9 +230,13 @@ class session_join(bpy.types.Operator): net_settings.ip, net_settings.port) # net_settings.is_running = True - drawer = draw.HUD() # bpy.ops.session.refresh() register_ticks() + + # Launch drawing module + if net_settings.enable_draw: + draw.renderer.run() + return {"FINISHED"} @@ -400,6 +387,9 @@ class session_stop(bpy.types.Operator): net_settings.is_admin = False client_state = 1 unregister_ticks() + + # Stop drawing + draw.renderer.stop() else: logger.debug("No server/client_instance running.") @@ -485,7 +475,7 @@ class session_settings(bpy.types.PropertyGroup): description="client enum", items=client_list_callback ) - + enable_draw = bpy.props.BoolProperty(name="enable_draw", description='Enable overlay drawing module', default=True) class session_snapview(bpy.types.Operator): bl_idname = "session.snapview" @@ -581,12 +571,15 @@ def register(): bpy.types.Scene.session_settings = bpy.props.PointerProperty( type=session_settings) bpy.app.handlers.depsgraph_update_post.append(depsgraph_update) + draw.register() def unregister(): global server global client_instance, client_keys + draw.unregister() + try: bpy.app.handlers.depsgraph_update_post.remove(depsgraph_update) except: @@ -609,6 +602,7 @@ def unregister(): del bpy.types.Scene.session_settings del bpy.types.ID.id + if __name__ == "__main__": register() diff --git a/ui.py b/ui.py index 84965f8..95d698a 100644 --- a/ui.py +++ b/ui.py @@ -25,20 +25,29 @@ class SessionSettingsPanel(bpy.types.Panel): row = layout.row() if operators.client_instance is None: - row = layout.row() box = row.box() row = box.row() - row.label(text="User infos") + row.label(text="USER", icon='GHOST_ENABLED') row = box.row() row.prop(scene.session_settings, "username", text="id") row = box.row() row.prop(scene.session_settings, "client_color", text="color") + row = box.row() row = layout.row() + box = row.box() + row = box.row() + row.label(text="NETWORK", icon = "TOOL_SETTINGS") + + row = box.row() + row.label(text="draw overlay:") + row.prop(net_settings, "enable_draw", text="") + + row = box.row() row.prop(scene.session_settings, "session_mode", expand=True) - row = layout.row() + row = box.row() if scene.session_settings.session_mode == 'HOST': box = row.box()