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

engine/src/jogl/com/jme3/input/jogl/NewtKeyInput.java

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

engine/src/jogl/com/jme3/system/jogl/JoglNewtDisplay.java

@@ -33,11 +33,11 @@
 package com.jme3.system.jogl;
 
 import com.jme3.system.AppSettings;
+import com.jogamp.newt.MonitorMode;
 import com.jogamp.newt.Screen;
-import com.jogamp.newt.ScreenMode;
 import com.jogamp.newt.event.WindowAdapter;
 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.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
@@ -120,25 +120,25 @@ public class JoglNewtDisplay extends JoglNewtAbstractDisplay {
          */
         screen.addReference();
         if (settings.isFullscreen()) {
-            List<ScreenMode> screenModes = screen.getScreenModes();
+            List<MonitorMode> screenModes = canvas.getMainMonitor().getSupportedModes();
             //the resolution is provided by the user
             Dimension dimension = new Dimension(settings.getWidth(), settings.getHeight());
-            screenModes = ScreenModeUtil.filterByResolution(screenModes, dimension);
-            screenModes = ScreenModeUtil.getHighestAvailableBpp(screenModes);
+            screenModes = MonitorModeUtil.filterByResolution(screenModes, dimension);
+            screenModes = MonitorModeUtil.getHighestAvailableBpp(screenModes);
             if (settings.getFrequency() > 0) {
-                screenModes = ScreenModeUtil.filterByRate(screenModes, settings.getFrequency());
+                screenModes = MonitorModeUtil.filterByRate(screenModes, settings.getFrequency());
             } 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}",
                 new Object[]{currentScreenMode.getRotatedWidth(),
                              currentScreenMode.getRotatedHeight(),
-                             currentScreenMode.getMonitorMode().getSurfaceSize().getBitsPerPixel(),
-                             currentScreenMode.getMonitorMode().getRefreshRate()});
+                             currentScreenMode.getSurfaceSize().getBitsPerPixel(),
+                             currentScreenMode.getRefreshRate()});
     }
 
     private void privateInit(){