Changeset 10659 in orxonox.OLD for branches/vs-enhencements/src/world_entities/projectiles

Timestamp:

May 23, 2007, 7:31:23 PM (17 years ago)

Author:

nicolasc

Message:

initial modularisation in spaceship config

Location:

branches/vs-enhencements/src/world_entities/projectiles

Files:

• plasma_pulse.cc (modified) (5 diffs)
• plasma_pulse.h (modified) (2 diffs)

branches/vs-enhencements/src/world_entities/projectiles/plasma_pulse.cc

@@ -47 +47 @@
   this->grid->setVisibility(false);
   this->grid->setPulse();
-
   this->grid->setTexture( "textures/plasma.png");
-
-  this->grid->toList(OM_ENVIRON); 
+  this->grid->toList(OM_ENVIRON);
+/*
+  this->blink = new Blink();
+  this->grid->setParent(this);
+  this->grid->setVisibility(false);
+  this->blink->setSize(1.0 );
+  this->blink->setPeriod(.4);
+  this->blink->setColor(10, 250, 150);
+  this->blink->loadBlinkSequence( "66678998766" );
+  this->blink->toList(OM_ENVIRON);*/
 }
 
@@ -61 +68 @@
 {
   this->grid->toList(OM_DEAD);
+//   this->blink->toList(OM_DEAD);
 }
 
@@ -69 +77 @@
   this->toList(OM_ENVIRON);
   this->grid->setVisibility(true);
+//   this->blink->setVisibility(true);
 
   this->setPhysDamage(10);
@@ -81 +90 @@
 
   this->grid->setVisibility(false);
+//   this->blink->setVisibility(false);
   this->lifeCycle = 0.0;
   this->toList(OM_NULL);
@@ -131 +141 @@
     glAlphaFunc( GL_GEQUAL, .5);
     this->grid->draw();
+//     this->blink->draw();
   glPopMatrix();
 

branches/vs-enhencements/src/world_entities/projectiles/plasma_pulse.h

@@ -9 +9 @@
 #include "projectile.h"
 #include "effects/billboard.h"
+#include "effects/blink.h"
 
 class Vector;
@@ -33 +34 @@
     static FastFactory*               fastFactory;
     Billboard*                        grid;
+//     Blink*                            blink;
 };