Merge branch 'master' of https://github.com/heapsio/hide

hide/Ide.hx

@@ -823,6 +823,11 @@ class Ide {
 		return path;
 	}
 
+	public function getUnCachedUrl( path : String ) {
+		var timestamp = Std.int(Date.now().getTime() / 1000);
+		return "file://" + getPath(path) + "?t=" + timestamp;
+	}
+
 	public static var IMG_EXTS = ["jpg", "jpeg", "gif", "png", "raw", "dds", "hdr", "tga"];
 	public function chooseImage( onSelect, allowNull=false ) {
 		chooseFile(IMG_EXTS, onSelect, allowNull);

hide/comp/Scene.hx

@@ -258,7 +258,7 @@ class Scene extends Component implements h3d.IDrawable {
 
 	function _loadTextureData( img : hxd.res.Image, onReady : Void -> Void, t : h3d.mat.Texture ) {
 		var path = ide.getPath(img.entry.path);
-		var img = new Element('<img src="file://$path" crossorigin="anonymous"/>');
+		var img = new Element('<img src="${ide.getUnCachedUrl(path)}" crossorigin="anonymous"/>');
 		function onLoaded() {
 			if( engine.driver == null ) return;
 			setCurrent();
@@ -280,7 +280,7 @@ class Scene extends Component implements h3d.IDrawable {
 		}
 		img.on("load", onLoaded);
 		function onChange() {
-			img.attr("src", 'file://$path?t=' + Std.int(Date.now().getTime() / 1000));
+			img.attr("src", ide.getUnCachedUrl(path));
 		}
 		ide.fileWatcher.register( path, onChange, true, element );
 		cleanup.push(function() { ide.fileWatcher.unregister( path, onChange ); });

hide/comp/SceneEditor.hx

@@ -516,11 +516,10 @@ class SceneEditor {
 				{ label : "Rename", enabled : current != null, click : function() tree.editNode(current) },
 				{ label : "Delete", enabled : current != null, click : function() deleteElements(curEdit.rootElements) },
 				{ label : "Duplicate", enabled : current != null, click : duplicate.bind(false) },
-				{ label : "Reference", enabled : current != null, click : function() createRef(current, current.parent) },
 			];
 
 			var isObj = current != null && (current.to(Object3D) != null || current.to(Object2D) != null);
-			var isRef = current != null && current.to(hrt.prefab.Reference) != null;
+			var isRef = isReference(current);
 
 			if( isObj ) {
 				var visible = !isHidden(current);
@@ -1828,7 +1827,7 @@ class SceneEditor {
 
 	public function setEnabled(elements : Array<PrefabElement>, enable: Bool) {
 		// Don't disable/enable Object3Ds, too confusing with visibility
-		elements = [for(e in elements) if(e.to(Object3D) == null || e.to(hrt.prefab.Reference) != null) e];
+		elements = [for(e in elements) if(e.to(Object3D) == null || isReference(e)) e];
 		var old = [for(e in elements) e.enabled];
 		function apply(on) {
 			for(i in 0...elements.length) {
@@ -1900,7 +1899,7 @@ class SceneEditor {
 		saveDisplayState();
 	}
 
-	function setLock(elements : Array<PrefabElement>, locked: Bool) {
+	public function setLock(elements : Array<PrefabElement>, locked: Bool, enableUndo : Bool = true) {
 		var prev = [for( o in elements ) o.locked];
 		for(o in elements) {
 			o.locked = locked;
@@ -1911,13 +1910,16 @@ class SceneEditor {
 				toggleInteractive(c,!isLocked(c));
 			}
 		}
-		undo.change(Custom(function(redo) {
-			for( i in 0...elements.length )
-				elements[i].locked = redo ? locked : prev[i];
-		}), function() {
-			tree.refresh();
-			refreshScene();
-		});
+		if (enableUndo) {
+			undo.change(Custom(function(redo) {
+				for( i in 0...elements.length )
+					elements[i].locked = redo ? locked : prev[i];
+			}), function() {
+				tree.refresh();
+				refreshScene();
+			});
+		}
+		
 		saveDisplayState();
 		showGizmo = !locked;
 		moveGizmoToSelection();
@@ -1944,25 +1946,6 @@ class SceneEditor {
 		setVisible(toHide, false);
 	}
 
-	function createRef(elt: PrefabElement, toParent: PrefabElement) {
-		var ref = new hrt.prefab.Reference(toParent);
-		ref.name = elt.name;
-		ref.source = "/"+elt.getAbsPath();
-		var obj3d = Std.downcast(elt, Object3D);
-		if(obj3d != null) {
-			ref.x = obj3d.x;
-			ref.y = obj3d.y;
-			ref.z = obj3d.z;
-			ref.scaleX = obj3d.scaleX;
-			ref.scaleY = obj3d.scaleY;
-			ref.scaleZ = obj3d.scaleZ;
-			ref.rotationX = obj3d.rotationX;
-			ref.rotationY = obj3d.rotationY;
-			ref.rotationZ = obj3d.rotationZ;
-		}
-		addElements([ref]);
-	}
-
 	function duplicate(thenMove: Bool) {
 		if(curEdit == null) return;
 		var elements = curEdit.rootElements;
@@ -2078,10 +2061,8 @@ class SceneEditor {
 		if( to == null )
 			to = sceneData;
 
-		{
-			var ref = Std.downcast(to, Reference);
-			@:privateAccess if( ref != null && ref.editMode ) to = ref.ref;
-		}
+		var ref = Std.downcast(to, Reference);
+		@:privateAccess if( ref != null && ref.editMode ) to = ref.ref;
 
 		var effectFunc = reparentImpl(e, to, index);
 		undo.change(Custom(function(undo) {
@@ -2589,6 +2570,10 @@ class SceneEditor {
 		return bestVertex;
 	}
 
+	static function isReference( what : PrefabElement ) : Bool {
+		return what != null && what.to(hrt.prefab.Reference) != null;
+	}
+
 	static function getPivot(objects: Array<Object>) {
 		if (customPivot != null) {
 			return customPivot.mesh.localToGlobal(customPivot.locPos.toPoint());

hide/comp/TileSelector.hx

@@ -113,7 +113,7 @@ class TileSelector extends Component {
 		if( tool.element.children().length == 0 )
 			tool.remove();
 
-		var url = "file://" + ide.getPath(file);
+		var url = ide.getUnCachedUrl(file);
 		var scroll = new Element("<div class='flex-scroll'><div class='scroll'>").appendTo(element).find(".scroll");
 		image = new Element('<div class="tile" style="background-image:url(\'$url\')"></div>').appendTo(scroll);
 

hide/comp/cdb/Cell.hx

@@ -455,12 +455,12 @@ class Cell extends Component {
 		if( tiles.length == 0 ) return;
 		tiles.removeClass("toload");
 		var imap = new Map();
-		var timestamp = Std.int(Date.now().getTime() / 1000);
 		for( t in tiles )
 			imap.set(t.getAttribute("path"), t);
 		for( path => elt in imap ) {
 			var img = js.Browser.document.createImageElement();
-			img.src = "file://"+path;
+			var url = Ide.inst.getUnCachedUrl(path);
+			img.src = url;
 			img.setAttribute("style","display:none");
 			img.onload = function() {
 				var iwidth = img.width;
@@ -473,7 +473,7 @@ class Cell extends Component {
 						var zoom = Std.parseFloat(pos[2]);
 						var bgw = Std.int(iwidth*zoom);
 						var bgh = Std.int(iheight*zoom);
-						var bg = 'url("$path?t=$timestamp") -${px}px -${py}px / ${bgw}px ${bgh}px';
+						var bg = 'url("$url") -${px}px -${py}px / ${bgw}px ${bgh}px';
 						if( zoom > 1 )
 							bg += ";image-rendering:pixelated";
 						t.setAttribute("style", t.getAttribute("style")+" background : "+bg+"; opacity : 1;");

hide/view/l3d/Level3D.hx

@@ -80,6 +80,8 @@ class CamController extends h3d.scene.CameraController {
 				pushY = e.relY;
 			default:
 			}
+		case EFocus:
+			@:privateAccess scene.window.mouseLock = false;
 		default:
 		}
 	}

hrt/prefab/Reference.hx

@@ -19,17 +19,10 @@ class Reference extends Object3D {
 		}
 	}
 
-	public function isFile() {
-		return source != null && source.charCodeAt(0) != "/".code;
-	}
-
 	override function save() {
-		// Recalc abs path if ref has been resolved to supprot renaming
-		if( ref != null && !isFile() )
-			source = "/"+ref.getAbsPath();
 		var obj : Dynamic = super.save();
 		#if editor
-		if( editMode && isFile() && ref != null )
+		if( editMode && ref != null )
 			hide.Ide.inst.savePrefab(source, ref);
 		#end
 		return obj;
@@ -40,32 +33,16 @@ class Reference extends Object3D {
 			return ref;
 		if(source == null)
 			return null;
-		if(isFile()) {
-			if(shared == null) { // Allow resolving ref in Hide prefore makeInstance
-				#if editor
-				ref = hide.Ide.inst.loadPrefab(source, null, true);
-				#else
-				return null;
-				#end
-			}
-			else
-				ref = shared.loadPrefab(source);
-			return ref;
-		}
-		else {
-			var lib = getParent(hrt.prefab.Library);
-			if(lib == null)
-				return null;
-			var all = lib.getAll(Prefab);
-			var path = source.substr(1);
-			for(p in all) {
-				if(!Std.is(p, Reference) && p.getAbsPath() == path) {
-					ref = p;
-					return ref;
-				}
-			}
+		if(shared == null) { // Allow resolving ref in Hide prefore makeInstance
+			#if editor
+			ref = hide.Ide.inst.loadPrefab(source, null, true);
+			#else
+			return null;
+			#end
 		}
-		return null;
+		else
+			ref = shared.loadPrefab(source);
+		return ref;
 	}
 
 	override function updateInstance( ctx: Context, ?propName : String ) {
@@ -108,33 +85,23 @@ class Reference extends Object3D {
 		if(p == null)
 			return ctx;
 
-		if(isFile()) {
-			ctx = super.makeInstance(ctx);
-			var prevShared = ctx.shared;
-			ctx.shared = ctx.shared.cloneRef(this, source);
-			makeChildren(ctx, p);
-			ctx.shared = prevShared;
+		ctx = super.makeInstance(ctx);
+		var prevShared = ctx.shared;
+		ctx.shared = ctx.shared.cloneRef(this, source);
+		makeChildren(ctx, p);
+		ctx.shared = prevShared;
 
-			#if editor
-			if (ctx.local2d == null) {
-				var path = hide.Ide.inst.appPath + "/res/icons/fileRef.png";
-				var data = sys.io.File.getBytes(path);
-				var tile = hxd.res.Any.fromBytes(path, data).toTile().center();
-				var objFollow = new h2d.ObjectFollower(ctx.local3d, ctx.shared.root2d);
-				objFollow.followVisibility = true;
-				var bmp = new h2d.Bitmap(tile, objFollow);
-				ctx.local2d = objFollow;
-			}
-			#end
-
-		}
-		else {
-			ctx = ctx.clone(this);
-			ctx.isSceneReference = true;
-			var refCtx = p.make(ctx); // no customMake here
-			ctx.local3d = refCtx.local3d;
-			updateInstance(ctx);
+		#if editor
+		if (ctx.local2d == null) {
+			var path = hide.Ide.inst.appPath + "/res/icons/fileRef.png";
+			var data = sys.io.File.getBytes(path);
+			var tile = hxd.res.Any.fromBytes(path, data).toTile().center();
+			var objFollow = new h2d.ObjectFollower(ctx.local3d, ctx.shared.root2d);
+			objFollow.followVisibility = true;
+			var bmp = new h2d.Bitmap(tile, objFollow);
+			ctx.local2d = objFollow;
 		}
+		#end
 
 		return ctx;
 	}
@@ -169,7 +136,7 @@ class Reference extends Object3D {
 		var element = new hide.Element('
 			<div class="group" name="Reference">
 			<dl>
-				<dt>Reference</dt><dd><input type="text" field="source"/></dd>
+				<dt>Reference</dt><dd><input type="fileselect" extensions="prefab l3d" field="source"/></dd>
 				<dt>Edit</dt><dd><input type="checkbox" field="editMode"/></dd>
 			</dl>
 			</div>');
@@ -181,18 +148,9 @@ class Reference extends Object3D {
 		}
 		updateProps();
 
-		element.find("input").contextmenu((e) -> {
-			e.preventDefault();
-			if( isFile() ) {
-				new hide.comp.ContextMenu([
-					{ label : "Open", click : () -> ctx.ide.openFile(ctx.ide.getPath(source)) },
-				]);
-			}
-		});
-
 		var props = ctx.properties.add(element, this, function(pname) {
 			ctx.onChange(this, pname);
-			if(pname == "source" || pname=="editMode") {
+			if(pname == "source" || pname == "editMode") {
 				ref = null;
 				updateProps();
 				if(!ctx.properties.isTempChange)

hrt/prefab/l3d/MeshSpray.hx

@@ -4,7 +4,7 @@ package hrt.prefab.l3d;
 
 class MeshSprayObject extends h3d.scene.Object {
 	public var batches : Array<h3d.scene.MeshBatch> = [];
-	public var batchesMap : Map<String,{ batch : h3d.scene.MeshBatch, pivot : h3d.Matrix }> = [];
+	public var batchesMap : Map<Int,Map<String,{ batch : h3d.scene.MeshBatch, pivot : h3d.Matrix }>> = [];
 	override function getMaterials( ?arr : Array<h3d.mat.Material>, recursive=true ) {
 		if( !recursive ) {
 			// batches materials are considered local materials
@@ -18,18 +18,42 @@ class MeshSprayObject extends h3d.scene.Object {
 
 class MeshSpray extends Object3D {
 
+	@:s var split : Int;
+
+	inline function getSplitID( c : Prefab ) {
+		var c = c.to(Object3D);
+		return (Math.floor(c.x/split) * 39119 + Math.floor(c.y/split)) % 0x7FFFFFFF;
+	}
+
 	override function createObject( ctx : Context ) {
 		var mspray = new MeshSprayObject(ctx.local3d);
 		// preallocate batches so their materials can be resolved
+		var curID = 0, curMap = mspray.batchesMap.get(0);
+		if( curMap == null ) {
+			curMap = new Map();
+			mspray.batchesMap.set(0, curMap);
+		}
 		for( c in children ) {
 			if( !c.enabled || c.type != "model" ) continue;
-			var batch = mspray.batchesMap.get(c.source);
+			if( split > 0 ) {
+				var sid = getSplitID(c);
+				if( sid != curID ) {
+					curID = sid;
+					curMap = mspray.batchesMap.get(sid);
+					if( curMap == null ) {
+						curMap = new Map();
+						mspray.batchesMap.set(sid, curMap);
+					}
+				}
+			}
+			var batch = curMap.get(c.source);
 			if( batch == null ) {
 				var obj = ctx.loadModel(c.source).toMesh();
 				var batch = new h3d.scene.MeshBatch(cast(obj.primitive,h3d.prim.MeshPrimitive), obj.material, mspray);
+				batch.cullingCollider = @:privateAccess batch.instanced.bounds;
 				var multi = Std.downcast(obj, h3d.scene.MultiMaterial);
 				if( multi != null ) batch.materials = multi.materials;
-				mspray.batchesMap.set(c.source, { batch : batch, pivot : obj.defaultTransform.isIdentity() ? null : obj.defaultTransform });
+				curMap.set(c.source, { batch : batch, pivot : obj.defaultTransform.isIdentity() ? null : obj.defaultTransform });
 				mspray.batches.push(batch);
 			}
 		}
@@ -47,10 +71,18 @@ class MeshSpray extends Object3D {
 			b.begin();
 			b.worldPosition = tmp;
 		}
+		var curID = 0, curMap = mspray.batchesMap.get(0);
 		for( c in children ) {
 			if( !c.enabled || c.type != "model" )
 				continue;
-			var inf = mspray.batchesMap.get(c.source);
+			if( split > 0 ) {
+				var sid = getSplitID(c);
+				if( sid != curID ) {
+					curMap = mspray.batchesMap.get(sid);
+					curID = sid;
+				}
+			}
+			var inf = curMap.get(c.source);
 			tmp.multiply3x4(c.to(Object3D).getTransform(), pos);
 			if( inf.pivot != null ) tmp.multiply3x4(inf.pivot, tmp);
 			inf.batch.emitInstance();
@@ -102,6 +134,7 @@ typedef MeshSprayConfig = {
 	var rotationOffset : Float;
 	var zOffset: Float;
 	var dontRepeatMesh : Bool;
+	var enableBrush : Bool;
 	var orientTerrain : Float;
 	var tiltAmount : Float;
 }
@@ -200,6 +233,7 @@ class MeshSpray extends Object3D {
 	@:s var defaultConfig: MeshSprayConfig;
 	@:s var currentPresetName : String = null;
 	@:s var currentSetName : String = null;
+	@:s var split : Int = 0;
 
 	var sceneEditor : hide.comp.SceneEditor;
 
@@ -260,6 +294,7 @@ class MeshSpray extends Object3D {
 			rotationOffset: 0,
 			zOffset: 0,
 			dontRepeatMesh: true,
+			enableBrush: true,
 			orientTerrain : 0,
 			tiltAmount : 0,
 		};
@@ -326,103 +361,6 @@ class MeshSpray extends Object3D {
 		}
 		sceneEditor = ectx.scene.editor;
 
-
-		var ctx = ectx.getContext(this);
-		var s2d = @:privateAccess ctx.local2d.getScene();
-		reset();
-		interactive = new h2d.Interactive(10000, 10000, s2d);
-		interactive.propagateEvents = true;
-		interactive.cancelEvents = false;
-
-		interactive.onWheel = function(e) {
-
-		};
-
-		interactive.onKeyUp = function(e) {
-			if (e.keyCode == hxd.Key.R) {
-				lastMeshId = -1;
-				if (lastSpray < Date.now().getTime() - 100) {
-					if( !K.isDown( K.SHIFT) ) {
-						if (previewModels.length > 0) {
-							sceneEditor.deleteElements(previewModels, () -> { }, false);
-							sceneEditor.selectElements([this]);
-							previewModels = [];
-						}
-						var worldPos = ectx.screenToGround(s2d.mouseX, s2d.mouseY);
-						previewMeshesAround(ectx, ctx, worldPos);
-					}
-					lastSpray = Date.now().getTime();
-				}
-			}
-		}
-
-		interactive.onPush = function(e) {
-			e.propagate = false;
-			sprayEnable = true;
-			var worldPos = ectx.screenToGround(s2d.mouseX, s2d.mouseY);
-			if( K.isDown( K.SHIFT) )
-				removeMeshesAround(ctx, worldPos);
-			else {
-				addMeshes(ctx);
-			}
-		};
-
-		interactive.onRelease = function(e) {
-			e.propagate = false;
-			sprayEnable = false;
-			var addedModels = sprayedModels.copy();
-			if (sprayedModels.length > 0) {
-				undo.change(Custom(function(undo) {
-					if(undo) {
-						sceneEditor.deleteElements(addedModels, () -> reset(), true, false);
-					}
-					else {
-						sceneEditor.addElements(addedModels, false, true, true);
-					}
-				}));
-				sprayedModels = [];
-			}
-			
-
-			if (previewModels.length > 0) {
-				sceneEditor.deleteElements(previewModels, () -> { }, false);
-				sceneEditor.selectElements([this], Nothing);
-				previewModels = [];
-			}
-		};
-
-		interactive.onMove = function(e) {
-			var worldPos = ectx.screenToGround(s2d.mouseX, s2d.mouseY);
-
-			var shiftPressed = K.isDown( K.SHIFT);
-
-			drawCircle(ctx, worldPos.x, worldPos.y, worldPos.z, (shiftPressed) ? currentConfig.deleteRadius : currentConfig.radius, 5, (shiftPressed) ? 9830400 : 38400);
-
-			if (lastSpray < Date.now().getTime() - 100) {
-				if (previewModels.length > 0) {
-					sceneEditor.deleteElements(previewModels, () -> { }, false, false);
-					previewModels = [];
-				}
-				if( !shiftPressed ) {
-					previewMeshesAround(ectx, ctx, worldPos);
-				}
-
-				if( K.isDown( K.MOUSE_LEFT) ) {
-					e.propagate = false;
-
-					if (sprayEnable) {
-						if( shiftPressed ) {
-							removeMeshesAround(ctx, worldPos);
-						} else {
-							addMeshes(ctx);
-							if (currentConfig.density == 1) sprayEnable = false;
-						}
-					}
-				}
-				lastSpray = Date.now().getTime();
-			}
-		};
-
 		var props = new hide.Element('<div class="group" name="Meshes"></div>');
 
 		var preset = new hide.Element('<div class="btn-list" align="center" ></div>').appendTo(props);
@@ -598,6 +536,10 @@ class MeshSpray extends Object3D {
 				Hold down SHIFT to remove meshes
 				<br/>Push R to randomize preview
 			</p>
+			<p align="center">
+				<label><input type="checkbox" id="enableBrush" style="margin-right: 5px;"/> Enable Brush</label>
+			</p>
+
 		</div>
 		').appendTo(props);
 
@@ -606,6 +548,20 @@ class MeshSpray extends Object3D {
 			currentConfig.dontRepeatMesh = repeat.is(":checked");
 		}).prop("checked", currentConfig.dontRepeatMesh);
 
+		var enableBrush = options.find("#enableBrush");
+		enableBrush.on("change", function() {
+			currentConfig.enableBrush = enableBrush.is(":checked");
+			sceneEditor.setLock([this], currentConfig.enableBrush, false);
+			removeInteractiveBrush();
+			if (currentConfig.enableBrush)
+				createInteractiveBrush(ectx);
+			else {
+				interactive.cancelEvents = true;
+			}
+			
+		}).prop("checked", currentConfig.enableBrush);
+		
+
 		options.find("#select").click(function(_) {
 			var options = selectElement.children().elements();
 			for (opt in options) {
@@ -649,7 +605,6 @@ class MeshSpray extends Object3D {
 					}
 				}
 				sceneEditor.deleteElements(meshes);
-				sceneEditor.selectElements([this], Nothing);
 			}
 		});
 
@@ -676,7 +631,114 @@ class MeshSpray extends Object3D {
 			saveConfigMeshBatch();
 		});
 
+		sceneEditor.setLock([this], currentConfig.enableBrush, false);
+		removeInteractiveBrush();
+		if (currentConfig.enableBrush)
+			createInteractiveBrush(ectx);
 		super.edit(ectx);
+
+		ectx.properties.add(new Element('
+		<div class="group" name="Extra">
+		<dl>
+			<dt>Split</dt><dd><input type="range" min="0" max="2048" field="split"/></dd>
+		</dl>
+		</div>'), this);
+	}
+
+	function createInteractiveBrush(ectx : EditContext) {
+		var ctx = ectx.getContext(this);
+		var s2d = @:privateAccess ctx.local2d.getScene();
+		interactive = new h2d.Interactive(10000, 10000, s2d);
+		interactive.propagateEvents = true;
+		interactive.cancelEvents = false;
+
+		interactive.onWheel = function(e) {
+
+		};
+
+		interactive.onKeyUp = function(e) {
+			if (e.keyCode == hxd.Key.R) {
+				lastMeshId = -1;
+				if (lastSpray < Date.now().getTime() - 100) {
+					if( !K.isDown( K.SHIFT) ) {
+						if (previewModels.length > 0) {
+							sceneEditor.deleteElements(previewModels, () -> { }, false);
+							previewModels = [];
+						}
+						var worldPos = ectx.screenToGround(s2d.mouseX, s2d.mouseY);
+						previewMeshesAround(ectx, ctx, worldPos);
+					}
+					lastSpray = Date.now().getTime();
+				}
+			}
+		}
+
+		interactive.onPush = function(e) {
+			e.propagate = false;
+			sprayEnable = true;
+			var worldPos = ectx.screenToGround(s2d.mouseX, s2d.mouseY);
+			if( K.isDown( K.SHIFT) )
+				removeMeshesAround(ctx, worldPos);
+			else {
+				addMeshes(ctx);
+			}
+		};
+
+		interactive.onRelease = function(e) {
+			e.propagate = false;
+			sprayEnable = false;
+			var addedModels = sprayedModels.copy();
+			if (sprayedModels.length > 0) {
+				undo.change(Custom(function(undo) {
+					if(undo) {
+						sceneEditor.deleteElements(addedModels, () -> removeInteractiveBrush(), true, false);
+					}
+					else {
+						sceneEditor.addElements(addedModels, false, true, true);
+					}
+				}));
+				sprayedModels = [];
+			}
+			
+
+			if (previewModels.length > 0) {
+				sceneEditor.deleteElements(previewModels, () -> { }, false);
+				previewModels = [];
+			}
+		};
+
+		interactive.onMove = function(e) {
+			var worldPos = ectx.screenToGround(s2d.mouseX, s2d.mouseY);
+
+			var shiftPressed = K.isDown( K.SHIFT);
+
+			drawCircle(ctx, worldPos.x, worldPos.y, worldPos.z, (shiftPressed) ? currentConfig.deleteRadius : currentConfig.radius, 5, (shiftPressed) ? 9830400 : 38400);
+
+			if (lastSpray < Date.now().getTime() - 100) {
+				if (previewModels.length > 0) {
+					sceneEditor.deleteElements(previewModels, () -> { }, false, false);
+					previewModels = [];
+				}
+				if( !shiftPressed ) {
+					previewMeshesAround(ectx, ctx, worldPos);
+				}
+
+				if( K.isDown( K.MOUSE_LEFT) ) {
+					e.propagate = false;
+
+					if (sprayEnable) {
+						if( shiftPressed ) {
+							removeMeshesAround(ctx, worldPos);
+						} else {
+							if (currentConfig.density == 1) sprayEnable = false;
+							else addMeshes(ctx);
+						}
+					}
+				}
+				lastSpray = Date.now().getTime();
+			}
+		};
+
 	}
 
 	function updateConfig() {
@@ -694,16 +756,16 @@ class MeshSpray extends Object3D {
 			input.change();
 		}
 
-		sceneEditor.properties.element.find("#repeatMeshBtn").prop("checked", CONFIG.dontRepeatMesh);
+		sceneEditor.properties.element.find("#repeatMesh").prop("checked", CONFIG.dontRepeatMesh);
 	}
 
 	override function removeInstance(ctx : Context):Bool {
-		reset();
+		removeInteractiveBrush();
 		return super.removeInstance(ctx);
 	}
 	override function setSelected( ctx : Context, b : Bool ) {
 		if( !b ) {
-			reset();
+			removeInteractiveBrush();
 			if( gBrushes != null ) {
 				for (g in gBrushes) g.remove();
 				gBrushes = null;
@@ -712,7 +774,7 @@ class MeshSpray extends Object3D {
 		return false;
 	}
 
-	function reset() {
+	function removeInteractiveBrush() {
 		if( interactive != null ) interactive.remove();
 		if (previewModels != null && previewModels.length > 0) {
 			sceneEditor.deleteElements(previewModels, () -> { }, false, false);
@@ -777,7 +839,6 @@ class MeshSpray extends Object3D {
 		if (computedDensity == 1)
 		if (previewModels.length > 0) {
 			sceneEditor.deleteElements(previewModels, () -> { }, false);
-			sceneEditor.selectElements([this], Nothing);
 			previewModels = [];
 		}
 		lastPos = point;
@@ -879,14 +940,16 @@ class MeshSpray extends Object3D {
 		var fakeRadius = currentConfig.deleteRadius * currentConfig.deleteRadius;
 		for (child in children) {
 			var model = child.to(hrt.prefab.Object3D);
-			if (distance(point2d.x, point2d.y, model.x, model.y) < fakeRadius) {
-				childToRemove.push(child);
+			if (model != null) {
+				if (distance(point2d.x, point2d.y, model.x, model.y) < fakeRadius) {
+					childToRemove.push(child);
+				}
 			}
+			
 		}
 		if (childToRemove.length > 0) {
 			wasEdited = true;
 			sceneEditor.deleteElements(childToRemove, () -> { }, false);
-			sceneEditor.selectElements([this], Nothing);
 		}
 	}
 
@@ -995,6 +1058,19 @@ class MeshSpray extends Object3D {
 		return primitive;
 	}
 
+	override function flatten<T:Prefab>( ?cl : Class<T>, ?arr: Array<T> ) : Array<T> {
+		if(arr == null)
+			arr = [];
+		if( cl == null )
+			arr.push(cast this);
+		else {
+			var i = to(cl);
+			if(i != null)
+				arr.push(i);
+		}
+		return arr;
+	}
+
 	static var _ = Library.register("meshSpray", MeshSpray);
 
 }