Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 13, 2006, 10:33:06 PM (18 years ago)
Author:
nicolasc
Message:

house cleaning

Location:
branches/playability/src/world_entities/projectiles
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/playability/src/world_entities/projectiles/hbolt.cc

    r10072 r10074  
    2727#include "debug.h"
    2828
    29 #include "static_model.h"
    30 #include "effects/billboard.h"
     29// #include "effects/billboard.h"
    3130
    3231
     
    5655  this->emitter->setEmissionRate(300.0);
    5756  this->emitter->setEmissionVelocity(50.0);
    58 
    59   this->mat = new Material("hBolt_halo");
    60   this->mat->setBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
    61   //this->mat->setBlendFunc(GL_SRC_ALPHA,GL_ONE);
    62   this->mat->setDiffuse(1,1,1);
    63   this->mat->setAmbient(1,1,1);
    64   this->mat->setIllum(3);
    65   this->mat->setDiffuseMap("hbolt_halo.png");
    66 //   this->mat->setDiffuseMap("hbolt_halo.png",1);
    67 //   this->mat->setDiffuseMap("hbolt_halo.png",2);
    68 //   dynamic_cast<StaticModel*>(this->getModel())->addMaterial(this->mat);
    69 //   dynamic_cast<StaticModel*>(this->getModel())->finalize();
    7057
    7158  this->halo = new Billboard();
     
    188175                  this->getAbsCoor ().z);
    189176
    190 //   glPushMatrix();
    191 //     glEnable(GL_BLEND);
    192 //     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
    193 //     glShadeModel(GL_FLAT);
    194 //     glClearColor(0.0, 0.0, 0.0, 0.0);
    195 //
    196 //     glEnable(GL_TEXTURE_2D);
    197 //     this->mat->select();
    198 //
    199 // //     Vector camera = State::getCamera()->getViewVector();
    200 //
    201 //     glBegin(GL_QUADS); // +X
    202 //       glTexCoord2f (0.0, 0.0);
    203 //       glVertex3f( 0.0f, -.7f, -.7f);
    204 //
    205 //       glTexCoord2f (0.0, 1.0);
    206 //       glVertex3f( 0.0f, -.7f , .7f);
    207 //
    208 //       glTexCoord2f (1.0, 1.0);
    209 //       glVertex3f( 0.0, .7f , .7f );
    210 //
    211 //       glTexCoord2f (1.0, 0.0);
    212 //       glVertex3f( 0.0, .7f, -.7f );
    213 //     glEnd();
    214 //   glPopMatrix();
    215 
    216 //   this->billboard->toggleBillboard();
    217 
    218177  this->halo->draw();
    219178
     
    222181  glRotatef(this->angle, 0.0, 0.0, 1.0);
    223182
    224 //   this->getModel()->draw();
     183  this->getModel()->draw();
    225184
    226185//   this->mat->select();
    227    dynamic_cast<StaticModel*>(this->getModel())->draw();
     186/*   dynamic_cast<StaticModel*>(this->getModel())->draw();*/
    228187//   this->mat->select();
    229188//   dynamic_cast<StaticModel*>(this->getModel())->draw();
  • branches/playability/src/world_entities/projectiles/hbolt.h

    r10063 r10074  
    4444    ParticleEmitter*                  emitter;
    4545
    46     Material*                         mat;
    47 
    4846    float                             angle;
    4947    float                             rotationSpeed;
  • branches/playability/src/world_entities/projectiles/lbolt.cc

    r10063 r10074  
    2929#include "debug.h"
    3030
    31 #include "static_model.h"
    32 
    3331
    3432#include "class_id_DEPRECATED.h"
     
    5856  this->rotationSpeed = 130;
    5957
    60   this->mat = new Material("lBolt");
    61   this->mat->setBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
    62   //this->mat->setBlendFunc(GL_SRC_ALPHA,GL_ONE);
    63   this->mat->setDiffuse(1,1,1);
    64   this->mat->setIllum(3);
    65   this->mat->setDiffuseMap("maps/lbolt2.png");
    66   this->mat->setDiffuseMap("maps/lbolt2.png",1);
    67   dynamic_cast<StaticModel*>(this->getModel())->addMaterial(this->mat);
    68   dynamic_cast<StaticModel*>(this->getModel())->finalize();
    69   this->mat->select();
    70 
    7158  this->halo = new Billboard();
    72   this->halo->setSize(.5, .5);
     59  this->halo->setSize(.35, .35);
    7360  this->halo->setTexture("hbolt_halo.png");
    7461}
     
    181168  this->halo->draw();
    182169
    183 //   this->mat->select();
    184 //   dynamic_cast<StaticModel*>(this->getModel())->draw();
    185 //   this->mat->select();
    186 //   dynamic_cast<StaticModel*>(this->getModel())->draw();
    187 //   this->mat->unselect();
    188 //   this->mat->unselect();
    189170  glPopMatrix();
    190171
  • branches/playability/src/world_entities/projectiles/lbolt.h

    r10063 r10074  
    4545    float                             rotationSpeed;
    4646
    47     Material*                         mat;
    48 
    4947    Billboard*                        halo;
    5048
Note: See TracChangeset for help on using the changeset viewer.