OpenSimulator GForge > Projects > Xenki Viewer > SVN

Diff of /trunk/DefaultRenderer/CameraControl.cs

-revision 19, Tue Sep  2 10:37:33 2008 UTC
+revision 20, Wed Sep  3 07:09:16 2008 UTC
 Line 106
              double scale = e.Delta / 1200.00;
              double distance = Point3D.Subtract(_cameraLookPoint, _camera.Position).Length;
-             if (distance > 1024 || distance <= 1)
+             if (distance > 1024 || distance <= 10)
              {
                  if (touch == false)
                  {
 Line 204
              Mouse.Capture(EventSource, CaptureMode.None);
              isTracking = false;
-             Transform3DGroup clickedtransformGroup = new Transform3DGroup();
+             //Transform3DGroup clickedtransformGroup = new Transform3DGroup();
-             clickedtransformGroup.Children.Add(_clickedRotate);
+             //clickedtransformGroup.Children.Add(_clickedRotate);
-             clickedtransformGroup.Children.Add(_clickedTranslate);
+             //clickedtransformGroup.Children.Add(_clickedTranslate);
-             visul3d.Transform =  clickedtransformGroup;
+             //visul3d.Transform =  clickedtransformGroup;
              _eventSource.ReleaseMouseCapture();
              _eventSource.Cursor = Cursors.Arrow;
-             string mmm = mm;
          }
          private void OnMouseMove(object sender, MouseEventArgs e)
-Line 239
+Line 236
              }
              else if (e.RightButton == MouseButtonState.Pressed && Keyboard.IsKeyDown(Key.A))
              {
+                 //TODO:
                  CameraPanLeft(currentPosition);
              }
              else if (e.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 (e.LeftButton == MouseButtonState.Pressed && (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl)))
              {
                  if(isTracking)
+                 {
+                     _eventSource.Cursor = Cursors.None;
                  PanObject(currentPosition);
              }
+             }
              _previousPosition2D = currentPosition;
          }
-Line 273
+Line 276
              // Write the new orientation back to the Rotation3D
-             _clickedAxisAngleRotate.Axis = q.Axis;
+             if (_clickedAxisAngleRotate.Angle >= 360||_clickedAxisAngleRotate.Angle<=-360)
-             _clickedAxisAngleRotate.Angle += q.Angle/4;
-             if (_clickedAxisAngleRotate.Angle >= 360)
                  _clickedAxisAngleRotate.Angle = 0;
+             _clickedAxisAngleRotate.Axis = q.Axis;
+             _clickedAxisAngleRotate.Angle -= q.Angle;
              _previousPosition3D = currentPosition3D;
          }
-Line 297
+Line 302
          #endregion Event Handling
          private void CameraPanLeft(Point currentPosition)
          {
              LineRange range;
-Line 323
+Line 329
              Vector3D vectMouse = pointNew - _cameraLookPoint;
              //vectMouse = Vector3D.Multiply(_cameraLookDirection, visul3d.Transform.Value);
-            _clickedTranslate.OffsetX += scalex * vectMouse.X;// _clickedTranslateOriginal.OffsetX + vectMouse.X;
+             _clickedTranslate.OffsetX = _clickedTranslateOriginal.OffsetX + vectMouse.X;
+             _clickedTranslate.OffsetY = _clickedTranslateOriginal.OffsetY + vectMouse.Y;
+             _clickedTranslate.OffsetZ = _clickedTranslateOriginal.OffsetZ + vectMouse.Z;// vectMouse.Z;
+            // //vectMouse = Vector3D.Multiply(_cameraLookDirection, visul3d.Transform.Value);
+            //_clickedTranslate.OffsetX += scalex * vectMouse.X;// _clickedTranslateOriginal.OffsetX + vectMouse.X;
             // _clickedTranslate.OffsetY += scaley * vectMouse.Y;// _clickedTranslateOriginal.OffsetY + vectMouse.Y;
-             _clickedTranslate.OffsetZ += scaley * vectMouse.Z;// _clickedTranslateOriginal.OffsetZ + vectMouse.Z;// vectMouse.Z;
+            // //_clickedTranslate.OffsetZ += scaley * vectMouse.Z;// _clickedTranslateOriginal.OffsetZ + vectMouse.Z;// vectMouse.Z;
-             mm += vectMouse.Y.ToString() + "/n";
+             //mm += vectMouse.Y.ToString() + "/n";
          }
-Line 346
+Line 357
          private void Focus(Point currentPosition)
          {
              double yDelta = currentPosition.Y - _previousPosition2D.Y;
-             double scale = yDelta / 100;
+             double scale = yDelta / 100.0;
              //Maybe this part need replaced by collision detection method
              double distance = Point3D.Subtract(_cameraLookPoint, _camera.Position).Length;
-             if (distance > 1024 || distance <= 0.5)
+             if (distance > 1024 || distance <= 1)
              {
                  if (touch == false)
                      touch = true;
-Line 372
+Line 383
              double axisAngle = currentPosition.X - _previousPosition2D.X;
              double angletimes = axisAngle;
-             if (angletimes > 360 || angletimes < -360)
+             if ( _rotation.Angle- angletimes <= -360)
-                 angletimes = 0;
-             if (angletimes + _rotation.Angle >= 360)
                  _rotation.Angle = 0;
              _rotation.Axis = new Vector3D(0, 0, 1);
-             _rotation.Angle += axisAngle;
+             _rotation.Angle -= axisAngle;
          }
          public HitTestResultBehavior HitTestCallback(HitTestResult result)
-Line 394
+Line 402
          {
              double yDelta = currentPosition.Y - _previousPosition2D.Y;
              double xDelta = currentPosition.X - _previousPosition2D.X;
-             double scale = yDelta / 10;
+             double scale = yDelta / 5.00;
              _camera.Position = new Point3D(_camera.Position.X, _camera.Position.Y, _camera.Position.Z + scale);
          }

 Legend:



Removed from v.19
 


changed lines


 
Added in v.20
 Legend:



Removed from v.19
 


changed lines


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

	ViewVC Help
Powered by ViewVC 1.0.0

MyGforge Home

Xenki Viewer

Diff of /trunk/DefaultRenderer/CameraControl.cs