From fcad1bae81d00ab987a297a57a0f10c2ff31c5c0 Mon Sep 17 00:00:00 2001
From: Swann <swann.martinez@protonmail.com>
Date: Mon, 8 Jul 2019 22:15:46 +0200
Subject: [PATCH] feat: uv loading

---
 helpers.py | 29 +++++++++++++++++++----------
 server.py  | 21 ++++++++++++++++++++-
 2 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/helpers.py b/helpers.py
index aebd333..cf397d8 100644
--- a/helpers.py
+++ b/helpers.py
@@ -238,17 +238,24 @@ def load_mesh(target=None, data=None, create=False):
 
             if len(verts) > 0:
                 f = mesh_buffer.faces.new(verts)
+
+                uv_layer = mesh_buffer.loops.layers.uv.verify()
+
                 f.material_index = data["faces"][p]['material_index']
 
-        for l in data["uv_layers"]:
-            pass
+                # UV loading
+                for i,loop in enumerate(f.loops):
+                    loop_uv = loop[uv_layer]
+                    loop_uv.uv = data["faces"][p]["uv"][i]
+
+                    print(loop_uv.uv)
 
         if target is None and create:
             target = bpy.data.meshes.new(data["name"])
 
         mesh_buffer.to_mesh(target)
 
-        mesh_buffer.from_mesh(target)
+        # mesh_buffer.from_mesh(target)
 
         # 2 - LOAD METADATA
         
@@ -256,16 +263,16 @@ def load_mesh(target=None, data=None, create=False):
         for uv_layer in data['uv_layers']:
             target.uv_layers.new(name=uv_layer)
 
-        uv_layer = mesh_buffer.loops.layers.uv.verify()
+       
         bevel_layer = mesh_buffer.verts.layers.bevel_weight.verify()
         skin_layer = mesh_buffer.verts.layers.skin.verify()
 
-        for face in mesh_buffer.faces:
+        # for face in mesh_buffer.faces:
 
-            # Face metadata
-            for loop in face.loops:
-                loop_uv = loop[uv_layer]
-                loop_uv.uv = data['faces'][face.index]["uv"]
+        #     # Face metadata
+        #     for loop in face.loops:
+        #         loop_uv = loop[uv_layer]
+        #         loop_uv.uv = data['faces'][face.index]["uv"]
         
 
         
@@ -742,12 +749,14 @@ def dump_mesh(mesh, data={}):
         f["verts"] = fverts
         f["material_index"] = face.material_index
 
+        uvs = []
         # Face metadata
         for loop in face.loops:
             loop_uv = loop[uv_layer]
 
-            f["uv"] = list(loop_uv.uv)
+            uvs.append(list(loop_uv.uv))
 
+        f["uv"] = uvs
         faces[face.index] = f
     
     mesh_data["faces"] = faces
diff --git a/server.py b/server.py
index a7a1a9f..a3e1f31 100644
--- a/server.py
+++ b/server.py
@@ -10,7 +10,26 @@ import message
 logger = logging.getLogger("Server")
 logging.basicConfig(level=logging.DEBUG)
 
-SUPPORTED_TYPES = ['Image','Client','Curve','Material','Texture', 'Light', 'Camera', 'Mesh','Armature', 'GreasePencil', 'Object', 'Action', 'Collection', 'Scene']
+SUPPORTED_TYPES = [
+        'Client',
+        'Image',
+        'Texture',
+        'Curve',
+        'Material',
+        'Light',
+        'SunLight',
+        'SpotLight',
+        'AreaLight',
+        'PointLight',
+        'Camera',
+        'Mesh',
+        'Armature',
+        'GreasePencil',
+        'Object',
+        'Action',
+        'Collection',
+        'Scene',
+]
                    
 class ServerAgent():
     def __init__(self, context=zmq.Context.instance(), id="admin"):