Changeset 10298 in orxonox.OLD for branches/playability/src/world_entities
- Timestamp:
- Jan 21, 2007, 6:23:04 PM (18 years ago)
- Location:
- branches/playability/src/world_entities
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/playability/src/world_entities/effects/wobblegrid.cc
r10168 r10298 202 202 up = h.cross(view); 203 203 204 Quaternion dir = Quaternion::lookAt( this->getAbsCoor(), this->getAbsCoor() + up, view);204 Quaternion dir = Quaternion::lookAt( Vector(), view, up); 205 205 this->setAbsDir(dir); 206 206 } -
branches/playability/src/world_entities/projectiles/acid_splash.cc
r10179 r10298 43 43 this->registerObject(this, AcidSplash::_objectList); 44 44 45 45 srand(time(0)); //initialize Random Nomber Generator 46 46 47 //this->loadModel("models/projectiles/laser.obj"); 47 48 … … 52 53 53 54 this->grid = new Wobblegrid( 5); 54 this->grid->setTexture( "maps/acid3.png");55 55 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"); 56 61 57 62 this->grid->toList(this->getOMListNumber()); -
branches/playability/src/world_entities/space_ships/space_ship.cc
r10297 r10298 29 29 #include "weapons/spike_launcher.h" 30 30 #include "weapons/spike_thrower.h" 31 #include "weapons/acid_launcher.h" 31 32 #include "weapons/boomerang_gun.h" 32 33 #include "weapons/turret.h" … … 178 179 // spike2->setName( "SpikeLauncher" ); 179 180 181 Weapon* acid0 = new AcidLauncher(); 182 acid0->setName( "AcidSplasher" ); 183 184 Weapon* acid1 = new AcidLauncher(); 185 acid1->setName( "AcidSplasher" ); 186 180 187 this->weaponMan.addWeapon( wpLeft1, 0, 0); 181 188 this->weaponMan.addWeapon( wpRight1, 0, 1); … … 196 203 this->weaponMan.addWeapon( wpRight3, 3, 5); 197 204 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); 204 215 this->secWeaponMan.changeWeaponConfig(1); 205 216 … … 236 247 237 248 bForward = bBackward = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = bFire = bSecFire = false; 238 239 249 240 250 this->setHealthMax(shieldMax); … … 288 298 this->secWeaponMan.setParentEntity( this); 289 299 290 this->weaponMan.setSlotCount( 6);300 this->weaponMan.setSlotCount(8); 291 301 292 302 this->weaponMan.setSlotPosition(0, Vector(0.0, 0, -3.0)); … … 307 317 this->weaponMan.setSlotPosition(5, Vector(1.5, 0, -.5)); 308 318 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))); 309 325 310 326 this->secWeaponMan.setSlotCount(6); -
branches/playability/src/world_entities/weapons/acid_launcher.cc
r10179 r10298 72 72 { 73 73 this->registerObject(this, AcidLauncher::_objectList); 74 74 /* 75 75 Animation3D* animation1 = this->getAnimation(WS_ACTIVATING, this); 76 76 Animation3D* animation2 = this->getAnimation(WS_DEACTIVATING, this); … … 87 87 this->setStateDuration(WS_RELOADING, 1.0f); 88 88 this->setStateDuration(WS_ACTIVATING, .4); 89 this->setStateDuration(WS_DEACTIVATING, .4); 89 this->setStateDuration(WS_DEACTIVATING, .4);*/ 90 90 91 this->setEnergyMax(10 );92 this->increaseEnergy(10 );91 this->setEnergyMax(100); 92 this->increaseEnergy(100); 93 93 //this->minCharge = 2; 94 94 … … 98 98 this->loadModel("models/guns/turret1.obj", 1.0); 99 99 100 this->setEmissionPoint(1. 684, 0.472, 0);100 this->setEmissionPoint(1.0, 0, 0); 101 101 this->getProjectileFactory()->prepare(50); 102 102 … … 158 158 159 159 pj->setParent(PNode::getNullParent()); 160 pj->setAbsCoor(this->getEmissionPoint() );160 pj->setAbsCoor(this->getEmissionPoint() + VECTOR_RAND(.1)); 161 161 pj->setAbsDir(this->getAbsDir()+Quaternion(0,VECTOR_RAND(5))); 162 162 pj->activate();
Note: See TracChangeset
for help on using the changeset viewer.