Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10333 in orxonox.OLD


Ignore:
Timestamp:
Jan 24, 2007, 3:29:46 PM (17 years ago)
Author:
nicolasc
Message:

bump: black acid splash

Location:
branches/playability/src/world_entities
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/playability/src/world_entities/effects/wobblegrid.cc

    r10327 r10333  
    164164
    165165  glPushAttrib(GL_ENABLE_BIT);
    166 //   glDisable(GL_LIGHTING);
    167 //   glDisable(GL_FOG);
     166  glDisable(GL_LIGHTING);
     167  glDisable(GL_FOG);
    168168
    169169  glMatrixMode(GL_MODELVIEW);
    … …  
    173173  //glTranslatef(0,0,0);
    174174  this->material->select();
     175
     176  glDisable(GL_BLEND);
     177  glEnable( GL_ALPHA_TEST);
     178  glAlphaFunc( GL_GEQUAL, .5);
    175179
    176180  glTranslatef (this->getAbsCoor ().x,
    … …  
    195199
    196200  Vector view = this->getAbsCoor() - State::getCameraNode()->getAbsCoor();
    197   view.normalize();
     201//   view.normalize();
    198202
    199203  Vector up = Vector(0, 1, 0);
    … …  
    203207//     up = Vector (0, 0, 1);
    204208
    205   Vector h = up.cross(view/*.getNormalized()*/);
    206   up = h.cross(view/*.getNormalized()*/);
     209  Vector h = up.cross(view.getNormalized());
     210  up = h.cross(view.getNormalized());
    207211  Quaternion dir = Quaternion::lookAt( this->getAbsCoor(), this->getAbsCoor() + up, view);
    208212//   Quaternion dir = Quaternion::lookAt( Vector(), view, up);

  • branches/playability/src/world_entities/projectiles/acid_splash.cc

    r10328 r10333  
    5555  this->grid->setParent( this);
    5656
    57 //  if (rand()/2 == 0) //!<Randomized Textrures
    58     this->grid->setTexture( "maps/acid3.png");
     57
     58  int rnd = rand()/3;
     59
     60  switch (rnd){
     61    case 0:
     62      this->grid->setTexture( "maps/acid2.png");
     63      break;
     64    case 1:
     65      this->grid->setTexture( "maps/acid3.png");
     66      break;
     67    case 2:
     68      this->grid->setTexture( "maps/blub.png");
     69      break;
     70    default:
     71      this->grid->setTexture( "maps/acid2.png");
     72  }
     73//   if (rand()/2 == 0) //!<Randomized Textrures
     74//     this->grid->setTexture( "maps/acid3.png");
    5975//   else
    6076//     this->grid->setTexture( "maps/blub.png");
    6177
    6278  this->grid->toList(OM_ENVIRON); //this->getOMListNumber());
    63   //this->toList(OM_ENVIRON);
     79  this->toList(OM_ENVIRON);
    6480}
    6581
    … …  
    113129  this->deactivate();
    114130 
    115   return;
     131//   return;
    116132
    117133  //dynamic_cast<SpaceShip*>(entity)->damage( this->getPhysDamage(), this->getElecDamage());

  • branches/playability/src/world_entities/projectiles/projectile_weapon.h

    r10256 r10333  
    116116
    117117//     FastFactory             ff;
    118     static FastFactory*               fastFactory;
     118//     static FastFactory*               fastFactory;
    119119
    120120    OrxSound::SoundSource  soundSource;

  • branches/playability/src/world_entities/projectiles/spike.cc

    r10289 r10333  
    4343  this->registerObject(this, Spike::_objectList);
    4444
    45   this->loadModel("models/projectiles/spike.obj");
     45  this->loadModel("models/projectiles/spike.obj", 2);
    4646
    4747  this->setMinEnergy(1);

  • branches/playability/src/world_entities/projectiles/spike_ball.cc

    r10286 r10333  
    130130    this->launcher[tmp + i] =  this->launcher[i] * (-1);
    131131  }
     132
     133  this->freeMode = false;
    132134}
    133135
    … …  
    157159void SpikeBall::blow()
    158160{
    159   updateFireDir();
     161  if ( this->freeMode )
     162    updateFireDir();
    160163
    161164  Spike* pj = NULL;
    … …  
    258261  float matrix[4][4];
    259262  glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
     263  this->halo->draw();
    260264
    261265  glRotatef(angle, this->getRotationAxis().x, this->getRotationAxis().y, this->getRotationAxis().z);
    … …  
    264268  this->getModel()->draw();
    265269
    266   this->halo->draw();
    267270
    268271  glPopMatrix();

  • branches/playability/src/world_entities/projectiles/spike_ball.h

    r10289 r10333  
    6161    float         size;
    6262
     63    bool          freeMode;
     64
    6365};
    6466

  • branches/playability/src/world_entities/space_ships/space_ship.cc

    r10332 r10333  
    176176  spike->setName( "SpikeThrower" );
    177177
    178 //  Weapon* spike2 = new SpikeLauncher();
    179 //  spike2->setName( "SpikeLauncher" );
    180 
    181   /*
     178
    182179  Weapon* acid0 = new AcidLauncher();
    183180  acid0->setName( "AcidSplasher" );
    … …  
    185182  Weapon* acid1 = new AcidLauncher();
    186183  acid1->setName( "AcidSplasher" );
    187   */
     184
    188185
    189186  this->weaponMan.addWeapon( wpLeft1, 0, 0);
    … …  
    195192  this->weaponMan.addWeapon( wpLeft3, 2, 4);
    196193  this->weaponMan.addWeapon( wpRight3, 2, 5);
    197 
     194/*
    198195  this->weaponMan.addWeapon( wpLeft1, 3, 0);
    199196  this->weaponMan.addWeapon( wpRight1, 3, 1);
    … …  
    204201  this->weaponMan.addWeapon( wpLeft3, 3, 4);
    205202  this->weaponMan.addWeapon( wpRight3, 3, 5);
    206 
    207   /*
    208   this->weaponMan.addWeapon( acid0, 0, 6);
    209   this->weaponMan.addWeapon( acid1, 0, 7);
    210   */
     203*/
     204
     205  this->weaponMan.addWeapon( acid0, 3, 0);
     206  this->weaponMan.addWeapon( acid1, 3, 1);
     207
    211208
    212209  this->secWeaponMan.addWeapon( cannon, 0, 2);
    … …  
    216213
    217214
    218   this->weaponMan.changeWeaponConfig(0);
     215  this->weaponMan.changeWeaponConfig(3);
    219216  this->secWeaponMan.changeWeaponConfig(1);
    220217
    221   curWeaponPrimary    = 3;
    222   curWeaponSecondary  = 0;
     218  curWeaponPrimary    = 0;
     219  curWeaponSecondary  = 1;
    223220
    224221  Playable::weaponConfigChanged();

  • branches/playability/src/world_entities/weapons/acid_launcher.cc

    r10298 r10333  
    8383  animation1->setInfinity(ANIM_INF_CONSTANT);
    8484  animation2->setInfinity(ANIM_INF_CONSTANT);
    85 
     85*/
    8686  this->setStateDuration(WS_SHOOTING, .6);
    8787  this->setStateDuration(WS_RELOADING, 1.0f);
    8888  this->setStateDuration(WS_ACTIVATING, .4);
    89   this->setStateDuration(WS_DEACTIVATING, .4);*/
     89  this->setStateDuration(WS_DEACTIVATING, .4);
    9090
    9191  this->setEnergyMax(100);
    … …  
    9696  this->setProjectileTypeC("AcidSplash");
    9797
    98   this->loadModel("models/guns/turret1.obj", 1.0);
     98//   this->loadModel("models/guns/turret1.obj", 1.0);
    9999
    100   this->setEmissionPoint(1.0, 0, 0);
    101   this->getProjectileFactory()->prepare(50);
     100  this->setEmissionPoint(2.0, 0, 0);
     101  this->getProjectileFactory()->prepare(100);
    102102
    103103  this->setActionSound(WA_SHOOT, "sound/explosions/explosion_1.wav");
Note: See TracChangeset for help on using the changeset viewer.