Changeset 6021 in orxonox.OLD for branches/newModel/src/lib/graphics/importer/static_model.cc

Timestamp:

Dec 10, 2005, 7:52:50 PM (18 years ago)

Author:

bensch

Message:

newModel new static_model class added

File:

• branches/newModel/src/lib/graphics/importer/static_model.cc (modified) (30 diffs)

branches/newModel/src/lib/graphics/importer/static_model.cc

@@ -18 +18 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_IMPORTER
 
-#include "model.h"
+#include "static_model.h"
 
 #include "stdlibincl.h"
@@ -141 +141 @@
    assigns it a Name and a Type
 */
-Model::Model(const char* modelName, MODEL_TYPE type)
+StaticModel::StaticModel(const char* modelName, MODEL_TYPE type)
 {
   this->setClassID(CL_MODEL, "Model");
@@ -174 +174 @@
    Looks if any from model allocated space is still in use, and if so deleted it.
 */
-Model::~Model()
+StaticModel::~StaticModel()
 {
   PRINTF(4)("Deleting Model ");
@@ -209 +209 @@
  *  Finalizes an Object. This can be done outside of the Class.
 */
-void Model::finalize()
+void StaticModel::finalize()
 {
   // this creates the display List.
@@ -236 +236 @@
  * rebuild the Model from the Information we got.
  */
-void Model::rebuild()
+void StaticModel::rebuild()
 {
   PRINTF(3)("Rebuilding Model '%s'\n", this->getName());
@@ -250 +250 @@
    It does this by just calling the Lists that must have been created earlier.
 */
-void Model::draw () const
+void StaticModel::draw () const
 {
 
@@ -295 +295 @@
    It does this by just calling the List that must have been created earlier.
 */
-void Model::draw (int groupNumber) const
+void StaticModel::draw (int groupNumber) const
 {
   if (groupNumber >= this->groupCount)
@@ -327 +327 @@
    It does this by just calling the List that must have been created earlier.
 */
-void Model::draw (char* groupName) const
+void StaticModel::draw (char* groupName) const
 {
   PRINTF(4)("drawing the requested 3D-Models if found.\n");
@@ -351 +351 @@
  *  deletes all the arrays
 */
-bool Model::deleteArrays()
+bool StaticModel::deleteArrays()
 {
   if (this->vertices)
@@ -375 +375 @@
  * This will be applied at the end of the importing Process.
 */
-bool Model::cleanup()
+bool StaticModel::cleanup()
 {
   PRINTF(4)("cleaning up the 3D-Model to save Memory.\n");
@@ -393 +393 @@
  * with this option set the Materials will not be deleted with the Model.
  */
-Material* Model::addMaterial(Material* material)
+Material* StaticModel::addMaterial(Material* material)
 {
   if (material == NULL)
@@ -409 +409 @@
  * @returns the added material
 */
-Material* Model::addMaterial(const char* materialName)
+Material* StaticModel::addMaterial(const char* materialName)
 {
   ModelMaterial* modMat = new ModelMaterial;
@@ -425 +425 @@
  * @returns the Material if found, NULL otherwise
 */
-Material* Model::findMaterialByName(const char* materialName)
+Material* StaticModel::findMaterialByName(const char* materialName)
 {
   list<ModelMaterial*>::iterator modMat;
@@ -441 +441 @@
    With it you should be able to create Models with more than one SubModel inside
 */
-bool Model::addGroup(const char* groupString)
+bool StaticModel::addGroup(const char* groupString)
 {
   PRINTF(5)("Read Group: %s.\n", groupString);
@@ -464 +464 @@
    If a vertex line is found this function will inject it into the vertex-Array
 */
-bool Model::addVertex (const char* vertexString)
+bool StaticModel::addVertex (const char* vertexString)
 {
   float subbuffer1;
@@ -482 +482 @@
 
 */
-bool Model::addVertex(float x, float y, float z)
+bool StaticModel::addVertex(float x, float y, float z)
 {
   PRINTF(5)("reading in a vertex: %f %f %f\n", x, y, z);
@@ -496 +496 @@
    If a vertexNormal line is found this function will inject it into the vertexNormal-Array
 */
-bool Model::addVertexNormal (const char* normalString)
+bool StaticModel::addVertexNormal (const char* normalString)
 {
   float subbuffer1;
@@ -515 +515 @@
    If a vertexNormal line is found this function will inject it into the vertexNormal-Array
 */
-bool Model::addVertexNormal(float x, float y, float z)
+bool StaticModel::addVertexNormal(float x, float y, float z)
 {
   PRINTF(5)("found vertex-Normal %f, %f, %f\n", x, y, z);
@@ -532 +532 @@
    !! WARNING THIS IS DIFFERNT FROM addVervexTexture(float, float); because it changes the second entry to 1-v !!
 */
-bool Model::addVertexTexture (const char* vTextureString)
+bool StaticModel::addVertexTexture (const char* vTextureString)
 {
   float subbuffer1;
@@ -550 +550 @@
    If a TextureCoordinate line is found this function will inject it into the TextureCoordinate-Array
 */
-bool Model::addVertexTexture(float u, float v)
+bool StaticModel::addVertexTexture(float u, float v)
 {
   PRINTF(5)("found vertex-Texture %f, %f\n", u, v);
@@ -567 +567 @@
    String is different from the argument addFace, in this that the first Vertex/Normal/Texcoord is 1 instead of 0
 */
-bool Model::addFace (const char* faceString)
+bool StaticModel::addFace (const char* faceString)
 {
   if (this->currentGroup->faceCount >0)
@@ -623 +623 @@
  * @param type The information Passed with each Vertex
 */
-bool Model::addFace(int faceElemCount, VERTEX_FORMAT type, ...)
+bool StaticModel::addFace(int faceElemCount, VERTEX_FORMAT type, ...)
 {
   if (this->currentGroup->faceCount > 0)
@@ -655 +655 @@
  * @param matString the Material that will be set.
 */
-bool Model::setMaterial(const char* matString)
+bool StaticModel::setMaterial(const char* matString)
 {
   if (this->currentGroup->faceCount > 0)
@@ -670 +670 @@
  * @param mtl the Material that will be set.
 */
-bool Model::setMaterial(Material* mtl)
+bool StaticModel::setMaterial(Material* mtl)
 {
   if (this->currentGroup->faceCount > 0)
@@ -690 +690 @@
    4. It goes through all the normale-Points and calculates the VertexNormale and includes it in the normals-Array.
 */
-bool Model::buildVertexNormals ()
+bool StaticModel::buildVertexNormals ()
 {
   PRINTF(4)("Normals are being calculated.\n");
@@ -763 +763 @@
  *  reads and includes the Faces/Materials into the openGL state Machine
 */
-bool Model::importToDisplayList()
+bool StaticModel::importToDisplayList()
 {
   // finalize the Arrays
@@ -855 +855 @@
  *  reads and includes the Faces/Materials into the openGL state Machine
 */
-bool Model::importToVertexArray()
+bool StaticModel::importToVertexArray()
 {
   // finalize the Arrays
@@ -875 +875 @@
  *  builds an array of triangles, that can later on be used for obb separation and octree separation
  */
-bool Model::buildTriangleList()
+bool StaticModel::buildTriangleList()
 {
   if( unlikely(this->triangles != NULL))
@@ -1007 +1007 @@
    merging this information, the face will be drawn.
 */
-bool Model::addGLElement (ModelFaceElement* elem)
+bool StaticModel::addGLElement (ModelFaceElement* elem)
 {
   PRINTF(5)("importing grafical Element to openGL.\n");
@@ -1043 +1043 @@
    This will inject a Cube, because this is the most basic model.
 */
-void Model::cubeModel()
+void StaticModel::cubeModel()
 {
   this->addVertex (-0.5, -0.5, 0.5);