Changeset 10074 in orxonox.OLD for branches/playability

Timestamp:

Dec 13, 2006, 10:33:06 PM (18 years ago)

Author:

nicolasc

Message:

house cleaning

Location:

branches/playability/src/world_entities/projectiles

Files:

• hbolt.cc (modified) (4 diffs)
• hbolt.h (modified) (1 diff)
• lbolt.cc (modified) (3 diffs)
• lbolt.h (modified) (1 diff)

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

@@ -27 +27 @@
 #include "debug.h"
 
-#include "static_model.h"
-#include "effects/billboard.h"
+// #include "effects/billboard.h"
 
 
@@ -56 +55 @@
   this->emitter->setEmissionRate(300.0);
   this->emitter->setEmissionVelocity(50.0);
-
-  this->mat = new Material("hBolt_halo");
-  this->mat->setBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
-  //this->mat->setBlendFunc(GL_SRC_ALPHA,GL_ONE);
-  this->mat->setDiffuse(1,1,1);
-  this->mat->setAmbient(1,1,1);
-  this->mat->setIllum(3);
-  this->mat->setDiffuseMap("hbolt_halo.png");
-//   this->mat->setDiffuseMap("hbolt_halo.png",1);
-//   this->mat->setDiffuseMap("hbolt_halo.png",2);
-//   dynamic_cast<StaticModel*>(this->getModel())->addMaterial(this->mat);
-//   dynamic_cast<StaticModel*>(this->getModel())->finalize();
 
   this->halo = new Billboard();
@@ -188 +175 @@
                   this->getAbsCoor ().z);
 
-//   glPushMatrix();
-//     glEnable(GL_BLEND);
-//     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-//     glShadeModel(GL_FLAT);
-//     glClearColor(0.0, 0.0, 0.0, 0.0);
-// 
-//     glEnable(GL_TEXTURE_2D);
-//     this->mat->select();
-// 
-// //     Vector camera = State::getCamera()->getViewVector();
-// 
-//     glBegin(GL_QUADS); // +X
-//       glTexCoord2f (0.0, 0.0);
-//       glVertex3f( 0.0f, -.7f, -.7f);
-// 
-//       glTexCoord2f (0.0, 1.0);
-//       glVertex3f( 0.0f, -.7f , .7f);
-// 
-//       glTexCoord2f (1.0, 1.0);
-//       glVertex3f( 0.0, .7f , .7f );
-// 
-//       glTexCoord2f (1.0, 0.0);
-//       glVertex3f( 0.0, .7f, -.7f );
-//     glEnd();
-//   glPopMatrix();
-
-//   this->billboard->toggleBillboard();
-
   this->halo->draw();
 
@@ -222 +181 @@
   glRotatef(this->angle, 0.0, 0.0, 1.0);
 
-//   this->getModel()->draw();
+  this->getModel()->draw();
 
 //   this->mat->select();
-   dynamic_cast<StaticModel*>(this->getModel())->draw();
+/*   dynamic_cast<StaticModel*>(this->getModel())->draw();*/
 //   this->mat->select();
 //   dynamic_cast<StaticModel*>(this->getModel())->draw();

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

@@ -44 +44 @@
     ParticleEmitter*                  emitter;
 
-    Material*                         mat;
-
     float                             angle;
     float                             rotationSpeed;

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

@@ -29 +29 @@
 #include "debug.h"
 
-#include "static_model.h"
-
 
 #include "class_id_DEPRECATED.h"
@@ -58 +56 @@
   this->rotationSpeed = 130;
 
-  this->mat = new Material("lBolt");
-  this->mat->setBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
-  //this->mat->setBlendFunc(GL_SRC_ALPHA,GL_ONE);
-  this->mat->setDiffuse(1,1,1);
-  this->mat->setIllum(3);
-  this->mat->setDiffuseMap("maps/lbolt2.png");
-  this->mat->setDiffuseMap("maps/lbolt2.png",1);
-  dynamic_cast<StaticModel*>(this->getModel())->addMaterial(this->mat);
-  dynamic_cast<StaticModel*>(this->getModel())->finalize();
-  this->mat->select();
-
   this->halo = new Billboard();
-  this->halo->setSize(.5, .5);
+  this->halo->setSize(.35, .35);
   this->halo->setTexture("hbolt_halo.png");
 }
@@ -181 +168 @@
   this->halo->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/projectiles/lbolt.h

@@ -45 +45 @@
     float                             rotationSpeed;
 
-    Material*                         mat;
-
     Billboard*                        halo;