OpenSimulator GForge > Projects > Xenki Viewer > SVN

Diff of /trunk/DefaultRenderer/CameraControl.cs

-revision 29, Thu Sep 18 06:48:12 2008 UTC
+revision 30, Thu Sep 18 10:09:45 2008 UTC
 Line 11
  //
  //------------------------------------------------------------------
- //------------------------------------------------------------------
- //
- // using http://www.codeplex.com/3DTools
- //
- //-------------------------------------------------------------------
  using System;
-Line 54
+Line 49
              frameTimer = new System.Windows.Threading.DispatcherTimer();
              frameTimer.Tick += new EventHandler(frameTimer_Tick);
-             frameTimer.Interval = new TimeSpan(0, 0, 0, 0, 1);
+             frameTimer.Interval = new TimeSpan(0, 0, 0, 0, 10);
              frameTimer.Start();
          }
          void frameTimer_Tick(object sender, EventArgs e)
          {
-            //this.OnMouseMove(sender, e);
+            // FPSMouseMove();
          }
-Line 183
+Line 178
              {
                  isPanningObject = false;
                  _cameraLookPoint = GetObjectCenterPosition(visul3d);
              }
-             //mm+="ResultPosition:" + visul3d.Content.Bounds.Location.ToString();
-             //string s = mm;
+             string s = mm;
              _eventSource.ReleaseMouseCapture();
              _eventSource.Cursor = Cursors.Arrow;
-Line 244
+Line 238
              }
              else if (e.LeftButton == MouseButtonState.Pressed)
              {
-                 LookAround(currentPosition,_camera.Transform);
+                 LookAround(currentPosition);
              }
-Line 252
+Line 246
          }
-         private void LookAround(Point currentPosition,Transform3D transformgroup)
+         private void LookAround(Point currentPosition)
          {
+            if (_cameraLookPoint == new Point3D(0, 0, 0))
+                 return;
              Vector3D currentPosition3D = ProjectToTrackball(EventSource.ActualWidth, EventSource.ActualHeight, currentPosition);
+             if (_previousPosition3D == currentPosition3D)
+                return;
              Vector3D axis = Vector3D.CrossProduct(_previousPosition3D, currentPosition3D);
              double angle = Vector3D.AngleBetween(_previousPosition3D, currentPosition3D);
+             angle *= 2;
              // We negate the angle because we are rotating the camera.
              // Do not do this if you are rotating the scene instead.
              Quaternion delta = new Quaternion(axis, -angle);
-             //foreach (Transform3D tran in group.Children)
-             //{
-             //    RotateTransform3D rotate = tran as RotateTransform3D;
-             //    if (rotate == null)
-             //        continue;
-             //    RotateTransform3D rt = (RotateTransform3D)rotate;
-             //    AxisAngleRotation3D r = (AxisAngleRotation3D)rt.Rotation;
-             //    Quaternion q = new Quaternion(r.Axis, r.Angle);
-             //    // Compose the delta with the previous orientation
-             //    q *= delta;
-             //    // Write the new orientation back to the Rotation3D
-             //    r.Axis = q.Axis;
-             //    r.Angle = q.Angle;
-             //}
-             if (_cameraLookPoint == new Point3D(0, 0, 0))
-                 return;
-            // delta *= delta;
              Matrix3D cameraMatrix3D = new Matrix3D();
              cameraMatrix3D.RotateAt(delta,_cameraLookPoint);
              _camera.Position = Point3D.Multiply(_camera.Position, cameraMatrix3D);
              _camera.LookDirection = Point3D.Subtract(_cameraLookPoint, _camera.Position);
              _previousPosition3D = currentPosition3D;
          }
          void _eventSource_MouseWheel(object sender, MouseWheelEventArgs e)
          {
-             double scale = -e.Delta / 1200.000;
+             double scale = -e.Delta / 800.000;
              if(_cameraLookPoint!=null&&_cameraLookPoint!=new Point3D(0,0,0))
              _camera.LookDirection = Point3D.Subtract(_cameraLookPoint, _camera.Position);
-             AdjustCameraPosition(_camera, _camera.LookDirection, scale);
+             int count = Math.Abs((int)(scale / zoomFactor));
+             for (int i = 1; i <= count; i++)
+             {
+                 if (scale > 0)
+                     AdjustCameraPosition(_camera, _camera.LookDirection, zoomFactor);
+                 else
+                     AdjustCameraPosition(_camera, _camera.LookDirection, -zoomFactor);
+             }
          }
          private void RotateObject(Point currentPosition)
          {
-             Vector3D currentPosition3D = ProjectToTrackball(EventSource.ActualWidth, EventSource.ActualHeight, currentPosition);
+             Vector3D currentPosition3D = ProjectToTrackball(_eventSource.ActualWidth, _eventSource.ActualHeight, currentPosition);
              Vector3D axis = Vector3D.CrossProduct(_previousPosition3D, currentPosition3D);
-             double angle = Vector3D.AngleBetween(_previousPosition3D, currentPosition3D);
+             double angle = Vector3D.AngleBetween(currentPosition3D,_previousPosition3D );
+             angle *= 2;
              Matrix3D mat = new Matrix3D();
              mat.RotateAt(new Quaternion(axis, angle), _clickedCenterPosition);
-Line 372
+Line 361
                      Point3DCollection points = meshGeometry3D.Positions;
                      for (int i = 0; i < points.Count; i++)
-                         points[i] = Point3D.Add(points[i], vector3D * 10);
+                         points[i] = Point3D.Add(points[i], vector3D * 50);
                  }
              }
          }
          string mm = "";
          private Vector3D GetTranslationVector3D(DependencyObject modelHit, Point startPosition, Point endPosition)
          {
-Line 408
+Line 396
              _camera.LookDirection = new Vector3D(_camera.LookDirection.X, _camera.LookDirection.Y, _camera.LookDirection.Z + scale);
          }
+         double zoomFactor = 0.0500;
          private void Focus(Point currentPosition)
          {
              //zoom
              double yDelta = currentPosition.Y - _previousPosition2D.Y;
-             double scale = yDelta / 100.000000;
+             double scale = yDelta/20 ;
-             AdjustCameraPosition(_camera,_camera.LookDirection,scale);
+             int count = Math.Abs( (int)(scale / zoomFactor));
+             for (int i = 1; i <= count; i++)
+             {
+                 if (yDelta > 0)
+                     AdjustCameraPosition(_camera, _camera.LookDirection, zoomFactor);
+                 else
+                     AdjustCameraPosition(_camera, _camera.LookDirection, -zoomFactor);
+             }
              //rotate the camera
              double axisAngle = currentPosition.X - _previousPosition2D.X;
              Matrix3D matrixRoateCamera = new Matrix3D();
-Line 424
+Line 421
              _camera.LookDirection  = Point3D.Subtract(_cameraLookPoint, _camera.Position);
          }
-         private void AdjustCameraPosition(PerspectiveCamera camera,Vector3D lookDirection, double scale )
+         private void AdjustCameraPosition(PerspectiveCamera camera,Vector3D lookDirection, double factor )
          {
-             Point3D cameraPos = new Point3D(camera.Position.X - scale * lookDirection.X,
+             Point3D cameraPos = new Point3D(camera.Position.X - factor * lookDirection.X,
-                 camera.Position.Y - scale * lookDirection.Y,
+                 camera.Position.Y - factor * lookDirection.Y,
-                 camera.Position.Z - scale * lookDirection.Z);
+                 camera.Position.Z - factor * lookDirection.Z);
              //too fast
-             if (Point3D.Subtract(cameraPos, camera.Position).Length > 1.000000000)
+             //if (Point3D.Subtract(cameraPos, camera.Position).Length > 0.5000000000)
-                 cameraPos = new Point3D(camera.Position.X - scale / 10 * lookDirection.X,
+             //    cameraPos = new Point3D(camera.Position.X - factor / 10 * lookDirection.X,
-                  camera.Position.Y - scale / 10 * lookDirection.Y,
+             //     camera.Position.Y - factor / 10 * lookDirection.Y,
-                  camera.Position.Z - scale / 10 * lookDirection.Z);
+             //     camera.Position.Z - factor / 10 * lookDirection.Z);
              double distance = Point3D.Subtract(_cameraLookPoint, cameraPos).Length;
-             if (distance > 524 || distance <= 1.000000)
+             if (distance > 512.0000 || distance <= 0.5000000)
              {
              }
              else
-Line 471
+Line 468
          //for test
          /*
-         private void FPSMouseMove(object sender, EventArgs e)
+         private void FPSMouseMove()
          {
-              currentPosition = e.GetPosition(EventSource);
+              Point curr = Mouse.GetPosition(_eventSource);
+              currentPosition = curr;
               if (isTracking)
               {
-                  if (isLookAround == true)
+                  if (Mouse.RightButton == MouseButtonState.Pressed && (Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown(Key.RightShift)))
+                  {
                       LookUpDown(currentPosition);
-                  else if (isFocus == true)
+                  }
+                  else if (Mouse.LeftButton == MouseButtonState.Pressed && (Keyboard.IsKeyDown(Key.LeftAlt) || Keyboard.IsKeyDown(Key.RightAlt)))
+                  {
+                      if (isTracking)
                   {
                       _eventSource.Cursor = Cursors.None;
                       Focus(currentPosition);
                   }
-                  else if (isCameraPanUP)
+                  }
+                  else if (Mouse.RightButton == MouseButtonState.Pressed && Keyboard.IsKeyDown(Key.Q))
+                  {
+                      if (isTracking)
                       CameraPanUP(currentPosition);
-                  else if (isCameraPanLeftRight)
+                  }
+                  else if (Mouse.RightButton == MouseButtonState.Pressed && Keyboard.IsKeyDown(Key.A))
+                  {
+                      if (isTracking)
                   {
                       _eventSource.Cursor = Cursors.None;
                       CameraPanLeftRight(currentPosition);
                   }
-                  else if (isRotateObject)
+                  }
+                  else if (Mouse.LeftButton == MouseButtonState.Pressed && (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
+                      && (Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown(Key.RightShift)))
+                  {
+                      if (isTracking)
                   {
                       _eventSource.Cursor = Cursors.None;
                       RotateObject(currentPosition);
                   }
-                  else if (isPanObject)
+                  }
+                  else if (Mouse.LeftButton == MouseButtonState.Pressed && (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl)))
+                  {
+                      if (isTracking)
                   {
                       _eventSource.Cursor = Cursors.None;
+                          isPanningObject = true;
                       PanObject(currentPosition);
                   }
-                  else if (isLookAround)
+                  }
+                  else if (Mouse.LeftButton == MouseButtonState.Pressed)
                   {
                       LookAround(currentPosition);
                   }
               }
              _previousPosition2D = currentPosition;
-         }*/
+         }
+         */
      }

 Legend:



Removed from v.29
 


changed lines


 
Added in v.30
 Legend:



Removed from v.29
 


changed lines


 
Added in v.30
-Removed from v.29
+Added in v.30

	ViewVC Help
Powered by ViewVC 1.0.0

MyGforge Home

Xenki Viewer

Diff of /trunk/DefaultRenderer/CameraControl.cs