Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10641 in orxonox.OLD for branches/vs-enhencements


Ignore:
Timestamp:
Apr 26, 2007, 2:10:37 PM (18 years ago)
Author:
nicolasc
Message:

bump

Location:
branches/vs-enhencements/src
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • branches/vs-enhencements/src/util/track/track.cc

    r10640 r10641  
    255255       {
    256256           Vector tmp = this->calcPos();
    257    
    258    
     257
     258
    259259           Vector dV = tmp - this->trackNode->getAbsCoor();
    260260           float dx = speed * dt;
    261261           float ratio = dx / dV.len();
    262    
     262
    263263           if( dt > 0.0f)
    264264           {
     
    267267           }
    268268           tmp = this->calcPos();
    269    
     269
    270270           Vector v(0.0, 1.0, 0.0);
    271271           Quaternion quat = Quaternion(this->calcDir(), v);
    272272           Quaternion q(-PI/2, v);
    273273           quat = quat * q;
    274    
     274
    275275           // move trackNode of the track
    276276           this->trackNode->shiftCoor(tmp - this->trackNode->getAbsCoor());
  • branches/vs-enhencements/src/util/track/track.h

    r10640 r10641  
    4343   float                 duration;             //!< The time used to cross this Track (curve).
    4444   float                 endTime;              //!< The time at which this Track ends.
    45    float                 width;                //!< Th width of the Path. This tells the Player(s), how far he(they) can go to the left/right.
    46    float                 height;
    47    float                 depth;
    48    float                 stretch;
     45   float                 width;                //!< The width of the action box, next to the player.
     46   float                 height;               //!< The Height of the action box, next to the player
     47   float                 depth;                //!< Depth of the action box
     48   float                 stretch;              //!< multiplyer between w/h at player and w/h at far end of the action box
    4949
    5050   int                   nodeCount;            //!< The count of points this Track has.
  • branches/vs-enhencements/src/world_entities/WorldEntities.am

    r10622 r10641  
    3333                world_entities/weapons/spike_thrower.cc \
    3434                world_entities/weapons/acid_launcher.cc \
     35                world_entities/weapons/rf_cannon.cc \
    3536                \
    3637                world_entities/projectiles/lbolt.cc \
     
    184185                weapons/spike_thrower.h \
    185186                weapons/acid_launcher.h \
     187                weapons/rf_cannon.h \
    186188                \
    187189                projectiles/lbolt.h \
  • branches/vs-enhencements/src/world_entities/space_ships/space_ship.cc

    r10640 r10641  
    2626#include "weapons/medium_blaster.h"
    2727#include "weapons/heavy_blaster.h"
     28#include "weapons/rf_cannon.h"
    2829#include "weapons/swarm_launcher.h"
    2930#include "weapons/spike_thrower.h"
     
    161162  wpLeft1->setName( "LightBlaster");
    162163
     164//   Weapon* wpRight1 = new RFCannon ();
     165  wpRight1->setName( "RFCannon");
     166//   Weapon* wpLeft1 = new RFCannon ();
     167  wpLeft1->setName( "RFCannon");
     168
    163169  Weapon* wpRight2 = new MediumBlaster ();
    164170  wpRight2->setName( "MediumBlaster");
     
    173179  Weapon* cannon = new SwarmLauncher();
    174180  cannon->setName( "SwarmLauncher");
    175 /*
    176   Weapon* spike = new SpikeThrower();
    177   spike->setName( "SpikeThrower" );
    178 
    179 
    180   Weapon* acid0 = new AcidLauncher();
    181   acid0->setName( "AcidSplasher" );
    182 
    183   Weapon* acid1 = new AcidLauncher();
    184   acid1->setName( "AcidSplasher" );*/
    185181
    186182
     
    11771173
    11781174  State::getPlayer()->hud().setOverlayPercentage(100-int(100*this->actionWidthPercentage));
    1179   PRINTF(0)("TravelDistance has been updated\n");
     1175//   PRINTF(0)("TravelDistance has been updated\n");
    11801176  this->isTravelDistanceInit = true;
    11811177}
Note: See TracChangeset for help on using the changeset viewer.