[fxparams] removed blendFactor

hide/view/FXEditor.hx

@@ -740,7 +740,7 @@ class FXEditor extends hide.view.FileView {
 			data.refreshObjectAnims();
 		}
 
-		if(pname == "time" || pname == "loop" || pname == "animation" || pname == "blendMode" || pname == "blendFactor") {
+		if(pname == "time" || pname == "loop" || pname == "animation" || pname == "blendMode") {
 			afterPan(false);
 			data.refreshObjectAnims();
 		}

hrt/prefab/Curve.hx

@@ -513,7 +513,7 @@ class Curve extends Prefab {
 		return curves.find(c -> StringTools.endsWith(c.name, suffix));
 	}
 
-	public static function getVectorValue(curves: Array<Curve>, defVal: Float=0.0, scale: Float=1.0, blendFactor: Float = 1.0, randomValue: Float = 0) : Value {
+	public static function getVectorValue(curves: Array<Curve>, defVal: Float=0.0, scale: Float=1.0, randomValue: Float = 0) : Value {
 		inline function find(s) {
 			return findCurve(curves, s);
 		}

hrt/prefab/fx/BaseFX.hx

@@ -113,7 +113,6 @@ interface BaseFX {
 	@:s public var startDelay : Float;
 	@:c public var scriptCode : String;
 	@:c public var cullingRadius : Float;
-	@:c public var blendFactor : Float;
 	@:s public var markers : Array<{t: Float}>;
 
 	#if editor

hrt/prefab/fx/Evaluator.hx

@@ -42,7 +42,6 @@ class Evaluator {
 					var a = c1.getVal(time);
 					var b = c2.getVal(time);
 
-					// Remap random from [-1,1]to [0,1] because blendFactor
 					// Should be in [0,1]
 					var rand = getRandom(pidx, ridx);
 					var min = -1;

hrt/prefab/fx/FX.hx

@@ -24,8 +24,6 @@ class FXAnimation extends h3d.scene.Object {
 	public var cullingRadius : Float;
 	public var cullingDistance = defaultCullingDistance;
 
-	public var blendFactor: Float;
-
 	public var objAnims: Array<ObjectAnimation>;
 	public var events: Array<hrt.prefab.fx.Event.EventInstance>;
 	public var emitters : Array<hrt.prefab.fx.Emitter.EmitterObject>;
@@ -364,7 +362,7 @@ class FXAnimation extends h3d.scene.Object {
 				return scale != 1.0 ? VMult(curves[0].makeVal(), VConst(scale)) : curves[0].makeVal();
 			}
 
-			return Curve.getVectorValue(curves, defVal, scale, blendFactor);
+			return Curve.getVectorValue(curves, defVal, scale);
 		}
 
 		function makeColor(name: String) {
@@ -480,7 +478,6 @@ class FX extends Object3D implements BaseFX {
 	@:c public var scriptCode : String;
 	@:s public var cullingRadius : Float;
 	@:s public var markers : Array<{t: Float}> = [];
-	@:c public var blendFactor : Float;
 
 	@:s public var parameters : Array<Parameter> = [];
 
@@ -498,7 +495,6 @@ class FX extends Object3D implements BaseFX {
 		super(parent, contextShared);
 		duration = 5.0;
 		cullingRadius = 3.0;
-		blendFactor = 1.0;
 	}
 
 	override function make( ?sh:hrt.prefab.Prefab.ContextMake) : Prefab  {
@@ -520,7 +516,6 @@ class FX extends Object3D implements BaseFX {
 		var fxanim = createInstance(parent3d);
 		fxanim.duration = duration;
 		fxanim.cullingRadius = cullingRadius;
-		fxanim.blendFactor = blendFactor;
 
 		var p = fxanim.parent;
 		while(p != null) {
@@ -554,7 +549,6 @@ class FX extends Object3D implements BaseFX {
 		var fxanim = Std.downcast(local3d, FXAnimation);
 		fxanim.duration = duration;
 		fxanim.cullingRadius = cullingRadius;
-		fxanim.blendFactor = blendFactor;
 
 		fxanim.setParameters(parameters);
 	}
@@ -577,7 +571,6 @@ class FX extends Object3D implements BaseFX {
 				<dl>
 					<dt>Duration</dt><dd><input type="number" value="0" field="duration"/></dd>
 					<dt>Culling radius</dt><dd><input type="number" field="cullingRadius"/></dd>
-					<dt>Blend factor</dt><dd><input type="range" field="blendFactor" min="0" max="1"/></dd>
 				</dl>
 			</div>');
 		ctx.properties.add(props, this, function(pname) {

hrt/prefab/fx/FX2D.hx

@@ -168,7 +168,6 @@ class FX2D extends Object2D implements BaseFX {
 	@:c public var scriptCode : String;
 	@:c public var cullingRadius : Float;
 	@:c public var markers : Array<{t: Float}> = [];
-	@:c public var blendFactor : Float;
 
 
 	@:s var loop : Bool = false;
@@ -204,7 +203,7 @@ class FX2D extends Object2D implements BaseFX {
 			if(uniform && curves.length == 1 && curves[0].name == name)
 				return scale != 1.0 ? VMult(curves[0].makeVal(), VConst(scale)) : curves[0].makeVal();
 
-			return Curve.getVectorValue(curves, defVal, scale, blendFactor);
+			return Curve.getVectorValue(curves, defVal, scale);
 		}
 
 		function makeColor(name: String) {