X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_texture.py;h=3b2201302ee1aaa0854e2a77468f496b171e260d;hb=180b20bee11425a776c5ead05afcf6a63945d3b2;hp=8c750ab9f73504493d09bd9d9138beba5837eb5e;hpb=0055fd43dc1d3b6ca65823f40dfdf78e65770f15;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_texture.py b/blender/io_mspgl/export_texture.py
index 8c750ab9..3b220130 100644
--- a/blender/io_mspgl/export_texture.py
+++ b/blender/io_mspgl/export_texture.py
@@ -1,40 +1,56 @@
+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")
 
-		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=='RGBA':
+			fmt = 'SRGB_ALPHA' if colorspace=='sRGB' else 'RGBA'
+		elif usage=='GRAY':
+			if colorspace=='sRGB':
+				raise Exception("Grayscale textures with sRGB colorspace are not supported")
+			fmt = 'LUMINANCE'
+		else:
+			fmt = 'SRGB' if colorspace=='sRGB' else 'RGB'
+
+		tex_res.statements.append(Statement("storage", Token(fmt), image.size[0], image.size[1]))
 
-		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:
+			tex_res.statements.append(Statement("external_image", fn))
 		else:
 			texdata = ""
-			if texture.use_alpha:
-				fmt = '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 = '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