feat(rcf): improve init scene
This commit is contained in:
@ -164,7 +164,6 @@ def to_bpy(store_item):
|
|||||||
value_casted = mathutils.Vector(
|
value_casted = mathutils.Vector(
|
||||||
(store_value[0], store_value[1], store_value[2]))
|
(store_value[0], store_value[1], store_value[2]))
|
||||||
|
|
||||||
|
|
||||||
return value_casted
|
return value_casted
|
||||||
|
|
||||||
|
|
||||||
@ -225,6 +224,7 @@ def init_scene():
|
|||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
def update_scene(msg):
|
def update_scene(msg):
|
||||||
global client
|
global client
|
||||||
|
|
||||||
@ -261,6 +261,9 @@ def update_ui(msg):
|
|||||||
recv_callbacks = [update_scene, update_ui]
|
recv_callbacks = [update_scene, update_ui]
|
||||||
post_init_callbacks = [refresh_window]
|
post_init_callbacks = [refresh_window]
|
||||||
|
|
||||||
|
# Catch operator execution
|
||||||
|
#C.window_manager.operators['MESH_OT_primitive_plane_add'].bl_idname
|
||||||
|
|
||||||
|
|
||||||
class session_join(bpy.types.Operator):
|
class session_join(bpy.types.Operator):
|
||||||
bl_idname = "session.join"
|
bl_idname = "session.join"
|
||||||
@ -369,7 +372,7 @@ class session_create(bpy.types.Operator):
|
|||||||
|
|
||||||
bpy.ops.session.join()
|
bpy.ops.session.join()
|
||||||
|
|
||||||
init_scene()
|
# init_scene()
|
||||||
|
|
||||||
bpy.app.timers.register(observer)
|
bpy.app.timers.register(observer)
|
||||||
return {"FINISHED"}
|
return {"FINISHED"}
|
||||||
@ -568,7 +571,6 @@ class session_draw_clients(bpy.types.Operator):
|
|||||||
session = context.scene.session_settings
|
session = context.scene.session_settings
|
||||||
|
|
||||||
if client:
|
if client:
|
||||||
|
|
||||||
# Local view update
|
# Local view update
|
||||||
current_coords = get_client_view_rect()
|
current_coords = get_client_view_rect()
|
||||||
if current_coords != self.coords:
|
if current_coords != self.coords:
|
||||||
@ -636,6 +638,8 @@ class session_snapview(bpy.types.Operator):
|
|||||||
return {"CANCELLED"}
|
return {"CANCELLED"}
|
||||||
|
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
# TODO: Rename to match official blender convention
|
# TODO: Rename to match official blender convention
|
||||||
classes = (
|
classes = (
|
||||||
session_join,
|
session_join,
|
||||||
|
21
net_ui.py
21
net_ui.py
@ -34,9 +34,8 @@ class SessionSettingsPanel(bpy.types.Panel):
|
|||||||
row.prop(net_settings, "update_frequency", text="")
|
row.prop(net_settings, "update_frequency", text="")
|
||||||
row = layout.row()
|
row = layout.row()
|
||||||
|
|
||||||
|
|
||||||
row = layout.row()
|
row = layout.row()
|
||||||
row.operator("session.stop", text="exit session")
|
row.operator("session.stop", icon='QUIT', text="Exit")
|
||||||
|
|
||||||
else:
|
else:
|
||||||
row = layout.row()
|
row = layout.row()
|
||||||
@ -48,6 +47,7 @@ class SessionSettingsPanel(bpy.types.Panel):
|
|||||||
|
|
||||||
row = layout.row()
|
row = layout.row()
|
||||||
|
|
||||||
|
|
||||||
class SessionUsersPanel(bpy.types.Panel):
|
class SessionUsersPanel(bpy.types.Panel):
|
||||||
"""Creates a Panel in the scene context of the properties editor"""
|
"""Creates a Panel in the scene context of the properties editor"""
|
||||||
bl_label = "NET users"
|
bl_label = "NET users"
|
||||||
@ -79,10 +79,12 @@ class SessionUsersPanel(bpy.types.Panel):
|
|||||||
if values.id == net_operators.client.id:
|
if values.id == net_operators.client.id:
|
||||||
info = "(self)"
|
info = "(self)"
|
||||||
# detail_item_box = item_box.row()
|
# detail_item_box = item_box.row()
|
||||||
detail_item_box.label(text="{} {}".format(values.id.decode(),info))
|
detail_item_box.label(
|
||||||
|
text="{} {}".format(values.id.decode(), info))
|
||||||
|
|
||||||
if net_operators.client.id.decode() not in key:
|
if net_operators.client.id.decode() not in key:
|
||||||
detail_item_box.operator("session.snapview",text="",icon='VIEW_CAMERA').target_client = values.id.decode()
|
detail_item_box.operator(
|
||||||
|
"session.snapview", text="", icon='VIEW_CAMERA').target_client = values.id.decode()
|
||||||
row = layout.row()
|
row = layout.row()
|
||||||
else:
|
else:
|
||||||
row.label(text="Empty")
|
row.label(text="Empty")
|
||||||
@ -90,7 +92,6 @@ class SessionUsersPanel(bpy.types.Panel):
|
|||||||
row = layout.row()
|
row = layout.row()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class SessionPropertiesPanel(bpy.types.Panel):
|
class SessionPropertiesPanel(bpy.types.Panel):
|
||||||
"""Creates a Panel in the scene context of the properties editor"""
|
"""Creates a Panel in the scene context of the properties editor"""
|
||||||
bl_label = "NET properties"
|
bl_label = "NET properties"
|
||||||
@ -114,7 +115,8 @@ class SessionPropertiesPanel(bpy.types.Panel):
|
|||||||
if net_operators.client:
|
if net_operators.client:
|
||||||
row = layout.row(align=True)
|
row = layout.row(align=True)
|
||||||
row.prop(net_settings, "buffer", text="")
|
row.prop(net_settings, "buffer", text="")
|
||||||
row.operator("session.add_prop", text="",icon="ADD").property_path = net_settings.buffer
|
row.operator("session.add_prop", text="",
|
||||||
|
icon="ADD").property_path = net_settings.buffer
|
||||||
row = layout.row()
|
row = layout.row()
|
||||||
# Property area
|
# Property area
|
||||||
area_msg = row.box()
|
area_msg = row.box()
|
||||||
@ -123,11 +125,14 @@ class SessionPropertiesPanel(bpy.types.Panel):
|
|||||||
item_box = area_msg.box()
|
item_box = area_msg.box()
|
||||||
detail_item_box = item_box.row()
|
detail_item_box = item_box.row()
|
||||||
# detail_item_box = item_box.row()
|
# detail_item_box = item_box.row()
|
||||||
detail_item_box.label(text="{} ({}) {} ".format(key, values.mtype, values.id.decode()))
|
detail_item_box.label(text="{} ({}) {} ".format(
|
||||||
detail_item_box.operator("session.remove_prop",text="",icon="X").property_path = key
|
key, values.mtype, values.id.decode()))
|
||||||
|
detail_item_box.operator(
|
||||||
|
"session.remove_prop", text="", icon="X").property_path = key
|
||||||
else:
|
else:
|
||||||
area_msg.label(text="Empty")
|
area_msg.label(text="Empty")
|
||||||
|
|
||||||
|
|
||||||
classes = (
|
classes = (
|
||||||
SessionSettingsPanel,
|
SessionSettingsPanel,
|
||||||
SessionUsersPanel,
|
SessionUsersPanel,
|
||||||
|
Reference in New Issue
Block a user