Backups/multi-user
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(rcf): fix add object

Browse Source
This commit is contained in:
Swann Martinez
2019-03-29 18:19:53 +01:00
parent c366da3e5c
commit 2e931585ff
1 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
net_operators.py
View File

@ -510,6 +510,7 @@ class session_join(bpy.types.Operator):
# REGISTER Updaters # REGISTER Updaters
bpy.app.timers.register(tick) bpy.app.timers.register(tick)
bpy.app.timers.register(mesh_tick)
bpy.app.timers.register(object_tick) bpy.app.timers.register(object_tick)
bpy.ops.session.draw('INVOKE_DEFAULT') bpy.ops.session.draw('INVOKE_DEFAULT')
@ -626,6 +627,7 @@ class session_stop(bpy.types.Operator):
bpy.ops.asyncio.stop() bpy.ops.asyncio.stop()
net_settings.is_running = False net_settings.is_running = False
bpy.app.timers.unregister(tick) bpy.app.timers.unregister(tick)
bpy.app.timers.unregister(mesh_tick)
bpy.app.timers.unregister(object_tick) bpy.app.timers.unregister(object_tick)
else: else:
logger.debug("No server/client running.") logger.debug("No server/client running.")
@ -898,6 +900,10 @@ classes = (
) )
def mesh_tick(): def mesh_tick():
mesh = get_update("Mesh")
if mesh:
upload_mesh(bpy.data.meshes[mesh])
return 2 return 2
@ -923,32 +929,34 @@ def tick():
# TODO: Enqueu tqsks # TODO: Enqueu tqsks
def depsgraph_update(scene): def depsgraph_update(scene):
for c in bpy.context.depsgraph.updates.items(): for c in bpy.context.depsgraph.updates.items():
print(c[1].id)
global client global client
if client: if client:
if client.status == net_components.RCFStatus.CONNECTED: if client.status == net_components.RCFStatus.CONNECTED:
print(c[1].id) if scene.session_settings.active_object:
if c[1].is_updated_geometry: if c[1].is_updated_geometry:
pass if c[1].id.name == scene.session_settings.active_object.name:
elif c[1].is_updated_transform: add_update(c[1].id.bl_rna.name,c[1].id.name)
if c[1].id.name == scene.session_settings.active_object.name: elif c[1].is_updated_transform:
add_update(c[1].id.bl_rna.name,c[1].id.name) if c[1].id.name == scene.session_settings.active_object.name:
else: add_update(c[1].id.bl_rna.name,c[1].id.name)
if c[1].id.bl_rna.name == 'Material' or c[1].id.bl_rna.name == 'Shader Nodetree':
print(c[1].id.bl_rna.name)
data_name = c[1].id.name
if data_name in bpy.data.objects.keys():
found = False
for k in client.property_map.keys():
if data_name in k:
found = True
break
if not found: # if c[1].id.bl_rna.name == 'Material' or c[1].id.bl_rna.name== 'Shader Nodetree':
client.property_map["Object/{}".format(data_name)] = net_components.RCFMessage("Object/{}".format(data_name), "Object", None) print(c[1].id.bl_rna.name)
upload_mesh(bpy.data.objects[data_name].data) data_name = c[1].id.name
dump_datablock(bpy.data.objects[data_name],1) if c[1].id.bl_rna.name == "Object":
dump_datablock(bpy.data.scenes[0],4) if data_name in bpy.data.objects.keys():
found = False
for k in client.property_map.keys():
if data_name in k:
found = True
break
if not found:
client.property_map["Object/{}".format(data_name)] = net_components.RCFMessage("Object/{}".format(data_name), "Object", None)
upload_mesh(bpy.data.objects[data_name].data)
dump_datablock(bpy.data.objects[data_name],1)
dump_datablock(bpy.data.scenes[0],4)
# dump_datablock(bpy.data.scenes[0],4) # dump_datablock(bpy.data.scenes[0],4)