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

feat: cleanup code

Browse Source
This commit is contained in:
Swann Martinez
2019-07-12 10:57:56 +02:00
parent e0a08ac4f8
commit cc12defa51
1 changed files with 69 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
helpers.py
View File

@ -11,12 +11,14 @@ from . import draw, environment
from .libs import dump_anything from .libs import dump_anything
# TODO: replace hardcoded values... # TODO: replace hardcoded values...
BPY_TYPES = {'Image':'images', 'Texture': 'textures','Material': 'materials', 'GreasePencil': 'grease_pencils', 'Curve': 'curves', 'Collection': 'collections', 'Mesh': 'meshes', 'Object': 'objects', BPY_TYPES = {'Image': 'images', 'Texture': 'textures', 'Material': 'materials', 'GreasePencil': 'grease_pencils', 'Curve': 'curves', 'Collection': 'collections', 'Mesh': 'meshes', 'Object': 'objects',
'Scene': 'scenes', 'Light': 'lights', 'SunLight': 'lights', 'SpotLight': 'lights', 'AreaLight': 'lights', 'PointLight': 'lights', 'Camera': 'cameras', 'Action': 'actions', 'Armature': 'armatures'} 'Scene': 'scenes', 'Light': 'lights', 'SunLight': 'lights', 'SpotLight': 'lights', 'AreaLight': 'lights', 'PointLight': 'lights', 'Camera': 'cameras', 'Action': 'actions', 'Armature': 'armatures'}
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
logging.basicConfig(level=logging.DEBUG) logging.basicConfig(level=logging.DEBUG)
# UTILITY FUNCTIONS # UTILITY FUNCTIONS
def revers(d): def revers(d):
l = [] l = []
for i in d: for i in d:
@ -68,11 +70,14 @@ def get_selected_objects(scene):
# LOAD HELPERS # LOAD HELPERS
# def load_color(color_dict, target_color_attribute):
# target_color_attribute
def load_dict(src_dict, target): def load_dict(src_dict, target):
try: try:
for item in src_dict: for item in src_dict:
# attr = # attr =
setattr(target,item,src_dict[item]) setattr(target, item, src_dict[item])
except Exception as e: except Exception as e:
logger.error(e) logger.error(e)
@ -131,7 +136,7 @@ def resolve_bpy_path(path):
try: try:
path = path.split('/') path = path.split('/')
item = getattr(bpy.data,BPY_TYPES[path[0]])[path[1]] item = getattr(bpy.data, BPY_TYPES[path[0]])[path[1]]
except: except:
pass pass
@ -165,9 +170,9 @@ def load_image(target=None, data=None):
img_name = "{}.png".format(image.name) img_name = "{}.png".format(image.name)
logger.info("updating {} cache file".format(image.name)) logger.info("updating {} cache file".format(image.name))
img_path = os.path.join(environment.CACHE_DIR,img_name) img_path = os.path.join(environment.CACHE_DIR, img_name)
file = open(img_path,'wb') file = open(img_path, 'wb')
file.write(data["pixels"]) file.write(data["pixels"])
file.close() file.close()
@ -233,7 +238,7 @@ def load_mesh(target=None, data=None, create=False):
mesh_buffer = bmesh.new() mesh_buffer = bmesh.new()
for i in data["verts"]: for i in data["verts"]:
v = mesh_buffer.verts.new(data["verts"][i]["co"]) v = mesh_buffer.verts.new(data["verts"][i]["co"])
mesh_buffer.verts.ensure_lookup_table() mesh_buffer.verts.ensure_lookup_table()
@ -256,11 +261,10 @@ def load_mesh(target=None, data=None, create=False):
f.material_index = data["faces"][p]['material_index'] f.material_index = data["faces"][p]['material_index']
# UV loading # UV loading
for i,loop in enumerate(f.loops): for i, loop in enumerate(f.loops):
loop_uv = loop[uv_layer] loop_uv = loop[uv_layer]
loop_uv.uv = data["faces"][p]["uv"][i] loop_uv.uv = data["faces"][p]["uv"][i]
if target is None and create: if target is None and create:
target = bpy.data.meshes.new(data["name"]) target = bpy.data.meshes.new(data["name"])
@ -270,11 +274,10 @@ def load_mesh(target=None, data=None, create=False):
# 2 - LOAD METADATA # 2 - LOAD METADATA
## uv's # uv's
for uv_layer in data['uv_layers']: for uv_layer in data['uv_layers']:
target.uv_layers.new(name=uv_layer) target.uv_layers.new(name=uv_layer)
bevel_layer = mesh_buffer.verts.layers.bevel_weight.verify() bevel_layer = mesh_buffer.verts.layers.bevel_weight.verify()
skin_layer = mesh_buffer.verts.layers.skin.verify() skin_layer = mesh_buffer.verts.layers.skin.verify()
@ -285,9 +288,6 @@ def load_mesh(target=None, data=None, create=False):
# loop_uv = loop[uv_layer] # loop_uv = loop[uv_layer]
# loop_uv.uv = data['faces'][face.index]["uv"] # loop_uv.uv = data['faces'][face.index]["uv"]
dump_anything.load(target, data) dump_anything.load(target, data)
# 3 - LOAD MATERIAL SLOTS # 3 - LOAD MATERIAL SLOTS
@ -408,8 +408,6 @@ def load_collection(target=None, data=None, create=False):
target.collection.children.unlink( target.collection.children.unlink(
bpy.data.collections[collection]) bpy.data.collections[collection])
target.id = data['id'] target.id = data['id']
client = bpy.context.window_manager.session.username client = bpy.context.window_manager.session.username
@ -479,7 +477,6 @@ def load_material(target=None, data=None, create=False):
load_dict(data['grease_pencil'], target.grease_pencil) load_dict(data['grease_pencil'], target.grease_pencil)
elif data["use_nodes"]: elif data["use_nodes"]:
if target.node_tree is None: if target.node_tree is None:
target.use_nodes = True target.use_nodes = True
@ -489,7 +486,6 @@ def load_material(target=None, data=None, create=False):
for node in data["node_tree"]["nodes"]: for node in data["node_tree"]["nodes"]:
# fix None node tree error # fix None node tree error
index = target.node_tree.nodes.find(node) index = target.node_tree.nodes.find(node)
if index is -1: if index is -1:
@ -501,16 +497,18 @@ def load_material(target=None, data=None, create=False):
target.node_tree.nodes[index], data["node_tree"]["nodes"][node]) target.node_tree.nodes[index], data["node_tree"]["nodes"][node])
if data["node_tree"]["nodes"][node]['type'] == 'TEX_IMAGE': if data["node_tree"]["nodes"][node]['type'] == 'TEX_IMAGE':
target.node_tree.nodes[index].image = bpy.data.images[data["node_tree"]["nodes"][node]['image']['name']] target.node_tree.nodes[index].image = bpy.data.images[data["node_tree"]
["nodes"][node]['image']['name']]
for input in data["node_tree"]["nodes"][node]["inputs"]: for input in data["node_tree"]["nodes"][node]["inputs"]:
try: try:
if hasattr(target.node_tree.nodes[index].inputs[input],"default_value"): if hasattr(target.node_tree.nodes[index].inputs[input], "default_value"):
target.node_tree.nodes[index].inputs[input].default_value = data[ target.node_tree.nodes[index].inputs[input].default_value = data[
"node_tree"]["nodes"][node]["inputs"][input]["default_value"] "node_tree"]["nodes"][node]["inputs"][input]["default_value"]
except Exception as e: except Exception as e:
logger.error("Fail loading {} node value from {} ({}) ".format(target.name, target.node_tree.nodes[index].inputs[input].default_value,e)) logger.error("Fail loading {} node value from {} ({}) ".format(
target.name, target.node_tree.nodes[index].inputs[input].default_value, e))
continue continue
# Load nodes links # Load nodes links
@ -525,11 +523,9 @@ def load_material(target=None, data=None, create=False):
target.node_tree.links.new(input_socket, output_socket) target.node_tree.links.new(input_socket, output_socket)
# Load other meshes metadata # Load other meshes metadata
# dump_anything.load(target, data) # dump_anything.load(target, data)
target.id = data['id'] target.id = data['id']
except Exception as e: except Exception as e:
@ -601,8 +597,12 @@ def load_light(target=None, data=None, create=False, type=None):
target.id = data['id'] target.id = data['id']
# Tmp color fix
# setattr(target,"color",data['color']['owner'])
except Exception as e: except Exception as e:
logger.error("light loading error: {}".format(e)) logger.error("light loading error: {}".format(e))
pass
def load_default(target=None, data=None, create=False, type=None): def load_default(target=None, data=None, create=False, type=None):
@ -617,6 +617,8 @@ def load_default(target=None, data=None, create=False, type=None):
logger.error("default loading error {}".format(e)) logger.error("default loading error {}".format(e))
# DUMP HELPERS # DUMP HELPERS
def dump(key): def dump(key):
target = resolve_bpy_path(key) target = resolve_bpy_path(key)
target_type = key.split('/')[0] target_type = key.split('/')[0]
@ -625,27 +627,32 @@ def dump(key):
if target_type == 'Image': if target_type == 'Image':
data = {} data = {}
data['pixels'] = dump_image(target) data['pixels'] = dump_image(target)
dump_datablock_attibute(target,[], 2,data) dump_datablock_attibutes(target, [], 2, data)
data = dump_datablock_attibute(target,["name",'size','height','alpha','float_buffer','filepath','source'], 2, data) data = dump_datablock_attibutes(
target,
["name", 'size', 'height', 'alpha', 'float_buffer', 'filepath', 'source'],
2,
data)
elif target_type == 'Material': elif target_type == 'Material':
data = dump_datablock(target, 2) data = dump_datablock(target, 2)
if target.node_tree: if target.node_tree:
dump_datablock_attibute(target.node_tree, ["nodes","links"] , 5, data['node_tree']) dump_datablock_attibutes(
target.node_tree, ["nodes", "links"], 5, data['node_tree'])
elif target.grease_pencil: elif target.grease_pencil:
dump_datablock_attibute(target, ["grease_pencil"] , 3, data) dump_datablock_attibutes(target, ["grease_pencil"], 3, data)
elif target_type == 'GreasePencil': elif target_type == 'GreasePencil':
data = dump_datablock(target, 2) data = dump_datablock(target, 2)
dump_datablock_attibute( dump_datablock_attibutes(
target, ['layers'], 9, data) target, ['layers'], 9, data)
elif target_type == 'Camera': elif target_type == 'Camera':
data = dump_datablock(target, 1) data = dump_datablock(target, 1)
elif 'Light' in target_type: elif 'Light' in target_type:
data = dump_datablock(target, 1) data = dump_datablock(target, 3)
elif target_type == 'Mesh': elif target_type == 'Mesh':
data = dump_datablock(target, 2) data = dump_datablock(target, 2)
data = dump_mesh(target,data) data = dump_mesh(target, data)
# dump_datablock_attibute( # dump_datablock_attibutes(
# target, ['name', 'polygons', 'edges', 'vertices', 'id'], 6, data) # target, ['name', 'polygons', 'edges', 'vertices', 'id'], 6, data)
# Fix material index # Fix material index
m_list = [] m_list = []
@ -655,19 +662,19 @@ def dump(key):
data['material_list'] = m_list data['material_list'] = m_list
elif target_type == 'Curve': elif target_type == 'Curve':
data = dump_datablock(target, 1) data = dump_datablock(target, 1)
dump_datablock_attibute( dump_datablock_attibutes(
target, ['splines'], 5, data) target, ['splines'], 5, data)
# for index, spline in enumerate(target.splines): # for index, spline in enumerate(target.splines):
# data["splines"][index] = dump_datablock_attibute(target.splines[index],"Curve/{}".format(index), ["bezier_points", "material_index", "points", "order_u", "order_v", "point_count_u", "point_count_v", # data["splines"][index] = dump_datablock_attibutes(target.splines[index],"Curve/{}".format(index), ["bezier_points", "material_index", "points", "order_u", "order_v", "point_count_u", "point_count_v",
# "radius_interpolation", "resolution_v", "use_bezier_u", "use_bezier_v", "use_cyclic_u", "use_cyclic_v", "use_endpoint_u", "use_endpoint_v"], 3) # "radius_interpolation", "resolution_v", "use_bezier_u", "use_bezier_v", "use_cyclic_u", "use_cyclic_v", "use_endpoint_u", "use_endpoint_v"], 3)
elif target_type == 'Object': elif target_type == 'Object':
data = dump_datablock(target, 1) data = dump_datablock(target, 1)
elif target_type == 'Collection': elif target_type == 'Collection':
data = dump_datablock(target, 4) data = dump_datablock(target, 4)
elif target_type == 'Scene': elif target_type == 'Scene':
data = dump_datablock_attibute( data = dump_datablock_attibutes(
target, ['name', 'collection', 'id', 'camera', 'grease_pencil'], 2) target, ['name', 'collection', 'id', 'camera', 'grease_pencil'], 2)
dump_datablock_attibute( dump_datablock_attibutes(
target, ['collection'], 4, data) target, ['collection'], 4, data)
# elif target_type == 'Armature': # elif target_type == 'Armature':
@ -689,7 +696,7 @@ def dump_datablock(datablock, depth):
return data return data
def dump_datablock_attibute(datablock=None, attributes=[], depth=1, dickt=None): def dump_datablock_attibutes(datablock=None, attributes=[], depth=1, dickt=None):
if datablock: if datablock:
dumper = dump_anything.Dumper() dumper = dump_anything.Dumper()
dumper.type_subset = dumper.match_subset_all dumper.type_subset = dumper.match_subset_all
@ -716,7 +723,7 @@ def dump_image(image):
if image.source == "GENERATED": if image.source == "GENERATED":
img_name = "{}.png".format(image.name) img_name = "{}.png".format(image.name)
image.filepath_raw = os.path.join(environment.CACHE_DIR,img_name) image.filepath_raw = os.path.join(environment.CACHE_DIR, img_name)
image.file_format = "PNG" image.file_format = "PNG"
image.save() image.save()
@ -729,6 +736,7 @@ def dump_image(image):
logger.error("image format not supported") logger.error("image format not supported")
return pixels return pixels
def dump_mesh(mesh, data={}): def dump_mesh(mesh, data={}):
import bmesh import bmesh
@ -750,14 +758,14 @@ def dump_mesh(mesh, data={}):
v['bevel'] = vert[bevel_layer] v['bevel'] = vert[bevel_layer]
# v['skin'] = list(vert[skin_layer]) # v['skin'] = list(vert[skin_layer])
verts[str(vert.index)] = v verts[str(vert.index)] = v
mesh_data["verts"] = verts mesh_data["verts"] = verts
edges = {} edges = {}
for edge in mesh_buffer.edges: for edge in mesh_buffer.edges:
e = {} e = {}
e["verts"] = [edge.verts[0].index,edge.verts[1].index] e["verts"] = [edge.verts[0].index, edge.verts[1].index]
# Edge metadata # Edge metadata
e["smooth"] = edge.smooth e["smooth"] = edge.smooth
@ -794,6 +802,7 @@ def dump_mesh(mesh, data={}):
mesh_data["uv_layers"] = uv_layers mesh_data["uv_layers"] = uv_layers
return mesh_data return mesh_data
def init_client(key=None): def init_client(key=None):
client_dict = {} client_dict = {}