#1097-Made GL version 30=3, 40=4 and eliminate redundant version checks

Author: louhy

jme3-core/src/main/java/com/jme3/system/AppSettings.java

@@ -111,7 +111,7 @@ public final class AppSettings extends HashMap<String, Object> {
      *
      * @see AppSettings#setRenderer(java.lang.String)
      */
-    public static final String LWJGL_OPENGL32 = "LWJGL-OpenGL32";
+    public static final String LWJGL_OPENGL32 = LWJGL_OPENGL3;
 
     /**
      * Use LWJGL as the display system and force using the OpenGL3.3 renderer.
@@ -143,7 +143,7 @@ public final class AppSettings extends HashMap<String, Object> {
      *
      * @see AppSettings#setRenderer(java.lang.String)
      */
-    public static final String LWJGL_OPENGL40 = "LWJGL-OpenGL40";
+    public static final String LWJGL_OPENGL40 = LWJGL_OPENGL4;
 
     /**
      * Use LWJGL as the display system and force using the OpenGL4.1 renderer.

jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglContext.java

@@ -117,7 +117,6 @@ protected int[] getGLVersion(String renderer) {
                 maj = 3;
                 min = 0;
                 break;
-            case AppSettings.LWJGL_OPENGL3://For backwards compatibility; previously meant 3.2
             case AppSettings.LWJGL_OPENGL32:
                 maj = 3;
                 min = 2;
@@ -126,7 +125,6 @@ protected int[] getGLVersion(String renderer) {
                 maj = 3;
                 min = 3;
                 break;
-            case AppSettings.LWJGL_OPENGL4://For backwards compatibility
             case AppSettings.LWJGL_OPENGL40:
                 maj = 4;
                 min = 0;

jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglContext.java

@@ -105,11 +105,9 @@ public abstract class LwjglContext implements JmeContext {
 
     private static final Set<String> SUPPORTED_RENDERS = new HashSet<>(Arrays.asList(
             AppSettings.LWJGL_OPENGL2,
-            AppSettings.LWJGL_OPENGL3,
             AppSettings.LWJGL_OPENGL30,
             AppSettings.LWJGL_OPENGL32,
             AppSettings.LWJGL_OPENGL33,
-            AppSettings.LWJGL_OPENGL4,
             AppSettings.LWJGL_OPENGL40,
             AppSettings.LWJGL_OPENGL41,
             AppSettings.LWJGL_OPENGL42,

jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglWindow.java

@@ -76,10 +76,6 @@ public abstract class LwjglWindow extends LwjglContext implements Runnable {
     private static final Map<String, Runnable> RENDER_CONFIGS = new HashMap<>();
 
     static {
-        RENDER_CONFIGS.put(AppSettings.LWJGL_OPENGL3, () -> {
-            glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
-            glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
-        });
         RENDER_CONFIGS.put(AppSettings.LWJGL_OPENGL30, () -> {
             glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
             glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
@@ -92,10 +88,6 @@ public abstract class LwjglWindow extends LwjglContext implements Runnable {
             glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
             glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
         });
-        RENDER_CONFIGS.put(AppSettings.LWJGL_OPENGL4, () -> {
-            glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
-            glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
-        });
         RENDER_CONFIGS.put(AppSettings.LWJGL_OPENGL40, () -> {
             glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
             glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);

jme3-vr/src/main/java/com/jme3/system/lwjgl/LwjglContextVR.java

@@ -147,15 +147,14 @@ protected int getNumSamplesToUse() {
     }
 
     protected void initContextFirstTime() {
-        final GLCapabilities capabilities = createCapabilities(settings.getRenderer().equals(AppSettings.LWJGL_OPENGL3) || 
-                settings.getRenderer().equals(AppSettings.LWJGL_OPENGL32));
+        final GLCapabilities capabilities = createCapabilities(settings.getRenderer().equals(AppSettings.LWJGL_OPENGL32));
 
         if (!capabilities.OpenGL20) {
             throw new RendererException("OpenGL 2.0 or higher is required for jMonkeyEngine");
         }
 
-        if (settings.getRenderer().equals(AppSettings.LWJGL_OPENGL2) || settings.getRenderer().equals(AppSettings.LWJGL_OPENGL32)
-                || settings.getRenderer().equals(AppSettings.LWJGL_OPENGL3)) {
+        if (settings.getRenderer().equals(AppSettings.LWJGL_OPENGL2)
+                || settings.getRenderer().equals(AppSettings.LWJGL_OPENGL32)) {
             GL gl = new LwjglGL();
             GLExt glext = new LwjglGLExt();
             GLFbo glfbo;