Changeset 7014 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Feb 3, 2006, 2:14:22 PM (18 years ago)

Author:

bensch

Message:

trunk: new algorithm for the Camera-Distance

Location:

trunk/src/world_entities

Files:

• camera.cc (modified) (2 diffs)
• camera.h (modified) (1 diff)
• creatures/md2_creature.cc (modified) (1 diff)
• playable.cc (modified) (1 diff)
• space_ships/helicopter.cc (modified) (1 diff)
• space_ships/hover.cc (modified) (1 diff)
• space_ships/turbine_hover.cc (modified) (1 diff)
• terrain.cc (modified) (1 diff)
• world_entity.cc (modified) (2 diffs)

trunk/src/world_entities/camera.cc

@@ -65 +65 @@
  * @returns The PNode of the Target (from there you can get position and so on
 */
-PNode* Camera::getTarget()
+PNode* Camera::getTargetNode() const
 {
   return (PNode*)this->target;
@@ -146 +146 @@
 {
   //update frustum plane
-  this->viewVector = (this->getAbsCoor() -  this->target->getAbsCoor()).getNormalized();
-  this->frustumPlane = Plane(this->viewVector, this->getAbsCoor() + this->viewVector * 3.0);
+  this->viewVector = (this->target->getAbsCoor() - this->getAbsCoor()).getNormalized();
+  this->frustumPlane = Plane(this->viewVector, this->getAbsCoor() + this->viewVector * 0.1);
 
   this->upVector =  this->getAbsDirV();

trunk/src/world_entities/camera.h

@@ -37 +37 @@
 
   void lookAt(PNode* target);
-  PNode* getTarget();
+  CameraTarget* getTarget() const { return this->target; };
+  PNode* getTargetNode() const;
 
   void setAspectRatio(float aspectRatio);

trunk/src/world_entities/creatures/md2_creature.cc

@@ -119 +119 @@
   this->cameraConnNode.setName("CameraConnectorNode");
   this->addChild(&this->cameraConnNode);
-  this->cameraConnNode.addChild(State::getCameraTarget());
-  this->cameraConnNode.addChild(State::getCamera());
-  State::getCameraTarget()->setRelCoor(10,0,0);
+  this->cameraConnNode.addChild(State::getCameraTargetNode());
+  this->cameraConnNode.addChild(State::getCameraNode());
+  State::getCameraTargetNode()->setRelCoor(10,0,0);
 
   travelSpeed = 15.0;

trunk/src/world_entities/playable.cc

@@ -285 +285 @@
 void  Playable::attachCamera()
 {
-  State::getCamera()->setParentSoft(this);
-  State::getCameraTarget()->setParentSoft(this);
+  State::getCameraNode()->setParentSoft(this);
+  State::getCameraTargetNode()->setParentSoft(this);
 
 }

trunk/src/world_entities/space_ships/helicopter.cc

@@ -203 +203 @@
 {
   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
-  State::getCamera()->setParentSoft(this->getWeaponManager()->getFixedTarget());
-  State::getCameraTarget()->setParentSoft(this->getWeaponManager()->getFixedTarget());
+  State::getCameraNode()->setParentSoft(this->getWeaponManager()->getFixedTarget());
+  State::getCameraTargetNode()->setParentSoft(this->getWeaponManager()->getFixedTarget());
 }
 

trunk/src/world_entities/space_ships/hover.cc

@@ -192 +192 @@
   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
 
-  State::getCamera()->setParentSoft(&this->cameraNode);
-  State::getCamera()->setRelCoorSoft(-10, 0,0);
-  State::getCameraTarget()->setParentSoft(&this->cameraNode);
+  State::getCameraNode()->setParentSoft(&this->cameraNode);
+  State::getCameraNode()->setRelCoorSoft(-10, 0,0);
+  State::getCameraTargetNode()->setParentSoft(&this->cameraNode);
 }
 

trunk/src/world_entities/space_ships/turbine_hover.cc

@@ -222 +222 @@
   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
 
-  State::getCamera()->setParentSoft(&this->cameraNode);
-  State::getCamera()->setRelCoorSoft(-10, 0,0);
-  State::getCameraTarget()->setParentSoft(&this->cameraNode);
+  State::getCameraNode()->setParentSoft(&this->cameraNode);
+  State::getCameraNode()->setRelCoorSoft(-10, 0,0);
+  State::getCameraTargetNode()->setParentSoft(&this->cameraNode);
 }
 

trunk/src/world_entities/terrain.cc

@@ -241 +241 @@
 glPushMatrix();
 glLoadIdentity();
- Vector camera =   State::getCamera()->getAbsCoor(); // Go on here ..........!!!
+ Vector camera =   State::getCameraNode()->getAbsCoor(); // Go on here ..........!!!
 
     /*

trunk/src/world_entities/world_entity.cc

@@ -30 +30 @@
 
 #include "state.h"
+#include "camera.h"
 
 using namespace std;
@@ -319 +320 @@
 
     // This Draws the LOD's
-    float cameraDistance = (State::getCamera()->getAbsCoor() - this->getAbsCoor()).len();
+    float cameraDistance = State::getCamera()->distance(this);
+    printf("%s::%s, distance %f\n", this->getClassName(), this->getName(), cameraDistance);
     if (cameraDistance > 30 && this->models.size() >= 3 && this->models[2] != NULL)
     {