Changeset 4358 in orxonox.OLD for orxonox/trunk/src

Timestamp:

May 28, 2005, 12:33:39 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: movenet is as it should be in framework

File:

• orxonox/trunk/src/subprojects/framework.cc (modified) (3 diffs)

orxonox/trunk/src/subprojects/framework.cc

@@ -35 +35 @@
     {
 #ifdef GUI_MODULE
-      while(gtk_events_pending()) 
+      while(gtk_events_pending())
         gtk_main_iteration();
 #endif
@@ -60 +60 @@
   
   camera->apply();
+      printf("distance: %f\n", (camera->getTarget()->getAbsCoor()-camera->getAbsCoor()).len());
   
   SDL_GL_SwapBuffers(); // Swap the buffers
@@ -97 +98 @@
           h.normalize();
           v.normalize();
+          float distance = view.len();
+          
+          Vector newCameraPos = camera->getAbsCoor();
+          Vector newTargetPos = camera->getTarget()->getAbsCoor();
+          int changed = 0;
 
           if (mouseDown[1])
-            camera->setRelCoor(camera->getRelCoor()+ h * event.motion.xrel *.05 - v * event.motion.yrel * .05);
+            {
+              newCameraPos = camera->getRelCoor()+ (h * event.motion.xrel - v * event.motion.yrel) * .005 * distance;
+              changed += 1;
+            }
           if (mouseDown[3])
-            camera->getTarget()->setRelCoor(camera->getTarget()->getRelCoor()+ h * event.motion.xrel *.05 - v * event.motion.yrel * .05);
+            {
+              newTargetPos = camera->getTarget()->getRelCoor() + (h * event.motion.xrel - v * event.motion.yrel) * .005 * distance;
+              changed += 2;
+            }
+          
+          Vector newView = newTargetPos - newCameraPos;
+
+          if (changed == 1)
+            camera->setRelCoor(newCameraPos + newView * (1- distance/newView.len()));
+          else if (changed == 2)
+            camera->getTarget()->setRelCoor(newTargetPos - newView * (1-distance/newView.len()));
+          else if (changed == 3)
+            {
+              camera->setRelCoor(newCameraPos);
+              camera->getTarget()->setRelCoor(newTargetPos);
+            }
             
         }