Changeset 4677 in orxonox.OLD for orxonox/trunk
- Timestamp:
- Jun 23, 2005, 11:29:18 PM (19 years ago)
- Location:
- orxonox/trunk/src/lib
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/lib/graphics/importer/model.cc
r4580 r4677 145 145 this->normalCount = 0; 146 146 this->texCoordCount = 0; 147 this->faceCount = 0; 147 148 148 149 this->scaleFactor = 1; … … 553 554 554 555 this->currentGroup->faceCount += this->currentGroup->currentFace->vertexCount -2; 556 this->faceCount += this->currentGroup->currentFace->vertexCount -2; 555 557 } 556 558 … … 585 587 586 588 this->currentGroup->faceCount += this->currentGroup->currentFace->vertexCount - 2; 589 this->faceCount += this->currentGroup->currentFace->vertexCount -2; 587 590 } 588 591 -
orxonox/trunk/src/lib/graphics/importer/model.h
r4579 r4677 141 141 142 142 /** \returns The number of Vertices of the Model */ 143 inline int getVertexCount(void) const { return this->vertexCount;}143 inline int getVertexCount(void) const { return this->vertexCount; }; 144 144 /** \returns The number of Normals of the Model */ 145 inline int getNormalCount(void) const {return this->normalCount;} 146 /** \returns The number of Texture Coordinates of the Model*/ 147 inline int getTexCoordCount(void) const {return this->texCoordCount;} 145 inline int getNormalCount(void) const { return this->normalCount; }; 146 /** \returns The number of Texture Coordinates of the Model */ 147 inline int getTexCoordCount(void) const { return this->texCoordCount; }; 148 /** \returns The number of Faces of the entire Model */ 149 inline unsigned int getFaceCount() const { return this->faceCount; }; 148 150 149 151 protected: … … 174 176 unsigned int normalCount; //!< A modelwide Counter for the normals. 175 177 unsigned int texCoordCount; //!< A modelwide Counter for the texCoord. 178 unsigned int faceCount; //!< A modelwide Counter for the faces 176 179 Array<GLfloat>* vertices; //!< The Array that handles the Vertices. 177 180 Array<GLfloat>* normals; //!< The Array that handles the Normals. -
orxonox/trunk/src/lib/particles/particle_engine.h
r4519 r4677 1 /*! 1 /*! 2 2 \file particle_engine.h 3 3 \brief Definition of the ParticleEngine … … 11 11 #include "particle_emitter.h" 12 12 13 // FORWARD DEFINITION 13 // FORWARD DEFINITION 14 14 template<class T> class tList; 15 15 -
orxonox/trunk/src/lib/particles/particle_system.cc
r4667 r4677 45 45 } 46 46 47 /** 48 \brief creates a Particle System out of a XML-element 49 \param root: the XML-element to load from 50 */ 47 51 ParticleSystem::ParticleSystem(const TiXmlElement* root) : PhysicsInterface(this) 48 52 { … … 329 333 tickPart = tickPart->next; 330 334 } 335 } 336 337 338 /** 339 * \returns the count of Faces of this ParticleSystem 340 */ 341 unsigned int ParticleSystem::getFaceCount(void) const 342 { 343 switch (this->particleType) 344 { 345 case PARTICLE_SPRITE: 346 return this->count; 347 break; 348 case PARTICLE_MODEL: 349 if (this->model) 350 return this->count * this->model->getFaceCount(); 351 break; 352 } 331 353 } 332 354 -
orxonox/trunk/src/lib/particles/particle_system.h
r4663 r4677 101 101 inline float getMass(void) const { return this->initialMass; }; 102 102 103 unsigned int getFaceCount(void) const; 104 105 103 106 virtual void applyField(Field* field); 104 107 /** \brief this is an empty function, because the Physics are implemented in tick \param dt: useless here */
Note: See TracChangeset
for help on using the changeset viewer.