Fix emissive

h3d/mat/PbrMaterial.hx

@@ -166,6 +166,7 @@ class PbrMaterial extends Material {
 		mainPass.removeShader(mainPass.getShader(h3d.shader.pbr.StrengthValues));
 		mainPass.removeShader(mainPass.getShader(h3d.shader.pbr.AlphaMultiply));
 		mainPass.removeShader(mainPass.getShader(h3d.shader.Parallax));
+		mainPass.removeShader(mainPass.getShader(h3d.shader.Emissive));
 		// Backward compatibility
 		if( !Reflect.hasField(props, "depthTest") ) Reflect.setField(props, "depthTest", Less);
 		if( !Reflect.hasField(props, "colorMask") ) Reflect.setField(props, "colorMask", 1 << 0 | 1 << 1 | 1 << 2 | 1 << 3);
@@ -194,9 +195,8 @@ class PbrMaterial extends Material {
 			mainPass.setPassName("default");
 		case BeforeTonemapping:
 			mainPass.setPassName("beforeTonemapping");
-			var e = mainPass.getShader(h3d.shader.Emissive);
-			if( e == null ) e = mainPass.addShader(new h3d.shader.Emissive(props.emissive));
-			e.emissive = props.emissive;
+			if( props.emissive > 0 ) 
+				mainPass.addShader(new h3d.shader.Emissive(props.emissive));
 		case Distortion:
 			mainPass.setPassName("distortion");
 			mainPass.depthWrite = false;

h3d/shader/Emissive.hx

@@ -7,7 +7,7 @@ class Emissive extends hxsl.Shader {
 		@param var emissive : Float;
 
 		function fragment() {
-			pixelColor.rgb = max(pixelColor.rgb, pixelColor.rgb + pixelColor.rgb * emissive * pixelColor.a);
+			pixelColor.rgb += pixelColor.rgb * emissive;
 		}
 
 	};