rename fx2d to l2d, move some 2d prefabs to l2d

hide/view/FXEditor.hx

@@ -1207,7 +1207,7 @@ class FXEditor extends FileView {
 		var obj2dElt = Std.downcast(elt, hrt.prefab.Object2D);
 		var shaderElt = Std.downcast(elt, hrt.prefab.Shader);
 		var emitterElt = Std.downcast(elt, hrt.prefab.fx.Emitter);
-		var particle2dElt = Std.downcast(elt, hrt.prefab.fx2d.Particle2D);
+		var particle2dElt = Std.downcast(elt, hrt.prefab.l2d.Particle2D);
 		var menuItems : Array<hide.comp.ContextMenu.ContextMenuItem> = [];
 		var lightElt = Std.downcast(elt, Light);
 
@@ -1346,7 +1346,7 @@ class FXEditor extends FileView {
 			}
 		}
 		if (particle2dElt != null) {
-			for(param in hrt.prefab.fx2d.Particle2D.emitter2dParams) {
+			for(param in hrt.prefab.l2d.Particle2D.emitter2dParams) {
 				if(!param.animate)
 					continue;
 				addParam(param, "");

hrt/prefab/Shader.hx

@@ -37,7 +37,7 @@ class Shader extends Prefab {
 				case TSampler2D:
 					if(val != null)
 						val = ctx.loadTexture(val);
-					var childNoise = getOpt(Noise, v.name);
+					var childNoise = getOpt(hrt.prefab.l2d.NoiseGenerator, v.name);
 					if(childNoise != null)
 						val = childNoise.toTexture();
 				default:

hrt/prefab/fx/Emitter.hx

@@ -420,7 +420,7 @@ class EmitterObject extends h3d.scene.Object {
 	// OBJECTS
 	public var particleTemplate : hrt.prefab.Object3D;
 	public var subEmitterTemplate : Emitter;
-	public var trailTemplate : Trail;
+	public var trailTemplate : hrt.prefab.l3d.Trail;
 	public var subEmitters : Array<EmitterObject> = [];
 	public var trails : Array<EmitterTrail> = [];
 	// LIFE
@@ -1191,7 +1191,7 @@ class Emitter extends Object3D {
 		var subEmitterTemplate : Emitter = cast children.find( p -> p.enabled && Std.downcast(p, Emitter) != null && p.to(Object3D).visible);
 		emitterObj.subEmitterTemplate = subEmitterTemplate;
 		// TRAIL
-		var trailTemplate : Trail = cast children.find( p -> p.enabled && Std.downcast(p, Trail) != null && p.to(Object3D).visible);
+		var trailTemplate : hrt.prefab.l3d.Trail = cast children.find( p -> p.enabled && Std.is(p, hrt.prefab.l3d.Trail) && p.to(Object3D).visible);
 		emitterObj.trailTemplate = trailTemplate;
 		// RANDOM
 		emitterObj.seedGroup 			= 	getParamVal("seedGroup");

hrt/prefab/fx/FX2D.hx

@@ -19,7 +19,7 @@ class FX2DAnimation extends h2d.Object {
 	public var loop : Bool;
 	public var objects: Array<ObjectAnimation> = [];
 	public var shaderAnims : Array<ShaderAnimation> = [];
-	public var emitters : Array<hrt.prefab.fx2d.Particle2D.Particles>;
+	public var emitters : Array<hrt.prefab.l2d.Particle2D.Particles>;
 	public var events: Array<hrt.prefab.fx.Event.EventInstance>;
 
 	var evaluator : Evaluator;
@@ -46,12 +46,12 @@ class FX2DAnimation extends h2d.Object {
 	}
 
 	function initEmitters(ctx: Context, elt: PrefabElement) {
-		var em = Std.downcast(elt, hrt.prefab.fx2d.Particle2D);
+		var em = Std.downcast(elt, hrt.prefab.l2d.Particle2D);
 		if(em != null)  {
 			for(emCtx in ctx.shared.getContexts(elt)) {
 				if(emCtx.local2d == null) continue;
 				if(emitters == null) emitters = [];
-				var emobj : hrt.prefab.fx2d.Particle2D.Particles = cast emCtx.local2d;
+				var emobj : hrt.prefab.l2d.Particle2D.Particles = cast emCtx.local2d;
 				emitters.push(emobj);
 			}
 		}
@@ -111,9 +111,9 @@ class FX2DAnimation extends h2d.Object {
 				}
 			}
 
-			var atlas : Dynamic = Std.downcast(anim.elt2d, hrt.prefab.fx2d.Atlas);
+			var atlas : Dynamic = Std.downcast(anim.elt2d, hrt.prefab.l2d.Atlas);
 			if (atlas == null) {
-				atlas = Std.downcast(anim.elt2d, hrt.prefab.fx2d.Anim2D);
+				atlas = Std.downcast(anim.elt2d, hrt.prefab.l2d.Anim2D);
 			}
 			if (atlas != null) {
 				@:privateAccess if (!atlas.loop) {
@@ -232,7 +232,7 @@ class FX2D extends BaseFX {
 			anyFound = true;
 		}
 
-		if (Std.is(elt, hrt.prefab.fx2d.Anim2D) || Std.is(elt, hrt.prefab.fx2d.Atlas))
+		if (Std.is(elt, hrt.prefab.l2d.Anim2D) || Std.is(elt, hrt.prefab.l2d.Atlas))
 			anyFound = true;
 
 		if(anyFound)

hrt/prefab/fx2d/Anim2D.hx → hrt/prefab/l2d/Anim2D.hx

@@ -1,4 +1,4 @@
-package hrt.prefab.fx2d;
+package hrt.prefab.l2d;
 
 class Anim2D extends Object2D {
 
@@ -11,7 +11,7 @@ class Anim2D extends Object2D {
 	var nbFrames : Int = 30;
 
 	var delayStart : Float = 0;
-	
+
 	var loop : Bool = false;
 
 	var tex : h3d.mat.Texture;
@@ -41,9 +41,9 @@ class Anim2D extends Object2D {
 
 	override function updateInstance( ctx: Context, ?propName : String ) {
 		super.updateInstance(ctx, propName);
-		
+
 		var h2dAnim = (cast ctx.local2d : h2d.Anim);
-		
+
 		if (propName == null || (propName == "src" || propName == "widthFrame" || propName == "heightFrame" || propName == "nbFrames")) {
 			if (tex != null) {
 				tex = null;

hrt/prefab/fx2d/Atlas.hx → hrt/prefab/l2d/Atlas.hx

@@ -1,4 +1,4 @@
-package hrt.prefab.fx2d;
+package hrt.prefab.l2d;
 
 class Atlas extends Object2D {
 

hrt/prefab/fx2d/Bitmap.hx → hrt/prefab/l2d/Bitmap.hx

@@ -1,9 +1,9 @@
-package hrt.prefab.fx2d;
+package hrt.prefab.l2d;
 
 class Bitmap extends Object2D {
 
 	// parameters
-	var color : Int = 16777215;
+	var color : Int = 0xFFFFFF;
 
 	var src : String;
 

hrt/prefab/Blur.hx → hrt/prefab/l2d/Blur.hx

@@ -1,4 +1,4 @@
-package hrt.prefab;
+package hrt.prefab.l2d;
 
 class Blur extends Prefab {
 

hrt/prefab/Noise.hx → hrt/prefab/l2d/NoiseGenerator.hx

@@ -1,4 +1,4 @@
-package hrt.prefab;
+package hrt.prefab.l2d;
 
 enum abstract NoiseMode(String) {
 	var Perlin;
@@ -12,7 +12,7 @@ enum abstract RepeatMode(String) {
 	var None;
 }
 
-class Noise extends Prefab {
+class NoiseGenerator extends Prefab {
 
 	public var seed : Int = Std.random(100);
 
@@ -262,7 +262,7 @@ class Noise extends Prefab {
 
 	#end
 
-	static var _ = Library.register("noise", Noise);
+	static var _ = Library.register("noise", NoiseGenerator);
 
 }
 

hrt/prefab/fx2d/Particle2D.hx → hrt/prefab/l2d/Particle2D.hx

@@ -1,16 +1,16 @@
-package hrt.prefab.fx2d;
+package hrt.prefab.l2d;
 
 import hrt.prefab.fx.Evaluator;
 import hrt.prefab.fx.Value;
 import h2d.Particles.ParticleGroup;
 
 class Particles extends h2d.Particles {
-	
+
 	var evaluator : Evaluator;
-	
+
 	var lastTime = -1.0;
 	var curTime = 0.0;
-	
+
 	var random: hxd.Rand;
 	var randomSeed = 0;
 
@@ -22,14 +22,14 @@ class Particles extends h2d.Particles {
 	public var speed : Value;
 	public var speedIncr : Value;
 	public var gravity : Value;
-	
+
 	public function new( ?parent ) {
 		super(parent);
 		randomSeed = Std.random(0xFFFFFF);
 		random = new hxd.Rand(randomSeed);
 		evaluator = new Evaluator(random);
 	}
-	
+
 	function tick( dt : Float, full=true) {
 		var group = this.groups[0];
 
@@ -50,7 +50,7 @@ class Particles extends h2d.Particles {
 		curTime = 0.0;
 		lastTime = 0.0;
 	}
-	
+
 	public function setTime(time: Float) {
 		if(time < lastTime || lastTime < 0) {
 			reset();
@@ -101,14 +101,14 @@ class Particle2D extends Object2D {
 		super.updateInstance(ctx, propName);
 
 		var particles2d = (cast ctx.local2d : Particles);
-		
+
 		particles2d.visible = visible;
 
 		function makeVal(name, def ) : Value {
 			var c = Curve.getCurve(this, name);
 			return c != null ? VCurve(c) : def;
 		}
-		
+
 		if (paramsParticleGroup != null) {
 			particles2d.enable = makeVal("enable", VConst((paramsParticleGroup.enable) ? 1 : 0));
 			particles2d.speed = makeVal("speed", VConst(paramsParticleGroup.speed));
@@ -122,7 +122,7 @@ class Particle2D extends Object2D {
 		var particle2d = new Particles(ctx.local2d);
 		ctx.local2d = particle2d;
 		ctx.local2d.name = name;
-	
+
 		var group = new ParticleGroup(particle2d);
 		particle2d.addGroup(group);
 		if (paramsParticleGroup != null)
@@ -161,12 +161,12 @@ class Particle2D extends Object2D {
 		super.edit(ctx);
 
 		var params = new hide.Element(hide.view.Particles2D.getParamsHTMLform());
-		
+
 		var particles2d = (cast ctx.getContext(this).local2d : Particles);
 		var group = @:privateAccess particles2d.groups[0];
 		ctx.properties.add(params, group, function (pname) {
 			// if fx2d is running, tick() changes group params and modifies group.save()
-			// if a param has a curve and we changed this param on the right panel, 
+			// if a param has a curve and we changed this param on the right panel,
 			// the saved value will be the value of the curve at this point.
 			Reflect.setField(paramsParticleGroup, pname, Reflect.field(group.save(), pname));
 		});

hrt/prefab/fx2d/Text.hx → hrt/prefab/l2d/Text.hx

@@ -1,9 +1,9 @@
-package hrt.prefab.fx2d;
+package hrt.prefab.l2d;
 
 class Text extends Object2D {
 
 	// parameters
-	var color : Int = 16777215;
+	var color : Int = 0xFFFFFF;
 	var size : Int = 12;
 	var cutoff : Float = 0.5;
 	var smoothing : Float = 1 / 32;
@@ -59,7 +59,7 @@ class Text extends Object2D {
 		if (v.dsGain != null) this.dsGain = v.dsGain;
 		if (v.dsQuality != null) this.dsQuality = v.dsQuality;
 		if (v.dsSmoothColor != null) this.dsSmoothColor = v.dsSmoothColor;
-			
+
 		#if editor
 		this.text = v.text;
 		#end
@@ -124,9 +124,9 @@ class Text extends Object2D {
 				dsQuality,
 				dsSmoothColor
 			);
-		} else 
+		} else
 			h2dText.filter = null;
-		
+
 		h2dText.textAlign = switch (align) {
 			case 1:
 				Center;
@@ -205,7 +205,7 @@ class Text extends Object2D {
 
 	override function edit( ctx : EditContext ) {
 		super.edit(ctx);
-		
+
 		var parameters = new hide.Element('<div class="group" name="Parameters"></div>');
 
 		var gr = new hide.Element('<dl></dl>').appendTo(parameters);
@@ -260,7 +260,7 @@ class Text extends Object2D {
 		new hide.Element('<dt>Size</dt><dd><input type="range" min="1" max="50" step="1" field="size" /></dd>').appendTo(gr);
 		new hide.Element('<dt>Cutoff</dt><dd><input type="range" min="0" max="1" field="cutoff" /></dd>').appendTo(gr);
 		new hide.Element('<dt>Smoothing</dt><dd><input type="range" min="0" max="1" field="smoothing" /></dd>').appendTo(gr);
-		
+
 		ctx.properties.add(parameters, this, function(pname) {
 			ctx.onChange(this, pname);
 		});

hrt/prefab/Trail.hx → hrt/prefab/l3d/Trail.hx

@@ -1,4 +1,4 @@
-package hrt.prefab;
+package hrt.prefab.l3d;
 
 class Trail extends Object3D {