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

Timestamp:

Jan 26, 2007, 10:58:31 AM (18 years ago)

Author:

patrick

Message:

merged branche camera to trunk. resolved many conflicts as in the other projects too

Location:

trunk/src/world_entities

Files:

• Makefile.am (modified) (2 diffs)
• WorldEntities.am (modified) (2 diffs)
• blackscreen.cc (copied) (copied from branches/camera/src/world_entities/blackscreen.cc) (1 diff)
• blackscreen.h (copied) (copied from branches/camera/src/world_entities/blackscreen.h)
• camera.cc (modified) (9 diffs)
• camera.h (modified) (7 diffs)
• cameraman.cc (copied) (copied from branches/camera/src/world_entities/cameraman.cc)
• cameraman.h (copied) (copied from branches/camera/src/world_entities/cameraman.h)
• targets.h (copied) (copied from branches/camera/src/world_entities/targets.h)
• test_entity.h (modified) (2 diffs)

trunk/src/world_entities/Makefile.am

@@ -6 +6 @@
 
 ## THESE ARE THE BASE CLASSES OF ALL WORLD_ENTITIES
-libORXwe_a_SOURCES = world_entity.cc                            camera.cc               playable.cc             player.cc \
+libORXwe_a_SOURCES = world_entity.cc    cameraman.cc                    camera.cc               playable.cc             player.cc \
                                                 npcs/npc.cc                             weapons/weapon_manager.cc               weapons/crosshair.cc \
                                 weapons/weapon.cc               weapons/ammo_container.cc               projectiles/projectile.cc \
@@ -14 +14 @@
 
 
-noinst_HEADERS = world_entity.h                                 camera.h                extendable.h            playable.h \
+noinst_HEADERS = world_entity.h         cameraman.h                     camera.h                extendable.h            playable.h \
                                 player.h                                npcs/npc.h                              weapons/weapon_manager.h                weapons/crosshair.h \
                                 weapons/weapon.h                weapons/ammo_container.h                projectiles/projectile.h \

trunk/src/world_entities/WorldEntities.am

@@ -24 +24 @@
                 world_entities/test_entity.cc \
                 world_entities/test_entity2.cc \
+                world_entities/blackscreen.cc \
                 world_entities/planet.cc \
                 world_entities/bsp_entity.cc \
@@ -151 +152 @@
                 test_entity.h \
                 test_entity2.h \
+                blackscreen.h \
                 planet.h \
                 bsp_entity.h \

trunk/src/world_entities/blackscreen.cc

@@ -23 +23 @@
 #include "material.h"
 #include "state.h"
-#include "class_id_DEPRECATED.h"
 
 ObjectListDefinition(BlackScreen);

trunk/src/world_entities/camera.cc

@@ -18 +18 @@
 #include "key_mapper.h"
 #include "glincl.h"
-//#include "util/loading/load_param.h"
+#include "util/loading/load_param.h"
 #include "world_entity.h"
+#include "vector.h"
+#include "targets.h"
+
+
+
 
 ObjectListDefinition(Camera);
+
 
 /**
@@ -51 +57 @@
   this->setName("camera");
   this->target = new CameraTarget();
-
+  this->target->masta=this;
   this->subscribeEvent(ES_GAME, KeyMapper::PEV_VIEW0);
   this->subscribeEvent(ES_GAME, KeyMapper::PEV_VIEW1);
@@ -89 +95 @@
 void Camera::lookAt(PNode* target)
 {
+  this->target->setParentSoft(target,0.2);
+}
+
+/**
+ * @returns The PNode of the Target (from there you can get position and so on
+*/
+PNode* Camera::getTargetNode() const
+{
+  return (PNode*)this->target;
+}
+
+void Camera::setTargetNode(PNode* target)
+{
   this->target->setParent(target);
-}
-
-/**
- * @returns The PNode of the Target (from there you can get position and so on
-*/
-PNode* Camera::getTargetNode() const
-{
-  return (PNode*)this->target;
 }
 
@@ -186 +197 @@
   this->viewVector = (this->target->getAbsCoor() - this->getAbsCoor()).getNormalized();
   this->frustumPlane = Plane(this->viewVector, this->getAbsCoor() + this->viewVector * 0.1);
-
   this->upVector =  this->getAbsDirV();
 
-
+  // iteration for fovy
   float tmpFovy = (this->toFovy - this->fovy);
   if (fabsf(tmpFovy) > 0.01)
     this->fovy += tmpFovy * fabsf(dt);
+
+
+
+
+  //iterate(float dt, translate, target)
+  target->translate(dt);
 }
 
@@ -227 +243 @@
   Vector targetPosition = this->target->getAbsCoor();
 
-       // Setting the Camera Eye, lookAt and up Vectors
+        //Setting the Camera Eye, lookAt and up Vectors
   gluLookAt(cameraPosition.x, cameraPosition.y, cameraPosition.z,
             targetPosition.x, targetPosition.y, targetPosition.z,
@@ -269 +285 @@
 }
 
-/*
+
 void Camera::loadParams(const TiXmlElement* root)
 {
@@ -289 +305 @@
   LoadParam(root, "viewNormalDistance", this, Camera, setViewNormalDistance);
 }
-*/
+
 
 void Camera::setViewTopFovy(float fovy)
@@ -350 +366 @@
   this->viewNormalDistance = Distance;
 }
+
+
+
+
+void Camera::glLookAt(float eyex, float eyey, float eyez, float centerx, float centery, float centerz, float upx, float upy, float upz)
+{
+  //Vector* eye=new Vector(eyex, eyey, eyez);
+  Vector* center=new Vector (centerx, centery, centerz);
+  Vector* up=new Vector(upx, upy, upz);
+
+  center->x-=eyex;
+  center->y-=eyey;
+  center->z-=eyez;
+
+  center->normalize();
+  up->normalize();
+  Vector* s = VectorProd(center, up);
+  Vector* u = VectorProd(s, center);
+  GLfloat Matrix[]={s->x, s->y, s->z, 0, u->x, u->y, u->z, 0, -center->x, -center->y, -center->z, 0, 0, 0, 0, 1};
+
+  glMultMatrixf(Matrix);
+  glTranslated(-eyex, -eyey, -eyez);
+  delete center;
+  delete up;
+  delete s;
+  delete u;
+
+}
+
+
+
+
+Vector* Camera::VectorProd(Vector* v1, Vector* v2)
+{
+Vector* temp= new Vector();
+temp->x=v1->y * v2->z - v1->z * v2->y;
+temp->y=v1->z * v2->x - v1->x * v2->z;
+temp->z=v1->x * v2->y - v1->y * v2->x;
+return temp;
+}
+
+
+
+
+
+
+
+
+
+
+
+
 
 
@@ -355 +423 @@
 // CAMERA-TARGET //
 ///////////////////
+//REATE_FACTORY(CameraTarget);
+
 
 ObjectListDefinition(CameraTarget);
+
+
 CameraTarget::CameraTarget()
 {
   this->registerObject(this, CameraTarget::_objectList);
   //  this->setParentMode(PNODE_MOVEMENT);
-}
-
+  this->speed=1;
+  translateTo.x=0;
+  translateTo.y=0;
+  translateTo.z=0;
+  rotateBy.x=0;
+  rotateBy.y=0;
+  rotateBy.z=0;
+  target=createStick();
+}
+
+
+void CameraTarget::detach()
+{
+  masta->setParentSoft(target);
+  masta->getTargetNode()->setParentSoft(target);
+}
+
+PNode* CameraTarget::createStick()
+{
+  return new Targets();
+}
+
+
+void CameraTarget::atach(PNode* object)
+{
+  masta->setParentSoft(object);
+  masta->getTargetNode()->setParentSoft(object);
+}
+
+
+
+
+Vector CameraTarget::iterate(float dt, const Vector* Target, const Vector* cam)
+{
+
+
+  Vector tmpVec;
+  tmpVec= (*Target - *cam);
+  tmpVec.normalize();
+  return  tmpVec;
+
+}
+
+
+void CameraTarget::translate(float dt)
+{
+  if (fabs(translateTo.len()  - (target->getAbsCoor()).len()) >= 11 )
+ {
+   printf("translate\n");
+   Vector tmpVec= iterate(dt,  &translateTo,  &(masta->getAbsCoor()));
+   target->shiftCoor(speed*tmpVec.x, speed*tmpVec.y, speed*tmpVec.z);
+  }
+}
+
+Vector * CameraTarget::rotate(Vector* newPos, float speed)
+{
+
+}
+
+void CameraTarget::jump(float x, float y, float z)
+{
+target->setAbsCoor(x,y,z);
+}
+
+
+void CameraTarget::trans(float x, float y, float z)
+{
+  Vector tmpVec=Vector(x,y,z);
+  if( this->getParent())
+    this->getParent()->setRelCoor(this->getParent()->getRelCoor());
+  translateNow(&tmpVec);
+}
+
+void CameraTarget::translateNow(Vector* vec)
+{
+translateTo=*vec;
+}
+
+void CameraTarget::changeSpeed(float speed)
+{
+  if (speed!=0)
+this->speed=speed;
+  return;
+}
+
+
+bool CameraTarget::isDone()
+{
+  if (fabs(translateTo.len()  - (target->getAbsCoor()).len()) >= 11 )
+    return 0;
+  else
+    return 1;
+}

trunk/src/world_entities/camera.h

@@ -11 +11 @@
 #include "plane.h"
 
+
 class World;
 class CameraTarget;
 class Event;
-
 
 //! Camera
@@ -22 +22 @@
 class Camera : public PNode, public EventListener
 {
+  friend class CameraTarget;
+  friend class CameraMan;
   ObjectListDeclaration(Camera);
 public:
@@ -34 +36 @@
     ViewTop
   };
-
+  public:
   Camera();
   Camera(const TiXmlElement* root);
@@ -42 +44 @@
   CameraTarget* getTarget() const { return this->target; };
   PNode* getTargetNode() const;
-
+  void setTargetNode(PNode* target);
   void setAspectRatio(float aspectRatio);
   inline float getAspectRatio() {return this->aspectRatio;};
@@ -70 +72 @@
   inline bool getEventHandling() {return this->eventHandling;}
 
+  void glLookAt(float eyex, float eyey, float eyez, float centerx, float centery, float centerz, float upx, float upy, float upz);
+  Vector* VectorProd(Vector* v1, Vector* v2);
+  void Rotate();
   void tick(float dt);
   void apply ();
@@ -75 +80 @@
 
   void process(const Event &event);
+  //CameraTarget*     target;          //!< The Target of the Camera (where this Camera Looks at)
 
-  //virtual void loadParams(const TiXmlElement* root);
+  virtual void loadParams(const TiXmlElement* root);
 
   void              setViewTopFovy(float fovy);
@@ -132 +138 @@
 class CameraTarget : public PNode
 {
-  friend class Camera;             //! The CameraTarget is a friend of Camera. noone else needs a CameraTarget, so noone else can create it.
+  friend class Camera;        //! The CameraTarget is a friend of Camera. noone else needs a CameraTarget, so noone else can create it.
   ObjectListDeclaration(CameraTarget);
 
 private:
   CameraTarget();
+  virtual ~CameraTarget() {}
+  float speed;
+  PNode* target;
+  PNode* freeTarget;
+  Camera* masta;
+  Vector translateTo;
+  Vector rotateBy;
+
 
 public:
+
+  void detach();
+  void atach(PNode* object);
+  Vector iterate(float dt, const Vector* target, const Vector* cam);
+  void translate(float dt);
+  void changeSpeed(float speed);
+  Vector* rotate(Vector* newPos, float speed);
+  void jump(float x, float y, float z);
+  void translateNow(Vector* vec);
+  PNode* createStick();
+  void trans(float x, float y, float z);
+  bool isDone();
 };
 
 
+
+
 #endif /* _CAMERA_H */
+

trunk/src/world_entities/test_entity.h

@@ -3 +3 @@
 
 #include "world_entity.h"
+#include "cameraman.h"
 
 class TiXmlElement;
-
+class Material;
 
 class TestEntity : public WorldEntity
 {
     ObjectListDeclaration(TestEntity);
+
+  private:
+
+  CameraMan* CM;
 
   public:
@@ -18 +23 @@
     void init();
     virtual void loadParams(const TiXmlElement* root);
-
-
+    void test();
+    void t2();
+    void t3();
+    void t4();
+    void t5();
+    void changeState (bool);
     virtual void tick (float time);
     virtual void draw() const;