Changeset 10642 in orxonox.OLD

Timestamp:

Apr 27, 2007, 12:03:26 AM (17 years ago)

Author:

rennerc

Message:

implemented action box

Location:

branches/vs-enhencements/src

Files:

• util/Makefile.am (modified) (2 diffs)
• util/state.cc (modified) (1 diff)
• util/state.h (modified) (3 diffs)
• util/track/action_box.cc (added)
• util/track/action_box.h (added)
• util/track/track.cc (modified) (4 diffs)
• util/track/track.h (modified) (4 diffs)
• world_entities/space_ships/space_ship.cc (modified) (1 diff)
• world_entities/spectator.cc (modified) (2 diffs)

branches/vs-enhencements/src/util/Makefile.am

@@ -26 +26 @@
                         animation/animation_player.cc \
                         \
-                        track/track.cc
+                        track/track.cc \
+                        track/action_box.cc
 
 noinst_HEADERS =        \
@@ -49 +50 @@
                         animation/t_animation.h \
                         \
-                        track/track.h
+                        track/track.h \
+                        track/action_box.h

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

@@ -55 +55 @@
 int State::menuID = -1;
 
+ActionBox* State::actionBox = NULL;
 
 /**

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

@@ -20 +20 @@
 class CameraMan;
 class ScriptManager;
+class ActionBox;
 
 
@@ -126 +127 @@
   /** @returns the scroller-travelnode (center of the screen) */
   static PNode* getTravelNode() { return State::travelNode; }
+  
+  /** sets the action box (this is where the fighting takes place) */
+  static void setActionBox( ActionBox* ab ){ State::actionBox = ab; }
+  /** @returns the action box (this is where the fighting takes place) */
+  static ActionBox* getActionBox(){ return State::actionBox; }
 
 
@@ -142 +148 @@
   static Player*                player;             //!< A reference to the Player
   static PNode*                 travelNode;         //!< A reference to the scroller-travelnode
+  static ActionBox*             actionBox;          //!< A reference to the action box
 
   static SkyBox*                skyBox;            //!< The SkyBox used in the current world.

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

@@ -29 +29 @@
 
 #include "debug.h"
+#include "action_box.h"
 
 ObjectListDefinition(Track);
@@ -74 +75 @@
   this->localTime = 0;
   this->pause = false;
+  
+  this->actionBox = NULL;
 }
 
@@ -97 +100 @@
      }
      LOAD_PARAM_END_CYCLE(element);
+     
+     LoadParam(root, "ActionBox", this, Track, addActionBox );
 }
 
@@ -335 +340 @@
 }
 
-void Track::drawBox() const
-{
-    glMatrixMode(GL_MODELVIEW);
-    glPushMatrix();
-
-    glPushAttrib(GL_ENABLE_BIT);
-
-    glDisable(GL_LIGHTING);
-    glDisable(GL_TEXTURE_2D);
-    glDisable(GL_BLEND);
-    glLineWidth(2.0);
-
-    glTranslatef (trackNode->getAbsCoor ().x,
-                  trackNode->getAbsCoor ().y,
-                  trackNode->getAbsCoor ().z);
-    Vector tmpRot = trackNode->getAbsDir().getSpacialAxis();
-    glRotatef (trackNode->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-
-
-    glColor3f(1.0, 1.0, 0.0);
-    glBegin(GL_LINE_STRIP);
-      glVertex3f(0, height, width);
-      glVertex3f(0, -height, width);
-      glVertex3f(0, -height, -width);
-      glVertex3f(0, height, -width);
-      glVertex3f(0, height, width);
-    glEnd();
-
-    glBegin(GL_LINE_STRIP);
-      glVertex3f(depth, height * stretch, width * stretch);
-      glVertex3f(depth, -height * stretch, width * stretch);
-      glVertex3f(depth, -height * stretch, -width * stretch);
-      glVertex3f(depth, height * stretch, -width * stretch);
-      glVertex3f(depth, height * stretch, width * stretch);
-    glEnd();
-
-    glBegin(GL_LINE_STRIP);
-      glVertex3f(depth, height * stretch, width * stretch);
-      glVertex3f(0, height, width);
-      glVertex3f(0, -height, width);
-      glVertex3f(depth, -height * stretch, width * stretch);
-    glEnd();
-
-    glBegin(GL_LINE_STRIP);
-      glVertex3f(depth, height * stretch, -width * stretch);
-      glVertex3f(0, height, -width);
-      glVertex3f(0, -height, -width);
-      glVertex3f(depth, -height * stretch, -width * stretch);
-    glEnd();
-
-    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 );
+}
+
+
+

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

@@ -12 +12 @@
 class PNode;
 class TiXmlElement;
+class ActionBox;
 
 class Track : public BaseObject
@@ -37 +38 @@
 
    void drawGraph(float dt = 0.01) const;
-   void drawBox() const;
 
    //float                 startingTime;         //!< The time at which this Track begins.
@@ -53 +53 @@
  private:
    void init();
-
-
+   
  private:
    CurveType            curveType;              //!< The CurveType the entire TrackSystem will have.
@@ -61 +60 @@
    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 );
+   
+
 };
 

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

@@ -490 +490 @@
   if( this->entityTrack != NULL && this->isDrawTrack())
     this->entityTrack->drawGraph();
-  this->entityTrack->drawBox();
 
   WorldEntity::draw();

branches/vs-enhencements/src/world_entities/spectator.cc

@@ -28 +28 @@
 
 #include "player.h"
+
+#include "util/track/action_box.h"
 
 
@@ -298 +300 @@
   else if( event.type == KeyMapper::PEV_BACKWARD)
     this->bBackward = event.bPressed; //this->shiftCoor(0,-.1,0);
+  else if ( event.type == KeyMapper::PEV_JUMP )
+  {
+    if ( State::getActionBox() && State::getActionBox()->isPointInBox( this->getAbsCoor() ) )
+    {
+      PRINTF(0)("IN BOX\n");
+    }
+    else
+    {
+      PRINTF(0)("NOT IN BOX\n");
+    }
+  }
   else if( event.type == EV_MOUSE_MOTION)
   {