Changeset 10352 in orxonox.OLD for branches

Timestamp:

Jan 24, 2007, 7:44:44 PM (18 years ago)

Author:

gfilip

Message:

finito

Location:

branches/camera/src/world_entities

Files:

• blackscreen.cc (modified) (1 diff)
• camera.cc (modified) (5 diffs)
• test_entity.cc (modified) (2 diffs)

branches/camera/src/world_entities/blackscreen.cc

@@ -96 +96 @@
   glPushAttrib(GL_ENABLE_BIT);
   glDisable(GL_LIGHTING);
+  glEnable(GL_BLEND);   // Turn Blending On
+
+  glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
-  glEnable(GL_BLEND);   // Turn Blending On
+  /* translate */
+  glTranslatef (this->getAbsCoor ().x,
+                this->getAbsCoor ().y,
+                this->getAbsCoor ().z);
+  Vector tmpRot = this->getAbsDir().getSpacialAxis();
+  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
 this->material->setTransparency(i);

branches/camera/src/world_entities/camera.cc

@@ -64 +64 @@
 void Camera::lookAt(PNode* target)
 {
-  this->target->setParent(target);
+  this->target->setParentSoft(target,0.2);
 }
 
@@ -313 +313 @@
 void CameraTarget::detach()
 {
-  masta->setParent(target);
-  masta->getTargetNode()->setParent(target);
+  masta->setParentSoft(target);
+  masta->getTargetNode()->setParentSoft(target);
 }
 
@@ -325 +325 @@
 void CameraTarget::atach(PNode* object)
 {
-  masta->setParent(object);
-  masta->getTargetNode()->setParent(object);
+  masta->setParentSoft(object);
+  masta->getTargetNode()->setParentSoft(object);
 }
 
@@ -348 +348 @@
   if (fabs(translateTo.len()  - (target->getAbsCoor()).len()) >= 11 )
  {
-
+   printf("translate\n");
    Vector tmpVec= iterate(dt,  &translateTo,  &(masta->getAbsCoor()));
-    glLoadIdentity();
-    target->shiftCoor(speed*tmpVec.x, speed*tmpVec.y, speed*tmpVec.z);
-
+   target->shiftCoor(speed*tmpVec.x, speed*tmpVec.y, speed*tmpVec.z);
   }
 }
@@ -370 +368 @@
 {
   Vector tmpVec=Vector(x,y,z);
+  if( this->getParent())
+    this->getParent()->setRelCoor(this->getParent()->getRelCoor());
   translateNow(&tmpVec);
 }

branches/camera/src/world_entities/test_entity.cc

@@ -80 +80 @@
 {
   CM= State::getCameraman();
-  CM->changeCurrTarget( "BlackScreen", "fadeToBlack");
+  CM->changeCurrTarget( "WorldEntity", "Ebene");
 }
 
@@ -88 +88 @@
   CM->createCam();
   CM->setCam(1);
-  CM->moveCurrCam(0, 0, 100);
+  CM->moveCurrCam(100, 0, 200);
 }