Changeset 6208 in orxonox.OLD for branches/christmas_branche/src/world_entities

Timestamp:

Dec 21, 2005, 2:47:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: new control

Location:

branches/christmas_branche/src/world_entities

Files:

• camera.cc (modified) (6 diffs)
• creatures/md2_creature.cc (modified) (5 diffs)
• creatures/md2_creature.h (modified) (2 diffs)

branches/christmas_branche/src/world_entities/camera.cc

@@ -119 +119 @@
     case VIEW_NORMAL:
       this->toFovy = 60.0;
-      this->setParentSoft("TrackNode");
-      this->target->setParentSoft("TrackNode");
+/*      this->setParentSoft("TrackNode");
+      this->target->setParentSoft("TrackNode"); */
       this->setRelCoorSoft(-10, 5, 0);
       this->target->setRelCoorSoft(0,0,0);
@@ -129 +129 @@
   //    this->target->setRelCoorSoft(Vector(10,0,0));
 
-      if (!strcmp(this->target->getParent()->getName(), "Player"))
-        this->target->setParentSoft("TrackNode");
-      else
-        this->target->setParentSoft("Player");
-      this->getParent()->debugNode(0);
+//       if (!strcmp(this->target->getParent()->getName(), "Player"))
+//         this->target->setParentSoft("TrackNode");
+//       else
+//         this->target->setParentSoft("Player");
+//       this->getParent()->debugNode(0);
 
 //      this->setParent("main-Turret");
@@ -142 +142 @@
     case VIEW_FRONT:
       this->toFovy = 120.0;
-       this->setParentSoft("Player");
-       this->target->setParentSoft("Player");
+/*       this->setParentSoft("Player");
+       this->target->setParentSoft("Player");*/
        this->setRelCoorSoft(4, 0, 0, 5);
        this->target->setRelCoorSoft(Vector(10,0,0), 5);
@@ -150 +150 @@
     case VIEW_LEFT:
       this->toFovy = 90;
-      this->setParentSoft("TrackNode");
-      this->target->setParentSoft("TrackNode");
+/*      this->setParentSoft("TrackNode");
+      this->target->setParentSoft("TrackNode");*/
       this->setRelCoorSoft(0, 1, -10, .5);
       this->target->setRelCoorSoft(0,0,0);
@@ -157 +157 @@
     case VIEW_RIGHT:
       this->toFovy = 90;
-      this->setParentSoft("TrackNode");
-      this->target->setParentSoft("TrackNode");
+/*      this->setParentSoft("TrackNode");
+      this->target->setParentSoft("TrackNode");*/
       this->setRelCoorSoft(Vector(0, 1, 10));
       this->target->setRelCoorSoft(0,0,0);
@@ -164 +164 @@
     case VIEW_TOP:
       this->toFovy= 120;
-      this->setParentSoft("TrackNode");
-      this->target->setParentSoft("TrackNode");
+/*      this->setParentSoft("TrackNode");
+      this->target->setParentSoft("TrackNode");*/
       this->setRelCoorSoft(Vector(30, 50, 0));
       this->target->setRelCoorSoft(35,0,0);

branches/christmas_branche/src/world_entities/creatures/md2_creature.cc

@@ -23 +23 @@
 #include "md2Model.h"
 #include "resource_manager.h"
+#include "state.h"
 
 #include "weapons/weapon_manager.h"
@@ -122 +123 @@
   cycle = 0.0;
 
+  this->cameraConnNode.addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
+  this->cameraConnNode.setName("CameraConnectorNode");
+  this->addChild(&this->cameraConnNode);
+  this->cameraConnNode.addChild(State::getCameraTarget());
+  State::getCameraTarget()->setRelCoor(10,0,0);
 
   travelSpeed = 15.0;
@@ -239 +245 @@
 {
   this->drawLODsafe();
+
+  this->cameraConnNode.debugDraw(0);
 }
 
@@ -274 +282 @@
   }
 
+
   //orient the MD2Creature in direction of the mouse
   this->setAbsDir( /*rotQuat*/ mouseDirX);
+  this->cameraConnNode.setRelDir(mouseDirY);
 
   this->getWeaponManager()->tick(time);
@@ -377 +387 @@
     this->yMouse = event.yRel;
     this->mouseDirX *= Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0));
-    this->mouseDirY *= Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,0,1));
+    this->mouseDirY *= Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,1,0));
 //     if( xMouse*xMouse < 0.9)
 //      this->setAbsDir(mouseDir);

branches/christmas_branche/src/world_entities/creatures/md2_creature.h

@@ -62 +62 @@
     bool                  bJump;              //!< jump
 
+    PNode                 cameraConnNode;     //!< The Node the camera is connected to.
+
     float                 xMouse;             //!< mouse moved in x-Direction
     float                 yMouse;             //!< mouse moved in y-Direction
@@ -70 +72 @@
     Quaternion            mouseDirX;           //!< the direction where the player wants to fly
     Quaternion            mouseDirY;           //!< the direction where the player wants to fly
-    Quaternion rotQuat;
     float                 travelSpeed;        //!< the current speed of the player (to make soft movement)
     float                 acceleration;       //!< the acceleration of the player.