fixed particle system being rendered more than once

Author: flipcoder

src/Audio.cpp

@@ -1,3 +1 @@
 #include "Audio.h"
-
-// this is a test

src/Indicator.cpp

@@ -38,8 +38,8 @@ void Indicator :: renderSelf(IPartitioner* partitioner, unsigned int flags) cons
     glEnd();
 
     //glDisable(GL_POINT_SPRITE);
+    
     glDisable(GL_BLEND);
-
     glDepthMask(GL_TRUE);
 
     Renderer::get().lighting(Renderer::BIND_LIGHTING);

src/Node.cpp

@@ -426,12 +426,12 @@ Node* Node ::add(Node* n)
 Node* Node ::add(shared_ptr<Node> n)
 {
     ASSERT(n);
-    ASSERT(this != n.get());
-    //ASSERT(n->getParent() == NULL); // node we're trying to add has no existing parent
+    ASSERT(this != n.get()); // can't add to self
+    ASSERT(n->getParent() == NULL); // node we're trying to add has no existing parent
 
     // do similar checks in case assertions are disabled
-    if(this == n.get())
-        return NULL; // can't add node to self
+    //if(this == n.get())
+    //    return NULL; // can't add node to self
     //if(find(n))
     //    return false; // node already connected
     //if(m_pParent != NULL)

src/ParticleSystem.cpp

@@ -169,6 +169,9 @@ void ParticleSystem :: logicSelf(unsigned int advance)
 
 void ParticleSystem :: renderSelf(IPartitioner* partitioner, unsigned int flags) const
 {
+    if(!(flags & RENDER_AMBIENT_PASS))
+        return;
+
     Renderer::get().shaders(Renderer::UNBIND_SHADERS);
     Renderer::get().lighting(Renderer::UNBIND_LIGHTING);
 

src/Scene.cpp

@@ -84,7 +84,7 @@ bool Scene :: load(string fn)
 {
     clear();
 
-    if(stringEndsWith<string>(boost::to_upper_copy(fn), ".FML"))
+    if(stringEndsWith<string>(boost::to_lower_copy(fn), ".fml"))
         return loadFML(fn);
     return loadAI(fn);