X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fmaterial.py;h=87e9479bbc676c309495d39b527a1c1848bef6f4;hb=16ff00bce699d09cc89e4280a97b097c59e7e475;hp=167751c34208e2b185bb0bdf382eaa559ef2c03c;hpb=cdb41a03865c72e69e7829641089fba4c361a56e;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/material.py b/blender/io_mspgl/material.py
index 167751c3..87e9479b 100644
--- a/blender/io_mspgl/material.py
+++ b/blender/io_mspgl/material.py
@@ -27,24 +27,39 @@ def check_invert_green(node_tree, node):
 
 	from .util import get_linked_node_and_socket
 
-	green, g_sock = get_linked_node_and_socket(node_tree, node.inputs["G"])
+	green, _ = get_linked_node_and_socket(node_tree, node.inputs["G"])
 	if not green or green.type!='MATH' or green.operation!='SUBTRACT':
 		return (None, None)
-	green, g_sock = get_linked_node_and_socket(node_tree, green.inputs[1])
+	green, _ = get_linked_node_and_socket(node_tree, green.inputs[1])
 
-	red, r_sock = get_linked_node_and_socket(node_tree, node.inputs["R"])
-	blue, b_sock = get_linked_node_and_socket(node_tree, node.inputs["B"])
+	red, _ = get_linked_node_and_socket(node_tree, node.inputs["R"])
+	blue, _ = get_linked_node_and_socket(node_tree, node.inputs["B"])
 	if not red or red.type!='SEPRGB' or blue!=red or green!=red:
 		return (None, None)
 
 	return get_linked_node_and_socket(node_tree, red.inputs["Image"])
 
-def get_unlit_inputs(node_tree, node):
+def check_additive_blend(node_tree, node):
 	if node.type=='GROUP':
-		return check_group(node_tree, node, get_unlit_inputs)
-	elif node.type=='MIX_SHADER':
+		return check_group(node_tree, node, check_additive_blend)
+	elif node.type=='ADD_SHADER':
 		from .util import get_linked_node_and_socket
 
+		shader1, _ = get_linked_node_and_socket(node_tree, node.inputs[0])
+		shader2, _ = get_linked_node_and_socket(node_tree, node.inputs[1])
+		if shader1.type=='BSDF_TRANSPARENT':
+			return get_linked_node_and_socket(node_tree, node.inputs[1])
+		elif shader2.type=='BSDF_TRANSPARENT':
+			return get_linked_node_and_socket(node_tree, node.inputs[0])
+
+	return (None, None)
+
+def get_unlit_inputs(node_tree, node, additive):
+	from .util import get_linked_node_and_socket
+
+	if node.type=='GROUP':
+		return check_group(node_tree, node, get_unlit_inputs)
+	elif node.type=='MIX_SHADER' and not additive:
 		shader1, _ = get_linked_node_and_socket(node_tree, node.inputs[1])
 		shader2, _ = get_linked_node_and_socket(node_tree, node.inputs[2])
 		if shader1.type=='BSDF_TRANSPARENT' and shader2.type=='EMISSION':
@@ -55,7 +70,17 @@ def get_unlit_inputs(node_tree, node):
 			if factor_from==color_from:
 				return (color_input, factor_input)
 	elif node.type=='EMISSION':
-		return (node.inputs["Color"], None)
+		color_input = node.inputs["Color"]
+		if additive:
+			color_from, _ = get_linked_node_and_socket(node_tree, color_input)
+			if color_from.type=='MIX_RGB' and color_from.blend_type=='MIX':
+				mix_factor_input = color_from.inputs["Fac"]
+				mix_factor_from, _ = get_linked_node_and_socket(node_tree, mix_factor_input)
+				mix_color_input = color_from.inputs["Color2"]
+				mix_color_from, _ = get_linked_node_and_socket(node_tree, mix_color_input)
+				if mix_factor_from==mix_color_from:
+					return (mix_color_input, mix_factor_input)
+		return (color_input, None)
 	return (None, None)
 
 class MaterialProperty:
@@ -121,8 +146,10 @@ class Material:
 		self.render_mode = material.render_mode
 		self.technique = material.technique
 		self.render_methods = material.render_methods[:]
+		self.uniforms = material.uniforms[:]
 		self.receive_shadows = material.receive_shadows
 		self.cast_shadows = (material.shadow_method!='NONE')
+		self.blend_type = 'ALPHA' if material.blend_method=='BLEND' else 'NONE'
 		self.image_based_lighting = material.image_based_lighting
 
 		if self.render_mode=='EXTERNAL' and not self.technique:
@@ -141,7 +168,13 @@ class Material:
 			if self.render_mode=='BUILTIN':
 				raise Exception("Invalid configuration on material {}: Empty material with builtin rendering".format(self.name))
 			return
-		elif surface_node.type=='BSDF_PRINCIPLED':
+
+		additive_node, _ = check_additive_blend(material.node_tree, surface_node)
+		if additive_node:
+			self.blend_type = 'ADDITIVE'
+			surface_node = additive_node
+
+		if surface_node.type=='BSDF_PRINCIPLED':
 			self.type = "pbr"
 
 			base_color = self.create_property("base_color", (0.8, 0.8, 0.8, 1.0))
@@ -156,7 +189,7 @@ class Material:
 			normal.set_from_input(material.node_tree, surface_node.inputs["Normal"])
 			emission.set_from_input(material.node_tree, surface_node.inputs["Emission"])
 		elif surface_node.type=='EMISSION' or surface_node.type=='MIX_SHADER':
-			color_input, alpha_input = get_unlit_inputs(material.node_tree, surface_node)
+			color_input, alpha_input = get_unlit_inputs(material.node_tree, surface_node, self.blend_type=='ADDITIVE')
 			if not color_input:
 				raise Exception("Unsupported configuration for unlit material {}".format(self.name))
 
@@ -165,6 +198,8 @@ class Material:
 			color = self.create_property("color", "texture", (1.0, 1.0, 1.0, 1.0))
 
 			color.set_from_input(material.node_tree, color_input, alpha_input)
+			if self.blend_type=='ADDITIVE' and alpha_input:
+				self.blend_type = 'ADDITIVE_ALPHA'
 		else:
 			raise Exception("Unsupported surface node type {} on material {}".format(surface_node.type, self.name))