X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_texture.py;h=3e78a4cd6ee33af497f4cde7d6a27f281490982c;hb=2a0d4c5aa8a6e3cca56fb446ab8e9a0fadc02bd1;hp=23c5777d39ce4b2e92401bacda2ebc0da4e74c68;hpb=b130e82b37b033fdfb020ebc82a473df2d9d3db5;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_texture.py b/blender/io_mspgl/export_texture.py
index 23c5777d..3e78a4cd 100644
--- a/blender/io_mspgl/export_texture.py
+++ b/blender/io_mspgl/export_texture.py
@@ -1,41 +1,58 @@
+import os
+
 class TextureExporter:
 	def __init__(self):
 		self.inline_data = True
 
-	def export_texture(self, texture):
+	def export_texture(self, tex_node, usage='RGB'):
+		image = tex_node.image
 		from .datafile import Resource, Statement, Token
-		tex_res = Resource(texture.name+".tex2d")
+		tex_res = Resource(image.name+".tex2d", "texture2d")
 
-		if texture.use_interpolation:
-			if texture.use_mipmap:
-				tex_res.statements.append(Statement("min_filter", Token('LINEAR_MIPMAP_LINEAR')))
+		use_interpolation = tex_node.interpolation!='Closest'
+		if use_interpolation:
+			if tex_node.use_mipmap:
+				tex_res.statements.append(Statement("filter", Token('LINEAR_MIPMAP_LINEAR')))
 				tex_res.statements.append(Statement("generate_mipmap", True))
 			else:
-				tex_res.statements.append(Statement("min_filter", Token('LINEAR')))
-			tex_res.statements.append(Statement("max_anisotropy", texture.filter_eccentricity))
+				tex_res.statements.append(Statement("filter", Token('LINEAR')))
+			tex_res.statements.append(Statement("max_anisotropy", tex_node.max_anisotropy))
 		else:
-			if texture.use_mipmap:
-				tex_res.statements.append(Statement("min_filter", Token('NEAREST_MIPMAP_NEAREST')))
+			if tex_node.use_mipmap:
+				tex_res.statements.append(Statement("filter", Token('NEAREST_MIPMAP_NEAREST')))
 				tex_res.statements.append(Statement("generate_mipmap", True))
 			else:
-				tex_res.statements.append(Statement("min_filter", Token('NEAREST')))
+				tex_res.statements.append(Statement("filter", Token('NEAREST')))
+
+		colorspace = image.colorspace_settings.name
+		if usage=='GRAY' and colorspace=='sRGB':
+				raise Exception("Grayscale textures with sRGB colorspace are not supported")
 
-		if not self.inline_data:
-			from .util import image_name
-			tex_res.statements.append(Statement("external_image", image_name(texture.image)))
+		fn = os.path.basename(image.filepath)
+		if not self.inline_data and fn:
+			srgb = "_srgb" if colorspace=='sRGB' else ""
+			tex_res.statements.append(Statement("external_image"+srgb, fn))
 		else:
+			if usage=='RGBA':
+				fmt = 'SRGB8_ALPHA8' if colorspace=='sRGB' else 'RGBA8'
+			elif usage=='GRAY':
+				fmt = 'LUMINANCE8'
+			else:
+				fmt = 'SRGB8' if colorspace=='sRGB' else 'RGB8'
+
+			tex_res.statements.append(Statement("storage", Token(fmt), image.size[0], image.size[1]))
+
 			texdata = ""
-			colorspace = texture.image.colorspace_settings.name
-			if texture.use_alpha:
-				fmt = 'SRGB_ALPHA' if colorspace=='sRGB' else 'RGBA'
-				for p in texture.image.pixels:
+			if usage=='RGBA':
+				for p in image.pixels:
 					texdata += "\\x{:02X}".format(int(p*255))
+			elif usage=='GRAY':
+				for i in range(0, len(image.pixels), 4):
+					texdata += "\\x{:02X}".format(image.pixels[i])
 			else:
-				fmt = 'SRGB' if colorspace=='sRGB' else 'RGB'
-				for i in range(0, len(texture.image.pixels), 4):
+				for i in range(0, len(image.pixels), 4):
 					for j in range(3):
-						texdata += "\\x{:02X}".format(int(texture.image.pixels[i+j]*255))
-			tex_res.statements.append(Statement("storage", Token(fmt), texture.image.size[0], texture.image.size[1]))
+						texdata += "\\x{:02X}".format(int(image.pixels[i+j]*255))
 			tex_res.statements.append(Statement("raw_data", texdata))
 
 		return tex_res