From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 29 Oct 2016 17:02:10 +0000 (+0300)
Subject: Add properties to export materials as texture array layers
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=1d0b0fcb7ad573053a8730a90f7fb33061038db2;p=libs%2Fgl.git

Add properties to export materials as texture array layers
---

diff --git a/blender/io_mspgl/export_mesh.py b/blender/io_mspgl/export_mesh.py
index 8f868882..1652c1a4 100644
--- a/blender/io_mspgl/export_mesh.py
+++ b/blender/io_mspgl/export_mesh.py
@@ -321,10 +321,11 @@ class MeshExporter:
 		fmt = ["NORMAL3"]
 		if texunits:
 			for i, u in texunits:
+				size = str(len(mesh.vertices[0].uvs[i]))
 				if u.unit==0 or force_unit0:
-					fmt.append("TEXCOORD2")
+					fmt.append("TEXCOORD"+size)
 				else:
-					fmt.append("TEXCOORD2_%d"%u.unit)
+					fmt.append("TEXCOORD%s_%d"%(size, u.unit))
 			if self.tbn_vecs:
 				fmt += ["TANGENT3", "BINORMAL3"]
 		if self.export_groups:
@@ -342,10 +343,11 @@ class MeshExporter:
 				normal = v.normal
 			for i, u in texunits:
 				if v.uvs[i]!=uvs.get(i):
+					size = str(len(v.uvs[i]))
 					if u.unit==0 or force_unit0:
-						out_file.write("texcoord2", *v.uvs[i])
+						out_file.write("texcoord"+size, *v.uvs[i])
 					else:
-						out_file.write("multitexcoord2", u.unit, *v.uvs[i])
+						out_file.write("multitexcoord"+size, u.unit, *v.uvs[i])
 					uvs[i] = v.uvs[i]
 			if self.tbn_vecs:
 				if v.tan!=tan:
diff --git a/blender/io_mspgl/mesh.py b/blender/io_mspgl/mesh.py
index 2cd64236..d05b9de8 100644
--- a/blender/io_mspgl/mesh.py
+++ b/blender/io_mspgl/mesh.py
@@ -158,6 +158,13 @@ class Mesh:
 				v.faces.append(f)
 			for u in self.uv_layers:
 				f.uvs.append([u.data[f.loop_indices[i]].uv for i in range(len(f.vertices))])
+			if f.material_index<len(self.materials):
+				mat = self.materials[f.material_index]
+				if mat and mat.array_atlas:
+					layer = (mat.array_layer,)
+					print(f.uvs, layer)
+					for i in range(len(f.uvs)):
+						f.uvs[i] = [mathutils.Vector(tuple(u)+layer) for u in f.uvs[i]]
 
 		self.edges = dict([(e.key, Edge(e)) for e in self.edges])
 		for f in self.faces:
diff --git a/blender/io_mspgl/properties.py b/blender/io_mspgl/properties.py
index 129b02e6..f5a57cb7 100644
--- a/blender/io_mspgl/properties.py
+++ b/blender/io_mspgl/properties.py
@@ -35,6 +35,26 @@ class MspGLObjectProperties(bpy.types.Panel):
 		if obj.lod_for_parent:
 			self.layout.prop(obj, "lod_index")
 
+class MspGLMaterialProperties(bpy.types.Panel):
+	bl_idname = "MATERIAL_PT_mspgl_properties"
+	bl_label = "MspGL properties"
+	bl_space_type = "PROPERTIES"
+	bl_region_type = "WINDOW"
+	bl_context = "material"
+
+	@classmethod
+	def poll(cls, context):
+		return context.active_object.active_material is not None
+
+	def draw(self, context):
+		mat = context.active_object.active_material
+		if not mat:
+			return
+
+		self.layout.prop(mat, "array_atlas");
+		if mat.array_atlas:
+			self.layout.prop(mat, "array_layer");
+
 def register_properties():
 	bpy.types.Mesh.winding_test = bpy.props.BoolProperty(name="Winding test", description="Perform winding test to skip back faces")
 	bpy.types.Object.technique = bpy.props.StringProperty(name="Technique", description="Name of the technique to use for rendering")
@@ -43,3 +63,5 @@ def register_properties():
 	bpy.types.Object.compound = bpy.props.BoolProperty(name="Compound with parent", description="Join this object to its parent when exporting")
 	bpy.types.Object.lod_for_parent = bpy.props.BoolProperty(name="LoD for parent", description="This object is a level of detail for its parent")
 	bpy.types.Object.lod_index = bpy.props.IntProperty(name="LoD index", description="Index of the level of detail", min=1, default=1)
+	bpy.types.Material.array_atlas = bpy.props.BoolProperty(name="Texture array atlas", description="The material is stored in a texture array")
+	bpy.types.Material.array_layer = bpy.props.IntProperty("Texture array layer", description="Layer of the texture array atlas to use")