aboutsummaryrefslogtreecommitdiffstats
path: root/ardor3d-jogl/src/main
diff options
context:
space:
mode:
authorJulien Gouesse <[email protected]>2013-05-09 18:40:47 +0200
committerJulien Gouesse <[email protected]>2013-05-09 18:40:47 +0200
commita0de39780778110895233d2fe41048b8c3e120aa (patch)
tree5c4dfc084f1130abc60d3acc1a235a35b2d311bb /ardor3d-jogl/src/main
parenta5a28593b52b96c7b06017a3a519c11dba07b298 (diff)
Modifies the few classes using NEWT to fix compile errors caused by API changes in JOGL 2.0 build 987
Diffstat (limited to 'ardor3d-jogl/src/main')
-rw-r--r--ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglNewtWindow.java20
1 files changed, 10 insertions, 10 deletions
diff --git a/ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglNewtWindow.java b/ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglNewtWindow.java
index 9f6a710..1dc9dcc 100644
--- a/ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglNewtWindow.java
+++ b/ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglNewtWindow.java
@@ -22,15 +22,15 @@ import com.ardor3d.annotation.MainThread;
import com.ardor3d.framework.DisplaySettings;
import com.ardor3d.framework.NativeCanvas;
import com.ardor3d.image.Image;
-import com.jogamp.newt.Screen;
-import com.jogamp.newt.ScreenMode;
+import com.jogamp.newt.MonitorDevice;
+import com.jogamp.newt.MonitorMode;
import com.jogamp.newt.event.KeyListener;
import com.jogamp.newt.event.MouseListener;
import com.jogamp.newt.event.WindowAdapter;
import com.jogamp.newt.event.WindowEvent;
import com.jogamp.newt.event.WindowListener;
import com.jogamp.newt.opengl.GLWindow;
-import com.jogamp.newt.util.ScreenModeUtil;
+import com.jogamp.newt.util.MonitorModeUtil;
public class JoglNewtWindow implements NativeCanvas, NewtWindowContainer {
@@ -77,18 +77,18 @@ public class JoglNewtWindow implements NativeCanvas, NewtWindowContainer {
* current resolution
*/
if (_settings.isFullScreen()) {
- final Screen screen = _newtWindow.getScreen();
- List<ScreenMode> screenModes = screen.getScreenModes();
+ final MonitorDevice monitor = _newtWindow.getMainMonitor();
+ List<MonitorMode> monitorModes = monitor.getSupportedModes();
// the resolution is provided by the user
final Dimension dimension = new Dimension(_settings.getWidth(), _settings.getHeight());
- screenModes = ScreenModeUtil.filterByResolution(screenModes, dimension);
- screenModes = ScreenModeUtil.getHighestAvailableBpp(screenModes);
+ monitorModes = MonitorModeUtil.filterByResolution(monitorModes, dimension);
+ monitorModes = MonitorModeUtil.getHighestAvailableBpp(monitorModes);
if (_settings.getFrequency() > 0) {
- screenModes = ScreenModeUtil.filterByRate(screenModes, _settings.getFrequency());
+ monitorModes = MonitorModeUtil.filterByRate(monitorModes, _settings.getFrequency());
} else {
- screenModes = ScreenModeUtil.getHighestAvailableRate(screenModes);
+ monitorModes = MonitorModeUtil.getHighestAvailableRate(monitorModes);
}
- screen.setCurrentScreenMode(screenModes.get(0));
+ monitor.setCurrentMode(monitorModes.get(0));
}
}