OpenSimulator GForge > Projects > Xenki Viewer > SVN

Diff of /trunk/DefaultRenderer/CameraControl.cs

-revision 24, Wed Sep 10 09:00:17 2008 UTC
+revision 74, Mon Nov 24 10:43:20 2008 UTC
 Line 11
  //
  //------------------------------------------------------------------
- //------------------------------------------------------------------
- //
- // using http://www.codeplex.com/3DTools
- //
- //-------------------------------------------------------------------
  using System;
-Line 26
+Line 21
  using System.Windows.Controls;
  using Petzold.Media3D;
  using _3DTools;
+ using Xenki.Framework;
+ using System.Collections.Generic;
  namespace Xenki.DefaultRenderer
  {
+     public delegate void CameraPositionChanged(Point3D oldpos,Point3D newpos);
      public class CameraControl
      {
          private FrameworkElement _eventSource;
          private Point _previousPosition2D;
          private Vector3D _previousPosition3D = new Vector3D(0, 0, 1);
-         private Transform3DGroup _transform;
-         private ScaleTransform3D _scale = new ScaleTransform3D();
-         private AxisAngleRotation3D _rotation = new AxisAngleRotation3D();
-         private TranslateTransform3D _translate = new TranslateTransform3D();
-         private Vector3D _cameraLookDirection = new Vector3D(128, 128, 10);
          private PerspectiveCamera _camera;
          private Point3D _cameraLookPoint;
-         private RotateTransform3D _rotationTransform = new RotateTransform3D();
          ModelVisual3D visul3d;
-         //rotate and pan object clicked
-         private TranslateTransform3D _clickedTranslate = new TranslateTransform3D();
-         private RotateTransform3D _clickedRotate = new RotateTransform3D();
-         private AxisAngleRotation3D _clickedAxisAngleRotate = new AxisAngleRotation3D();
          Point3D _clickedCenterPosition;
-         Transform3DGroup _clickedGroup;
+         DefaultAvatarManager avatarManager = DefaultAvatarManager.SingletonInstance();
          bool isTracking = false;
+         bool isPanningObject = false;
-         public CameraControl(PerspectiveCamera camera)
+         DefaultPrimControl m_primitiveData;
-         {
-             _camera = camera;
+         public event CameraPositionChanged OncameraPositionChanged;
+         System.Windows.Threading.DispatcherTimer frameTimer;
-             _rotationTransform.Rotation = _rotation;
-             _transform = new Transform3DGroup();
+         public CameraControl(PerspectiveCamera camera,DefaultPrimControl datacontrol)
-            // _transform.Children.Add(_translate);
+         {
-             _transform.Children.Add(_rotationTransform);
+              //dataControl = DefaultNetwork.DefaultNetwork.m_primitiveData;
-             _cameraLookDirection = _camera.LookDirection;
+             _camera = camera;
+             m_primitiveData = datacontrol;
+             frameTimer = new System.Windows.Threading.DispatcherTimer();
+             frameTimer.Tick += new EventHandler(frameTimer_Tick);
+             frameTimer.Interval = new TimeSpan(0, 0, 0, 1, 10);
+             frameTimer.Start();
          }
-         /// <summary>
+         void frameTimer_Tick(object sender, EventArgs e)
-         ///     A transform to move the camera or scene to the trackball's
-         ///     current orientation and scale.
-         /// </summary>
-         public Transform3DGroup Transform
          {
-             get { return _transform; }
+             // FPSMouseMove();
          }
          [System.Runtime.InteropServices.DllImportAttribute("user32.dll", EntryPoint = "SetCursorPos")]
          [return: System.Runtime.InteropServices.MarshalAsAttribute(System.Runtime.InteropServices.UnmanagedType.Bool)]
          public static extern bool SetCursorPos(int X, int Y);
-Line 103
+Line 95
                      _eventSource.MouseMove -= this.OnMouseMove;
                      _eventSource.MouseLeftButtonDown -= _eventSource_MouseLeftButtonDown;
                      _eventSource.MouseRightButtonDown -= _eventSource_MouseRightButtonDown;
+                     _eventSource.KeyDown -= this._eventSource_KeyDown;
                  }
                  _eventSource = value;
                  _eventSource.MouseWheel += _eventSource_MouseWheel;
-Line 110
+Line 104
                  _eventSource.MouseRightButtonDown += _eventSource_MouseRightButtonDown;
                  _eventSource.MouseUp += this.OnMouseUp;
                  _eventSource.MouseMove += this.OnMouseMove;
+                 _eventSource.Focusable = true;
+                 _eventSource.Focus();
+                 Keyboard.Focus(_eventSource);
+                _eventSource.KeyDown += _eventSource_KeyDown;
              }
          }
+         void _eventSource_KeyDown(object sender, KeyEventArgs e)
+         {
+             if ((e.Key == Key.Left||e.Key == Key.A)&&Mouse.LeftButton == MouseButtonState.Released&&MouseButtonState.Released==Mouse.RightButton)
+             {
+                 CameraLookLeftRight(-4.0);
+                 e.Handled = true;
+             }
+             else if (e.Key == Key.Right||e.Key == Key.D)
+             {
+                 CameraLookLeftRight(4.0);
+                 e.Handled = true;
+             }
+             else if (e.Key == Key.Up || e.Key == Key.W)
+             {
+                 //walk forward
+                 CameraWalk(0.05);
+                 e.Handled = true;
+             }
+             else if (e.Key == Key.Down || e.Key == Key.S)
+             {
+                 //walk back
+                 CameraWalk(-0.05);
+                 e.Handled = true;
+             }
+         }
+         //camera walk should be setting according to the avatar's walking path
+         private void CameraWalk(double distanceTick)
+         {
+             OpenMetaverse.Vector3 newpos = OpenMetaverse.Vector3.Add(avatarManager.m_Myself.Position,avatarManager.m_Myself.Position* ((float)distanceTick));
+             avatarManager.AvatarMove(avatarManager.m_Myself,newpos);
+             //Vector3D cameraLookDirection = _camera.LookDirection;
+             //Vector3D vzAxis = new Vector3D(0, 0, 1);
+             //Vector3D walkDirection = Vector3D.Add(vzAxis, cameraLookDirection);
+             _camera.LookDirection =  new Vector3D(_camera.LookDirection.X, _camera.LookDirection.Y, 0);
+             Point3D pos = Point3D.Add(_camera.Position, _camera.LookDirection * distanceTick);
+             if (OncameraPositionChanged != null)
+             {
+                 OncameraPositionChanged(_camera.Position, pos);
+             }
+             _camera.Position = new Point3D(newpos.X + 5, newpos.Y + 5, newpos.Z + 5);// pos;
+         }
+         private void CameraLookLeftRight(double angle)
+         {
+             Vector3D axis = new Vector3D(0, 0, 1);
+             Quaternion delta = new Quaternion(axis, -angle);
+             Matrix3D cameraMatrix3D = new Matrix3D();
+             cameraMatrix3D.RotateAt(delta, _camera.Position);
+             _camera.LookDirection = Vector3D.Multiply(_camera.LookDirection, cameraMatrix3D);// Point3D.Subtract(_cameraLookPoint, _camera.Position);
+         }
          void _eventSource_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
          {
              Mouse.Capture(_eventSource, CaptureMode.Element);
              Point pclick = e.GetPosition(_eventSource);
+             originalMouseClickPos = _eventSource.PointToScreen(pclick);
              HitTestResult hitresult = VisualTreeHelper.HitTest(EventSource, pclick);
              RayMeshGeometry3DHitTestResult result3d = hitresult as RayMeshGeometry3DHitTestResult;
              if (result3d == null)
-Line 128
+Line 194
              if (visul3d == null)
                  return;
-             Transform3DGroup group = visul3d.Transform as Transform3DGroup;
-             if (group != null)
-             {
-                 foreach (Transform3D tran in group.Children)
-                 {
-                     if (tran is RotateTransform3D)
-                     {
-                         _clickedRotate = tran as RotateTransform3D;
-                         if (_clickedRotate != null)
-                         {
-                             _clickedAxisAngleRotate = new AxisAngleRotation3D();
-                             _clickedRotate.Rotation = _clickedAxisAngleRotate;
-                         }
-                     }
-                     else if (tran is TranslateTransform3D)
-                         _clickedTranslate = tran as TranslateTransform3D;
-                 }
-             }
-             else
-                 return;
              //for ALT + MOUSE + ROTATE
              VisualTreeHelper.HitTest(_eventSource, null, HitTestCallback, new PointHitTestParameters(pclick));
-             _rotationTransform.CenterX = _cameraLookPoint.X;
+              _camera.LookDirection = Point3D.Subtract(_cameraLookPoint, _camera.Position);
-             _rotationTransform.CenterY = _cameraLookPoint.Y;
-             _rotationTransform.CenterZ = _cameraLookPoint.Z;
-             _cameraLookDirection = Point3D.Subtract(_cameraLookPoint, _camera.Position);
-             _camera.LookDirection = _cameraLookDirection;
              isTracking = true;
              _eventSource.CaptureMouse();
-Line 183
+Line 222
              if (visul3d == null)
                  return;
-             _clickedGroup = visul3d.Transform as Transform3DGroup;
-             if (_clickedGroup != null)
-             {
-                 foreach (Transform3D tran in _clickedGroup.Children)
-                 {
-                     if (tran is RotateTransform3D)
-                     {
-                         _clickedRotate = tran as RotateTransform3D;
-                         if (_clickedRotate != null)
-                         {
-                             _clickedAxisAngleRotate = _clickedRotate.Rotation as AxisAngleRotation3D;
-                             if (_clickedAxisAngleRotate == null)
-                                 _clickedAxisAngleRotate = new AxisAngleRotation3D();
-                             _clickedRotate.Rotation = _clickedAxisAngleRotate;
-                         }
-                     }
-                     else if (tran is TranslateTransform3D)
-                     {
-                         _clickedTranslate = tran as TranslateTransform3D;
-                     }
-                 }
-             }
-             else
-                 return;
              //for ALT + MOUSE + ROTATE
              VisualTreeHelper.HitTest(_eventSource, null, HitTestCallback, new PointHitTestParameters(pclick));
-             _rotationTransform.CenterX = _cameraLookPoint.X;
+             _camera.LookDirection  = Point3D.Subtract(_cameraLookPoint, _camera.Position);
-             _rotationTransform.CenterY = _cameraLookPoint.Y;
-             _rotationTransform.CenterZ = _cameraLookPoint.Z;
+             _clickedCenterPosition =  GetObjectCenterPosition(visul3d);
-             //for rotate the object mouse clicked
-             _clickedRotate.CenterX = _clickedCenterPosition.X = visul3d.Content.Bounds.Location.X + visul3d.Content.Bounds.SizeX / 2;
-             _clickedRotate.CenterY = _clickedCenterPosition.Y = visul3d.Content.Bounds.Location.Y + visul3d.Content.Bounds.SizeY / 2;
-             _clickedRotate.CenterZ = _clickedCenterPosition.Z = visul3d.Content.Bounds.Location.Z + visul3d.Content.Bounds.SizeZ / 2;
-             _cameraLookDirection = Point3D.Subtract(_cameraLookPoint, _camera.Position);
+             //uint? key = DefaultNetwork.DefaultNetwork.m_primitiveData.GetKeyInSceneByValue(visul3d);
-             _camera.LookDirection = _cameraLookDirection;
+             //if (key.HasValue)
+             //{
+             //    OpenMetaverse.Primitive dataaaa =DefaultNetwork.DefaultNetwork.m_primitiveData.PrimModelsInScene[key.Value];
+             //    uint id = dataaaa.ParentID;
+             //    OpenMetaverse.Vector3  parentpos = DefaultNetwork.DefaultNetwork.m_primitiveData.GetModelsParentPosition(id);
+             //    OpenMetaverse.Vector3 mypos = dataaaa.Position;
+             //}
              //TRACK BALL
              _previousPosition3D = ProjectToTrackball(
                 EventSource.ActualWidth,
-Line 237
+Line 250
              e.Handled = true;
          }
+         private Point3D GetObjectCenterPosition(ModelVisual3D visual)
+         {
+             return Point3D.Add(visual.Content.Bounds.Location,
+                 new Vector3D(visual.Content.Bounds.SizeX / 2, visual.Content.Bounds.SizeY / 2, visual.Content.Bounds.SizeZ / 2));
+         }
          private void OnMouseUp(object sender, MouseEventArgs e)
          {
-             Mouse.Capture(EventSource, CaptureMode.None);
-             isTracking = false;
              //set the mouse to the original position when clicked the object.
+             if (_eventSource.Cursor != Cursors.Arrow)
+             {
              SetCursorPos((int)originalMouseClickPos.X, (int)originalMouseClickPos.Y);
+                 _eventSource.Cursor = Cursors.Arrow;
+             }
+             Mouse.Capture(EventSource, CaptureMode.None);
+             isTracking = false;
+             if (isPanningObject == true)
+             {
+                 isPanningObject = false;
+                 _cameraLookPoint = GetObjectCenterPosition(visul3d);
+             }
              _eventSource.ReleaseMouseCapture();
-             _eventSource.Cursor = Cursors.Arrow;
          }
+         Point currentPosition;
          private void OnMouseMove(object sender, MouseEventArgs e)
          {
-             Point currentPosition = e.GetPosition(EventSource);
+             currentPosition = e.GetPosition(EventSource);
              if (e.RightButton == MouseButtonState.Pressed && (Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown(Key.RightShift)))
              {
-Line 264
+Line 294
                      Focus(currentPosition);
                  }
              }
-             else if (e.RightButton == MouseButtonState.Pressed && Keyboard.IsKeyDown(Key.Q))
-             {
-                 if(isTracking)
-                     CameraPanUP(currentPosition);
-             }
              else if (e.RightButton == MouseButtonState.Pressed && Keyboard.IsKeyDown(Key.A))
              {
                  if (isTracking)
-Line 292
+Line 317
                  if (isTracking)
                  {
                      _eventSource.Cursor = Cursors.None;
+                     isPanningObject = true;
                      PanObject(currentPosition);
                  }
              }
              else if (e.LeftButton == MouseButtonState.Pressed)
              {
+                 if(isTracking)
                  LookAround(currentPosition);
              }
+             else if (e.RightButton == MouseButtonState.Pressed)
+             {
+                 if (isTracking)
+                     CameraPanUP(currentPosition);
+             }
              _previousPosition2D = currentPosition;
          }
          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);
-             // Get the current orientantion from the RotateTransform3D
+             Matrix3D cameraMatrix3D = new Matrix3D();
-             Transform3DGroup group = _camera.Transform as Transform3DGroup;
+             cameraMatrix3D.RotateAt(delta,_cameraLookPoint);
-             if (group == null)
-                 return;
-             foreach (Transform3D tran in group.Children)
+             _camera.Position = Point3D.Multiply(_camera.Position, cameraMatrix3D);
-             {
+             _camera.LookDirection = Point3D.Subtract(_cameraLookPoint, _camera.Position);
-                 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;
-             }
              _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, _cameraLookDirection, 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 *= 3.00000;
-             if (_clickedAxisAngleRotate.Angle >= 360 || _clickedAxisAngleRotate.Angle <= -360)
+             Matrix3D mat = new Matrix3D();
-                 _clickedAxisAngleRotate.Angle = 0;
+             mat.RotateAt(new Quaternion(axis, angle), _clickedCenterPosition);
-             _clickedAxisAngleRotate.Axis = axis;
+             RotateObject(mat, visul3d);
-             _clickedAxisAngleRotate.Angle -= angle;
+             IEnumerator<Visual3D> children = m_primitiveData.GetChildrenByVisual3D(visul3d);
+             while (children.MoveNext())
+             {
+                 RotateObject(mat, children.Current);
+             }
              _previousPosition3D = currentPosition3D;
          }
+         private void RotateObject(Matrix3D mat,Visual3D visual)
+         {
+             GeometryModel3D geometryModel3D = (visual as ModelVisual3D).Content as GeometryModel3D;
+             if (geometryModel3D != null)
+             {
+                 MeshGeometry3D meshGeometry3D = geometryModel3D.Geometry as MeshGeometry3D;
+                 if (meshGeometry3D != null)
+                 {
+                     Point3DCollection points = meshGeometry3D.Positions;
+                     for (int i = 0; i < points.Count; i++)
+                         points[i] = Point3D.Multiply(points[i], mat);
+                 }
+             }
+         }
          private Vector3D ProjectToTrackball(double width, double height, Point point)
          {
              double x = point.X / (width / 2);    // Scale so bounds map to [0,0] - [2,2]
-Line 390
+Line 448
              double scalex = currentPosition.X - _previousPosition2D.X;
              Vector3D vector3D = GetTranslationVector3D(visul3d, _previousPosition2D, currentPosition);
+             Point3D cPos = _camera.Position;
-             _camera.Position += Math.Abs(scalex) * vector3D;
+             cPos += Math.Abs(scalex) * vector3D;
+             if (OncameraPositionChanged != null)
+                 OncameraPositionChanged(_camera.Position, cPos);
+             _camera.Position = cPos;
          }
          private void PanObject(Point currentPosition)
          {
-             double scaley = currentPosition.Y - _previousPosition2D.Y;
+             IEnumerator<Visual3D> children = m_primitiveData.GetChildrenByVisual3D(visul3d);
-             scaley = Math.Abs( scaley );
-             double scalex = currentPosition.X - _previousPosition2D.X;
-             scalex = Math.Abs( scalex);
              Vector3D vector3D = GetTranslationVector3D(visul3d, _previousPosition2D, currentPosition);
+             MoveObject(visul3d, vector3D);
-             _clickedTranslate.OffsetX += scalex * vector3D.X;// _clickedTranslateOriginal.OffsetX + vector3D.X;
+             while( children.MoveNext())
-             _clickedTranslate.OffsetY += scalex * vector3D.Y;// _clickedTranslateOriginal.OffsetY + vector3D.Y;
+             {
-             _clickedTranslate.OffsetZ += scaley * vector3D.Z;// _clickedTranslateOriginal.OffsetZ + vector3D.Z;// vectMouse.Z;
+                 MoveObject(children.Current, vector3D);
+             }
+         }
-             visul3d.Transform.Transform(new Point3D(visul3d.Content.Bounds.Location.X + scalex * vector3D.X, visul3d.Content.Bounds.Location.Y + scalex * vector3D.Y, visul3d.Content.Bounds.Location.Z + scaley * vector3D.Z));
+         private void MoveObject(Visual3D visual, Vector3D vector3D)
+         {
+             GeometryModel3D geometryModel3D = (visual as ModelVisual3D).Content as GeometryModel3D;
+             if (geometryModel3D != null)
+             {
+                 MeshGeometry3D meshGeometry3D = geometryModel3D.Geometry as MeshGeometry3D;
+                 if (meshGeometry3D != null)
+                 {
+                     Point3DCollection points = meshGeometry3D.Positions;
+                     for (int i = 0; i < points.Count; i++)
+                         points[i] = Point3D.Add(points[i], vector3D * 50);
+                 }
+             }
          }
+         string mm = "";
          private Vector3D GetTranslationVector3D(DependencyObject modelHit, Point startPosition, Point endPosition)
          {
              Vector3D translationVector3D = new Vector3D();
-Line 438
+Line 514
          private void LookUpDown(Point currentPosition)
          {
              double scale  = currentPosition.Y- _previousPosition2D.Y;
-             scale = scale/5.000000;
+           // scale = scale;
              _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,_cameraLookDirection,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;
+             double axisAngle = _previousPosition2D.X  - currentPosition.X;
-             _rotation.Axis = new Vector3D(0, 0, 1);
+             Matrix3D matrixRoateCamera = new Matrix3D();
-             _rotation.Angle -= axisAngle;
+             matrixRoateCamera.RotateAt(new Quaternion(new Vector3D(0, 0, 1), axisAngle), _cameraLookPoint);
+             Point3D pos = Point3D.Multiply(_camera.Position, matrixRoateCamera);
+             if (OncameraPositionChanged != null)
+                 OncameraPositionChanged(_camera.Position, pos);
+             _camera.Position = pos;
              _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
+             {
+                 if (OncameraPositionChanged != null)
+                     OncameraPositionChanged(camera.Position, cameraPos);
                  camera.Position = cameraPos;
          }
+         }
          //get the clicked 3d position
          public HitTestResultBehavior HitTestCallback(HitTestResult result)
          {

 Legend:



Removed from v.24
 


changed lines


 
Added in v.74
 Legend:



Removed from v.24
 


changed lines


 
Added in v.74
-Removed from v.24
+Added in v.74

	ViewVC Help
Powered by ViewVC 1.0.0

MyGforge Home

Xenki Viewer

Diff of /trunk/DefaultRenderer/CameraControl.cs