summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
52dd039)
Any channel can now be inverted (though the shader graph inspection does
not detect this yet), so a separate invert_green channel is no longer
needed.
tex_name = p.texture.image.name+".tex2d"
if tex_name not in resources:
tex_name = p.texture.image.name+".tex2d"
if tex_name not in resources:
- resources[tex_name] = texture_export.export_texture(p.texture, p.tex_usage, invert_green=p.invert_green)
+ resources[tex_name] = texture_export.export_texture(p.texture, p.tex_channels)
samp_name = sampler_export.get_sampler_name(p.texture)
if samp_name not in resources:
samp_name = sampler_export.get_sampler_name(p.texture)
if samp_name not in resources:
yield int(pixels[i+1]*255)
yield int(pixels[i+2]*255)
yield int(pixels[i+1]*255)
yield int(pixels[i+2]*255)
-def pixels_to_rgb_invert_green(pixels):
+def pixels_to_rgb_invert(pixels, mask):
for i in range(0, len(pixels), 4):
for i in range(0, len(pixels), 4):
- yield int(pixels[i]*255)
- yield 255-int(pixels[i+1]*255)
- yield int(pixels[i+2]*255)
+ r = int(pixels[i]*255)
+ yield 255-r if mask&1 else r
+ g = int(pixels[i+1]*255)
+ yield 255-g if mask&2 else g
+ b = int(pixels[i+2]*255)
+ yield 255-b if mask&4 else b
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)
class TextureExporter:
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)
class TextureExporter:
- def export_texture(self, tex_node, usage='RGB', *, invert_green=False):
+ 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")
image = tex_node.image
from .datafile import RawData, Resource, Statement, Token
tex_res = Resource(image.name+".tex", "texture")
tex_res.statements.append(Statement("generate_mipmap", True))
colorspace = image.colorspace_settings.name
tex_res.statements.append(Statement("generate_mipmap", True))
colorspace = image.colorspace_settings.name
- if usage=='GRAY' and colorspace=='sRGB':
+ if len(channels)==1 and colorspace=='sRGB':
raise Exception("Unsupported configuration on texture {}: Grayscale with sRGB".format(image.name))
raise Exception("Unsupported configuration on texture {}: Grayscale with sRGB".format(image.name))
+ invert_mask = sum(1<<i for i, c in enumerate(channels) if c[0]=='~')
+
from .util import basename
fn = basename(image.filepath)
from .util import basename
fn = basename(image.filepath)
- if not invert_green and fn:
+ if not invert_mask and fn:
if not tex_node.use_mipmap:
tex_res.statements.append(Statement("mipmap_levels", 1))
srgb = "_srgb" if colorspace=='sRGB' else ""
tex_res.statements.append(Statement("external_image"+srgb, fn))
else:
if not tex_node.use_mipmap:
tex_res.statements.append(Statement("mipmap_levels", 1))
srgb = "_srgb" if colorspace=='sRGB' else ""
tex_res.statements.append(Statement("external_image"+srgb, fn))
else:
fmt = 'SRGB8_ALPHA8' if colorspace=='sRGB' else 'RGBA8'
fmt = 'SRGB8_ALPHA8' if colorspace=='sRGB' else 'RGBA8'
fmt = 'LUMINANCE8'
else:
fmt = 'SRGB8' if colorspace=='sRGB' else 'RGB8'
fmt = 'LUMINANCE8'
else:
fmt = 'SRGB8' if colorspace=='sRGB' else 'RGB8'
pixels = tuple(image.pixels)
texdata = ""
pixels = tuple(image.pixels)
texdata = ""
texdata = pixels_to_rgba(pixels)
texdata = pixels_to_rgba(pixels)
texdata = pixels_to_gray(pixels)
texdata = pixels_to_gray(pixels)
- elif invert_green:
- texdata = pixels_to_rgb_invert_green(pixels)
+ elif invert_mask:
+ texdata = pixels_to_rgb_invert(pixels, invert_mask)
else:
texdata = pixels_to_rgb(pixels)
else:
texdata = pixels_to_rgb(pixels)
self.tex_keyword = tex_keyword
self.value = value
self.texture = None
self.tex_keyword = tex_keyword
self.value = value
self.texture = None
- self.tex_usage = None
- self.invert_green = False
+ self.tex_channels = None
def set_from_input(self, node_tree, input_socket, alpha_socket=None):
if self.keyword:
def set_from_input(self, node_tree, input_socket, alpha_socket=None):
if self.keyword:
from_node, _ = get_linked_node_and_socket(node_tree, input_socket)
alpha_from = None
if from_node:
from_node, _ = get_linked_node_and_socket(node_tree, input_socket)
alpha_from = None
if from_node:
if from_node.type=='NORMAL_MAP':
from_node, _ = get_linked_node_and_socket(node_tree, from_node.inputs["Color"])
invert, _ = check_invert_green(node_tree, from_node)
if from_node.type=='NORMAL_MAP':
from_node, _ = get_linked_node_and_socket(node_tree, from_node.inputs["Color"])
invert, _ = check_invert_green(node_tree, from_node)
+ channels = ['R', 'G', 'B']
if invert:
from_node = invert
if invert:
from_node = invert
- self.invert_green = True
- usage = 'RGB'
elif from_node.type=='RGBTOBW':
from_node, _ = get_linked_node_and_socket(node_tree, from_node.inputs["Color"])
elif from_node.type=='RGBTOBW':
from_node, _ = get_linked_node_and_socket(node_tree, from_node.inputs["Color"])
if alpha_socket:
alpha_from, _ = get_linked_node_and_socket(node_tree, alpha_socket)
if alpha_socket:
alpha_from, _ = get_linked_node_and_socket(node_tree, alpha_socket)
if from_node.type=='TEX_IMAGE':
self.texture = from_node
if from_node.type=='TEX_IMAGE':
self.texture = from_node
- if usage:
- self.tex_usage = usage
+ if channels:
+ self.tex_channels = channels
- self.tex_usage = 'RGBA'
+ self.tex_channels = ['R', 'G', 'B', 'A']
elif type(self.value)==tuple:
elif type(self.value)==tuple:
+ self.tex_channels = ['R', 'G', 'B']
- self.tex_usage = 'GRAY'
+ self.tex_channels = ['Y']
else:
raise Exception("Unsupported property input node type "+from_node.type)
else:
raise Exception("Unsupported property input node type "+from_node.type)