Changeset 10641 in orxonox.OLD

Timestamp:

Apr 26, 2007, 2:10:37 PM (17 years ago)

Author:

nicolasc

Message:

bump

Location:

branches/vs-enhencements/src

Files:

• util/track/track.cc (modified) (2 diffs)
• util/track/track.h (modified) (1 diff)
• world_entities/WorldEntities.am (modified) (2 diffs)
• world_entities/space_ships/space_ship.cc (modified) (4 diffs)
• world_entities/weapons/rf_cannon.cc (added)
• world_entities/weapons/rf_cannon.h (added)

branches/vs-enhencements/src/util/track/track.cc

@@ -255 +255 @@
        {
            Vector tmp = this->calcPos();
-    
-    
+
+
            Vector dV = tmp - this->trackNode->getAbsCoor();
            float dx = speed * dt;
            float ratio = dx / dV.len();
-    
+
            if( dt > 0.0f)
            {
@@ -267 +267 @@
            }
            tmp = this->calcPos();
-    
+
            Vector v(0.0, 1.0, 0.0);
            Quaternion quat = Quaternion(this->calcDir(), v);
            Quaternion q(-PI/2, v);
            quat = quat * q;
-    
+
            // move trackNode of the track
            this->trackNode->shiftCoor(tmp - this->trackNode->getAbsCoor());

branches/vs-enhencements/src/util/track/track.h

@@ -43 +43 @@
    float                 duration;             //!< The time used to cross this Track (curve).
    float                 endTime;              //!< The time at which this Track ends.
-   float                 width;                //!< Th width of the Path. This tells the Player(s), how far he(they) can go to the left/right.
-   float                 height;
-   float                 depth;
-   float                 stretch;
+   float                 width;                //!< The width of the action box, next to the player.
+   float                 height;               //!< The Height of the action box, next to the player 
+   float                 depth;                //!< Depth of the action box
+   float                 stretch;              //!< multiplyer between w/h at player and w/h at far end of the action box
 
    int                   nodeCount;            //!< The count of points this Track has.

branches/vs-enhencements/src/world_entities/WorldEntities.am

@@ -33 +33 @@
                 world_entities/weapons/spike_thrower.cc \
                 world_entities/weapons/acid_launcher.cc \
+                world_entities/weapons/rf_cannon.cc \
                 \
                 world_entities/projectiles/lbolt.cc \
@@ -184 +185 @@
                 weapons/spike_thrower.h \
                 weapons/acid_launcher.h \
+                weapons/rf_cannon.h \
                 \
                 projectiles/lbolt.h \

branches/vs-enhencements/src/world_entities/space_ships/space_ship.cc

@@ -26 +26 @@
 #include "weapons/medium_blaster.h"
 #include "weapons/heavy_blaster.h"
+#include "weapons/rf_cannon.h"
 #include "weapons/swarm_launcher.h"
 #include "weapons/spike_thrower.h"
@@ -161 +162 @@
   wpLeft1->setName( "LightBlaster");
 
+//   Weapon* wpRight1 = new RFCannon ();
+  wpRight1->setName( "RFCannon");
+//   Weapon* wpLeft1 = new RFCannon ();
+  wpLeft1->setName( "RFCannon");
+
   Weapon* wpRight2 = new MediumBlaster ();
   wpRight2->setName( "MediumBlaster");
@@ -173 +179 @@
   Weapon* cannon = new SwarmLauncher();
   cannon->setName( "SwarmLauncher");
-/*
-  Weapon* spike = new SpikeThrower();
-  spike->setName( "SpikeThrower" );
-
-
-  Weapon* acid0 = new AcidLauncher();
-  acid0->setName( "AcidSplasher" );
-
-  Weapon* acid1 = new AcidLauncher();
-  acid1->setName( "AcidSplasher" );*/
 
 
@@ -1177 +1173 @@
 
   State::getPlayer()->hud().setOverlayPercentage(100-int(100*this->actionWidthPercentage));
-  PRINTF(0)("TravelDistance has been updated\n");
+//   PRINTF(0)("TravelDistance has been updated\n");
   this->isTravelDistanceInit = true;
 }