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

remove(rcf): cleanup

Browse Source
This commit is contained in:
Swann Martinez
2019-04-01 11:45:16 +02:00
parent 2e931585ff
commit 8a6cd5fc11
7 changed files with 119 additions and 1647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
bench.blend
View File

Binary file not shown.

184
client.json
View File

@ -1,184 +0,0 @@
{
"active_material": "Material",
"active_material_index": 0,
"active_shape_key_index": 0,
"data": "Cube",
"delta_location": [
0.0,
0.0,
0.0
],
"delta_scale": [
1.0,
1.0,
1.0
],
"dimensions": [
2.615931749343872,
2.0,
2.615931749343872
],
"display_bounds_type": "BOX",
"display_type": "TEXTURED",
"empty_display_size": 1.0,
"empty_display_type": "ARROWS",
"empty_image_depth": "DEFAULT",
"empty_image_side": "DOUBLE_SIDED",
"hide_render": false,
"hide_select": false,
"hide_viewport": false,
"instance_faces_scale": 1.0,
"instance_type": "NONE",
"is_evaluated": false,
"is_from_instancer": false,
"is_from_set": false,
"is_instancer": false,
"is_library_indirect": false,
"location": [
-3.7747275829315186,
0.3205798268318176,
0.3536362648010254
],
"lock_rotation_w": false,
"lock_rotations_4d": false,
"matrix_basis": [
[
1.0,
0.0,
0.0,
-3.7747275829315186
],
[
0.0,
1.0,
0.0,
0.3205798268318176
],
[
0.0,
0.0,
1.0,
0.3536362648010254
],
[
0.0,
0.0,
0.0,
1.0
]
],
"matrix_local": [
[
1.0,
0.0,
0.0,
-3.7747275829315186
],
[
0.0,
1.0,
0.0,
0.3205798268318176
],
[
0.0,
0.0,
1.0,
0.3536362648010254
],
[
0.0,
0.0,
0.0,
1.0
]
],
"matrix_parent_inverse": [
[
1.0,
0.0,
0.0,
0.0
],
[
0.0,
1.0,
0.0,
0.0
],
[
0.0,
0.0,
1.0,
0.0
],
[
0.0,
0.0,
0.0,
1.0
]
],
"matrix_world": [
[
1.0,
0.0,
0.0,
-3.7747275829315186
],
[
0.0,
1.0,
0.0,
0.3205798268318176
],
[
0.0,
0.0,
1.0,
0.3536362648010254
],
[
0.0,
0.0,
0.0,
1.0
]
],
"mode": "OBJECT",
"name": "Cube",
"name_full": "Cube",
"original": "Cube",
"parent_bone": "",
"parent_type": "OBJECT",
"pass_index": 0,
"rotation_mode": "XYZ",
"scale": [
1.0,
1.0,
1.0
],
"show_all_edges": false,
"show_axis": false,
"show_bounds": false,
"show_empty_image_orthographic": true,
"show_empty_image_perspective": true,
"show_in_front": false,
"show_instancer_for_render": true,
"show_instancer_for_viewport": true,
"show_name": false,
"show_only_shape_key": false,
"show_texture_space": false,
"show_transparent": false,
"show_wire": false,
"tag": true,
"track_axis": "POS_Y",
"type": "MESH",
"up_axis": "Z",
"use_dynamic_topology_sculpting": false,
"use_fake_user": false,
"use_instance_faces_scale": false,
"use_instance_vertices_rotation": false,
"use_shape_key_edit_mode": false,
"users": 1
}

126
net_operators.py
View File

@ -24,13 +24,15 @@ context = None
update_list = {}
def add_update(type,item):
def add_update(type, item):
try:
if item not in update_list[type]:
update_list[type].append(item)
except KeyError:
update_list[type] = []
def get_update(type):
try:
update = None
@ -41,15 +43,15 @@ def get_update(type):
update_list[type] = []
return update
COLOR_TABLE = [(1, 0, 0, 1), (0, 1, 0, 1), (0, 0, 1, 1),
(0, 0.5, 1, 1), (0.5, 0, 1, 1)]
SUPPORTED_DATABLOCKS = ['collections', 'meshes', 'objects',
'materials', 'textures', 'lights', 'cameras', 'actions', 'armatures','grease_pencils']
SUPPORTED_TYPES = ['Collection', 'Mesh', 'Object', 'Material',
'Texture', 'Light', 'Camera', 'Action', 'Armature','GreasePencil','Scene']
CORRESPONDANCE = {'Collection':'collections', 'Mesh':'meshes', 'Object':'objects', 'Material':'materials',
'Texture':'textures','Scene':'scenes', 'Light':'lights', 'Camera':'cameras', 'Action':'actions', 'Armature':'armatures','GreasePencil':'grease_pencils'}
SUPPORTED_DATABLOCKS = ['collections', 'meshes', 'objects',
'materials', 'textures', 'lights', 'cameras', 'actions', 'armatures', 'grease_pencils']
SUPPORTED_TYPES = ['Collection', 'Mesh', 'Object', 'Material',
'Texture', 'Light', 'Camera', 'Action', 'Armature', 'GreasePencil', 'Scene']
CORRESPONDANCE = {'Collection': 'collections', 'Mesh': 'meshes', 'Object': 'objects', 'Material': 'materials',
'Texture': 'textures', 'Scene': 'scenes', 'Light': 'lights', 'Camera': 'cameras', 'Action': 'actions', 'Armature': 'armatures', 'GreasePencil': 'grease_pencils'}
# UTILITY FUNCTIONS
@ -73,7 +75,7 @@ def view3d_find():
def get_target(region, rv3d, coord):
target = [0,0,0]
target = [0, 0, 0]
if coord and region and rv3d:
view_vector = view3d_utils.region_2d_to_vector_3d(region, rv3d, coord)
@ -121,11 +123,12 @@ def randomStringDigits(stringLength=6):
lettersAndDigits = string.ascii_letters + string.digits
return ''.join(random.choice(lettersAndDigits) for i in range(stringLength))
def randomColor():
r = random.random()
v = random.random()
b = random.random()
return [r,v,b]
return [r, v, b]
def resolve_bpy_path(path):
@ -148,7 +151,8 @@ def refresh_window():
import bpy
bpy.ops.wm.redraw_timer(type='DRAW_WIN_SWAP', iterations=1)
def dump_datablock(datablock,depth):
def dump_datablock(datablock, depth):
if datablock:
print("sending {}".format(datablock.name))
@ -157,36 +161,41 @@ def dump_datablock(datablock,depth):
dumper.depth = depth
datablock_type = datablock.bl_rna.name
key = "{}/{}".format(datablock_type,datablock.name)
key = "{}/{}".format(datablock_type, datablock.name)
data = dumper.dump(datablock)
client.push_update(key, datablock_type, data)
def dump_datablock_attibute(datablock,attributes,depth=1):
def dump_datablock_attibute(datablock, attributes, depth=1):
if datablock:
dumper = dump_anything.Dumper()
dumper.type_subset = dumper.match_subset_all
dumper.depth = depth
datablock_type = datablock.bl_rna.name
key = "{}/{}".format(datablock_type,datablock.name)
key = "{}/{}".format(datablock_type, datablock.name)
data = {}
for attr in attributes:
try:
data[attr] = dumper.dump(getattr(datablock,attr))
data[attr] = dumper.dump(getattr(datablock, attr))
except:
pass
client.push_update(key, datablock_type, data)
def upload_mesh(mesh):
if mesh.bl_rna.name == 'Mesh':
dump_datablock_attibute(mesh,['name','polygons','edges','vertices'],6)
dump_datablock_attibute(
mesh, ['name', 'polygons', 'edges', 'vertices'], 6)
def upload_material(mesh):
if mesh.bl_rna.name == 'Material':
dump_datablock_attibute(mesh,['name','node_tree'],7)
dump_datablock_attibute(mesh, ['name', 'node_tree'], 7)
def upload_client_position():
global client
@ -201,7 +210,7 @@ def upload_client_position():
data = {}
data['location'] = current_coords
color = bpy.context.scene.session_settings.client_color
data['color'] = (color.r,color.g,color.b,1)
data['color'] = (color.r, color.g, color.b, 1)
client.push_update(key, 'client', data)
elif current_coords[0] != data['location'][0]:
data['location'] = current_coords
@ -209,21 +218,22 @@ def upload_client_position():
except:
pass
def init_scene():
for cam in bpy.data.cameras:
dump_datablock(cam,1)
dump_datablock(cam, 1)
for light in bpy.data.lights:
dump_datablock(light,1)
dump_datablock(light, 1)
for mat in bpy.data.materials:
dump_datablock(mat,7)
dump_datablock(mat, 7)
for mesh in bpy.data.meshes:
upload_mesh(mesh)
for object in bpy.data.objects:
dump_datablock(object,1)
dump_datablock(object, 1)
for collection in bpy.data.collections:
dump_datablock(collection,4)
dump_datablock(collection, 4)
for scene in bpy.data.scenes:
dump_datablock(scene,4)
dump_datablock(scene, 4)
def load_mesh(target=None, data=None, create=False):
@ -311,7 +321,7 @@ def load_scene(target=None, data=None, create=False):
# Load other meshes metadata
# dump_anything.load(target, data)
#Load master collection
# Load master collection
for object in data["collection"]["objects"]:
if object not in target.collection.objects.keys():
target.collection.objects.link(bpy.data.objects[object])
@ -320,7 +330,8 @@ def load_scene(target=None, data=None, create=False):
# TODO: Recursive link
for collection in data["collection"]["children"]:
if collection not in target.collection.children.keys():
target.collection.children.link(bpy.data.collections[collection])
target.collection.children.link(
bpy.data.collections[collection])
except:
print("Collection loading error")
@ -388,7 +399,7 @@ def load_gpencil(target=None, data=None, create=False):
def load_light(target=None, data=None, create=False, type=None):
try:
if target is None and create:
bpy.data.lights.new(data["name"],data["type"])
bpy.data.lights.new(data["name"], data["type"])
# Load other meshes metadata
dump_anything.load(target, data)
@ -441,7 +452,7 @@ def update_scene(msg):
elif 'Light' in msg.mtype:
load_light(target=target, data=msg.body,
create=net_vars.load_data)
elif msg.mtype == 'Camera' :
elif msg.mtype == 'Camera':
load_default(target=target, data=msg.body,
create=net_vars.load_data, type=msg.mtype)
else:
@ -508,10 +519,7 @@ class session_join(bpy.types.Operator):
net_settings.is_running = True
# REGISTER Updaters
bpy.app.timers.register(tick)
bpy.app.timers.register(mesh_tick)
bpy.app.timers.register(object_tick)
register_ticks()
bpy.ops.session.draw('INVOKE_DEFAULT')
return {"FINISHED"}
@ -626,9 +634,8 @@ class session_stop(bpy.types.Operator):
client = None
bpy.ops.asyncio.stop()
net_settings.is_running = False
bpy.app.timers.unregister(tick)
bpy.app.timers.unregister(mesh_tick)
bpy.app.timers.unregister(object_tick)
unregister_ticks()
else:
logger.debug("No server/client running.")
@ -663,6 +670,7 @@ class session_settings(bpy.types.PropertyGroup):
subtype='COLOR',
default=randomColor())
class session_draw_clients(bpy.types.Operator):
bl_idname = "session.draw"
bl_label = "draw clients"
@ -719,10 +727,8 @@ class session_draw_clients(bpy.types.Operator):
self.draw_items.clear()
# TODO: refactor this ugly things
def create_batch(self):
global client
index = 0
@ -768,7 +774,7 @@ class session_draw_clients(bpy.types.Operator):
position = values.body['location']
color = values.body['color']
batch = batch_for_shader(
shader, 'LINES', {"pos":position}, indices=indices)
shader, 'LINES', {"pos": position}, indices=indices)
self.draw_items.append(
(shader, batch, (position[1], values.id.decode()), color))
@ -833,7 +839,8 @@ class session_draw_clients(bpy.types.Operator):
session.active_object = context.selected_objects[0]
key = "net/objects/{}".format(client.id.decode())
data = {}
data['color'] = [session.client_color.r,session.client_color.g,session.client_color.b]
data['color'] = [session.client_color.r,
session.client_color.g, session.client_color.b]
data['object'] = session.active_object.name
client.push_update(
key, 'clientObject', data)
@ -858,7 +865,6 @@ class session_draw_clients(bpy.types.Operator):
self.unregister_handlers(context)
class session_snapview(bpy.types.Operator):
bl_idname = "session.snapview"
bl_label = "draw clients"
@ -899,6 +905,7 @@ classes = (
session_snapview,
)
def mesh_tick():
mesh = get_update("Mesh")
@ -907,26 +914,28 @@ def mesh_tick():
return 2
def object_tick():
obj = get_update("Object")
if obj:
dump_datablock_attibute(bpy.data.objects[obj],['matrix_world'])
dump_datablock_attibute(bpy.data.objects[obj], ['matrix_world'])
return 0.1
def material_tick():
return 2
def tick():
def draw_tick():
upload_client_position()
return 0.1
# TODO: Enqueu tqsks
def depsgraph_update(scene):
for c in bpy.context.depsgraph.updates.items():
@ -936,10 +945,10 @@ def depsgraph_update(scene):
if scene.session_settings.active_object:
if c[1].is_updated_geometry:
if c[1].id.name == scene.session_settings.active_object.name:
add_update(c[1].id.bl_rna.name,c[1].id.name)
add_update(c[1].id.bl_rna.name, c[1].id.name)
elif c[1].is_updated_transform:
if c[1].id.name == scene.session_settings.active_object.name:
add_update(c[1].id.bl_rna.name,c[1].id.name)
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)
@ -953,14 +962,29 @@ def depsgraph_update(scene):
break
if not found:
client.property_map["Object/{}".format(data_name)] = net_components.RCFMessage("Object/{}".format(data_name), "Object", None)
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.objects[data_name], 1)
dump_datablock(bpy.data.scenes[0], 4)
# dump_datablock(bpy.data.scenes[0],4)
def register_ticks():
# REGISTER Updaters
bpy.app.timers.register(draw_tick)
bpy.app.timers.register(mesh_tick)
bpy.app.timers.register(object_tick)
def unregister_ticks():
# REGISTER Updaters
bpy.app.timers.unregister(draw_tick)
bpy.app.timers.unregister(mesh_tick)
bpy.app.timers.unregister(object_tick)
def register():
from bpy.utils import register_class
for cls in classes:
@ -970,6 +994,7 @@ def register():
type=session_settings)
bpy.app.handlers.depsgraph_update_post.append(depsgraph_update)
def unregister():
global server
global client
@ -993,7 +1018,6 @@ def unregister():
for cls in reversed(classes):
unregister_class(cls)
del bpy.types.Scene.session_settings

2
net_ui.py
View File

@ -102,7 +102,7 @@ class SessionUsersPanel(bpy.types.Panel):
info = "(self)"
# detail_item_box = item_box.row()
detail_item_box.label(
text="{} - {} -{}".format(values.id.decode(),values.body, info))
text="{} - {}".format(values.id.decode(), info))
if net_operators.client.id.decode() not in key:
detail_item_box.operator(

29
rna_translation.py
View File

@ -1,29 +0,0 @@
from . import net_components
import bpy
import mathutils
def set_vector(value):
return [value.x, value.y, value.z]
def get_vector(value):
return mathutils.Vector(
(value[0], value[1], value[2]))
class RNAFactory(net_components.RCFFactory):
def load_getter(self, data):
print("load RNA getter")
getter = None
if isinstance(data.body, mathutils.Vector):
print("Vector")
getter = get_vector
return getter
def load_setter(self,data):
print("load RNA setter")
setter = None
if isinstance(data.body, mathutils.Vector):
print("Vector")
setter = set_vector
return setter

184
server.json
View File

@ -1,184 +0,0 @@
{
"active_material": "Material",
"active_material_index": 0,
"active_shape_key_index": 0,
"data": "Cube",
"delta_location": [
0.0,
0.0,
0.0
],
"delta_scale": [
1.0,
1.0,
1.0
],
"dimensions": [
2.0,
2.0,
2.0
],
"display_bounds_type": "BOX",
"display_type": "TEXTURED",
"empty_display_size": 1.0,
"empty_display_type": "ARROWS",
"empty_image_depth": "DEFAULT",
"empty_image_side": "DOUBLE_SIDED",
"hide_render": false,
"hide_select": false,
"hide_viewport": false,
"instance_faces_scale": 1.0,
"instance_type": "NONE",
"is_evaluated": false,
"is_from_instancer": false,
"is_from_set": false,
"is_instancer": false,
"is_library_indirect": false,
"location": [
0.0,
0.0,
0.0
],
"lock_rotation_w": false,
"lock_rotations_4d": false,
"matrix_basis": [
[
1.0,
0.0,
0.0,
0.0
],
[
0.0,
1.0,
0.0,
0.0
],
[
0.0,
0.0,
1.0,
0.0
],
[
0.0,
0.0,
0.0,
1.0
]
],
"matrix_local": [
[
1.0,
0.0,
0.0,
0.0
],
[
0.0,
1.0,
0.0,
0.0
],
[
0.0,
0.0,
1.0,
0.0
],
[
0.0,
0.0,
0.0,
1.0
]
],
"matrix_parent_inverse": [
[
1.0,
0.0,
0.0,
0.0
],
[
0.0,
1.0,
0.0,
0.0
],
[
0.0,
0.0,
1.0,
0.0
],
[
0.0,
0.0,
0.0,
1.0
]
],
"matrix_world": [
[
1.0,
0.0,
0.0,
0.0
],
[
0.0,
1.0,
0.0,
0.0
],
[
0.0,
0.0,
1.0,
0.0
],
[
0.0,
0.0,
0.0,
1.0
]
],
"mode": "OBJECT",
"name": "Cube",
"name_full": "Cube",
"original": "Cube",
"parent_bone": "",
"parent_type": "OBJECT",
"pass_index": 0,
"rotation_mode": "XYZ",
"scale": [
1.0,
1.0,
1.0
],
"show_all_edges": false,
"show_axis": false,
"show_bounds": false,
"show_empty_image_orthographic": true,
"show_empty_image_perspective": true,
"show_in_front": false,
"show_instancer_for_render": true,
"show_instancer_for_viewport": true,
"show_name": false,
"show_only_shape_key": false,
"show_texture_space": false,
"show_transparent": false,
"show_wire": false,
"tag": false,
"track_axis": "POS_Y",
"type": "MESH",
"up_axis": "Z",
"use_dynamic_topology_sculpting": false,
"use_fake_user": false,
"use_instance_faces_scale": false,
"use_instance_vertices_rotation": false,
"use_shape_key_edit_mode": false,
"users": 1
}

1155
test.json
View File

File diff suppressed because it is too large Load Diff