Changeset 3909 in orxonox.OLD for orxonox/trunk/src/lib/graphics/importer/model.cc

Timestamp:

Apr 21, 2005, 12:27:19 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: importer: no more fstream c-style code only

File:

• orxonox/trunk/src/lib/graphics/importer/model.cc (modified) (8 diffs)

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

@@ -27 +27 @@
 
 /**
-   \brief Creates a 3D-Model.
-
-   This only initializes a 3D-Model, but does not cleanup the Faces.
-*/
-Model::Model(void)
-{
-  this->initialize();
-}
-
-/**
    \brief Creates a 3D-Model. and assigns it a Name.
 */
-Model::Model(char* modelName)
-{
-  this->initialize();
+Model::Model(const char* modelName)
+{
+  PRINTF(4)("new 3D-Model is being created\n"); 
+  this->name = NULL;
   this->setName(modelName);
+
+
+  this->finalized = false;
+  // setting the start group;
+  this->firstGroup = new Group;
+  this->currentGroup = this->firstGroup;
+  this->groupCount = 0;
+  
+  this->initGroup (this->currentGroup);
+  this->scaleFactor = 1;
+  this->material = new Material();
+
+  this->vertices = new Array();
+  this->vTexture = new Array();
+  this->normals = new Array();
+
 }
 
@@ -169 +176 @@
 
 /**
-    \brief initializes the Model.
-
-    This Function initializes all the needed arrays, Lists and clientStates.
-    It also defines default values.
-*/
-bool Model::initialize (void)
-{
-  PRINTF(4)("new 3D-Model is being created\n"); 
-
-  this->name = NULL;
-  this->finalized = false;
-  // setting the start group;
-  this->firstGroup = new Group;
-  this->currentGroup = this->firstGroup;
-  this->groupCount = 0;
-  
-  this->initGroup (this->currentGroup);
-  this->scaleFactor = 1;
-  this->material = new Material();
-
-  this->vertices = new Array();
-  this->vTexture = new Array();
-  this->normals = new Array();
-
-  return true;
-}
-
-/**
    \brief sets a name to the Model
    \param name The name to set to this Model
@@ -204 +183 @@
   if (this->name) 
     delete this->name;
-  this->name = new char[strlen(name)+1];
-  strcpy(this->name, name);
+  if (name)
+    {
+      this->name = new char[strlen(name)+1];
+      strcpy(this->name, name);
+    }
+  else 
+    this->name = NULL;
 }
 /**
@@ -348 +332 @@
    If a vertex line is found this function will inject it into the vertex-Array
 */
-bool Model::addVertex (char* vertexString)
+bool Model::addVertex (const char* vertexString)
 {
   float subbuffer1;
@@ -379 +363 @@
    If a face line is found this function will add it to the glList.
 */
-bool Model::addFace (char* faceString)
+bool Model::addFace (const char* faceString)
 {
   if (this->currentGroup->faceCount >0)
@@ -477 +461 @@
    If a vertexNormal line is found this function will inject it into the vertexNormal-Array
 */
-bool Model::addVertexNormal (char* normalString)
+bool Model::addVertexNormal (const char* normalString)
 {
   float subbuffer1;
@@ -509 +493 @@
    this function will inject it into the vertexTexture-Array
 */
-bool Model::addVertexTexture (char* vTextureString)
+bool Model::addVertexTexture (const char* vTextureString)
 {
   float subbuffer1;
@@ -540 +524 @@
 bool Model::addUseMtl (const char* matString)
 {
-  /*
-  if (!this->mtlFileName)
-    {
-      PRINTF(4)("Not using new defined material, because no mtlFile found yet\n");
-      return false;
-    }
-  */      
   if (this->currentGroup->faceCount > 0)
     this->currentGroup->currentFace = this->currentGroup->currentFace->next = new Face;