From 524c5a0813f69e6e15d3a5b00e294cc98692f08c Mon Sep 17 00:00:00 2001
From: Swann Martinez <s.martinez@cubedns.fr>
Date: Tue, 2 Jul 2019 18:05:18 +0200
Subject: [PATCH] feat: progress on image support

---
 environment.py |  1 +
 helpers.py     | 33 +++++++++++++++++++++++++++++++--
 server.py      |  2 +-
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/environment.py b/environment.py
index 062fd53..974c17e 100644
--- a/environment.py
+++ b/environment.py
@@ -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")
 
 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
 SUBPROCESS_DIR = None
 DEFAULT_CONFIG = {
diff --git a/helpers.py b/helpers.py
index 0c37055..0c9b348 100644
--- a/helpers.py
+++ b/helpers.py
@@ -77,6 +77,8 @@ def load(key, value):
     if target_type == 'Object':
         load_object(target=target, data=value,
                     create=True)
+    if target_type == 'Image':
+        load_object(target=target, data=value)
     elif target_type == 'Mesh':
         load_mesh(target=target, data=value,
                   create=True)
@@ -136,7 +138,19 @@ def load_client(client=None, data=None):
             draw.renderer.draw_client_selected_objects(data)
 
 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):
     file = "cache_{}.json".format(data['name'])
@@ -540,7 +554,9 @@ def dump(key):
     data = None
 
     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':
         data = dump_datablock(target, 2)
         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
 
 
+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):
     client_dict = {}
 
diff --git a/server.py b/server.py
index 0c9460c..d8b2a32 100644
--- a/server.py
+++ b/server.py
@@ -10,7 +10,7 @@ import message
 logger = logging.getLogger("Server")
 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():
     def __init__(self, context=zmq.Context.instance(), id="admin"):