sigonasr2
/
jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #379 from davidB/fix_opengl3

Browse Source 
jogl: use pixel unit for window's dimension (fix issue on MaxOS X)
cleanup_build_scripts
Julien Gouesse 9 years ago
parent 50a9a8636b 0f140370ed
commit 361cb0893a
1 changed files with 5 additions and 5 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      jme3-jogl/src/main/java/com/jme3/input/jogl/NewtMouseInput.java

10
jme3-jogl/src/main/java/com/jme3/input/jogl/NewtMouseInput.java
Unescape View File

@ -176,7 +176,7 @@ public class NewtMouseInput implements MouseInput, MouseListener {
// invert DY // invert DY
int actualX = lastKnownLocation.getX(); int actualX = lastKnownLocation.getX();
int actualY = component.getHeight() - lastKnownLocation.getY(); int actualY = component.getSurfaceHeight() - lastKnownLocation.getY();
MouseMotionEvent evt = new MouseMotionEvent(actualX, actualY, MouseMotionEvent evt = new MouseMotionEvent(actualX, actualY,
newX - lastEventX, newX - lastEventX,
lastEventY - newY, lastEventY - newY,
@ -215,7 +215,7 @@ public class NewtMouseInput implements MouseInput, MouseListener {
@Override @Override
public void mousePressed(MouseEvent newtEvt) { public void mousePressed(MouseEvent newtEvt) {
MouseButtonEvent evt = new MouseButtonEvent(getJMEButtonIndex(newtEvt), true, newtEvt.getX(), newtEvt.getY()); MouseButtonEvent evt = new MouseButtonEvent(getJMEButtonIndex(newtEvt), true, newtEvt.getX(), component.getSurfaceHeight() - newtEvt.getY());
evt.setTime(newtEvt.getWhen()); evt.setTime(newtEvt.getWhen());
synchronized (eventQueue) { synchronized (eventQueue) {
eventQueue.add(evt); eventQueue.add(evt);
@ -224,7 +224,7 @@ public class NewtMouseInput implements MouseInput, MouseListener {
@Override @Override
public void mouseReleased(MouseEvent awtEvt) { public void mouseReleased(MouseEvent awtEvt) {
MouseButtonEvent evt = new MouseButtonEvent(getJMEButtonIndex(awtEvt), false, awtEvt.getX(), awtEvt.getY()); MouseButtonEvent evt = new MouseButtonEvent(getJMEButtonIndex(awtEvt), false, awtEvt.getX(), component.getSurfaceHeight() - awtEvt.getY());
evt.setTime(awtEvt.getWhen()); evt.setTime(awtEvt.getWhen());
synchronized (eventQueue) { synchronized (eventQueue) {
eventQueue.add(evt); eventQueue.add(evt);
@ -285,8 +285,8 @@ public class NewtMouseInput implements MouseInput, MouseListener {
private void recenterMouse(final GLWindow component) { private void recenterMouse(final GLWindow component) {
eventsSinceRecenter = 0; eventsSinceRecenter = 0;
isRecentering = true; isRecentering = true;
centerLocation.setX(component.getWidth() / 2); centerLocation.setX(component.getSurfaceWidth() / 2);
centerLocation.setY(component.getHeight() / 2); centerLocation.setY(component.getSurfaceHeight() / 2);
centerLocationOnScreen.setX(centerLocation.getX()); centerLocationOnScreen.setX(centerLocation.getX());
centerLocationOnScreen.setY(centerLocation.getY()); centerLocationOnScreen.setY(centerLocation.getY());

Write Preview
Loading…
Cancel
Save