Changeset 10049 in orxonox.OLD

Timestamp:

Dec 12, 2006, 11:20:58 PM (17 years ago)

Author:

nicolasc

Message:

bump

File:

• branches/playability/src/world_entities/projectiles/hbolt.cc (modified) (2 diffs)

branches/playability/src/world_entities/projectiles/hbolt.cc

@@ -60 +60 @@
   this->mat->setBlendFunc(GL_SRC_ALPHA,GL_ONE);
   this->mat->setDiffuse(1,1,1);
-/*  this->mat->setDiffuseMap("hbolt.png");
-  this->mat->setDiffuseMap("hbolt.png",1);
-  this->mat->setDiffuseMap("hbolt_halo.png",1);
+  this->mat->setDiffuseMap("hbolt_halo.png");
+//   this->mat->setDiffuseMap("hbolt.png",1);
+//   this->mat->setDiffuseMap("hbolt_halo.png",2);
   dynamic_cast<StaticModel*>(this->getModel())->addMaterial(this->mat);
-  dynamic_cast<StaticModel*>(this->getModel())->finalize();*/
+  dynamic_cast<StaticModel*>(this->getModel())->finalize();
+  this->mat->select();
 
 }
@@ -186 +187 @@
   this->getModel()->draw();
 
-/*
   this->mat->select();
   dynamic_cast<StaticModel*>(this->getModel())->draw();
-  this->mat->select();
-  dynamic_cast<StaticModel*>(this->getModel())->draw();
+//   this->mat->select();
+//   dynamic_cast<StaticModel*>(this->getModel())->draw();
   this->mat->unselect();
-  this->mat->unselect();*/
+
 
   glPopMatrix();