Commits

Cliff Biffle committed 1c419a3

Reworked scroll behavior. Unmodified X/Y scroll now moves the image in the viewport. Hold command to adjust depth.

Comments (0)

Files changed (1)

   }
 }
 
+#define SCROLL_SPEED (50.F)
+
 - (void) scrollWheel: (NSEvent *)theEvent {
   float deltaV = [theEvent deltaY];
   BOOL changes = NO;
   if (deltaV) {
-    camera.pos.z += deltaV / 100.;
-    camera.target.z += deltaV / 100.;
+    if ([theEvent modifierFlags] & NSCommandKeyMask) {
+      camera.pos.z -= deltaV / SCROLL_SPEED;
+      camera.target.z -= deltaV / SCROLL_SPEED;
+    } else {
+      camera.pos.y -= deltaV / SCROLL_SPEED;
+      camera.target.y -= deltaV / SCROLL_SPEED;
+    }
     changes = YES;
   }
   
   float deltaH = [theEvent deltaX];
   if (deltaH) {
-    camera.pos.x += deltaH / 100.;
-    camera.target.x += deltaH / 100.;
+    camera.pos.x -= deltaH / SCROLL_SPEED;
+    camera.target.x -= deltaH / SCROLL_SPEED;
     changes = YES;
   }
   
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.