Merge pull request #35 from SuperSimon81/master

Improved panning
picoe · Oct 17, 2019 · 533f283 · 533f283
2 parents c95545a + 9b167c4
commit 533f283
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/TestEtoOpenTK/TestViewport.cs b/TestEtoOpenTK/TestViewport.cs
@@ -181,12 +181,14 @@ void dragHandler(object sender, MouseEventArgs e)
 			{
 				object locking = new object();
 				lock (locking)
-				{
-					// Scaling factor is arbitrary - just based on testing to avoid insane panning speeds.
-					float new_X = (ovpSettings.cameraPosition.X - (((float)e.Location.X - x_orig) / 100.0f));
-					float new_Y = (ovpSettings.cameraPosition.Y + (((float)e.Location.Y - y_orig) / 100.0f));
-					ovpSettings.cameraPosition = new PointF(new_X, new_Y);
-				}
+				{
+                    // Scaling factor is arbitrary - just based on testing to avoid insane panning speeds.
+                    float new_X = (ovpSettings.cameraPosition.X - (((float)e.Location.X - x_orig) * ovpSettings.zoomFactor));
+                    float new_Y = (ovpSettings.cameraPosition.Y + (((float)e.Location.Y - y_orig) * ovpSettings.zoomFactor));
+                    ovpSettings.cameraPosition = new PointF(new_X, new_Y);
+                    x_orig = e.Location.X;
+                    y_orig = e.Location.Y;
+                }
 			}
 			updateViewport();
 			//e.Handled = true;