Changeset 6722 in orxonox.OLD
- Timestamp:
- Jan 25, 2006, 5:24:34 PM (19 years ago)
- Location:
- branches/spaceshipcontrol/src/world_entities
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/spaceshipcontrol/src/world_entities/space_ships/helicopter.cc
r6717 r6722 142 142 143 143 this->loadModel("models/ships/rotor.obj",1.0,3); 144 this->loadModel("models/ships/rotor.obj",0. 15,4);144 this->loadModel("models/ships/rotor.obj",0.2,4); 145 145 146 146 … … 521 521 522 522 523 if ((this->cameraNode.getAbsDirY()).y < 0. 8)523 if ((this->cameraNode.getAbsDirY()).y < 0.5) 524 524 { 525 525 if((this->cameraNode.getAbsDirX()).y > 0) 526 526 { 527 if(yMouse > 0) this->cameraNode.shiftDir(yDir); ;527 if(yMouse > 0) this->cameraNode.shiftDir(yDir); 528 528 } 529 529 else 530 530 { 531 if(yMouse < 0) this->cameraNode.shiftDir(yDir); ;531 if(yMouse < 0) this->cameraNode.shiftDir(yDir); 532 532 } 533 533 } -
branches/spaceshipcontrol/src/world_entities/weapons/turret.cc
r6671 r6722 116 116 void Turret::tick(float dt) 117 117 { 118 /* 118 119 119 Quaternion quat; 120 Vector direction = this->getAbsCoor();/*this->getWeaponManager()->getFixedTarget()->getAbsCoor() - this->getAbsCoor(); 120 Vector direction = this->getAbsCoor();/*this->getWeaponManager()->getFixedTarget()->getAbsCoor() - this->getAbsCoor();*/ 121 121 122 122 direction.normalize(); … … 127 127 quat = Quaternion(direction, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)) ; 128 128 129 this->setAbsDirSoft(quat, 5); */129 this->setAbsDirSoft(quat, 5); 130 130 } 131 131
Note: See TracChangeset
for help on using the changeset viewer.