[Hgengine-cvs] SF.net SVN: hgengine:[524] Mercury2/src

[<cn...@us...>]

Revision: 524
          http://hgengine.svn.sourceforge.net/hgengine/?rev=524&view=rev
Author:   cnlohr
Date:     2009-08-24 17:24:14 +0000 (Mon, 24 Aug 2009)

Log Message:
-----------
re-enable multipass rendering

Modified Paths:
--------------
    Mercury2/src/Mercury2.cpp
    Mercury2/src/MercuryNode.cpp

Modified: Mercury2/src/Mercury2.cpp
===================================================================
--- Mercury2/src/Mercury2.cpp	2009-08-24 17:10:52 UTC (rev 523)
+++ Mercury2/src/Mercury2.cpp	2009-08-24 17:24:14 UTC (rev 524)
@@ -21,6 +21,8 @@
 
 #include <MercuryLog.h>
 
+#define MULTIPASS
+
 bool SHOWBOUNDINGVOLUME = false;
 bool SHOWAXISES = false;
 bool DOOCCLUSIONCULL = false;
@@ -136,24 +138,22 @@
 		}
 
 		w->Clear();
-//		renderGraph.Render();
-//		RenderableNode::RecursiveRender(root);
-//		printf("\n");
 
-/*
+#ifdef MULTIPASS
 		for( g_iPass = 2; g_iPass < 5; g_iPass++ )	//2,3,4
 			if( root->GetPasses() & (1<<g_iPass) )
 				root->RecursiveRender( );
-*/
+#endif
 		root->RecursivePreRender();
+
+#ifndef MULTIPASS
 		root->RecursiveRender();
-		
-/*		for( g_iPass = 5; g_iPass < 15; g_iPass++ )	//5..15
+#else		
+		for( g_iPass = 5; g_iPass < 15; g_iPass++ )	//5..15
 			if( root->GetPasses() & (1<<g_iPass) )
 				root->RecursiveRender( );
+#endif
 		
-		*/
-//		renderGraph.RenderAlpha();
 		w->SwapBuffers();
 
 

Modified: Mercury2/src/MercuryNode.cpp
===================================================================
--- Mercury2/src/MercuryNode.cpp	2009-08-24 17:10:52 UTC (rev 523)
+++ Mercury2/src/MercuryNode.cpp	2009-08-24 17:24:14 UTC (rev 524)
@@ -201,8 +201,7 @@
 	printf( "1%*c %p:%s\n", depth, 0, this, GetName().c_str() );
 	depth++;
 #else
-//	if ( IsHidden() || IsCulled() || (! (m_iPasses & (1<<g_iPass))) )
-	if ( IsHidden() || IsCulled() )
+	if ( IsHidden() || IsCulled() || (! (m_iPasses & (1<<g_iPass))) )
 		return;
 #endif
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.