Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6811 in orxonox.OLD for trunk/src/world_entities/weapons


Ignore:
Timestamp:
Jan 28, 2006, 4:02:06 PM (19 years ago)
Author:
bensch
Message:

More stuff in Cannon and Hyperblast

Location:
trunk/src/world_entities/weapons
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/weapons/cannon.cc

    r6803 r6811  
    7474//  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
    7575
    76   this->loadModel("models/guns/plasmadriver_#.obj", 2.0);
     76  this->loadModel("models/guns/cannon.obj", 1.0);
    7777
    7878  this->setStateDuration(WS_SHOOTING, 2.0);
  • trunk/src/world_entities/weapons/hyperblaster.cc

    r6810 r6811  
    6666  this->setStateDuration(WS_SHOOTING, 2.0);
    6767  this->setStateDuration(WS_RELOADING, 5.0);
    68   this->setStateDuration(WS_ACTIVATING, .1);
    69   this->setStateDuration(WS_DEACTIVATING, .4);
     68  this->setStateDuration(WS_ACTIVATING, .8);
     69  this->setStateDuration(WS_DEACTIVATING, .8);
    7070
    7171  this->setEnergyMax(10);
     
    9797//     animation1->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.0, ANIM_LINEAR, ANIM_NULL);
    9898
    99   animation2->addKeyFrame(Vector(1.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
    100   animation2->addKeyFrame(Vector(1.0, 0.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
    101   animation2->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
     99  animation2->addKeyFrame(Vector(0.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
     100  animation2->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.5, ANIM_LINEAR, ANIM_NULL);
    102101
    103   animation3->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
    104   animation3->addKeyFrame(Vector(1.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
    105   animation2->addKeyFrame(Vector(1.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
     102  animation3->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.5, ANIM_LINEAR, ANIM_NULL);
     103  animation3->addKeyFrame(Vector(0.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
    106104}
    107105
Note: See TracChangeset for help on using the changeset viewer.