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

Fixed a build issue regarding lwjgl 3.x by now using 3.0.0a for longer stability as 3.0.0b-SNAPSHOT is a moving target and APIs are changing constantly.

Browse Source
This commit is contained in:
Daniel Johansson 2015-09-24 11:02:47 +01:00
parent ed2c998f39
commit f470637361
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jme3-lwjgl3/build.gradle
View File

@ -11,8 +11,8 @@ repositories {
dependencies { dependencies {
compile project(':jme3-core') compile project(':jme3-core')
compile project(':jme3-desktop') compile project(':jme3-desktop')
compile 'org.lwjgl:lwjgl:3.0.0b-SNAPSHOT' compile 'org.lwjgl:lwjgl:3.0.0a'
compile group: 'org.lwjgl', name: 'lwjgl-platform', version: '3.0.0b-SNAPSHOT', classifier: 'natives-windows' compile group: 'org.lwjgl', name: 'lwjgl-platform', version: '3.0.0a', classifier: 'natives-windows'
compile group: 'org.lwjgl', name: 'lwjgl-platform', version: '3.0.0b-SNAPSHOT', classifier: 'natives-linux' compile group: 'org.lwjgl', name: 'lwjgl-platform', version: '3.0.0a', classifier: 'natives-linux'
compile group: 'org.lwjgl', name: 'lwjgl-platform', version: '3.0.0b-SNAPSHOT', classifier: 'natives-osx' compile group: 'org.lwjgl', name: 'lwjgl-platform', version: '3.0.0a', classifier: 'natives-osx'
} }

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

@ -42,11 +42,13 @@ import com.jme3.renderer.lwjgl.LwjglGLExt;
import com.jme3.renderer.lwjgl.LwjglGLFboEXT; import com.jme3.renderer.lwjgl.LwjglGLFboEXT;
import com.jme3.renderer.lwjgl.LwjglGLFboGL3; import com.jme3.renderer.lwjgl.LwjglGLFboGL3;
import com.jme3.renderer.opengl.*; import com.jme3.renderer.opengl.*;
import com.jme3.renderer.opengl.GL;
import com.jme3.system.*; import com.jme3.system.*;
import org.lwjgl.Sys; import org.lwjgl.Sys;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import org.lwjgl.opengl.*; import org.lwjgl.opengl.ARBDebugOutput;
import org.lwjgl.opengl.ARBFramebufferObject;
import org.lwjgl.opengl.ContextCapabilities;
import org.lwjgl.opengl.EXTFramebufferMultisample;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Level; import java.util.logging.Level;
@ -132,7 +134,7 @@ public abstract class LwjglContext implements JmeContext {
} }
protected void initContextFirstTime() { protected void initContextFirstTime() {
final GLCapabilities capabilities = createCapabilities(settings.getRenderer().equals(AppSettings.LWJGL_OPENGL3)); final ContextCapabilities capabilities = createCapabilities(settings.getRenderer().equals(AppSettings.LWJGL_OPENGL3));
if (!capabilities.OpenGL20) { if (!capabilities.OpenGL20) {
throw new RendererException("OpenGL 2.0 or higher is required for jMonkeyEngine"); throw new RendererException("OpenGL 2.0 or higher is required for jMonkeyEngine");
@ -230,7 +232,7 @@ public abstract class LwjglContext implements JmeContext {
while (created.get() != createdVal) { while (created.get() != createdVal) {
try { try {
createdLock.wait(); createdLock.wait();
} catch (InterruptedException ex) { } catch (InterruptedException ignored) {
} }
} }
} }

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

@ -99,7 +99,7 @@ public abstract class LwjglWindow extends LwjglContext implements Runnable {
/** /**
* Set the title if its a windowed display * Set the title if its a windowed display
* *
* @param title * @param title the title to set
*/ */
public void setTitle(final String title) { public void setTitle(final String title) {
if (created.get() && window != -1) { if (created.get() && window != -1) {
@ -121,7 +121,7 @@ public abstract class LwjglWindow extends LwjglContext implements Runnable {
/** /**
* Apply the settings, changing resolution, etc. * Apply the settings, changing resolution, etc.
* *
* @param settings * @param settings the settings to apply when creating the context.
*/ */
protected void createContext(final AppSettings settings) { protected void createContext(final AppSettings settings) {
glfwSetErrorCallback(errorCallback = new GLFWErrorCallback() { glfwSetErrorCallback(errorCallback = new GLFWErrorCallback() {