cleanup : moved render order from Scene 3d to App

h3d/scene/Scene.hx

@@ -5,8 +5,6 @@ class Scene extends Object implements h3d.IDrawable implements hxd.SceneEvents.I
 	public var camera : h3d.Camera;
 	public var lightSystem : h3d.pass.LightSystem;
 	public var renderer(default,set) : Renderer;
-	var prePasses : Array<h3d.IDrawable>;
-	var postPasses : Array<h3d.IDrawable>;
 	var ctx : RenderContext;
 	var interactives : Array<Interactive>;
 	@:allow(h3d.scene.Interactive)
@@ -27,8 +25,6 @@ class Scene extends Object implements h3d.IDrawable implements hxd.SceneEvents.I
 		ctx = new RenderContext();
 		renderer = new Renderer();
 		lightSystem = new h3d.pass.LightSystem();
-		postPasses = [];
-		prePasses = [];
 	}
 
 	@:noCompletion public function setEvents(events) {
@@ -178,21 +174,6 @@ class Scene extends Object implements h3d.IDrawable implements hxd.SceneEvents.I
 		renderer = new Renderer();
 	}
 
-	/**
-	 allow to customize render passes (for example, branch sub scene or 2d context)
-	 */
-	public function addPass(p,before=false) {
-		if( before )
-			prePasses.push(p);
-		else
-			postPasses.push(p);
-	}
-
-	public function removePass(p) {
-		postPasses.remove(p);
-		prePasses.remove(p);
-	}
-
 	@:allow(h3d)
 	function addEventTarget(i:Interactive) {
 		interactives.push(i);
@@ -272,8 +253,7 @@ class Scene extends Object implements h3d.IDrawable implements hxd.SceneEvents.I
 		ctx.camera = camera;
 		ctx.engine = engine;
 		ctx.start();
-		for( p in prePasses )
-			p.render(engine);
+
 		syncRec(ctx);
 		emitRec(ctx);
 		// sort by pass id
@@ -316,8 +296,6 @@ class Scene extends Object implements h3d.IDrawable implements hxd.SceneEvents.I
 		#end
 
 		ctx.done();
-		for( p in postPasses )
-			p.render(engine);
 		ctx.camera = null;
 		ctx.engine = null;
 	}

hxd/App.hx

@@ -1,6 +1,6 @@
 package hxd;
 
-class App {
+class App implements h3d.IDrawable {
 
 	public var engine : h3d.Engine;
 	public var s3d : h3d.scene.Scene;
@@ -33,7 +33,6 @@ class App {
 	function setScene3D( s3d : h3d.scene.Scene, disposePrevious = true ) {
 		sevents.removeScene(this.s3d);
 		sevents.addScene(s3d);
-		s3d.addPass(s2d);
 		if( disposePrevious )
 			this.s3d.dispose();
 		this.s3d = s3d;
@@ -42,13 +41,16 @@ class App {
 	function setScene2D( s2d : h2d.Scene, disposePrevious = true ) {
 		sevents.removeScene(this.s2d);
 		sevents.addScene(s2d,0);
-		s3d.removePass(this.s2d);
-		s3d.addPass(s2d);
 		if( disposePrevious )
 			this.s2d.dispose();
 		this.s2d = s2d;
 	}
 
+	public function render(e:h3d.Engine) {
+		s3d.render(e);
+		s2d.render(e);
+	}
+
 	function setup() {
 		var initDone = false;
 		engine.onResized = function() {
@@ -58,7 +60,6 @@ class App {
 		};
 		s3d = new h3d.scene.Scene();
 		s2d = new h2d.Scene();
-		s3d.addPass(s2d);
 		sevents = new hxd.SceneEvents();
 		sevents.addScene(s2d);
 		sevents.addScene(s3d);
@@ -102,7 +103,7 @@ class App {
 			log.logLines = [];
 			engine.setDriver(log);
 			try {
-				engine.render(s3d);
+				engine.render(this);
 			} catch( e : Dynamic ) {
 				log.logLines.push(Std.string(e));
 			}
@@ -112,7 +113,7 @@ class App {
 			return;
 		}
 		#end
-		engine.render(s3d);
+		engine.render(this);
 	}
 
 	function update( dt : Float ) {

hxd/inspect/Inspector.hx

@@ -2,16 +2,6 @@ package hxd.inspect;
 import cdb.jq.JQuery;
 import hxd.inspect.Property;
 
-private class DrawEvent implements h3d.IDrawable {
-	var i : Inspector;
-	public function new(i) {
-		this.i = i;
-	}
-	public function render( engine : h3d.Engine ) {
-		i.sync();
-	}
-}
-
 class Tool {
 	public var name(default,set) : String;
 	public var icon(default,set) : String;
@@ -55,7 +45,6 @@ class Inspector {
 
 	var props : PropManager;
 	var jroot : JQuery;
-	var event : DrawEvent;
 	var oldLog : Dynamic -> haxe.PosInfos -> Void;
 	var savedFile : String;
 	var oldLoop : Void -> Void;
@@ -70,12 +59,12 @@ class Inspector {
 	var logPanel : Panel;
 	var panelList : Array<{ name : String, create : Void -> Panel, p : Panel } >;
 	var currentNode : Node;
+	var event : haxe.MainLoop.MainEvent;
 
 	public function new( scene, ?host, ?port ) {
 
 		current = this;
 
-		event = new DrawEvent(this);
 		savedFile = "sceneProps.js";
 		state = new Map();
 		oldLog = haxe.Log.trace;
@@ -274,10 +263,12 @@ class Inspector {
 	}
 
 	function set_scene(s:h3d.scene.Scene) {
-		if( scene != null )
-			scene.removePass(event);
-		if( s != null )
-			s.addPass(event);
+		if( s == null && event != null ) {
+			event.stop();
+			event = null;
+		}
+		if( s != null && event == null )
+			event = haxe.MainLoop.add(sync);
 		return scene = s;
 	}