Changeset 10456 in orxonox.OLD for trunk

Timestamp:

Jan 28, 2007, 7:15:34 PM (18 years ago)

Author:

patrick

Message:

double tick removed for camera, scroll board

Location:

trunk/src

Files:

• story_entities/game_world.cc (modified) (2 diffs)
• world_entities/camera.cc (modified) (1 diff)
• world_entities/scrolling_screen.cc (modified) (1 diff)

trunk/src/story_entities/game_world.cc

@@ -451 +451 @@
     this->dtS = this->dtS / TICK_SMOOTH_VALUE * speed;
 
+    // tick camera first
+    State::getCamera()->tick(this->dtS);
     // TICK everything
     for (i = 0; i < this->dataTank->tickLists.size(); ++i)
@@ -456 +458 @@
 
     /* update tick the rest */
-    State::getCamera()->tick(this->dtS);
+
     AnimationPlayer::getInstance()->tick(this->dtS);
     PhysicsEngine::getInstance()->tick(this->dtS);

trunk/src/world_entities/camera.cc

@@ -66 +66 @@
 void Camera::init()
 {
-  this->toList( OM_COMMON);
+  this->toList( OM_ENVIRON_NOTICK);
   //this->setName("camera");
   this->target = new CameraTarget();

trunk/src/world_entities/scrolling_screen.cc

@@ -162 +162 @@
 
 
-
+    Vector ddir = dir.cross( cam->getAbsDirV());
+    Quaternion q(ddir, cam->getAbsDirV());
+    this->setAbsDir( q);
 
 //     if( this->getParent() != cam)