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

feat: progress on image support

Browse Source
This commit is contained in:
Swann Martinez
2019-07-02 18:05:18 +02:00
parent 500a80cfd5
commit 524c5a0813
3 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
environment.py
View File

@ -12,6 +12,7 @@ CONFIG_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "config")
CONFIG = os.path.join(CONFIG_DIR, "app.yaml") CONFIG = os.path.join(CONFIG_DIR, "app.yaml")
THIRD_PARTY = os.path.join(os.path.dirname(os.path.abspath(__file__)), "libs") THIRD_PARTY = os.path.join(os.path.dirname(os.path.abspath(__file__)), "libs")
CACHE_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "cache")
PYTHON_PATH = None PYTHON_PATH = None
SUBPROCESS_DIR = None SUBPROCESS_DIR = None
DEFAULT_CONFIG = { DEFAULT_CONFIG = {

33
helpers.py
View File

@ -77,6 +77,8 @@ def load(key, value):
if target_type == 'Object': if target_type == 'Object':
load_object(target=target, data=value, load_object(target=target, data=value,
create=True) create=True)
if target_type == 'Image':
load_object(target=target, data=value)
elif target_type == 'Mesh': elif target_type == 'Mesh':
load_mesh(target=target, data=value, load_mesh(target=target, data=value,
create=True) create=True)
@ -136,7 +138,19 @@ def load_client(client=None, data=None):
draw.renderer.draw_client_selected_objects(data) draw.renderer.draw_client_selected_objects(data)
def load_image(target=None, data=None): def load_image(target=None, data=None):
pass if not target:
image = bpy.data.image.new(
name=data['name'],
width=data['width'],
height=data['height'],
alpha=data['alpha'],
float_buffer=data['float_buffer']
)
else:
image = target
dump_anything.load(target, data)
def load_armature(target=None, data=None, create=False): def load_armature(target=None, data=None, create=False):
file = "cache_{}.json".format(data['name']) file = "cache_{}.json".format(data['name'])
@ -540,7 +554,9 @@ def dump(key):
data = None data = None
if target_type == 'Image': if target_type == 'Image':
data = dump_datablock(target, 1) data = dump_datablock(target, 2)
data['pixels'] = dump_image(target)
print(data['name'])
elif target_type == 'Material': elif target_type == 'Material':
data = dump_datablock(target, 2) data = dump_datablock(target, 2)
dump_datablock_attibute(target, ['node_tree'], 7, data) dump_datablock_attibute(target, ['node_tree'], 7, data)
@ -621,6 +637,19 @@ def dump_datablock_attibute(datablock=None, attributes=[], depth=1, dickt=None):
return data return data
def dump_image(image):
pixels = []
for x in range(image.size[0]*image.size[1]):
px = [
image.pixels[x],
image.pixels[x+1],
image.pixels[x+2],
image.pixels[x+3]
]
pixels.append(px)
return pixels
def init_client(key=None): def init_client(key=None):
client_dict = {} client_dict = {}

2
server.py
View File

@ -10,7 +10,7 @@ import message
logger = logging.getLogger("Server") logger = logging.getLogger("Server")
logging.basicConfig(level=logging.DEBUG) logging.basicConfig(level=logging.DEBUG)
SUPPORTED_TYPES = ['Client','Curve','Material','Texture', 'Light', 'Camera', 'Mesh','Armature', 'GreasePencil', 'Object', 'Action', 'Collection', 'Scene'] SUPPORTED_TYPES = ['Image','Client','Curve','Material','Texture', 'Light', 'Camera', 'Mesh','Armature', 'GreasePencil', 'Object', 'Action', 'Collection', 'Scene']
class ServerAgent(): class ServerAgent():
def __init__(self, context=zmq.Context.instance(), id="admin"): def __init__(self, context=zmq.Context.instance(), id="admin"):