Changeset 10046 in orxonox.OLD for branches/playability/src/world_entities/projectiles

Timestamp:

Dec 12, 2006, 10:53:34 PM (18 years ago)

Author:

nicolasc

Message:

bump

File:

• branches/playability/src/world_entities/projectiles/lbolt.cc (modified) (4 diffs)

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

@@ -57 +57 @@
   this->angle = 0;
   this->rotationSpeed = 130;
-/*
+
   this->mat = new Material("lBolt");
   //this->mat->setBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
@@ -65 +65 @@
   this->mat->setDiffuseMap("lbolt.png",1);
   dynamic_cast<StaticModel*>(this->getModel())->addMaterial(this->mat);
-  dynamic_cast<StaticModel*>(this->getModel())->finalize();*/
+  dynamic_cast<StaticModel*>(this->getModel())->finalize();
 }
 
@@ -160 +160 @@
 {
   glPushAttrib(GL_ENABLE_BIT);
-  glDisable(GL_LIGHTING);
+  //glDisable(GL_LIGHTING);
 
   glMatrixMode(GL_MODELVIEW);
@@ -170 +170 @@
   this->getAbsDir().matrix (matrix);
   glMultMatrixf((float*)matrix);
-  this->getModel()->draw();
+  //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();