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

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

Revision: 643
          http://hgengine.svn.sourceforge.net/hgengine/?rev=643&view=rev
Author:   axlecrusher
Date:     2009-12-24 20:44:59 +0000 (Thu, 24 Dec 2009)

Log Message:
-----------
fix default pass for particle emitter

Modified Paths:
--------------
    Mercury2/Themes/default/File/scenegraph.xml
    Mercury2/modules/ParticleEmitter.cpp

Modified: Mercury2/Themes/default/File/scenegraph.xml
===================================================================
--- Mercury2/Themes/default/File/scenegraph.xml	2009-12-24 20:34:24 UTC (rev 642)
+++ Mercury2/Themes/default/File/scenegraph.xml	2009-12-24 20:44:59 UTC (rev 643)
@@ -38,7 +38,7 @@
 						<node type="transformnode" scalex="0.1" scaley="0.1" scalez="0.1">
 							<asset type="shader" file="GRAPHIC:FireParticles"/>
 							<asset type="texture" file="GRAPHIC:flame.png"/>
-							<node type="particleemitter" setPasses="7"/>
+							<node type="particleemitter"/>
 						</node>
 					</node>
 					<node type="transformnode" movx="1" fallback="lamprow.lamp" />

Modified: Mercury2/modules/ParticleEmitter.cpp
===================================================================
--- Mercury2/modules/ParticleEmitter.cpp	2009-12-24 20:34:24 UTC (rev 642)
+++ Mercury2/modules/ParticleEmitter.cpp	2009-12-24 20:44:59 UTC (rev 643)
@@ -124,6 +124,8 @@
 	m_particles(NULL), GenerateParticlesClbk(NULL),
 	m_bufferID(0), m_dirtyVBO(false)
 {
+	m_iForcePasses = m_iForcePasses | (1<<15);
+	m_iForcePasses = m_iForcePasses | (1<<7);
 	Init();
 }
 


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