michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implement ScrollWheel functionality again

This commit is contained in:
kappaOne 2012-11-25 20:14:48 +00:00
parent 9a968e8c41
commit b5a87d818e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/lwjgl/opengl/MacOSXNativeMouse.java
View File

@ -188,7 +188,7 @@ final class MacOSXNativeMouse extends EventQueue {
setCursorPos(x, y, nanos); setCursorPos(x, y, nanos);
} }
if ( dz != 0 ) { if ( dz != 0 ) {
int wheel_amount = (int)(-dz * WHEEL_SCALE); int wheel_amount = (int)(-dy * WHEEL_SCALE);
accum_dz += wheel_amount; accum_dz += wheel_amount;
putMouseEvent((byte)-1, (byte)0, wheel_amount, nanos); putMouseEvent((byte)-1, (byte)0, wheel_amount, nanos);
} }

10
src/native/macosx/org_lwjgl_opengl_Display.m
View File

@ -327,7 +327,7 @@ static NSAutoreleasePool *pool;
jclass mouse_class = (*env)->GetObjectClass(env, _parent->jmouse); jclass mouse_class = (*env)->GetObjectClass(env, _parent->jmouse);
jmethodID mousemove = (*env)->GetMethodID(env, mouse_class, "mouseMoved", "(FFFFFJ)V"); jmethodID mousemove = (*env)->GetMethodID(env, mouse_class, "mouseMoved", "(FFFFFJ)V");
NSPoint loc = [self convertPoint:[event locationInWindow] toView:self]; 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 { - (void)scrollWheel:(NSEvent *)event {
@ -340,10 +340,10 @@ static NSAutoreleasePool *pool;
//if (![event hasPreciseScrollingDeltas]) { // Also an OS X 10.7 API //if (![event hasPreciseScrollingDeltas]) { // Also an OS X 10.7 API
// dz *= 12; // or so // dz *= 12; // or so
//} //}
//jclass mouse_class = (*env)->GetObjectClass(env, _parent->jmouse); jclass mouse_class = (*env)->GetObjectClass(env, _parent->jmouse);
//jmethodID mousemove = (*env)->GetMethodID(env, mouse_class, "mouseMoved", "(FFFFFJ)V"); jmethodID mousemove = (*env)->GetMethodID(env, mouse_class, "mouseMoved", "(FFFFFJ)V");
//NSPoint loc = [self convertPoint:[event locationInWindow] toView:self]; NSPoint loc = [self convertPoint:[event locationInWindow] toView:self];
//(*env)->CallVoidMethod(env, _parent->jmouse, mousemove, loc.x, loc.y, [event deltaX], [event deltaY], dz, time); (*env)->CallVoidMethod(env, _parent->jmouse, mousemove, loc.x, loc.y, [event deltaX], [event deltaY], 1.0f, time);
} }
- (void)viewDidMoveToWindow - (void)viewDidMoveToWindow