2
0
Эх сурвалжийг харах

[fxparams] Fixed x/y/z curves indexing in emitters

Clement Espeute 1 жил өмнө
parent
commit
4e42650d12

+ 2 - 2
hide/comp/CurveEditor.hx

@@ -1263,7 +1263,7 @@ class CurveEditor extends hide.comp.Component {
 				onChange(false);
 			}
 
-			var xel = popup.find(".x");
+			var xel = popup.find(":x");
 			xel.val(hxd.Math.fmt(key.time));
 			xel.change(function(e) {
 				var f = Std.parseFloat(xel.val());
@@ -1273,7 +1273,7 @@ class CurveEditor extends hide.comp.Component {
 					afterEdit();
 				}
 			});
-			var yel = popup.find(".y");
+			var yel = popup.find(":y");
 			yel.val(hxd.Math.fmt(key.value));
 			yel.change(function(e) {
 				var f = Std.parseFloat(yel.val());

+ 4 - 4
hide/view/FXEditor.hx

@@ -1113,10 +1113,10 @@ class FXEditor extends hide.view.FileView {
 					var c = section.curves[i];
 
 					var curveColor = hide.comp.CurveEditor.CURVE_COLORS[i];
-					if (StringTools.contains(c.name, ".x") || StringTools.contains(c.name, ".h")) curveColor = hide.comp.CurveEditor.CURVE_COLORS[0];
-					if (StringTools.contains(c.name, ".y") || StringTools.contains(c.name, ".s")) curveColor = hide.comp.CurveEditor.CURVE_COLORS[1];
-					if (StringTools.contains(c.name, ".z") || StringTools.contains(c.name, ".l")) curveColor = hide.comp.CurveEditor.CURVE_COLORS[2];
-					if (StringTools.contains(c.name, ".w") || StringTools.contains(c.name, ".a")) curveColor = hide.comp.CurveEditor.CURVE_COLORS[3];
+					if (StringTools.contains(c.name, ":x") || StringTools.contains(c.name, ":h")) curveColor = hide.comp.CurveEditor.CURVE_COLORS[0];
+					if (StringTools.contains(c.name, ":y") || StringTools.contains(c.name, ":s")) curveColor = hide.comp.CurveEditor.CURVE_COLORS[1];
+					if (StringTools.contains(c.name, ":z") || StringTools.contains(c.name, ":l")) curveColor = hide.comp.CurveEditor.CURVE_COLORS[2];
+					if (StringTools.contains(c.name, ":w") || StringTools.contains(c.name, ":a")) curveColor = hide.comp.CurveEditor.CURVE_COLORS[3];
 
 					// Assign same color to curve and curve's header
 					c.color = curveColor;

+ 4 - 4
hrt/prefab/fx/Emitter.hx

@@ -1598,7 +1598,7 @@ class Emitter extends Object3D {
 
 			function makeCompVal(baseProp: Null<Float>, defVal: Float, randProp: Null<Float>, pname: String, suffix: String) : Value {
 				var xVal = vVal(baseProp != null ? baseProp : defVal);
-				var randCurve = getCurve(pname + suffix + ".rand");
+				var randCurve = getCurve(pname + suffix + ":rand");
 				var randVal : Value = VZero;
 				if(randCurve != null)
 					randVal = VRandom(randIdx++, VMult(randCurve.makeVal(), VConst(randProp != null ? randProp : 1.0)));
@@ -1634,9 +1634,9 @@ class Emitter extends Object3D {
 							param.name, suffix);
 					}
 					var v : Value = VVector(
-						makeComp(0, ".x"),
-						makeComp(1, ".y"),
-						makeComp(2, ".z"));
+						makeComp(0, ":x"),
+						makeComp(1, ":y"),
+						makeComp(2, ":z"));
 					if(v.match(VVector(VZero, VZero, VZero)))
 						v = VZero;
 					else if(v.match(VVector(VOne, VOne, VOne)))