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

[<axl...@us...>]

Revision: 368
          http://hgengine.svn.sourceforge.net/hgengine/?rev=368&view=rev
Author:   axlecrusher
Date:     2009-06-24 00:34:53 +0000 (Wed, 24 Jun 2009)

Log Message:
-----------
don't need to do this

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

Modified: Mercury2/src/MercuryNode.cpp
===================================================================
--- Mercury2/src/MercuryNode.cpp	2009-06-23 23:48:43 UTC (rev 367)
+++ Mercury2/src/MercuryNode.cpp	2009-06-24 00:34:53 UTC (rev 368)
@@ -105,7 +105,7 @@
 		child->RecursiveUpdate(dTime);
 }
 
-void MercuryNode::RecursiveRender(bool doAlpha)
+void MercuryNode::RecursiveRender()
 {
 	MercuryMatrix modelView;
 	ShaderAttribute sa;
@@ -128,7 +128,7 @@
 	//call render on other render graph entries under me
 	for (MercuryNode* child = FirstChild(); child != NULL; child = NextChild(child))
 	{
-		if (child->m_useAlphaPath && !doAlpha)
+		if ( child->m_useAlphaPath )
 			CURRENTRENDERGRAPH->AddAlphaNode(child);
 		else
 			child->RecursiveRender();

Modified: Mercury2/src/MercuryNode.h
===================================================================
--- Mercury2/src/MercuryNode.h	2009-06-23 23:48:43 UTC (rev 367)
+++ Mercury2/src/MercuryNode.h	2009-06-24 00:34:53 UTC (rev 368)
@@ -48,7 +48,7 @@
 		void ThreadedUpdate(float dTime);
 		
 		
-		void RecursiveRender(bool doAlpha = false);
+		void RecursiveRender();
 
 		///Run on parent when a child is added
 		virtual void OnAddChild() {};
@@ -89,7 +89,6 @@
 		
 		virtual MercuryMatrix ManipulateMatrix(const MercuryMatrix& matrix);
 
-		
 	protected:
 		std::list< MercuryNode* > m_children;	//These nodes are unique, not instanced
 		MercuryNode* m_parent;

Modified: Mercury2/src/RenderGraph.cpp
===================================================================
--- Mercury2/src/RenderGraph.cpp	2009-06-23 23:48:43 UTC (rev 367)
+++ Mercury2/src/RenderGraph.cpp	2009-06-24 00:34:53 UTC (rev 368)
@@ -96,7 +96,7 @@
 			(*i)->Render(srs.Node);
 		}
 		
-		srs.Node->RecursiveRender(true);
+		srs.Node->RecursiveRender();
 	
 		for (i = srs.Assets.begin();i != srs.Assets.end(); ++i)
 			(*i)->PostRender(srs.Node);


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