Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10298 in orxonox.OLD for branches/playability/src/world_entities


Ignore:
Timestamp:
Jan 21, 2007, 6:23:04 PM (18 years ago)
Author:
nicolasc
Message:

Fixed Wooblegrid, transparancy problem (acid splashes) still exists

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

Legend:

Unmodified
Added
Removed
  • branches/playability/src/world_entities/effects/wobblegrid.cc

    r10168 r10298  
    202202  up = h.cross(view);
    203203
    204   Quaternion dir = Quaternion::lookAt( this->getAbsCoor(), this->getAbsCoor() + up, view);
     204  Quaternion dir = Quaternion::lookAt( Vector(), view, up);
    205205  this->setAbsDir(dir);
    206206}
  • branches/playability/src/world_entities/projectiles/acid_splash.cc

    r10179 r10298  
    4343  this->registerObject(this, AcidSplash::_objectList);
    4444
    45  
     45  srand(time(0));   //initialize Random Nomber Generator
     46
    4647  //this->loadModel("models/projectiles/laser.obj");
    4748
     
    5253
    5354  this->grid = new Wobblegrid( 5);
    54   this->grid->setTexture( "maps/acid3.png");
    5555  this->grid->setParent( this);
     56
     57//  if (rand()/2 == 0) //!<Randomized Textrures
     58    this->grid->setTexture( "maps/acid3.png");
     59//   else
     60//     this->grid->setTexture( "maps/blub.png");
    5661
    5762  this->grid->toList(this->getOMListNumber());
  • branches/playability/src/world_entities/space_ships/space_ship.cc

    r10297 r10298  
    2929#include "weapons/spike_launcher.h"
    3030#include "weapons/spike_thrower.h"
     31#include "weapons/acid_launcher.h"
    3132#include "weapons/boomerang_gun.h"
    3233#include "weapons/turret.h"
     
    178179//  spike2->setName( "SpikeLauncher" );
    179180
     181  Weapon* acid0 = new AcidLauncher();
     182  acid0->setName( "AcidSplasher" );
     183
     184  Weapon* acid1 = new AcidLauncher();
     185  acid1->setName( "AcidSplasher" );
     186
    180187  this->weaponMan.addWeapon( wpLeft1, 0, 0);
    181188  this->weaponMan.addWeapon( wpRight1, 0, 1);
     
    196203  this->weaponMan.addWeapon( wpRight3, 3, 5);
    197204
    198   this->secWeaponMan.addWeapon( cannon, 0, 0);
    199   this->secWeaponMan.addWeapon( spike, 1, 1);
    200 //  this->secWeaponMan.addWeapon( spike2, 2, 2);
    201 
    202 
    203   this->weaponMan.changeWeaponConfig(3);
     205  this->weaponMan.addWeapon( acid0, 0, 6);
     206  this->weaponMan.addWeapon( acid1, 0, 7);
     207
     208  this->secWeaponMan.addWeapon( cannon, 0, 2);
     209  this->secWeaponMan.addWeapon( spike, 1, 3);
     210//   this->secWeaponMan.addWeapon( acid0, 2, 2);
     211//   this->secWeaponMan.addWeapon( acid1, 2, 3);
     212
     213
     214  this->weaponMan.changeWeaponConfig(0);
    204215  this->secWeaponMan.changeWeaponConfig(1);
    205216
     
    236247
    237248  bForward = bBackward = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = bFire = bSecFire = false;
    238  
    239249
    240250  this->setHealthMax(shieldMax);
     
    288298  this->secWeaponMan.setParentEntity( this);
    289299
    290   this->weaponMan.setSlotCount(6);
     300  this->weaponMan.setSlotCount(8);
    291301
    292302  this->weaponMan.setSlotPosition(0, Vector(0.0, 0, -3.0));
     
    307317  this->weaponMan.setSlotPosition(5, Vector(1.5, 0, -.5));
    308318  this->weaponMan.setSlotDirection(5, Quaternion(+M_PI_4*.5-M_PI, Vector(1,0,0)));
     319
     320  this->weaponMan.setSlotPosition(6, Vector(0.5, 0, 2.5));
     321  this->weaponMan.setSlotDirection(6, Quaternion(-M_PI_4*.5+M_PI, Vector(1,0,0)));
     322
     323  this->weaponMan.setSlotPosition(7, Vector(0.5, 0, -2.5));
     324  this->weaponMan.setSlotDirection(7, Quaternion(+M_PI_4*.5-M_PI, Vector(1,0,0)));
    309325
    310326  this->secWeaponMan.setSlotCount(6);
  • branches/playability/src/world_entities/weapons/acid_launcher.cc

    r10179 r10298  
    7272{
    7373  this->registerObject(this, AcidLauncher::_objectList);
    74 
     74/*
    7575  Animation3D* animation1 = this->getAnimation(WS_ACTIVATING, this);
    7676  Animation3D* animation2 = this->getAnimation(WS_DEACTIVATING, this);
     
    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
    91   this->setEnergyMax(10);
    92   this->increaseEnergy(10);
     91  this->setEnergyMax(100);
     92  this->increaseEnergy(100);
    9393  //this->minCharge = 2;
    9494
     
    9898  this->loadModel("models/guns/turret1.obj", 1.0);
    9999
    100   this->setEmissionPoint(1.684, 0.472, 0);
     100  this->setEmissionPoint(1.0, 0, 0);
    101101  this->getProjectileFactory()->prepare(50);
    102102
     
    158158
    159159      pj->setParent(PNode::getNullParent());
    160       pj->setAbsCoor(this->getEmissionPoint());
     160      pj->setAbsCoor(this->getEmissionPoint() + VECTOR_RAND(.1));
    161161      pj->setAbsDir(this->getAbsDir()+Quaternion(0,VECTOR_RAND(5)));
    162162      pj->activate();
Note: See TracChangeset for help on using the changeset viewer.