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

feat(rcf): append collection, object and material replication

Browse Source
This commit is contained in:
Swann Martinez
2019-03-25 18:51:54 +01:00
parent 8d47715af2
commit dab6ca681f
3 changed files with 116 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/dump_anything.py
View File

@ -277,6 +277,12 @@ class Loader:
pointer.write(bpy.data.textures.get(dump))
elif isinstance(rna_property_type, T.ColorRamp):
self._load_default(pointer, dump)
elif isinstance(rna_property_type, T.Object):
pointer.write(bpy.data.objects.get(dump))
elif isinstance(rna_property_type, T.Mesh):
pointer.write(bpy.data.meshes.get(dump))
elif isinstance(rna_property_type, T.Material):
pointer.write(bpy.data.materials.get(dump))
def _load_matrix(self, matrix, dump):
matrix.write(mathutils.Matrix(dump))
@ -299,10 +305,12 @@ class Loader:
return # TODO error handling
for k in self._ordered_keys(dump.keys()):
v = dump[k]
print(k)
if not hasattr(default.read(), k):
continue # TODO error handling
self._load_any(default.extend(k), v)
try:
self._load_any(default.extend(k), v)
except:
pass
@property
def match_subset_all(self):

103
net_operators.py
View File

@ -23,7 +23,7 @@ context = None
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']
SUPPORTED_TYPES = ['Mesh','Object', 'Material', 'Texture', 'Light', 'Camera', 'Action', 'Armature']
SUPPORTED_TYPES = ['Collection','Mesh','Object', 'Material', 'Texture', 'Light', 'Camera', 'Action', 'Armature']
# UTILITY FUNCTIONS
def clean_scene(elements=SUPPORTED_DATABLOCKS):
@ -174,8 +174,94 @@ def load_mesh(target=None, data=None, create=False):
# Load other meshes metadata
dump_anything.load(target, data)
def load_object(target=None, data=None, create=False):
bpy.data.objects.new()
try:
if target is None and create:
mesh = bpy.data.meshes[data["data"]]
if mesh:
target = bpy.data.objects.new(data["name"],mesh)
else:
print("Missing meshes")
# Load other meshes metadata
dump_anything.load(target, data)
except:
print("Object loading error")
def load_collection(target=None, data=None, create=False):
try:
if target is None and create:
target = bpy.data.collections.new(data["name"])
# Load other meshes metadata
# dump_anything.load(target, data)
# load objects into collection
for object in data["objects"]:
target.objects.link(bpy.data.objects[object])
except:
print("Collection loading error")
def load_material(target=None, data=None, create=False):
try:
if target is None and create:
target = bpy.data.materials.new(data["name"])
# Load other meshes metadata
dump_anything.load(target, data)
# load nodes
for node in data["node_tree"]["nodes"]:
print("load {}".format(node))
index = target.node_tree.nodes.find(node)
if index is -1:
node_type = data["node_tree"]["nodes"][node]["bl_idname"]
print("Create node {}".format(node_type))
target.node_tree.nodes.new(type=node_type)
print("properties")
dump_anything.load(target.node_tree.nodes[index],data["node_tree"]["nodes"][node])
for input in data["node_tree"]["nodes"][node]["inputs"]:
try:
target.node_tree.nodes[index].inputs[input].default_value = data["node_tree"]["nodes"][node]["inputs"][input]["default_value"]
# dump_anything.load(target.node_tree.nodes[index].inputs[input],)
except:
pass
# Load nodes links
target.node_tree.links.clear()
for link in data["node_tree"]["links"]:
current_link = data["node_tree"]["links"][link]
input = ...
output = ...
link_index = target.node_tree.links.new(node)
print(data["node_tree"]["links"][link])
except:
print("Material loading error")
def load_default(target=None, data=None, create=False,type=None):
try:
if target is None and create:
getattr(bpy.data,type).new(data["name"])
# Load other meshes metadata
dump_anything.load(target, data)
except:
print("default loading error")
def update_scene(msg):
global client
@ -191,10 +277,16 @@ def update_scene(msg):
target = resolve_bpy_path(msg.key)
if msg.mtype == 'Object':
pass
load_object(target=target, data=msg.body,create=net_vars.load_data)
if msg.mtype == 'Mesh':
load_mesh(target=target, data=msg.body,create=net_vars.load_data)
if msg.mtype == 'Collection':
load_collection(target=target, data=msg.body,create=net_vars.load_data)
if msg.mtype == 'Material':
load_material(target=target, data=msg.body,create=net_vars.load_data)
else:
load_default(target=target, data=msg.body,create=net_vars.load_data,type=msg.mtype)
recv_callbacks = [update_scene]
@ -219,7 +311,7 @@ class session_join(bpy.types.Operator):
net_settings = context.scene.session_settings
# Scene setup
if net_settings.session_mode == "CONNECT":
if net_settings.session_mode == "CONNECT" and net_settings.clear_scene:
clean_scene()
# Session setup
@ -370,6 +462,7 @@ class session_settings(bpy.types.PropertyGroup):
buffer = bpy.props.StringProperty(name="None")
is_running = bpy.props.BoolProperty(name="is_running", default=False)
load_data = bpy.props.BoolProperty(name="load_data", default=True)
clear_scene = bpy.props.BoolProperty(name="clear_scene", default=True)
update_frequency = bpy.props.FloatProperty(
name="update_frequency", default=0.008)
active_object = bpy.props.PointerProperty(

12
net_ui.py
View File

@ -30,10 +30,14 @@ class SessionSettingsPanel(bpy.types.Panel):
row.operator("session.create", text="HOST")
else:
box = row.box()
box.prop(net_settings, "ip", text="server ip")
box = box.row()
box.label(text="load data:")
box.prop(net_settings, "load_data", text="")
row = box.row()
row.prop(net_settings, "ip", text="server ip")
row = box.row()
row.label(text="load data:")
row.prop(net_settings, "load_data", text="")
row = box.row()
row.label(text="clear scene:")
row.prop(net_settings, "clear_scene", text="")
row = layout.row()
row.operator("session.join", text="CONNECT")