Changeset 7221 in orxonox.OLD for trunk/src/world_entities/planet.cc

Timestamp:

Mar 15, 2006, 3:10:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

File:

• trunk/src/world_entities/planet.cc (modified) (4 diffs)

trunk/src/world_entities/planet.cc

@@ -45 +45 @@
   this->toList(OM_GROUP_01);
 
-  this->material = new Material();
   //this->material->setIllum(20);
   //this->material->setAmbient(0.1, 0.1, 0.1);
@@ -71 +70 @@
 {
   PRINTF(5)("Deleting Planet\n");
-  if( this->material)
-    delete this->material;
 }
 
@@ -92 +89 @@
  * @param textureName the top texture.
 */
-void Planet::setTexture(const char* textureName)
+void Planet::setTexture(const std::string& textureName)
 {
-  this->material->setDiffuseMap(textureName);
+  this->material.setDiffuseMap(textureName);
 }
 
@@ -124 +121 @@
   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
-  this->material->select();
+  this->material.select();
 
 //   /WorldEntity::draw();