OpenSimulator GForge > Projects > Xenki Viewer > SVN

Diff of /trunk/DefaultRenderer/CameraControl.cs

-revision 17, Tue Sep  2 01:37:37 2008 UTC
+revision 19, Tue Sep  2 10:37:33 2008 UTC
 Line 38
          private PerspectiveCamera _camera;
          private Point3D _cameraLookPoint;
          private RotateTransform3D _rotationTransform = new RotateTransform3D();
-         ModelVisual3D clickedVisual;
+         //ModelVisual3D clickedVisual;
+         ModelVisual3D visul3d;
-         Transform3DGroup clickedtransformGroup;
+         //rotate and pan object clicked
-         private TranslateTransform3D _clickedTranslate = new TranslateTransform3D();
+         private TranslateTransform3D _clickedTranslate ;//= new TranslateTransform3D();
-         private TranslateTransform3D _clickedTranslateOriginal = new TranslateTransform3D();
+         private TranslateTransform3D _clickedTranslateOriginal;// = new TranslateTransform3D();
-         private RotateTransform3D _clickedRotate = new RotateTransform3D();
+         private RotateTransform3D _clickedRotate ;//= new RotateTransform3D();
          private AxisAngleRotation3D _clickedAxisAngleRotate = new AxisAngleRotation3D();
+         Point3D _clickedCenterPosition;
          bool isTracking = false;
-Line 59
+Line 62
              _transform.Children.Add(_rotationTransform);
              // _transform.Children.Add(_scale);
-             //for pan and rotate the object
+            // _clickedRotate.Rotation = _clickedAxisAngleRotate;
-             //clickedtransformGroup = new Transform3DGroup();
-             //clickedtransformGroup.Children.Add(_clickedRotate);
-             //clickedtransformGroup.Children.Add(_clickedTranslate);
          }
          /// <summary>
-Line 137
+Line 136
              if (result3d == null)
                  return;
-             ModelVisual3D visul3d = result3d.VisualHit as ModelVisual3D;
+             visul3d = result3d.VisualHit as ModelVisual3D;
              if (visul3d == null)
                  return;
              Transform3DGroup group = visul3d.Transform as Transform3DGroup;
              if (group != null)
              {
-                 if (group.Children[0] != null)
+                 foreach (Transform3D tran in group.Children)
+                 {
+                     if (tran is RotateTransform3D)
                  {
+                         _clickedRotate = new RotateTransform3D();
                      _clickedRotate = group.Children[0] as RotateTransform3D;
+                         if (_clickedRotate != null)
+                         {
+                             _clickedAxisAngleRotate = new AxisAngleRotation3D();
                      _clickedRotate.Rotation = _clickedAxisAngleRotate;
                  }
-                 if (group.Children[1] !=null)
+                     }
+                     else if (tran is TranslateTransform3D)
                      _clickedTranslate = group.Children[1] as TranslateTransform3D;
              }
-             //if (_clickedTranslate == null)
+             }
-             //    return;
+             else
+                 return;
              //for pan the object
-             clickedVisual = visul3d;
+             //clickedVisual = visul3d;
-             //clickedVisual.Transform = _clickedRotate;// clickedtransformGroup;// _clickedTranslate;
+             //visul3d.Transform = group;
              _clickedTranslateOriginal = _clickedTranslate.Clone();
-Line 171
+Line 179
              _rotationTransform.CenterZ = _cameraLookPoint.Z;
              //for rotate the object mouse clicked
-             _clickedRotate.CenterX = _cameraLookPoint.X;
-             _clickedRotate.CenterY = _cameraLookPoint.Y;
-             _clickedRotate.CenterZ = _cameraLookPoint.Z;
+             _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);
              _camera.LookDirection = _cameraLookDirection;
-Line 196
+Line 204
              Mouse.Capture(EventSource, CaptureMode.None);
              isTracking = false;
-             //_clickedRotate = null;
+             Transform3DGroup clickedtransformGroup = new Transform3DGroup();
-             //_clickedAxisAngleRotate = null;
+             clickedtransformGroup.Children.Add(_clickedRotate);
-             //_clickedTranslate = null;
+             clickedtransformGroup.Children.Add(_clickedTranslate);
-             //_clickedTranslateOriginal = null;
+             visul3d.Transform =  clickedtransformGroup;
              _eventSource.ReleaseMouseCapture();
              _eventSource.Cursor = Cursors.Arrow;
-Line 248
+Line 259
          private void RotateObject(Point currentPosition)
          {
+             Vector3D currentPosition3D = ProjectToTrackball(EventSource.ActualWidth, EventSource.ActualHeight, currentPosition);
-             //double axisAngle = currentPosition.X - _previousPosition2D.X;
-             //double angletimes = axisAngle;
-             //if (angletimes > 360 || angletimes < -360)
-             //    angletimes = 0;
-             //if (angletimes + _clickedAxisAngleRotate.Angle >= 360)
-             //    _clickedAxisAngleRotate.Angle = 0;
-             Vector3D currentPosition3D = ProjectToTrackball(clickedVisual.Content.Bounds.SizeX, clickedVisual.Content.Bounds.SizeZ,
-                 /*EventSource.ActualWidth, EventSource.ActualHeight, */currentPosition);
              Vector3D axis = Vector3D.CrossProduct(_previousPosition3D, currentPosition3D);
              double angle = Vector3D.AngleBetween(_previousPosition3D, currentPosition3D);
              Quaternion delta = new Quaternion(axis, -angle);
              // Get the current orientantion from the RotateTransform3D
-             AxisAngleRotation3D r = _rotation;
+             Quaternion q = new Quaternion(_clickedAxisAngleRotate.Axis, _clickedAxisAngleRotate.Angle);
-             Quaternion q = new Quaternion(_rotation.Axis, _rotation.Angle);
              // Compose the delta with the previous orientation
              q *= delta;
-             _clickedRotate.CenterX = _cameraLookPoint.X;
-             _clickedRotate.CenterY = _cameraLookPoint.Y;
-             _clickedRotate.CenterZ = _cameraLookPoint.Z;
              // Write the new orientation back to the Rotation3D
-             _clickedAxisAngleRotate.Axis =  q.Axis;
-             _clickedAxisAngleRotate.Angle += q.Angle;
+             _clickedAxisAngleRotate.Axis = q.Axis;
+             _clickedAxisAngleRotate.Angle += q.Angle/4;
+             if (_clickedAxisAngleRotate.Angle >= 360)
+                 _clickedAxisAngleRotate.Angle = 0;
              _previousPosition3D = currentPosition3D;
-             //_clickedAxisAngleRotate.Axis = new Vector3D(0, 0, 1);
-             //_clickedAxisAngleRotate.Angle += axisAngle;
          }
          private Vector3D ProjectToTrackball(double width, double height, Point point)
-Line 308
+Line 301
          {
              LineRange range;
              ViewportInfo.Point2DtoPoint3D(_eventSource as Viewport3D, currentPosition, out range);
-             Point3D pointNew = range.PointFromY(clickedVisual.Content.Bounds.Y);
+             Point3D pointNew = range.PointFromY(_clickedCenterPosition.Y);
              //_camera.Position.
          }
-Line 326
+Line 319
              LineRange range;
              ViewportInfo.Point2DtoPoint3D(_eventSource as Viewport3D, currentPosition, out range);
-             Point3D pointNew = range.PointFromY(clickedVisual.Content.Bounds.Y);
+             Point3D pointNew = range.PointFromY(_clickedCenterPosition.Y);
              Vector3D vectMouse = pointNew - _cameraLookPoint;
-             _clickedTranslate.OffsetX = _clickedTranslateOriginal.OffsetX + vectMouse.X;
+             //vectMouse = Vector3D.Multiply(_cameraLookDirection, visul3d.Transform.Value);
-             _clickedTranslate.OffsetY = _clickedTranslateOriginal.OffsetY + vectMouse.Y;
+            _clickedTranslate.OffsetX += scalex * vectMouse.X;// _clickedTranslateOriginal.OffsetX + vectMouse.X;
-             _clickedTranslate.OffsetZ = _clickedTranslateOriginal.OffsetZ +  vectMouse.Z;// vectMouse.Z;
+            // _clickedTranslate.OffsetY += scaley * vectMouse.Y;// _clickedTranslateOriginal.OffsetY + vectMouse.Y;
+             _clickedTranslate.OffsetZ += scaley * vectMouse.Z;// _clickedTranslateOriginal.OffsetZ + vectMouse.Z;// vectMouse.Z;
+             mm += vectMouse.Y.ToString() + "/n";
          }
          private void LookUpDown(Point currentPosition)
          {
              double scale  = currentPosition.Y- _previousPosition2D.Y;

 Legend:



Removed from v.17
 


changed lines


 
Added in v.19
 Legend:



Removed from v.17
 


changed lines


 
Added in v.19
-Removed from v.17
+Added in v.19

	ViewVC Help
Powered by ViewVC 1.0.0

MyGforge Home

Xenki Viewer

Diff of /trunk/DefaultRenderer/CameraControl.cs