hgengine-cvs

[Hgengine-cvs] SF.net SVN: hgengine:[641] Mercury2/modules/ParticleEmitter.cpp

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

Revision: 641
          http://hgengine.svn.sourceforge.net/hgengine/?rev=641&view=rev
Author:   axlecrusher
Date:     2009-12-24 19:32:26 +0000 (Thu, 24 Dec 2009)

Log Message:
-----------
more accurate vbo stats

Modified Paths:
--------------
    Mercury2/modules/ParticleEmitter.cpp

Modified: Mercury2/modules/ParticleEmitter.cpp
===================================================================
--- Mercury2/modules/ParticleEmitter.cpp	2009-12-24 19:31:48 UTC (rev 640)
+++ Mercury2/modules/ParticleEmitter.cpp	2009-12-24 19:32:26 UTC (rev 641)
@@ -267,7 +267,7 @@
 	GLCALL( glBindBufferARB(GL_ARRAY_BUFFER_ARB, m_bufferID) );
 //	GLCALL( glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER, 0) );
 
-	MercuryVBO::m_lastVBOrendered = this;
+	MercuryVBO::SetLastRendered(this);
 
 	if (m_dirtyVBO)
 	{
@@ -293,6 +293,7 @@
 	GLCALL( glPopAttrib() );
 
 	m_particlesDrawn+=m_maxParticles;
+	MercuryVBO::IncrementBatches();
 
 	base::Render(matrix);
 }


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

[Hgengine-cvs] SF.net SVN: hgengine:[658] Mercury2/modules/ParticleEmitter.cpp

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

Revision: 658
          http://hgengine.svn.sourceforge.net/hgengine/?rev=658&view=rev
Author:   axlecrusher
Date:     2010-01-14 19:36:39 +0000 (Thu, 14 Jan 2010)

Log Message:
-----------
Remove loading message.

Modified Paths:
--------------
    Mercury2/modules/ParticleEmitter.cpp

Modified: Mercury2/modules/ParticleEmitter.cpp
===================================================================
--- Mercury2/modules/ParticleEmitter.cpp	2010-01-14 19:34:46 UTC (rev 657)
+++ Mercury2/modules/ParticleEmitter.cpp	2010-01-14 19:36:39 UTC (rev 658)
@@ -207,7 +207,6 @@
 
 void ParticleEmitter::LoadFromXML(const XMLNode& node)
 {
-	printf("LOADED!!!!!\n");
 	base::LoadFromXML(node);
 /*	
 	XMLNode particleXML;


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

[Hgengine-cvs] SF.net SVN: hgengine:[690] Mercury2/modules/ParticleEmitter.cpp

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

Revision: 690
          http://hgengine.svn.sourceforge.net/hgengine/?rev=690&view=rev
Author:   axlecrusher
Date:     2010-04-20 13:13:56 +0000 (Tue, 20 Apr 2010)

Log Message:
-----------
fix screwy deactivation

Modified Paths:
--------------
    Mercury2/modules/ParticleEmitter.cpp

Modified: Mercury2/modules/ParticleEmitter.cpp
===================================================================
--- Mercury2/modules/ParticleEmitter.cpp	2010-04-08 03:48:44 UTC (rev 689)
+++ Mercury2/modules/ParticleEmitter.cpp	2010-04-20 13:13:56 UTC (rev 690)
@@ -96,8 +96,11 @@
 
 void ParticleBase::Deactivate()
 {
+	m_age = 0;
+	WriteAgeToVBO();
 	for (uint8_t i = 0; i < 4; ++i)
 	{
+		//zero vertices should enable fast empty set culling but does not work might need FBO
 		WriteFloatToVertices(0,i,0);
 		WriteFloatToVertices(0,i,1);
 		WriteFloatToVertices(0,i,2);


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

[Hgengine-cvs] SF.net SVN: hgengine:[691] Mercury2/modules/ParticleEmitter.cpp

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

Revision: 691
          http://hgengine.svn.sourceforge.net/hgengine/?rev=691&view=rev
Author:   axlecrusher
Date:     2010-04-20 15:45:40 +0000 (Tue, 20 Apr 2010)

Log Message:
-----------
oops we need to know the true age at all times

Modified Paths:
--------------
    Mercury2/modules/ParticleEmitter.cpp

Modified: Mercury2/modules/ParticleEmitter.cpp
===================================================================
--- Mercury2/modules/ParticleEmitter.cpp	2010-04-20 13:13:56 UTC (rev 690)
+++ Mercury2/modules/ParticleEmitter.cpp	2010-04-20 15:45:40 UTC (rev 691)
@@ -96,14 +96,15 @@
 
 void ParticleBase::Deactivate()
 {
-	m_age = 0;
-	WriteAgeToVBO();
+//	m_age = 0; //doing this breaks IsActive()
+//	WriteAgeToVBO();
 	for (uint8_t i = 0; i < 4; ++i)
 	{
 		//zero vertices should enable fast empty set culling but does not work might need FBO
 		WriteFloatToVertices(0,i,0);
 		WriteFloatToVertices(0,i,1);
 		WriteFloatToVertices(0,i,2);
+		WriteFloatToVertices(0,i,3); //fake zero age
 	}
 	m_emitter->SetDirtyVBO();
 }


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