Changeset 10046 in orxonox.OLD

Timestamp:

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

Author:

nicolasc

Message:

bump

Location:

branches/playability/src/world_entities

Files:

• projectiles/lbolt.cc (modified) (4 diffs)
• weapons/heavy_blaster.cc (modified) (1 diff)
• weapons/light_blaster.cc (modified) (1 diff)
• weapons/swarm_launcher.cc (modified) (1 diff)

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();
 

branches/playability/src/world_entities/weapons/heavy_blaster.cc

@@ -96 +96 @@
 
 //   pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*250 + VECTOR_RAND(5));
+//   pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*130 + VECTOR_RAND(1));
   pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*130 + VECTOR_RAND(1));
 

branches/playability/src/world_entities/weapons/light_blaster.cc

@@ -94 +94 @@
 
 //   pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*250 + VECTOR_RAND(5));
-  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*80);
+  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*180);
 
   pj->setAbsCoor(this->getEmissionPoint());

branches/playability/src/world_entities/weapons/swarm_launcher.cc

@@ -140 +140 @@
     return;
 
-  pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*100.0 /*+ VECTOR_RAND(13) */
+  pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*165.0 /*+ VECTOR_RAND(13) */
             /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());