[Hgengine-cvs] SF.net SVN: hgengine:[469] Mercury2

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

Revision: 469
          http://hgengine.svn.sourceforge.net/hgengine/?rev=469&view=rev
Author:   axlecrusher
Date:     2009-08-10 00:49:35 +0000 (Mon, 10 Aug 2009)

Log Message:
-----------
assets can't be culled because they are instanced

Modified Paths:
--------------
    Mercury2/Themes/default/File/scenegraphDeferred.xml
    Mercury2/src/HGMDLModel.cpp
    Mercury2/src/MercuryAsset.cpp
    Mercury2/src/MercuryAsset.h
    Mercury2/src/MercuryNode.cpp

Modified: Mercury2/Themes/default/File/scenegraphDeferred.xml
===================================================================
--- Mercury2/Themes/default/File/scenegraphDeferred.xml	2009-08-10 00:39:17 UTC (rev 468)
+++ Mercury2/Themes/default/File/scenegraphDeferred.xml	2009-08-10 00:49:35 UTC (rev 469)
@@ -17,8 +17,8 @@
 						<node type="transformnode" rotx="-90" >
 							<asset type="texture" file="MODEL:lamp.png"/>
 							<asset type="hgmdlmodel" file="MODEL:lampN.hgmdl" />
-							<node type="light" atten="0.7,0,30" power="4.0" shader="GRAPHIC:pointLight" />
 						</node>
+						<node type="light" atten="0.7,0,30" power="4.0" shader="GRAPHIC:pointLight" />
 						<node type="billboardnode" billboardaxis="0,1,0" spheremode="true" >
 							<node type="transformnode" roty="180" scalex="0.1" scaley="0.1" alphaPath="true">
 								<asset type="texture" file="GRAPHIC:flame.png"/>

Modified: Mercury2/src/HGMDLModel.cpp
===================================================================
--- Mercury2/src/HGMDLModel.cpp	2009-08-10 00:39:17 UTC (rev 468)
+++ Mercury2/src/HGMDLModel.cpp	2009-08-10 00:49:35 UTC (rev 469)
@@ -69,7 +69,6 @@
 		for(uint16_t i = 0; i < m_meshes.size(); ++i)
 			culled = culled && m_meshes[i]->DoCullingTests(n, matrix);
 	}
-	m_culled = culled;
 	return culled;
 }
 

Modified: Mercury2/src/MercuryAsset.cpp
===================================================================
--- Mercury2/src/MercuryAsset.cpp	2009-08-10 00:39:17 UTC (rev 468)
+++ Mercury2/src/MercuryAsset.cpp	2009-08-10 00:49:35 UTC (rev 469)
@@ -6,7 +6,7 @@
 extern bool DOOCCLUSIONCULL;
 
 MercuryAsset::MercuryAsset()
-	:m_isInstanced(false), m_boundingVolume(NULL), m_loadState(NONE), m_culled(false)
+	:m_isInstanced(false), m_boundingVolume(NULL), m_loadState(NONE)
 {
 }
 
@@ -48,7 +48,6 @@
 		if ( !culled && DOOCCLUSIONCULL)
 			m_boundingVolume->DoOcclusionTest( n->GetOcclusionResult() );
 	}
-	m_culled = culled;
 	return culled;
 }
 

Modified: Mercury2/src/MercuryAsset.h
===================================================================
--- Mercury2/src/MercuryAsset.h	2009-08-10 00:39:17 UTC (rev 468)
+++ Mercury2/src/MercuryAsset.h	2009-08-10 00:49:35 UTC (rev 469)
@@ -57,8 +57,6 @@
 		
 		inline void SetExcludeFromCull(bool t) { m_excludeFromCull = t; }
 		inline bool ExcludeFromCull() const { return m_excludeFromCull; }
-		
-		inline bool IsCulled() const { return m_culled; }
 	protected:
 		void SetLoadState(LoadState ls); //thread safe
 		LoadState GetLoadState(); //thread safe
@@ -66,7 +64,6 @@
 		bool m_isInstanced;
 		BoundingVolume* m_boundingVolume;
 		MString m_path;
-		bool m_culled;
 	private:
 		LoadState m_loadState;
 		MSemaphore m_lock;

Modified: Mercury2/src/MercuryNode.cpp
===================================================================
--- Mercury2/src/MercuryNode.cpp	2009-08-10 00:39:17 UTC (rev 468)
+++ Mercury2/src/MercuryNode.cpp	2009-08-10 00:49:35 UTC (rev 469)
@@ -250,10 +250,7 @@
 {
 	list< MercuryAsset* >::iterator i;
 	for (i = m_render.begin(); i != m_render.end(); ++i )
-	{
-		if ( !(*i)->IsCulled() )
-			(*i)->Render(this);
-	}
+		(*i)->Render(this);
 }
 
 void MercuryNode::PostRender(const MercuryMatrix& matrix)


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