Changeset 6806 in orxonox.OLD for trunk

Timestamp:

Jan 28, 2006, 12:40:08 PM (19 years ago)

Author:

bensch

Message:

trunk: hover-rotors

Location:

trunk/src/world_entities/space_ships

Files:

• hover.cc (modified) (6 diffs)
• hover.h (modified) (3 diffs)

trunk/src/world_entities/space_ships/hover.cc

@@ -110 +110 @@
   controlVelocityX = 100;
   controlVelocityY = 100;
-  //rotorspeed = 1;
-  //tailrotorspeed = 0;
-
-  //cycle = 0.0;
-
-  // cameraissue
+
+  this->rotorSpeed = 1000.0f;
+  this->rotorCycle = 0.0f;
+
+  // camera - issue
   this->cameraNode.addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
+  this->cameraNode.addNodeFlags(PNODE_PROHIBIT_CHILD_DELETE);
   this->cameraNode.setParent(this);
-  this->cameraNode.setParentMode(PNODE_ALL);
-
 
   // rotors
@@ -142 +140 @@
   this->loadModel("models/ships/hoverglider_wing.obj", 1.0f, 3);
   this->loadModel("models/ships/hoverglider_rotor.obj", 1.0f, 4);
+  this->loadModel("models/ships/rotor.obj", .45f, 5);
 
   //add events to the eventlist
@@ -258 +257 @@
   // spaceship controlled movement
   this->movement(dt);
+  this->rotorCycle += this->rotorSpeed * dt;
 
   Vector move = (velocity)*dt;
@@ -271 +271 @@
  * @param time the timeslice since the last frame
 */
-void Hover::movement (float time)
+void Hover::movement (float dt)
 {
   Vector accel(0.0, 0.0, 0.0);
@@ -330 +330 @@
   glRotatef (this->rotorNodeLeft.getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
   this->getModel(4)->draw();
+  glTranslatef(0,-1,0);
+  glRotatef(this->rotorCycle, 0,1,0);
+  this->getModel(5)->draw();
   glPopMatrix ();
 
@@ -351 +354 @@
   glScalef(1,1,-1);
   this->getModel(4)->draw();
+  glTranslatef(0,-1,0);
+  glRotatef(this->rotorCycle, 0,1,0);
+  this->getModel(5)->draw();
   glPopMatrix ();
 }

trunk/src/world_entities/space_ships/hover.h

@@ -28 +28 @@
 
     virtual void collidesWith(WorldEntity* entity, const Vector& location);
-    virtual void tick(float time);
+    virtual void tick(float dt);
     virtual void draw() const;
 
@@ -35 +35 @@
   private:
     void init();
-    void movement(float time);
+    void movement(float dt);
 
   private:
@@ -64 +64 @@
     float                 travelSpeed;        //!< the current speed of the Hove (to make soft movement)
     float                 acceleration;       //!< the acceleration of the Hover.
-    //float                 rotorspeed;         //!< the speed of the rotor.
-    //float                 tailrotorspeed;     //!< the relativ speed ot the tail rotor
+
+    float                 rotorSpeed;         //!< the speed of the rotor.
+    float                 rotorCycle;         //!< The Cycle the rotor is in.
 
     float                 airViscosity;