Răsfoiți Sursa

added -D prefab_refacto to disable some deleted prefabs

Nicolas Cannasse 4 ani în urmă
părinte
comite
3cdd3ea214
6 a modificat fișierele cu 14 adăugiri și 3 ștergeri
  1. 1 0
      hide.hxml
  2. 1 1
      hide/comp/SceneEditor.hx
  3. 4 0
      hide/view/Prefab.hx
  4. 1 1
      hrt/prefab/Model.hx
  5. 3 1
      hrt/prefab/RenderProps.hx
  6. 4 0
      hrt/prefab/Shader.hx

+ 1 - 0
hide.hxml

@@ -12,3 +12,4 @@ common.hxml
 --macro include("hrt.shgraph.nodes")
 -dce no
 -debug
+-D prefab_refacto

+ 1 - 1
hide/comp/SceneEditor.hx

@@ -2159,7 +2159,7 @@ class SceneEditor {
 			var prevIndex = prev.children.indexOf(elt);
 
 			var obj3d = elt.to(Object3D);
-			var preserveTransform = Std.is(toElt, hrt.prefab.fx.Emitter) || Std.is(prev, hrt.prefab.fx.Emitter);
+			var preserveTransform = #if prefab_refacto false #else Std.is(toElt, hrt.prefab.fx.Emitter) || Std.is(prev, hrt.prefab.fx.Emitter) #end;
 			var toObj = getObject(toElt);
 			var obj = getObject(elt);
 			var prevState = null, newState = null;

+ 4 - 0
hide/view/Prefab.hx

@@ -536,10 +536,12 @@ class Prefab extends FileView {
 		{
 		case "shadows":
 			r.shadows = enable;
+		#if !prefab_refacto
 		case "ssr":
 			var effect = r.getEffect(hrt.prefab.rfx.SSR);
 			if (effect != null)
 				effect.enabled = enable;
+		#end
 		default:
 		}
 	}
@@ -631,6 +633,7 @@ class Prefab extends FileView {
 			}
 		}
 		var color = getDisplayColor(p);
+		#if !prefab_refacto
 		if(color != null){
 			color = (color & 0xffffff) | 0xa0000000;
 			var box = p.to(hrt.prefab.l3d.Box);
@@ -644,6 +647,7 @@ class Prefab extends FileView {
 				poly.setColor(ctx, color);
 			}
 		}
+		#end
 	}
 
 	function getDisplayColor(p: PrefabElement) : Null<Int> {

+ 1 - 1
hrt/prefab/Model.hx

@@ -181,7 +181,7 @@ class Model extends Object3D {
 	override function getHideProps() : HideProps {
 		return {
 			icon : "cube", name : "Model", fileSource : ["fbx","hmd"],
-			allowChildren : function(t) return Library.isOfType(t,Object3D) || Library.isOfType(t,Material) || Library.isOfType(t,Shader) || Library.isOfType(t, hrt.prefab.fx.AnimEvent),
+			allowChildren : function(t) return Library.isOfType(t,Object3D) || Library.isOfType(t,Material) || Library.isOfType(t,Shader) #if !prefab_refacto || Library.isOfType(t, hrt.prefab.fx.AnimEvent) #end,
 			onResourceRenamed : function(f) animation = f(animation),
 		};
 	}

+ 3 - 1
hrt/prefab/RenderProps.hx

@@ -68,9 +68,11 @@ class RenderProps extends Prefab {
 		for(fx in renderer.effects)
 			fx.dispose();
 		renderer.effects = [for( v in getAll(hrt.prefab.rfx.RendererFX,true) ) v];
+		#if !prefab_refacto
 		var env = getOpt(hrt.prefab.l3d.Environment);
 		if( env != null )
 			env.applyToRenderer(renderer);
+		#end
 		renderer.refreshProps();
 		return true;
 	}
@@ -101,7 +103,7 @@ class RenderProps extends Prefab {
 		return { icon : "sun-o", name : "RenderProps", allowChildren : function(t) {
 			return Library.isOfType(t,hrt.prefab.rfx.RendererFX)
 				|| Library.isOfType(t,Light)
-				|| Library.isOfType(t,hrt.prefab.l3d.Environment);
+				#if !prefab_refacto || Library.isOfType(t,hrt.prefab.l3d.Environment) #end;
 		}};
 	}
 

+ 4 - 0
hrt/prefab/Shader.hx

@@ -44,11 +44,13 @@ class Shader extends Prefab {
 			case TSampler2D:
 				if( val != null )
 					val = hxd.res.Loader.currentInstance.load(val).toTexture();
+				#if !prefab_refacto
 				else {
 					var childNoise = getOpt(hrt.prefab.l2d.NoiseGenerator, v.name);
 					if(childNoise != null)
 						val = childNoise.toTexture();
 				}
+				#end
 			default:
 			}
 			if(val == null)
@@ -167,12 +169,14 @@ class Shader extends Prefab {
 		ectx.properties.add(group,this.props, function(pname) {
 			ectx.onChange(this, pname);
 
+			#if !prefab_refacto
 			// Notify change to emitter in case param is used by curves
 			var emitter = getParent(hrt.prefab.fx.Emitter);
 			if(emitter != null) {
 				var ec = ectx.getContext(emitter);
 				emitter.updateInstance(ec);
 			}
+			#end
 		});
 	}