From b5a87d818e32c6c30f56031fbd74b9b69355cd93 Mon Sep 17 00:00:00 2001 From: kappaOne Date: Sun, 25 Nov 2012 20:14:48 +0000 Subject: [PATCH] Implement ScrollWheel functionality again --- src/java/org/lwjgl/opengl/MacOSXNativeMouse.java | 2 +- src/native/macosx/org_lwjgl_opengl_Display.m | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/java/org/lwjgl/opengl/MacOSXNativeMouse.java b/src/java/org/lwjgl/opengl/MacOSXNativeMouse.java index a427d8ca..12415a35 100644 --- a/src/java/org/lwjgl/opengl/MacOSXNativeMouse.java +++ b/src/java/org/lwjgl/opengl/MacOSXNativeMouse.java @@ -188,7 +188,7 @@ final class MacOSXNativeMouse extends EventQueue { setCursorPos(x, y, nanos); } if ( dz != 0 ) { - int wheel_amount = (int)(-dz * WHEEL_SCALE); + int wheel_amount = (int)(-dy * WHEEL_SCALE); accum_dz += wheel_amount; putMouseEvent((byte)-1, (byte)0, wheel_amount, nanos); } diff --git a/src/native/macosx/org_lwjgl_opengl_Display.m b/src/native/macosx/org_lwjgl_opengl_Display.m index 6707bd79..efb6e3e1 100644 --- a/src/native/macosx/org_lwjgl_opengl_Display.m +++ b/src/native/macosx/org_lwjgl_opengl_Display.m @@ -327,7 +327,7 @@ static NSAutoreleasePool *pool; jclass mouse_class = (*env)->GetObjectClass(env, _parent->jmouse); jmethodID mousemove = (*env)->GetMethodID(env, mouse_class, "mouseMoved", "(FFFFFJ)V"); NSPoint loc = [self convertPoint:[event locationInWindow] toView:self]; - (*env)->CallVoidMethod(env, _parent->jmouse, mousemove, loc.x, loc.y, [event deltaX], [event deltaY], 0.0f, time); + (*env)->CallVoidMethod(env, _parent->jmouse, mousemove, loc.x, loc.y, [event deltaX], [event deltaY], 0.0f, time); } - (void)scrollWheel:(NSEvent *)event { @@ -340,10 +340,10 @@ static NSAutoreleasePool *pool; //if (![event hasPreciseScrollingDeltas]) { // Also an OS X 10.7 API // dz *= 12; // or so //} - //jclass mouse_class = (*env)->GetObjectClass(env, _parent->jmouse); - //jmethodID mousemove = (*env)->GetMethodID(env, mouse_class, "mouseMoved", "(FFFFFJ)V"); - //NSPoint loc = [self convertPoint:[event locationInWindow] toView:self]; - //(*env)->CallVoidMethod(env, _parent->jmouse, mousemove, loc.x, loc.y, [event deltaX], [event deltaY], dz, time); + jclass mouse_class = (*env)->GetObjectClass(env, _parent->jmouse); + jmethodID mousemove = (*env)->GetMethodID(env, mouse_class, "mouseMoved", "(FFFFFJ)V"); + NSPoint loc = [self convertPoint:[event locationInWindow] toView:self]; + (*env)->CallVoidMethod(env, _parent->jmouse, mousemove, loc.x, loc.y, [event deltaX], [event deltaY], 1.0f, time); } - (void)viewDidMoveToWindow