Changeset 10698 in orxonox.OLD for trunk/src/util/track

Timestamp:

Jun 14, 2007, 5:33:43 PM (18 years ago)

Author:

snellen

Message:

merged adm, hud, vs-enhancements : beni's responsible for this commit. blame him!

Location:

trunk/src/util/track

Files:

• action_box.cc (copied) (copied from branches/vs-enhencements/src/util/track/action_box.cc)
• action_box.h (copied) (copied from branches/vs-enhencements/src/util/track/action_box.h)
• track.cc (modified) (7 diffs)
• track.h (modified) (3 diffs)

trunk/src/util/track/track.cc

@@ -29 +29 @@
 
 #include "debug.h"
+#include "action_box.h"
 
 ObjectListDefinition(Track);
@@ -65 +66 @@
   this->duration = 20;
   this->endTime = 20;
-  this->width = 10;
+  this->width = 24;
+  this->height = 18;
+  this->depth = 200;
+  this->stretch = 4;
   this->curve = new BezierCurve();
   this->trackNode = new PNode(PNode::getNullParent(), PNODE_ALL);
@@ -71 +75 @@
   this->localTime = 0;
   this->pause = false;
+  
+  this->actionBox = NULL;
 }
 
@@ -94 +100 @@
      }
      LOAD_PARAM_END_CYCLE(element);
+
+     LoadParam(root, "ActionBox", this, Track, addActionBox );
 }
 
@@ -252 +260 @@
        {
            Vector tmp = this->calcPos();
-    
-    
+
+
            Vector dV = tmp - this->trackNode->getAbsCoor();
            float dx = speed * dt;
            float ratio = dx / dV.len();
-    
+
            if( dt > 0.0f)
            {
@@ -264 +272 @@
            }
            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());
@@ -331 +339 @@
     glPopMatrix();
 }
+
+/**
+ * creates new action box and assignes it to this track
+ * @param width_2 width/2 of near end
+ * @param height_2 height/2 of near end
+ * @param depth depth
+ * @param stretch far end will be stretched with this factor
+ */
+void Track::addActionBox( float width_2, float height_2, float depth, float stretch )
+{
+  actionBox = new ActionBox( this, width_2, height_2, depth, stretch );
+}
+
+
+

trunk/src/util/track/track.h

@@ -12 +12 @@
 class PNode;
 class TiXmlElement;
+class ActionBox;
 
 class Track : public BaseObject
@@ -42 +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                 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.
    Curve*                curve;                //!< The Curve of this Track
+   
+   ActionBox*            getActionBox(){ return this->actionBox; }
 
  private:
    void init();
-
-
+   
  private:
    CurveType            curveType;              //!< The CurveType the entire TrackSystem will have.
@@ -57 +62 @@
    int                  mode;                   //!< Defines the behaviour of the Track.
    bool                 pause;                  //!< Defines if the track runs (false) or not (true)
+   
+   ActionBox*           actionBox;
+   
+   void addActionBox( float width_2, float height_2, float depth, float stretch );
+   
+
 };