eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-01-29 03:11:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

updated to latest jogl stable release (2.3.1)

Browse Source
This commit is contained in:
codeanticode
2015-05-13 20:01:32 -04:00
parent 6913cf784a
commit 986e9aefa9
4 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/libraries/jogl/.classpath
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="lib" path="library/jogl-all.jar"/>
<classpathentry kind="lib" path="library/jogl-all.jar" sourcepath="library/jogl-java-src.zip"/>
<classpathentry kind="lib" path="library/gluegen-rt.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>

1
java/libraries/jogl/library/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
/jogl-java-src.zip

34
java/libraries/jogl/src/processing/jogl/PJOGL.java
View File

@@ -17,24 +17,24 @@ import java.nio.IntBuffer;
import javax.media.opengl.GL;
import javax.media.opengl.GL2;
import javax.media.opengl.GL2ES1;
import javax.media.opengl.GL2ES2;
import javax.media.opengl.GL2ES3;
import javax.media.opengl.GL2GL3;
import javax.media.opengl.GLAutoDrawable;
import javax.media.opengl.GLCapabilitiesImmutable;
import javax.media.opengl.GLContext;
import javax.media.opengl.GLDrawable;
import com.jogamp.opengl.GL;
import com.jogamp.opengl.GL2;
import com.jogamp.opengl.GL2ES1;
import com.jogamp.opengl.GL2ES2;
import com.jogamp.opengl.GL2ES3;
import com.jogamp.opengl.GL2GL3;
import com.jogamp.opengl.GLAutoDrawable;
import com.jogamp.opengl.GLCapabilitiesImmutable;
import com.jogamp.opengl.GLContext;
import com.jogamp.opengl.GLDrawable;
//import javax.media.opengl.GLEventListener;
//import javax.media.opengl.GLFBODrawable;
import javax.media.opengl.GLProfile;
import com.jogamp.opengl.GLProfile;
//import javax.media.opengl.awt.GLCanvas;
import javax.media.opengl.fixedfunc.GLMatrixFunc;
import javax.media.opengl.glu.GLU;
import javax.media.opengl.glu.GLUtessellator;
import javax.media.opengl.glu.GLUtessellatorCallbackAdapter;
import com.jogamp.opengl.fixedfunc.GLMatrixFunc;
import com.jogamp.opengl.glu.GLU;
import com.jogamp.opengl.glu.GLUtessellator;
import com.jogamp.opengl.glu.GLUtessellatorCallbackAdapter;
import processing.core.PApplet;
import processing.core.PGraphics;
@@ -669,12 +669,12 @@ public class PJOGL extends PGL {
gl2 = gl.getGL2ES2();
try {
gl2x = gl.getGL2();
} catch (javax.media.opengl.GLException e) {
} catch (com.jogamp.opengl.GLException e) {
gl2x = null;
}
try {
gl3 = gl.getGL2GL3();
} catch (javax.media.opengl.GLException e) {
} catch (com.jogamp.opengl.GLException e) {
gl3 = null;
}
}

40
java/libraries/jogl/src/processing/jogl/PSurfaceJOGL.java
View File

@@ -1,20 +1,18 @@
package processing.jogl;
import java.awt.Component;
import java.awt.EventQueue;
import java.awt.Frame;
import java.awt.Rectangle;
//import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import javax.media.nativewindow.NativeSurface;
import javax.media.nativewindow.ScalableSurface;
import javax.media.opengl.GLAnimatorControl;
import javax.media.opengl.GLAutoDrawable;
import javax.media.opengl.GLCapabilities;
import javax.media.opengl.GLEventListener;
import javax.media.opengl.GLException;
import javax.media.opengl.GLProfile;
import com.jogamp.nativewindow.NativeSurface;
import com.jogamp.nativewindow.ScalableSurface;
import com.jogamp.opengl.GLAnimatorControl;
import com.jogamp.opengl.GLAutoDrawable;
import com.jogamp.opengl.GLCapabilities;
import com.jogamp.opengl.GLEventListener;
import com.jogamp.opengl.GLException;
import com.jogamp.opengl.GLProfile;
import com.jogamp.nativewindow.MutableGraphicsConfiguration;
import com.jogamp.newt.Display;
@@ -219,16 +217,16 @@ public class PSurfaceJOGL implements PSurface {
}
}
int[] reqSurfacePixelScale;
float[] reqSurfacePixelScale;
if (graphics.is2X()) {
// Retina
reqSurfacePixelScale = new int[] { ScalableSurface.AUTOMAX_PIXELSCALE,
ScalableSurface.AUTOMAX_PIXELSCALE };
reqSurfacePixelScale = new float[] { ScalableSurface.AUTOMAX_PIXELSCALE,
ScalableSurface.AUTOMAX_PIXELSCALE };
pgl.pixel_scale = 2;
} else {
// Non-retina
reqSurfacePixelScale = new int[] { ScalableSurface.IDENTITY_PIXELSCALE,
ScalableSurface.IDENTITY_PIXELSCALE };
reqSurfacePixelScale = new float[] { ScalableSurface.IDENTITY_PIXELSCALE,
ScalableSurface.IDENTITY_PIXELSCALE };
pgl.pixel_scale = 1;
}
window.setSurfaceScale(reqSurfacePixelScale);
@@ -312,7 +310,10 @@ public class PSurfaceJOGL implements PSurface {
});
// window.setVisible(true);
window.setVisible(true);
System.err.println("1. set visible");
/*
try {
EventQueue.invokeAndWait(new Runnable() {
public void run() {
@@ -322,7 +323,8 @@ public class PSurfaceJOGL implements PSurface {
} catch (Exception ex) {
// error setting the window visible, should quit...
}
*/
// frame = new DummyFrame();
// return frame;
}
@@ -391,7 +393,7 @@ public class PSurfaceJOGL implements PSurface {
if (animator != null) {
System.err.println("2. start animator");
animator.start();
animator.getThread().setName("Processing-GL-draw");
// animator.getThread().setName("Processing-GL-draw");
}
}
@@ -483,8 +485,8 @@ public class PSurfaceJOGL implements PSurface {
}
}
public void init(GLAutoDrawable drawable) {
pgl.init(drawable);
pgl.getGL(drawable);
pgl.init(drawable);
sketch.start();
int c = graphics.backgroundColor;