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

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

Revision: 480
          http://hgengine.svn.sourceforge.net/hgengine/?rev=480&view=rev
Author:   axlecrusher
Date:     2009-08-16 15:33:55 +0000 (Sun, 16 Aug 2009)

Log Message:
-----------
Init was used to add assets to pre and post render. Since that is gone, init does nothing.  Init will probably be tranformed into a function to recycle assets.

Modified Paths:
--------------
    Mercury2/src/Light.cpp
    Mercury2/src/MercuryAsset.cpp
    Mercury2/src/MercuryAsset.h
    Mercury2/src/MercuryNode.cpp
    Mercury2/src/RenderBuffer.cpp
    Mercury2/src/RenderBuffer.h
    Mercury2/src/Shader.cpp
    Mercury2/src/Shader.h
    Mercury2/src/Texture.cpp
    Mercury2/src/Texture.h

Modified: Mercury2/src/Light.cpp
===================================================================
--- Mercury2/src/Light.cpp	2009-08-16 13:58:08 UTC (rev 479)
+++ Mercury2/src/Light.cpp	2009-08-16 15:33:55 UTC (rev 480)
@@ -63,7 +63,6 @@
 //			shader->LoadFromXML( node );
 			shader->LoadShader(key, 0);
 			SetShader( shader );
-//			shader->Init( this );
 		}
 
 		m_fullscreen = node.Attribute("fullscreen")=="true"?true:false;

Modified: Mercury2/src/MercuryAsset.cpp
===================================================================
--- Mercury2/src/MercuryAsset.cpp	2009-08-16 13:58:08 UTC (rev 479)
+++ Mercury2/src/MercuryAsset.cpp	2009-08-16 15:33:55 UTC (rev 480)
@@ -15,10 +15,8 @@
 	SAFE_DELETE(m_boundingVolume);
 }
 
-void MercuryAsset::Init(MercuryNode* node)
+void MercuryAsset::Init()
 {
-//	if ( node ) node->AddPreRender(this);
-//	if ( node ) node->AddRender(this);
 }
 
 void MercuryAsset::SetLoadState(LoadState ls)

Modified: Mercury2/src/MercuryAsset.h
===================================================================
--- Mercury2/src/MercuryAsset.h	2009-08-16 13:58:08 UTC (rev 479)
+++ Mercury2/src/MercuryAsset.h	2009-08-16 15:33:55 UTC (rev 480)
@@ -30,7 +30,7 @@
 		MercuryAsset();
 		virtual ~MercuryAsset();
 		
-		virtual void Init(MercuryNode* node);
+		virtual void Init();
 		
 		/** PreRender should be called before any real openGL render commands.
 		It is used to handles things like frustum culling, and occlusion culling.

Modified: Mercury2/src/MercuryNode.cpp
===================================================================
--- Mercury2/src/MercuryNode.cpp	2009-08-16 13:58:08 UTC (rev 479)
+++ Mercury2/src/MercuryNode.cpp	2009-08-16 15:33:55 UTC (rev 480)
@@ -257,7 +257,6 @@
 			{
 				asset->LoadFromXML( child );
 				this->AddAsset( asset );
-				asset->Init( this );
 			}
 		}
 	}

Modified: Mercury2/src/RenderBuffer.cpp
===================================================================
--- Mercury2/src/RenderBuffer.cpp	2009-08-16 13:58:08 UTC (rev 479)
+++ Mercury2/src/RenderBuffer.cpp	2009-08-16 15:33:55 UTC (rev 480)
@@ -17,18 +17,6 @@
 	if (m_bufferID != 0) glDeleteRenderbuffersEXT(1, &m_bufferID);
 }
 
-void RenderBuffer::Init(MercuryNode* node)
-{
-	MercuryAsset::Init( node );
-	
-	RenderableNode* rn = RenderableNode::Cast( node );
-	if ( rn )
-	{
-//		rn->AddPreRender( this );
-		rn->AddPostRender( this );
-	}
-}
-
 void RenderBuffer::Render(const MercuryNode* node)
 {
 	if ( !m_initiated ) InitRenderBuffer();

Modified: Mercury2/src/RenderBuffer.h
===================================================================
--- Mercury2/src/RenderBuffer.h	2009-08-16 13:58:08 UTC (rev 479)
+++ Mercury2/src/RenderBuffer.h	2009-08-16 15:33:55 UTC (rev 480)
@@ -18,8 +18,6 @@
 		RenderBuffer();
 		virtual ~RenderBuffer();
 		
-		virtual void Init(MercuryNode* node);
-		
 		virtual void Render(const MercuryNode* node);
 		virtual void PostRender(const MercuryNode* node);
 		virtual void LoadFromXML(const XMLNode& node);

Modified: Mercury2/src/Shader.cpp
===================================================================
--- Mercury2/src/Shader.cpp	2009-08-16 13:58:08 UTC (rev 479)
+++ Mercury2/src/Shader.cpp	2009-08-16 15:33:55 UTC (rev 480)
@@ -58,11 +58,6 @@
 	DestroyShader( );
 }
 
-void Shader::Init(MercuryNode* node)
-{
-	MercuryAsset::Init( node );
-}
-
 void Shader::Render(const MercuryNode* node)
 {
 	bool bApply = true;

Modified: Mercury2/src/Shader.h
===================================================================
--- Mercury2/src/Shader.h	2009-08-16 13:58:08 UTC (rev 479)
+++ Mercury2/src/Shader.h	2009-08-16 15:33:55 UTC (rev 480)
@@ -77,7 +77,6 @@
 	Shader();
 	virtual ~Shader();
 		
-	virtual void Init(MercuryNode* node);
 	virtual void Render(const MercuryNode* node);
 	virtual void PostRender(const MercuryNode* node);
 	static Shader* Generate() { return new Shader; }

Modified: Mercury2/src/Texture.cpp
===================================================================
--- Mercury2/src/Texture.cpp	2009-08-16 13:58:08 UTC (rev 479)
+++ Mercury2/src/Texture.cpp	2009-08-16 15:33:55 UTC (rev 480)
@@ -37,11 +37,6 @@
 	m_textureID = 0;
 }
 
-void Texture::Init(MercuryNode* node)
-{
-	MercuryAsset::Init( node );
-}
-
 void Texture::LoadFromRaw()
 {
 	if ( !m_raw ) return;

Modified: Mercury2/src/Texture.h
===================================================================
--- Mercury2/src/Texture.h	2009-08-16 13:58:08 UTC (rev 479)
+++ Mercury2/src/Texture.h	2009-08-16 15:33:55 UTC (rev 480)
@@ -12,8 +12,6 @@
 		
 		void Clean();
 		
-		virtual void Init(MercuryNode* node);
-			
 		virtual void Render(const MercuryNode* node);
 		virtual void PostRender(const MercuryNode* node);
 			


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