Changeset 9832 in orxonox.OLD for branches/new_class_id/src/lib

Timestamp:

Sep 26, 2006, 3:44:38 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: Loading via the new Interface works, (it seems)

Location:

branches/new_class_id/src/lib/graphics/importer

Files:

• static_model.cc (modified) (5 diffs)
• static_model.h (modified) (3 diffs)

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

@@ -37 +37 @@
  */
 StaticModel::StaticModel(const std::string& modelName)
-  : data(new StaticModelData(modelName))
+    : data(new StaticModelData(modelName))
 {
   this->registerObject(this, StaticModel::_objectList);
@@ -43 +43 @@
   this->setName(modelName);
 }
+
+StaticModel::StaticModel(const StaticModel& staticModel)
+  : data(staticModel.data)
+{
+  this->registerObject(this, StaticModel::_objectList);
+  this->setName(staticModel.getName());
+  this->updateBase();
+}
+
 
 /**
@@ -60 +69 @@
 }
 
+StaticModel& StaticModel::operator=(const StaticModel& model)
+{
+  this->data = model.data;
+  this->updateBase();
+  return *this;
+};
+
+
 /**
  * @brief Finalizes an Object. This can be done outside of the Class.
@@ -66 +83 @@
 {
   data->finalize();
+  this->updateBase();
+}
 
-  // write out the modelInfo data used for the collision detection!
-  this->pModelInfo.pVertices = &this->data->getVertices()[0];
-  this->pModelInfo.numVertices = this->data->getVertices().size();
-  this->pModelInfo.pNormals = &this->data->getNormals()[0];
-  this->pModelInfo.numNormals = this->data->getNormals().size();
-  this->pModelInfo.pTexCoor = &this->data->getTexCoords()[0];
-  this->pModelInfo.numTexCoor = this->data->getTexCoords().size();
-
-  this->pModelInfo.pTriangles = this->data->getTrianglesExt();
-  this->pModelInfo.numTriangles = this->data->getTriangles().size();
+void StaticModel::acquireData(const StaticModelData::Pointer& data)
+{
+  this->data = data;
+  this->updateBase();
 }
 
@@ -92 +105 @@
   return retVal;
 }
+
+void StaticModel::updateBase()
+{
+  // write out the modelInfo data used for the collision detection!
+  this->pModelInfo.pVertices = &this->data->getVertices()[0];
+  this->pModelInfo.numVertices = this->data->getVertices().size();
+  this->pModelInfo.pNormals = &this->data->getNormals()[0];
+  this->pModelInfo.numNormals = this->data->getNormals().size();
+  this->pModelInfo.pTexCoor = &this->data->getTexCoords()[0];
+  this->pModelInfo.numTexCoor = this->data->getTexCoords().size();
+
+  this->pModelInfo.pTriangles = this->data->getTrianglesExt();
+  this->pModelInfo.numTriangles = this->data->getTriangles().size();
+}
+
 
 /**

branches/new_class_id/src/lib/graphics/importer/static_model.h

@@ -24 +24 @@
 {
   ObjectListDeclaration(StaticModel);
-  public:
+public:
   StaticModel(const std::string& modelName = "");
+  StaticModel(const StaticModel& staticModel);
   virtual ~StaticModel();
 
-  StaticModel& operator=(const StaticModel& model) { this->data = model.data; return *this; };
+  StaticModel& operator=(const StaticModel& model);
 
   virtual void draw() const { data->draw(); };
@@ -58 +59 @@
   void finalize();
 
-  void acquireData(const StaticModelData::Pointer& data) { this->data = data; };
+  void acquireData(const StaticModelData::Pointer& data);
   const StaticModelData::Pointer& dataPointer() const { return this->data; };
 
@@ -64 +65 @@
   float getScaleFactor() const { return data->getScaleFactor(); }
 
- protected:
+protected:
   void cubeModel();
 
- private:
-   StaticModelData::Pointer         data;
+private:
+  void updateBase();
+private:
+  StaticModelData::Pointer         data;
 };