Changeset 10159 in orxonox.OLD for branches/playability/src
- Timestamp:
- Jan 3, 2007, 12:53:52 PM (18 years ago)
- Location:
- branches/playability/src/world_entities
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/playability/src/world_entities/projectiles/hbolt.cc
r10109 r10159 159 159 { 160 160 161 glPushAttrib(GL_ENABLE_BIT); 162 glDisable(GL_LIGHTING); 163 glDisable(GL_FOG); 164 161 165 glMatrixMode(GL_MODELVIEW); 162 166 glPushMatrix(); … … 176 180 177 181 glPopMatrix(); 182 glPopAttrib(); 183 178 184 } -
branches/playability/src/world_entities/space_ships/space_ship.cc
r10156 r10159 375 375 //FIXME Just testaddition to show the wobblegrid 376 376 this->test = new Wobblegrid(5); 377 test->setTexture("maps/ fichte_ast6.tga");377 test->setTexture("maps/blub.png"); 378 378 379 379 test->setAbsCoor( this->getAbsCoor() + Vector(0, 2, 0)); -
branches/playability/src/world_entities/weapons/heavy_blaster.cc
r10152 r10159 98 98 } 99 99 100 if (this->leftRight == W_RIGHT) 101 { 100 102 this->emissionPoint[0]->setRelCoor(Vector(1.1, 0.14, 0.06)); 101 103 this->emissionPoint[1]->setRelCoor(Vector(1.1, -.06, 0.14)); 102 104 this->emissionPoint[2]->setRelCoor(Vector(1.1, 0.06, -.14)); 105 } 106 else { 107 this->emissionPoint[0]->setRelCoor(Vector(1.1, 0.14, -.06)); 108 this->emissionPoint[1]->setRelCoor(Vector(1.1, -.06, -.14)); 109 this->emissionPoint[2]->setRelCoor(Vector(1.1, 0.06, 0.14)); 110 } 103 111 104 112 … … 119 127 120 128 for (int i = 0; i < this->getBarrels(); i++){ 121 this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0. 1, ANIM_LINEAR, ANIM_NULL);122 this->shootAnim[i][0]->addKeyFrame(Vector(-0.3, 0.0, 0.0), Quaternion(), 1.0, ANIM_LINEAR, ANIM_NULL);123 this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0. 4, ANIM_LINEAR, ANIM_NULL);124 125 this->shootAnim[i][1]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0. 1, ANIM_LINEAR, ANIM_NULL);126 this->shootAnim[i][1]->addKeyFrame(Vector(-0.4, 0.0, 0.0), Quaternion(), 1. 0, ANIM_LINEAR, ANIM_NULL);127 this->shootAnim[i][1]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0. 4, ANIM_LINEAR, ANIM_NULL);129 this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.05, ANIM_LINEAR, ANIM_NULL); 130 this->shootAnim[i][0]->addKeyFrame(Vector(-0.3, 0.0, 0.0), Quaternion(), 0.9, ANIM_LINEAR, ANIM_NULL); 131 this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.55, ANIM_LINEAR, ANIM_NULL); 132 133 this->shootAnim[i][1]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.05, ANIM_LINEAR, ANIM_NULL); 134 this->shootAnim[i][1]->addKeyFrame(Vector(-0.4, 0.0, 0.0), Quaternion(), 1.2, ANIM_LINEAR, ANIM_NULL); 135 this->shootAnim[i][1]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.25, ANIM_LINEAR, ANIM_NULL); 128 136 } 129 137 -
branches/playability/src/world_entities/weapons/light_blaster.cc
r10152 r10159 103 103 104 104 for (int i = 0; i < this->getBarrels(); i++){ 105 this->shootAnim[i][0]->addKeyFrame(Vector( 0.0, 0.0, 0.0), Quaternion(0, 0, 0), 0.05, ANIM_NULL, ANIM_LINEAR);106 this->shootAnim[i][0]->addKeyFrame(Vector( 0.0, 0.0, 0.0), Quaternion(120, 0, 0), 0.0, ANIM_NULL, ANIM_LINEAR);105 this->shootAnim[i][0]->addKeyFrame(Vector(), Quaternion(0.0, 0.0, 0.0), 0.04, ANIM_NULL, ANIM_LINEAR); 106 this->shootAnim[i][0]->addKeyFrame(Vector(), Quaternion(M_2_PI/3.0, 0.0, 0.0), 0.01, ANIM_NULL, ANIM_LINEAR); 107 107 } 108 108
Note: See TracChangeset
for help on using the changeset viewer.