uniform scaling and scale cleanup in magnet

src/operators/filter/magnet.glsl

@@ -36,14 +36,28 @@ ReturnT thismap(CoordT p, ContextT ctx) {
 	CoordT translate = THIS_asCoordT(THIS_Translate) * d;
 	p -= translate;
 
-	CoordT scale = mix(CoordT(1.), THIS_asCoordT(THIS_Scale), d);
-	p /= scale;
+	float adjust = 1.;
+	switch (int(THIS_Scaletype)) {
+		case THISTYPE_Scaletype_uniform:
+		{
+			float scale = mix(1., THIS_Uniformscale, d);
+			p /= scale;
+			adjust = scale;
+		}
+		break;
+		case THISTYPE_Scaletype_separate:
+		{
+			vec3 scale = mix(vec3(1.), THIS_Scale, d);
+			p /= THIS_asCoordT(scale);
+			adjust = vmin(scale);
+		}
+		break;
+	}
+
 	p += center;
 	ReturnT res = inputOp1(p, ctx);
-	#ifdef THIS_RETURN_TYPE_float
-		res /= length(scale);
-	#else
-		res.x /= length(scale);
+	#ifdef THIS_RETURN_TYPE_Sdf
+		res = withAdjustedScale(res, adjust);
 	#endif
 	return res;
 }

src/operators/filter/magnet.yaml

@@ -1,7 +1,7 @@
 !rop
 meta: !meta
   opType: raytk.operators.filter.magnet
-  opVersion: '14'
+  opVersion: '15'
   opStatus: default
 opDef: !def
   enable: !expr

src/operators/filter/magnet_params.txt

@@ -1,3 +1,4 @@
 names	source	handling	readOnlyHandling	conversion	enable
-Center[xyz] Translate[xyz] Scale[xyz] Amount Radius Fade	param	runtime	macro		1
+Center[xyz] Translate[xyz] Scale[xyz] Uniformscale Amount Radius Fade	param	runtime	macro		1
 Rotate[xyz]	param	runtime	macro	angle	1
+Scaletype	param	constant			1