removed Instance

hide/view/Prefab.hx

@@ -7,7 +7,6 @@ import hxd.Key as K;
 
 import hrt.prefab.Prefab as PrefabElement;
 import hrt.prefab.Object3D;
-import hrt.prefab.l3d.Instance;
 import hide.comp.cdb.DataFiles;
 
 
@@ -60,18 +59,19 @@ private class PrefabSceneEditor extends hide.comp.SceneEditor {
 			haxe.Timer.delay(addElements.bind([p]), 0);
 		}
 
+		#if !prefab_refacto
 		function addNewInstances() {
 			var items = new Array<hide.comp.ContextMenu.ContextMenuItem>();
 			for(type in DataFiles.getAvailableTypes() ) {
 				var typeId = DataFiles.getTypeName(type);
 				var label = typeId.charAt(0).toUpperCase() + typeId.substr(1);
 
-				var refCols = Instance.findRefColumns(type);
+				var refCols = hrt.prefab.l3d.Instance.findRefColumns(type);
 				var refSheet = refCols == null ? null : type.base.getSheet(refCols.sheet);
-				var idCol = refCols == null ? null : Instance.findIDColumn(refSheet);
+				var idCol = refCols == null ? null : hrt.prefab.l3d.Instance.findIDColumn(refSheet);
 
 				function make(name) {
-					var p = new Instance(current == null ? sceneData : current);
+					var p = new hrt.prefab.l3d.Instance(current == null ? sceneData : current);
 					p.name = name;
 					p.props = makeCdbProps(p, type);
 					setup(p);
@@ -122,6 +122,8 @@ private class PrefabSceneEditor extends hide.comp.SceneEditor {
 			});
 		};
 		addNewInstances();
+		#end
+
 		newItems.unshift({
 			label : "Recents",
 			menu : recents,

hrt/prefab/l3d/Instance.hx

@@ -1,208 +0,0 @@
-package hrt.prefab.l3d;
-using Lambda;
-
-class Instance extends Object3D {
-
-	public function new(?parent) {
-		super(parent);
-		type = "instance";
-		props = {};
-	}
-
-	#if editor
-	override function makeInstance(ctx:Context):Context {
-		var ctx = super.makeInstance(ctx);
-		var kind = getRefSheet(this);
-		var unknown = kind == null || kind.idx == null;
-
-		var modelPath = unknown ? null : findModelPath(kind.sheet, kind.idx.obj);
-		if(modelPath != null) {
-			try {
-				if(hrt.prefab.Library.getPrefabType(modelPath) != null) {
-					var ref = ctx.shared.loadPrefab(modelPath);
-					if(ref != null) {
-						var prevShared = ctx.shared;
-						ctx.shared = ctx.shared.cloneRef(this, modelPath);
-						ref.make(ctx);
-						ctx.shared = prevShared;
-					}
-				}
-				else {
-					var obj = ctx.loadModel(modelPath);
-					obj.name = name;
-					ctx.local3d.addChild(obj);
-				}
-			} catch( e : hxd.res.NotFound ) {
-				ctx.shared.onError(e);
-			}
-		}
-		else {
-			var tile = unknown ? getDefaultTile().center() : findTile(kind.sheet, kind.idx.obj).center();
-			var objFollow = new h2d.ObjectFollower(ctx.local3d, ctx.local2d);
-			objFollow.followVisibility = true;
-			var bmp = new h2d.Bitmap(tile, objFollow);
-			ctx.local2d = objFollow;
-		}
-		return ctx;
-	}
-
-	override function makeInteractive(ctx:Context):hxd.SceneEvents.Interactive {
-		var int = super.makeInteractive(ctx);
-		if( int == null ) {
-			// no meshes ? do we have an icon instead...
-			var follow = Std.downcast(ctx.local2d, h2d.ObjectFollower);
-			if( follow != null ) {
-				var bmp = Std.downcast(follow.getChildAt(0), h2d.Bitmap);
-				if( bmp != null ) {
-					var i = new h2d.Interactive(bmp.tile.width, bmp.tile.height, bmp);
-					i.x = bmp.tile.dx;
-					i.y = bmp.tile.dy;
-					int = i;
-				}
-			}
-		}
-		return int;
-	}
-
-	override function removeInstance(ctx:Context):Bool {
-		if(!super.removeInstance(ctx))
-			return false;
-		if(ctx.local2d != null ) {
-			var p = parent;
-			var pctx = null;
-			while( p != null ) {
-				pctx = ctx.shared.getContexts(p)[0];
-				if( pctx != null ) break;
-				p = p.parent;
-			}
-			if( ctx.local2d != (pctx == null ? ctx.shared.root2d : pctx.local2d) ) ctx.local2d.remove();
-		}
-		return true;
-	}
-
-	// ---- statics
-
-	public static function getRefSheet(p: Prefab) {
-		var name = p.getCdbType();
-		if( name == null )
-			return null;
-		var sheet = hide.comp.cdb.DataFiles.resolveType(name);
-		if( sheet == null )
-			return null;
-		var refCols = findRefColumns(sheet);
-		if(refCols == null)
-			return null;
-		var refId : Dynamic = p.props;
-		for( c in refCols.cols )
-			refId = Reflect.field(refId, c.name);
-		if(refId == null)
-			return null;
-		var refSheet = sheet.base.getSheet(refCols.sheet);
-		if(refSheet == null)
-			return null;
-		return {sheet: refSheet, idx: refSheet.index.get(refId)};
-	}
-
-	public static function findRefColumns(sheet : cdb.Sheet) {
-		for(col in sheet.columns) {
-			switch(col.type) {
-				case TRef(sheet):
-					return {cols: [col], sheet: sheet};
-				default:
-			}
-		}
-		for(col in sheet.columns) {
-			switch(col.type) {
-			case TProperties:
-				var sub = sheet.getSub(col);
-				for( col2 in sub.columns )
-					switch( col2.type ) {
-					case TRef(sheet2):
-						return {cols: [col,col2], sheet: sheet2};
-					default:
-					}
-			default:
-			}
-		}
-		return null;
-	}
-
-	public static function findIDColumn(refSheet : cdb.Sheet) {
-		return refSheet.columns.find(c -> c.type == cdb.Data.ColumnType.TId);
-	}
-
-	public static function findModelPath(refSheet : cdb.Sheet, obj : Dynamic) {
-		function filter(f: String) {
-			if(f != null) {
-				var lower = f.toLowerCase();
-				if(StringTools.endsWith(lower, ".fbx") || hrt.prefab.Library.getPrefabType(lower) != null)
-					return f;
-			}
-			return null;
-		}
-		var path = null;
-		for(c in refSheet.columns) {
-			if(c.type == cdb.Data.ColumnType.TList) {
-				var sub = refSheet.getSub(c);
-				if(sub == null) continue;
-				var lines : Array<Dynamic> = Reflect.field(obj, c.name);
-				if(lines == null || lines.length == 0) continue;
-				// var lines = sub.getLines();
-				// if(lines.length == 0) continue;
-				var col = sub.columns.find(sc -> sc.type == cdb.Data.ColumnType.TFile);
-				if(col == null) continue;
-				path = filter(Reflect.getProperty(lines[0], col.name));
-				if(path != null) break;
-			}
-			else if(c.type == cdb.Data.ColumnType.TFile) {
-				path = filter(Reflect.getProperty(obj, c.name));
-				if(path != null) break;
-			}
-		}
-		return path;
-	}
-
-	override function getHideProps() : HideProps {
-		return { icon : "circle", name : "Instance" };
-	}
-
-	static function getModel(refSheet : cdb.Sheet, obj : Dynamic) {
-		var path = findModelPath(refSheet, obj);
-		if(path == null)
-			return null;
-		try {
-			var model = hxd.res.Loader.currentInstance.load(path).toModel();
-			return model;
-		} catch( e : hxd.res.NotFound ) {}
-		return null;
-	}
-
-	static function findTile(refSheet : cdb.Sheet, obj : Dynamic) {
-		var tileCol = refSheet.columns.find(c -> c.type == cdb.Data.ColumnType.TTilePos);
-		if(tileCol != null) {
-			var tile: cdb.Types.TilePos = Reflect.getProperty(obj, tileCol.name);
-			if(tile != null)
-				return makeTile(tile);
-		}
-		return getDefaultTile();
-	}
-
-	static function getDefaultTile() : h2d.Tile {
-		var engine = h3d.Engine.getCurrent();
-		var t = @:privateAccess engine.resCache.get(Instance);
-		if( t == null ) {
-			t = hxd.res.Any.fromBytes("",sys.io.File.getBytes(hide.Ide.inst.getPath("${HIDE}/res/icons/unknown.png"))).toTile();
-			@:privateAccess engine.resCache.set(Instance, t);
-		}
-		return t.clone();
-	}
-
-	static function makeTile(p:cdb.Types.TilePos) : h2d.Tile {
-		var w = (p.width == null ? 1 : p.width) * p.size;
-		var h = (p.height == null ? 1 : p.height) * p.size;
-		return hxd.res.Loader.currentInstance.load(p.file).toTile().sub(p.x * p.size, p.y * p.size, w, h);
-	}
-	#end
-
-	static var _ = Library.register("instance", Instance);
-}