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

restore the JOGL/JOAL hooks (#1368)

Browse Source 
* restore the "hooks" for using JOGL/JOAL instead of LWJGL as the backend

* clarify the AppSettings javadoc related to JOGL and JOAL

* clarify some JmeDesktopSystem diagnostics related to JOGL and JOAL
This commit is contained in:
Stephen Gold 2020-05-08 12:01:59 -07:00 committed by GitHub
parent c0692df207
commit d6b0069407
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 69 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
jme3-core/src/main/java/com/jme3/system/AppSettings.java
View File

@ -238,6 +238,33 @@ public final class AppSettings extends HashMap<String, Object> {
*/
public static final String ANDROID_OPENAL_SOFT = "OpenAL_SOFT";
/**
* Use JogAmp's JOGL as the display system, with the OpenGL forward compatible profile
* <p>
* N.B: This backend is EXPERIMENTAL
*
* @see AppSettings#setRenderer(java.lang.String)
*/
public static final String JOGL_OPENGL_FORWARD_COMPATIBLE = "JOGL_OPENGL_FORWARD_COMPATIBLE";
/**
* Use JogAmp's JOGL as the display system, with the backward compatible profile
* <p>
* N.B: This backend is EXPERIMENTAL
*
* @see AppSettings#setRenderer(java.lang.String)
*/
public static final String JOGL_OPENGL_BACKWARD_COMPATIBLE = "JOGL_OPENGL_BACKWARD_COMPATIBLE";
/**
* Use JogAmp's JOAL as the audio renderer.
* <p>
* N.B: This backend is EXPERIMENTAL
*
* @see AppSettings#setAudioRenderer(java.lang.String)
*/
public static final String JOAL = "JOAL";
static {
defaults.put("Width", 640);
defaults.put("Height", 480);
@ -644,6 +671,8 @@ public final class AppSettings extends HashMap<String, Object> {
* <li>AppSettings.LWJGL_OPENGL3 - Force OpenGL3.3 compatability</li>
* <li>AppSettings.LWJGL_OPENGL_ANY - Choose an appropriate
* OpenGL version based on system capabilities</li>
* <li>AppSettings.JOGL_OPENGL_BACKWARD_COMPATIBLE</li>
* <li>AppSettings.JOGL_OPENGL_FORWARD_COMPATIBLE</li>
* <li>null - Disable graphics rendering</li>
* </ul>
* @param renderer The renderer to set
@ -667,6 +696,7 @@ public final class AppSettings extends HashMap<String, Object> {
* Set the audio renderer to use. One of:<br>
* <ul>
* <li>AppSettings.LWJGL_OPENAL - Default for LWJGL</li>
* <li>AppSettings.JOAL</li>
* <li>null - Disable audio</li>
* </ul>
* @param audioRenderer

41
jme3-desktop/src/main/java/com/jme3/system/JmeDesktopSystem.java
View File

@ -221,6 +221,36 @@ public class JmeDesktopSystem extends JmeSystemDelegate {
return null;
}
private JmeContext newContextJogl(AppSettings settings, JmeContext.Type type) {
try {
Class ctxClazz = null;
switch (type) {
case Display:
ctxClazz = Class.forName("com.jme3.system.jogl.JoglNewtDisplay");
break;
case Canvas:
ctxClazz = Class.forName("com.jme3.system.jogl.JoglNewtCanvas");
break;
case OffscreenSurface:
ctxClazz = Class.forName("com.jme3.system.jogl.JoglOffscreenBuffer");
break;
default:
throw new IllegalArgumentException("Unsupported context type " + type);
}
return (JmeContext) ctxClazz.newInstance();
} catch (InstantiationException ex) {
logger.log(Level.SEVERE, "Failed to create context", ex);
} catch (IllegalAccessException ex) {
logger.log(Level.SEVERE, "Failed to create context", ex);
} catch (ClassNotFoundException ex) {
logger.log(Level.SEVERE, "CRITICAL ERROR: Context class is missing!\n"
+ "Make sure jme3-jogl is on the classpath.", ex);
}
return null;
}
private JmeContext newContextCustom(AppSettings settings, JmeContext.Type type) {
try {
String className = settings.getRenderer().substring("CUSTOM".length());
@ -250,6 +280,9 @@ public class JmeDesktopSystem extends JmeSystemDelegate {
} else if (settings.getRenderer().startsWith("LWJGL")) {
ctx = newContextLwjgl(settings, contextType);
ctx.setSettings(settings);
} else if (settings.getRenderer().startsWith("JOGL")) {
ctx = newContextJogl(settings, contextType);
ctx.setSettings(settings);
} else if (settings.getRenderer().startsWith("CUSTOM")) {
ctx = newContextCustom(settings, contextType);
ctx.setSettings(settings);
@ -267,8 +300,8 @@ public class JmeDesktopSystem extends JmeSystemDelegate {
Class<T> clazz = (Class<T>) Class.forName(className);
return clazz.newInstance();
} catch (ClassNotFoundException ex) {
logger.log(Level.SEVERE, "CRITICAL ERROR: Audio implementation class is missing!\n"
+ "Make sure jme3_lwjgl-oal is on the classpath.", ex);
logger.log(Level.SEVERE, "CRITICAL ERROR: Audio implementation class "
+ className + " is missing!\n", ex);
} catch (IllegalAccessException ex) {
logger.log(Level.SEVERE, "Failed to create context", ex);
} catch (InstantiationException ex) {
@ -289,6 +322,10 @@ public class JmeDesktopSystem extends JmeSystemDelegate {
al = newObject("com.jme3.audio.lwjgl.LwjglAL");
alc = newObject("com.jme3.audio.lwjgl.LwjglALC");
efx = newObject("com.jme3.audio.lwjgl.LwjglEFX");
} else if (settings.getAudioRenderer().startsWith("JOAL")) {
al = newObject("com.jme3.audio.joal.JoalAL");
alc = newObject("com.jme3.audio.joal.JoalALC");
efx = newObject("com.jme3.audio.joal.JoalEFX");
} else {
throw new UnsupportedOperationException(
"Unrecognizable audio renderer specified: "