Switches to GlueGen build 669, JOAL build 435 and JOGL build 989

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10622 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
3.0
jul..om 12 years ago
parent bcb7922b9d
commit b03d6abc33
  1. BIN
      engine/lib/jogl/gluegen-rt-natives-linux-amd64.jar
  2. BIN
      engine/lib/jogl/gluegen-rt-natives-linux-armv6.jar
  3. BIN
      engine/lib/jogl/gluegen-rt-natives-linux-armv6hf.jar
  4. BIN
      engine/lib/jogl/gluegen-rt-natives-linux-i586.jar
  5. BIN
      engine/lib/jogl/gluegen-rt-natives-macosx-universal.jar
  6. BIN
      engine/lib/jogl/gluegen-rt-natives-solaris-amd64.jar
  7. BIN
      engine/lib/jogl/gluegen-rt-natives-solaris-i586.jar
  8. BIN
      engine/lib/jogl/gluegen-rt-natives-windows-amd64.jar
  9. BIN
      engine/lib/jogl/gluegen-rt-natives-windows-i586.jar
  10. BIN
      engine/lib/jogl/gluegen-rt.jar
  11. BIN
      engine/lib/jogl/joal-natives-linux-amd64.jar
  12. BIN
      engine/lib/jogl/joal-natives-linux-armv6.jar
  13. BIN
      engine/lib/jogl/joal-natives-linux-armv6hf.jar
  14. BIN
      engine/lib/jogl/joal-natives-linux-i586.jar
  15. BIN
      engine/lib/jogl/joal-natives-macosx-universal.jar
  16. BIN
      engine/lib/jogl/joal-natives-solaris-amd64.jar
  17. BIN
      engine/lib/jogl/joal-natives-solaris-i586.jar
  18. BIN
      engine/lib/jogl/joal-natives-windows-amd64.jar
  19. BIN
      engine/lib/jogl/joal-natives-windows-i586.jar
  20. BIN
      engine/lib/jogl/joal.jar
  21. BIN
      engine/lib/jogl/jogl-all-natives-linux-amd64.jar
  22. BIN
      engine/lib/jogl/jogl-all-natives-linux-armv6.jar
  23. BIN
      engine/lib/jogl/jogl-all-natives-linux-armv6hf.jar
  24. BIN
      engine/lib/jogl/jogl-all-natives-linux-i586.jar
  25. BIN
      engine/lib/jogl/jogl-all-natives-macosx-universal.jar
  26. BIN
      engine/lib/jogl/jogl-all-natives-solaris-amd64.jar
  27. BIN
      engine/lib/jogl/jogl-all-natives-solaris-i586.jar
  28. BIN
      engine/lib/jogl/jogl-all-natives-windows-amd64.jar
  29. BIN
      engine/lib/jogl/jogl-all-natives-windows-i586.jar
  30. BIN
      engine/lib/jogl/jogl-all.jar
  31. 22
      engine/src/jogl/com/jme3/input/jogl/NewtKeyInput.java
  32. 22
      engine/src/jogl/com/jme3/system/jogl/JoglNewtDisplay.java

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -100,7 +100,7 @@ public class NewtKeyInput implements KeyInput, KeyListener {
} }
public void keyPressed(KeyEvent evt) { public void keyPressed(KeyEvent evt) {
int code = convertAwtKey(evt.getKeyCode()); int code = convertNewtKey(evt.getKeySymbol());
// Check if key was already pressed // Check if key was already pressed
if (!keyStateSet.get(code)){ if (!keyStateSet.get(code)){
@ -114,7 +114,7 @@ public class NewtKeyInput implements KeyInput, KeyListener {
} }
public void keyReleased(KeyEvent evt) { public void keyReleased(KeyEvent evt) {
int code = convertAwtKey(evt.getKeyCode()); int code = convertNewtKey(evt.getKeySymbol());
// Check if key was already released // Check if key was already released
if (keyStateSet.get(code)) { if (keyStateSet.get(code)) {
@ -215,8 +215,8 @@ public class NewtKeyInput implements KeyInput, KeyListener {
return KeyEvent.VK_SEMICOLON; return KeyEvent.VK_SEMICOLON;
case KEY_APOSTROPHE: case KEY_APOSTROPHE:
return KeyEvent.VK_QUOTE; return KeyEvent.VK_QUOTE;
case KEY_GRAVE: //case KEY_GRAVE:
return KeyEvent.VK_DEAD_GRAVE; // return KeyEvent.VK_DEAD_GRAVE;
case KEY_LSHIFT: case KEY_LSHIFT:
return KeyEvent.VK_SHIFT; return KeyEvent.VK_SHIFT;
case KEY_BACKSLASH: case KEY_BACKSLASH:
@ -309,8 +309,8 @@ public class NewtKeyInput implements KeyInput, KeyListener {
return KeyEvent.VK_F14; return KeyEvent.VK_F14;
case KEY_F15: case KEY_F15:
return KeyEvent.VK_F15; return KeyEvent.VK_F15;
case KEY_KANA: //case KEY_KANA:
return KeyEvent.VK_KANA; // return KeyEvent.VK_KANA;
case KEY_CONVERT: case KEY_CONVERT:
return KeyEvent.VK_CONVERT; return KeyEvent.VK_CONVERT;
case KEY_NOCONVERT: case KEY_NOCONVERT:
@ -372,7 +372,7 @@ public class NewtKeyInput implements KeyInput, KeyListener {
* @param key awt KeyEvent key code * @param key awt KeyEvent key code
* @return jme KeyInput key code * @return jme KeyInput key code
*/ */
public static int convertAwtKey(int key) { public static int convertNewtKey(short key) {
switch ( key ) { switch ( key ) {
case KeyEvent.VK_ESCAPE: case KeyEvent.VK_ESCAPE:
return KEY_ESCAPE; return KEY_ESCAPE;
@ -454,8 +454,8 @@ public class NewtKeyInput implements KeyInput, KeyListener {
return KEY_SEMICOLON; return KEY_SEMICOLON;
case KeyEvent.VK_QUOTE: case KeyEvent.VK_QUOTE:
return KEY_APOSTROPHE; return KEY_APOSTROPHE;
case KeyEvent.VK_DEAD_GRAVE: //case KeyEvent.VK_DEAD_GRAVE:
return KEY_GRAVE; // return KEY_GRAVE;
case KeyEvent.VK_SHIFT: case KeyEvent.VK_SHIFT:
return KEY_LSHIFT; return KEY_LSHIFT;
case KeyEvent.VK_BACK_SLASH: case KeyEvent.VK_BACK_SLASH:
@ -546,8 +546,8 @@ public class NewtKeyInput implements KeyInput, KeyListener {
return KEY_F14; return KEY_F14;
case KeyEvent.VK_F15: case KeyEvent.VK_F15:
return KEY_F15; return KEY_F15;
case KeyEvent.VK_KANA: //case KeyEvent.VK_KANA:
return KEY_KANA; // return KEY_KANA;
case KeyEvent.VK_CONVERT: case KeyEvent.VK_CONVERT:
return KEY_CONVERT; return KEY_CONVERT;
case KeyEvent.VK_NONCONVERT: case KeyEvent.VK_NONCONVERT:

@ -33,11 +33,11 @@
package com.jme3.system.jogl; package com.jme3.system.jogl;
import com.jme3.system.AppSettings; import com.jme3.system.AppSettings;
import com.jogamp.newt.MonitorMode;
import com.jogamp.newt.Screen; import com.jogamp.newt.Screen;
import com.jogamp.newt.ScreenMode;
import com.jogamp.newt.event.WindowAdapter; import com.jogamp.newt.event.WindowAdapter;
import com.jogamp.newt.event.WindowEvent; import com.jogamp.newt.event.WindowEvent;
import com.jogamp.newt.util.ScreenModeUtil; import com.jogamp.newt.util.MonitorModeUtil;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Level; import java.util.logging.Level;
@ -120,25 +120,25 @@ public class JoglNewtDisplay extends JoglNewtAbstractDisplay {
*/ */
screen.addReference(); screen.addReference();
if (settings.isFullscreen()) { if (settings.isFullscreen()) {
List<ScreenMode> screenModes = screen.getScreenModes(); List<MonitorMode> screenModes = canvas.getMainMonitor().getSupportedModes();
//the resolution is provided by the user //the resolution is provided by the user
Dimension dimension = new Dimension(settings.getWidth(), settings.getHeight()); Dimension dimension = new Dimension(settings.getWidth(), settings.getHeight());
screenModes = ScreenModeUtil.filterByResolution(screenModes, dimension); screenModes = MonitorModeUtil.filterByResolution(screenModes, dimension);
screenModes = ScreenModeUtil.getHighestAvailableBpp(screenModes); screenModes = MonitorModeUtil.getHighestAvailableBpp(screenModes);
if (settings.getFrequency() > 0) { if (settings.getFrequency() > 0) {
screenModes = ScreenModeUtil.filterByRate(screenModes, settings.getFrequency()); screenModes = MonitorModeUtil.filterByRate(screenModes, settings.getFrequency());
} else { } else {
screenModes = ScreenModeUtil.getHighestAvailableRate(screenModes); screenModes = MonitorModeUtil.getHighestAvailableRate(screenModes);
} }
screen.setCurrentScreenMode(screenModes.get(0)); canvas.getMainMonitor().setCurrentMode(screenModes.get(0));
} }
ScreenMode currentScreenMode = screen.getCurrentScreenMode(); MonitorMode currentScreenMode = canvas.getMainMonitor().getCurrentMode();
logger.log(Level.FINE, "Selected display mode: {0}x{1}x{2} @{3}", logger.log(Level.FINE, "Selected display mode: {0}x{1}x{2} @{3}",
new Object[]{currentScreenMode.getRotatedWidth(), new Object[]{currentScreenMode.getRotatedWidth(),
currentScreenMode.getRotatedHeight(), currentScreenMode.getRotatedHeight(),
currentScreenMode.getMonitorMode().getSurfaceSize().getBitsPerPixel(), currentScreenMode.getSurfaceSize().getBitsPerPixel(),
currentScreenMode.getMonitorMode().getRefreshRate()}); currentScreenMode.getRefreshRate()});
} }
private void privateInit(){ private void privateInit(){

Loading…
Cancel
Save