Changeset 10236 in orxonox.OLD

Timestamp:

Jan 14, 2007, 9:35:08 PM (17 years ago)

Author:

gfilip

Message:

another update

Location:

branches/camera/src/world_entities

Files:

• blackscreen.cc (modified) (1 diff)
• camera.cc (modified) (6 diffs)
• camera.h (modified) (1 diff)
• cameraman.cc (modified) (3 diffs)
• cameraman.h (modified) (1 diff)
• test_entity.cc (modified) (6 diffs)
• test_entity.h (modified) (3 diffs)

branches/camera/src/world_entities/blackscreen.cc

@@ -108 +108 @@
 glEnable(GL_BLEND);     // Turn Blending On
 
-
+//
+//  Coord schould depend on CameraTarget
+//
+//
+//
 
 glColor4f(0, 0, 0, i);

branches/camera/src/world_entities/camera.cc

@@ -22 +22 @@
 #include "shell_command.h"
 #include "targets.h"
-#include <iostream.h>
+
 
 
@@ -324 +324 @@
 void CameraTarget::detach()
 {
-  glLoadIdentity();
-
-//Movemet
-  State::getCameraNode()->setParentSoft(PNode::getNullParent());
-
-//LookAt
- // State::getCameraTargetNode()->setParentSoft(PNode::getNullParent());
+  State::getCameraNode()->setParentSoft(target);
+  State::getCameraTargetNode()->setParentSoft(target);
 }
 
@@ -344 +339 @@
   State::getCameraTargetNode()->setParentSoft(object);
 }
+
+
 
 
@@ -366 +363 @@
     glLoadIdentity();
     target->shiftCoor(speed*tmpVec.x, speed*tmpVec.y, speed*tmpVec.z);
-    // cout << "%%" << tmpVec.x << "%%";
 
   }
@@ -403 +399 @@
 void CameraTarget::test()
 {
-  glLoadIdentity();
+glLoadIdentity();
 
 atach(target);
 
-//tar->setRelCoorSoft(1000,1000,1000);
-
-
-  //Vector* vec=new Vector(5000,5000,5000);
-  //translateNow(vec);
-  //glMatrixMode (GL_MODELVIEW);
-  //glLoadIdentity();
-  //glTranslatef(100, 100, 100);
- // State::getCamera()->getTargetNode()->setRelCoor(100,100,100);
 }
 
@@ -422 +409 @@
 {
   trans(-200, 0, 0);
-  //target->setAbsCoor(target->getAbsCoorX()-200, target->getAbsCoorY(), target->getAbsCoorZ());
-}
-
-
+}
+
+

branches/camera/src/world_entities/camera.h

@@ -95 +95 @@
   float speed;
   PNode* target;
+  PNode* freeTarget;
 
 public:

branches/camera/src/world_entities/cameraman.cc

@@ -26 +26 @@
   currentCam=State::getCamera();
   this->cameras.push_back(currentCam);
+  currentCam->target->detach();
 
 }
@@ -34 +35 @@
   Camera* newCamera=new Camera();
   this->cameras.push_back(newCamera);
-  //cameraList.size();
-  //cameraList[4]
+  newCamera->target->detach();
 }
 
@@ -64 +64 @@
 void cameraman::changeTarget(int camNo, PNode* target)
 {
-  cameras[camNo]->target->atach(target);
+  cameras[camNo]->lookAt(target);
 }
 
 
 void cameraman::changeCurrTarget(PNode* target)
+{
+  currentCam->lookAt(target);
+}
+
+void cameraman::atachCurrTarget(PNode* target)
 {
   currentCam->target->atach(target);

branches/camera/src/world_entities/cameraman.h

@@ -22 +22 @@
     void changeTarget(int camNo, PNode* target);
     void changeCurrTarget(PNode* target);
+    void atachCurrTarget(PNode* target);
     void jumpCam(int x, int y, int z, int camNo);
     void jumpCurrCam(int x, int y, int z);

branches/camera/src/world_entities/test_entity.cc

@@ -25 +25 @@
 
 
-#include "material.h"
-
 #include "state.h"
 
@@ -35 +33 @@
 CREATE_FACTORY(TestEntity);
 
-float i=0;
-bool state=1;
+
 
 /**
@@ -73 +70 @@
   this->registerObject(this, TestEntity::_objectList);
   this->toList(OM_GROUP_00);
+  CM= new cameraman();
+  test();
+}
 
-  /*this->material = new Material();
-  this->material->setIllum(3);
-  this->material->setDiffuse(1.0,1.0,1.0);
-  this->material->setSpecular(0.0,0.0,0.0);
-  this->material->setAmbient(1.0, 1.0, 1.0);
-  this->material->setDiffuseMap("maps/TE2.tga");*/
+void TestEntity::test()
+{
+  CM->moveCurrCam(-200, 0, 0);
+  CM->createCam();
+  CM->moveCam(0, -200, 0, 1);
 }
+
 
 
@@ -94 +94 @@
 void TestEntity::draw() const
 {
-//   if(!mediaLoaded)
-//     false;
 
-//  glPushAttrib(GL_ENABLE_BIT);
-//  glDisable(GL_LIGHTING);
-//   glDisable(GL_BLEND);
-//
-//   glEnable(GL_TEXTURE_2D);
-//   glBindTexture(GL_TEXTURE_2D, media_container->getFrameTexture(counter));
-
-//  glPushMatrix();
- /* glTranslatef (this->getAbsCoor ().x,
-                this->getAbsCoor ().y,
-                this->getAbsCoor ().z);
-  glRotatef(axis, 0.0f, 1.0f, 0.0f);*/
-//PRINTF(0)("axis: %f\n", axis);
-//glEnable(GL_BLEND);   // Turn Blending On
-
-
-
-//glColor4f(0, 0, 0, i);
-
-//  glBegin(GL_QUADS);
-//    glVertex3f(-1.0f, -100.0f, -100.0f);
-//     glTexCoord2f(1.0f, 1.0f);
-//    glVertex3f(-1.0f, -100.0f, 100.0f);
-//     glTexCoord2f(0.0f, 1.0f);
-//    glVertex3f(-1.0f, 100.0f, 100.0f);
-//     glTexCoord2f(0.0f, 0.0f);
-//    glVertex3f(-1.0f, 100.0f, -100.0f);
-//     glTexCoord2f(1.0f, 0.0f);
-
-//  glEnd();
-
-//  glPopMatrix();
-//  glPopAttrib();
 }
 
@@ -137 +102 @@
 void TestEntity::tick (float time)
 {
-//  if (state==0 && i==1)
-//    i=0;
-//  if (state==1 && i<=1)
-//    i=i+0.005;
+
 }
 
@@ -146 +108 @@
 void  TestEntity::changeState (bool sta)
 {
-  state=sta;
+
 }

branches/camera/src/world_entities/test_entity.h

@@ -3 +3 @@
 
 #include "world_entity.h"
+#include "cameraman.h"
 
 class TiXmlElement;
@@ -13 +14 @@
   private:
 
-    Material*       material;
+  cameraman* CM;
 
   public:
@@ -22 +23 @@
     void init();
     virtual void loadParams(const TiXmlElement* root);
-
+    void test();
     void changeState (bool);
     virtual void tick (float time);