Changeset 6162 in orxonox.OLD for trunk/src/lib/graphics/importer/static_model.cc

Timestamp:

Dec 19, 2005, 4:52:01 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the spaceshipcontroll branche into the trunk
merged with command
svn merge -r6036:HEAD spaceshipcontrol/ ../trunk/
no conflicts

File:

• trunk/src/lib/graphics/importer/static_model.cc (modified) (2 diffs)

trunk/src/lib/graphics/importer/static_model.cc

@@ -144 +144 @@
 StaticModel::StaticModel(const char* modelName)
 {
-  this->setClassID(CL_MODEL, "Model");
+  this->setClassID(CL_STATIC_MODEL, "StaticModel");
   PRINTF(4)("new 3D-Model is being created\n");
   this->setName(modelName);
@@ -550 +550 @@
       this->currentGroup->currentFace->vertexCount++;
     }
-  
+
   this->currentGroup->faceCount += this->currentGroup->currentFace->vertexCount -2;
   this->faceCount += this->currentGroup->currentFace->vertexCount -2;