Changeset 4677 in orxonox.OLD

Timestamp:

Jun 23, 2005, 11:29:18 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: possibility to return the count of faces of some Object

Location:

orxonox/trunk/src/lib

Files:

• graphics/importer/model.cc (modified) (3 diffs)
• graphics/importer/model.h (modified) (2 diffs)
• particles/particle_engine.h (modified) (2 diffs)
• particles/particle_system.cc (modified) (2 diffs)
• particles/particle_system.h (modified) (1 diff)

orxonox/trunk/src/lib/graphics/importer/model.cc

@@ -145 +145 @@
   this->normalCount = 0;
   this->texCoordCount = 0;
+  this->faceCount = 0;
 
   this->scaleFactor = 1;
@@ -553 +554 @@
 
   this->currentGroup->faceCount += this->currentGroup->currentFace->vertexCount -2;
+  this->faceCount += this->currentGroup->currentFace->vertexCount -2;
 }
 
@@ -585 +587 @@
 
   this->currentGroup->faceCount += this->currentGroup->currentFace->vertexCount - 2;
+  this->faceCount += this->currentGroup->currentFace->vertexCount -2;
 }
 

orxonox/trunk/src/lib/graphics/importer/model.h

@@ -141 +141 @@
 
   /** \returns The number of Vertices of the Model */
-  inline int getVertexCount(void) const {return this->vertexCount;}
+  inline int getVertexCount(void) const { return this->vertexCount; };
   /** \returns The number of Normals of the Model */
-  inline int getNormalCount(void) const {return this->normalCount;}
-  /** \returns The number of Texture Coordinates of the Model*/
-  inline int getTexCoordCount(void) const {return this->texCoordCount;}
+  inline int getNormalCount(void) const { return this->normalCount; };
+  /** \returns The number of Texture Coordinates of the Model */
+  inline int getTexCoordCount(void) const { return this->texCoordCount; };
+  /** \returns The number of Faces of the entire Model */
+  inline unsigned int getFaceCount() const { return this->faceCount; };
 
  protected:
@@ -174 +176 @@
   unsigned int     normalCount;     //!< A modelwide Counter for the normals.
   unsigned int     texCoordCount;   //!< A modelwide Counter for the texCoord.
+  unsigned int     faceCount;       //!< A modelwide Counter for the faces
   Array<GLfloat>*  vertices;        //!< The Array that handles the Vertices.
   Array<GLfloat>*  normals;         //!< The Array that handles the Normals.

orxonox/trunk/src/lib/particles/particle_engine.h

@@ -1 @@
-/*! 
+/*!
     \file particle_engine.h
     \brief Definition of the ParticleEngine
@@ -11 +11 @@
 #include "particle_emitter.h"
 
-// FORWARD DEFINITION 
+// FORWARD DEFINITION
 template<class T> class tList;
 

orxonox/trunk/src/lib/particles/particle_system.cc

@@ -45 +45 @@
 }
 
+/**
+  \brief creates a Particle System out of a XML-element
+  \param root: the XML-element to load from
+ */
 ParticleSystem::ParticleSystem(const TiXmlElement* root) : PhysicsInterface(this)
 {
@@ -329 +333 @@
       tickPart = tickPart->next;
     }
+}
+
+
+/**
+ * \returns the count of Faces of this ParticleSystem
+ */
+unsigned int ParticleSystem::getFaceCount(void) const
+{
+  switch (this->particleType)
+  {
+    case PARTICLE_SPRITE:
+      return this->count;
+      break;
+    case PARTICLE_MODEL:
+      if (this->model)
+        return this->count * this->model->getFaceCount();
+      break;
+  }
 }
 

orxonox/trunk/src/lib/particles/particle_system.h

@@ -101 +101 @@
   inline float getMass(void) const { return this->initialMass; };
 
+  unsigned int getFaceCount(void) const;
+
+
   virtual void applyField(Field* field);
   /** \brief this is an empty function, because the Physics are implemented in tick \param dt: useless here */