Changeset 10596
- Timestamp:
- Sep 27, 2015, 12:32:52 PM (9 years ago)
- Location:
- code/branches/clangenb
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/clangenb/data/levels/emptyLevel.oxw
r10494 r10596 15 15 include("templates/spaceshipAssff2.oxt") 16 16 include("templates/spaceshipPirate.oxt") 17 include("templates/spaceship HeartAttack.oxt")17 include("templates/spaceshipEscort.oxt") 18 18 ?> 19 19 … … 30 30 31 31 <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/> 32 <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipHeartAttack /> 33 <SpaceShip position="0,2000,200" lookat="0,0,0" name="movingtarget" radarname="Pirate"> 34 <events> 35 <visibility> 36 <EventListener event="boxtrigger4" /> 37 </visibility> 38 </events> 39 <templates> 40 <Template link=spaceshippirate /> 41 </templates> 42 <controller> 43 <WaypointController team=1> 44 <waypoints> 45 <Model mesh="cube.mesh" scale=8 position=" 0,1700,-200" /> 46 <Model mesh="cube.mesh" scale=8 position=" 0,1700,-700" /> 47 <Model mesh="cube.mesh" scale=8 position="500,1700,-700" /> 48 <Model mesh="cube.mesh" scale=8 position="500,1700,-200" /> 49 </waypoints> 50 </WaypointController> 51 </controller> 52 </SpaceShip> 32 <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort /> 33 53 34 </Scene> 54 35 </Level> -
code/branches/clangenb/src/modules/weapons/weaponmodes/EnergyDrink.cc
r10494 r10596 108 108 model->setScale(5); 109 109 110 110 this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition()); 111 111 projectile->setOrientation(this->getMuzzleOrientation()); 112 112 projectile->setPosition(this->getMuzzlePosition()); -
code/branches/clangenb/src/modules/weapons/weaponmodes/FusionFire.cc
r10494 r10596 67 67 { 68 68 BillboardProjectile* projectile = new BillboardProjectile(this->getContext()); 69 70 69 70 this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition()); 71 71 projectile->setOrientation(this->getMuzzleOrientation()); 72 72 projectile->setPosition(this->getMuzzlePosition()); -
code/branches/clangenb/src/modules/weapons/weaponmodes/LaserFire.cc
r10494 r10596 66 66 ParticleProjectile* projectile = new ParticleProjectile(this->getContext()); 67 67 68 68 this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition()); 69 69 projectile->setOrientation(this->getMuzzleOrientation()); 70 70 projectile->setPosition(this->getMuzzlePosition());
Note: See TracChangeset
for help on using the changeset viewer.