X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=blender%2Fio_mspgl%2Fexport_texture.py;h=dd8191ce9f108652b2924ee1a77fbd0197d0f94c;hb=HEAD;hp=3194edae8e53e1a407acac8073327ba818e52bdd;hpb=d9fbb830ddf5c9b69a046a641b16d6ae25d216b1;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_texture.py b/blender/io_mspgl/export_texture.py
index 3194edae..2269e27a 100644
--- a/blender/io_mspgl/export_texture.py
+++ b/blender/io_mspgl/export_texture.py
@@ -23,55 +23,73 @@ def pixels_to_gray(pixels):
 	for i in range(0, len(pixels), 4):
 		yield int((pixels[i]+pixels[i+1]+pixels[i+2])*255/3)
 
+def pixels_to_single_channel(pixels, channel):
+	for i in range(0, len(pixels), 4):
+		yield int(pixels[i+channel]*255)
+
 class TextureExporter:
 	def export_texture(self, tex_node, channels=['R', 'G', 'B']):
 		image = tex_node.image
 		from .datafile import RawData, Resource, Statement, Token
-		tex_res = Resource(image.name+".tex", "texture")
+		tex_res = Resource(self.get_texture_name(tex_node, channels), "texture")
 
 		tex_res.statements.append(Statement("type", Token("\\2d")))
 
 		if tex_node.use_mipmap:
 			tex_res.statements.append(Statement("generate_mipmap", True))
 
-		colorspace = image.colorspace_settings.name
-		if len(channels)==1 and colorspace=='sRGB':
-			raise Exception("Unsupported configuration on texture {}: Grayscale with sRGB".format(image.name))
+		from .texture import Texture
+		texture = Texture(tex_node, channels)
 
 		invert_mask = sum(1<<i for i, c in enumerate(channels) if c[0]=='~')
 
 		fn = bpy.path.basename(image.filepath)
-		if not invert_mask and fn:
+		native_channels = None
+		if fn:
+			abs_path = bpy.path.abspath(image.filepath) 
+			if os.path.exists(abs_path):
+				import imbuf
+				native_bpp = imbuf.load(bpy.path.abspath(image.filepath)).planes
+				if native_bpp==32:
+					native_channels = ['R', 'G', 'B', 'A']
+				elif native_bpp==24:
+					native_channels = ['R', 'G', 'B']
+				elif native_bpp==8:
+					native_channels = ['Y']
+
+		if not invert_mask and channels==native_channels:
 			if not tex_node.use_mipmap:
 				tex_res.statements.append(Statement("mipmap_levels", 1))
-			srgb = "_srgb" if colorspace=='sRGB' else ""
+			srgb = "_srgb" if texture.srgb else ""
 			tex_res.statements.append(Statement("external_image"+srgb, fn))
 		else:
-			if len(channels)==4:
-				fmt = 'SRGB8_ALPHA8' if colorspace=='sRGB' else 'RGBA8'
-			elif len(channels)==1:
-				fmt = 'LUMINANCE8'
-			else:
-				fmt = 'SRGB8' if colorspace=='sRGB' else 'RGB8'
-
-			tex_res.statements.append(Statement("storage", Token(fmt), image.size[0], image.size[1]))
+			tex_res.statements.append(Statement("storage", Token(texture.pixelformat), texture.width, texture.height))
 
 			pixels = tuple(image.pixels)
 			texdata = ""
 			if len(channels)==4:
 				texdata = pixels_to_rgba(pixels)
 			elif len(channels)==1:
-				texdata = pixels_to_gray(pixels)
+				if channels[0]=='Y':
+					texdata = pixels_to_gray(pixels)
+				else:
+					texdata = pixels_to_single_channel(pixels, "RGBA".index(channels[0]))
 			elif invert_mask:
 				texdata = pixels_to_rgb_invert(pixels, invert_mask)
 			else:
 				texdata = pixels_to_rgb(pixels)
 
-			data = RawData(image.name+".mdr", bytes(texdata))
+			data = RawData(os.path.splitext(tex_res.name)[0]+".mdr", bytes(texdata))
 			tex_res.statements.append(tex_res.create_reference_statement("external_data", data))
 
 		return tex_res
 
+	def get_texture_name(self, tex_node, channels):
+		image_name = tex_node.image.name
+		if len(channels)==1 and channels[0]!='Y':
+			image_name += "_"+channels[0]
+		return image_name+".tex"
+
 class SamplerExporter:
 	def export_sampler(self, tex_node):
 		from .datafile import Resource, Statement, Token