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

Updates JOGL (2.2.0)

Browse Source
This commit is contained in:
Julien Gouesse 2014-08-10 15:30:01 +02:00
parent 1b0f6d0f59
commit 44f7e8bb84
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jme3-jogl/build.gradle
View File

@ -5,7 +5,7 @@ if (!hasProperty('mainClass')) {
dependencies {
compile project(':jme3-core')
compile project(':jme3-desktop')
compile 'org.jogamp.gluegen:gluegen-rt-main:2.1.4'
compile 'org.jogamp.jogl:jogl-all-main:2.1.4'
compile 'org.jogamp.joal:joal-main:2.1.4'
compile 'org.jogamp.gluegen:gluegen-rt-main:2.2.0'
compile 'org.jogamp.jogl:jogl-all-main:2.2.0'
compile 'org.jogamp.joal:joal-main:2.2.0'
}

26
jme3-jogl/src/main/java/com/jme3/system/jogl/JoglOffscreenBuffer.java
View File

@ -75,7 +75,7 @@ public class JoglOffscreenBuffer extends JoglContext implements Runnable {
caps.setSampleBuffers(true);
caps.setNumSamples(samples);
offscreenDrawable = GLDrawableFactory.getFactory(GLProfile.getMaxFixedFunc(true)).createOffscreenAutoDrawable(null, caps, null, width, height, null);
offscreenDrawable = GLDrawableFactory.getFactory(GLProfile.getMaxFixedFunc(true)).createOffscreenAutoDrawable(null, caps, null, width, height);
offscreenDrawable.display();
@ -120,7 +120,8 @@ public class JoglOffscreenBuffer extends JoglContext implements Runnable {
super.internalDestroy();
}
public void run(){
@Override
public void run(){
loadNatives();
logger.log(Level.FINE, "Using JOGL {0}", NewtVersion.getInstance().getImplementationVersion());
initInThread();
@ -130,14 +131,16 @@ public class JoglOffscreenBuffer extends JoglContext implements Runnable {
deinitInThread();
}
public void destroy(boolean waitFor){
@Override
public void destroy(boolean waitFor){
needClose.set(true);
if (waitFor) {
waitFor(false);
}
}
public void create(boolean waitFor){
@Override
public void create(boolean waitFor){
if (created.get()){
logger.warning("create() called when pbuffer is already created!");
return;
@ -149,13 +152,16 @@ public class JoglOffscreenBuffer extends JoglContext implements Runnable {
}
}
public void restart() {
@Override
public void restart() {
}
public void setAutoFlushFrames(boolean enabled){
@Override
public void setAutoFlushFrames(boolean enabled){
}
public Type getType() {
@Override
public Type getType() {
return Type.OffscreenSurface;
}
@ -174,10 +180,12 @@ public class JoglOffscreenBuffer extends JoglContext implements Runnable {
return null;
}
public TouchInput getTouchInput() {
@Override
public TouchInput getTouchInput() {
return null;
}
public void setTitle(String title) {
@Override
public void setTitle(String title) {
}
}