瀏覽代碼

minor cleanup

ncannasse 10 年之前
父節點
當前提交
862a9e6474
共有 2 個文件被更改,包括 12 次插入15 次删除
  1. 1 3
      h3d/scene/RenderContext.hx
  2. 11 12
      h3d/scene/Scene.hx

+ 1 - 3
h3d/scene/RenderContext.hx

@@ -114,7 +114,7 @@ class RenderContext extends h3d.impl.RenderContext {
 		drawPass = null;
 		uploadParams = null;
 		// move passes to pool, and erase data
-		var p = firstAlloc, prev = null;
+		var p = firstAlloc;
 		while( p != null ) {
 			p.obj = null;
 			p.pass = null;
@@ -122,11 +122,9 @@ class RenderContext extends h3d.impl.RenderContext {
 			p.shaders = null;
 			p.next = null;
 			p.index = 0;
-			prev = p;
 			p = p.nextAlloc;
 		}
 		pool = firstAlloc;
-
 		for( c in cachedShaderList ) {
 			c.s = null;
 			c.next = null;

+ 11 - 12
h3d/scene/Scene.hx

@@ -87,21 +87,20 @@ class Scene extends Object implements h3d.IDrawable {
 		ctx.lightSystem = lightSystem;
 		renderer.process(ctx, passes);
 
-		// relink pass objects to reuse
-		var count = 0;
-		var prev : h3d.pass.Object = null;
+		// check that passes have been rendered
+		#if debug
 		for( p in passes ) {
-			if( !p.rendered )
-				throw "Pass " + p.name+" has not been rendered : don't know how to handle.";
-			var p = p.passes;
-			if( prev != null )
-				prev.next = p;
-			while( p != null ) {
-				prev = p;
-				p = p.next;
+			if( !p.rendered ) {
+				trace("Pass " + p.name+" has not been rendered : don't know how to handle.");
+				var o = p.passes;
+				while( o != null ) {
+					trace(" used by " + o.obj.name == null ? "" + o.obj : o.obj.name);
+					o = o.next;
+				}
 			}
 		}
-		if( passes.length > 0 ) ctx.passes = passes[0].passes;
+		#end
+
 		ctx.done();
 		for( p in postPasses )
 			p.render(engine);