Skip to content

Commit 9bc4634

Browse files
bgroenks96bgroenks96
committed
Merge pull request #9 from bgroenks96/master
chore: update JogAmp to version 2.3.1
2 parents 89ac286 + 574aa15 commit 9bc4634

5 files changed

Lines changed: 62 additions & 45 deletions

File tree

‎coregl-utils-examples/src/main/java/de/lessvoid/coregl/examples/CoreExampleMain.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* @author Brian Groenke
1414
*/
1515
public class CoreExampleMain {
16-
16+
1717
private static final int DISPLAY_WIDTH = 1024, DISPLAY_HEIGHT = 768;
1818

1919
/**
@@ -26,7 +26,7 @@ public class CoreExampleMain {
2626
* @param mainArgs
2727
*/
2828
public static void runExample(RenderLoopCallback example, String[] mainArgs) {
29-
String backendName = "jogl"; // default backend to use in case one isn't specified
29+
String backendName = "JOGL"; // default backend to use in case one isn't specified
3030
if(mainArgs.length == 0) {
3131
System.err.println("No backend argument supplied. Defaulting to '" + backendName + "'");
3232
printUsageString();
@@ -47,7 +47,7 @@ public static void runExample(RenderLoopCallback example, String[] mainArgs) {
4747
System.err.println("unrecognized backend name: " + mainArgs[0]);
4848
printUsageString();
4949
}
50-
50+
5151
if (gl != null && setup != null) {
5252
try {
5353
setup.initialize(example.getClass().getSimpleName() + " (" + backendName.toUpperCase() + ")", DISPLAY_WIDTH, DISPLAY_HEIGHT);
@@ -58,7 +58,7 @@ public static void runExample(RenderLoopCallback example, String[] mainArgs) {
5858
}
5959
}
6060
}
61-
61+
6262
private static void printUsageString() {
6363
System.err.println("Usage: to specify a CoreGL backend, pass its identifier as a program argument (JOGL = 'jogl' LWJGL = 'lwjgl')");
6464
}

‎coregl-utils-jogl/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</parent>
88
<artifactId>coregl-utils-jogl</artifactId>
99
<properties>
10-
<jogamp.version>2.2.4</jogamp.version>
10+
<jogamp.version>2.3.1</jogamp.version>
1111
</properties>
1212
<dependencies>
1313
<dependency>
@@ -38,6 +38,6 @@
3838
<url>http://www.jogamp.org/deployment/maven/</url>
3939
<layout>default</layout>
4040
</repository>
41-
</repositories>
41+
</repositories>
4242
<name>OpenGL core utilities - Jogl Adapter</name>
4343
</project>

‎coregl-utils-jogl/src/main/java/de/lessvoid/coregl/jogl/CoreSetupJogl.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,19 @@
77
import java.util.logging.LogRecord;
88
import java.util.logging.Logger;
99

10-
import javax.media.nativewindow.WindowClosingProtocol.WindowClosingMode;
11-
import javax.media.nativewindow.util.Rectangle;
12-
import javax.media.opengl.GLAutoDrawable;
13-
import javax.media.opengl.GLCapabilities;
14-
import javax.media.opengl.GLEventListener;
15-
import javax.media.opengl.GLProfile;
16-
10+
import com.jogamp.nativewindow.WindowClosingProtocol.WindowClosingMode;
11+
import com.jogamp.nativewindow.util.Rectangle;
1712
import com.jogamp.newt.Display;
1813
import com.jogamp.newt.MonitorMode;
1914
import com.jogamp.newt.NewtFactory;
2015
import com.jogamp.newt.Screen;
2116
import com.jogamp.newt.event.WindowAdapter;
2217
import com.jogamp.newt.event.WindowEvent;
2318
import com.jogamp.newt.opengl.GLWindow;
19+
import com.jogamp.opengl.GLAutoDrawable;
20+
import com.jogamp.opengl.GLCapabilities;
21+
import com.jogamp.opengl.GLEventListener;
22+
import com.jogamp.opengl.GLProfile;
2423

2524
import de.lessvoid.coregl.spi.CoreGL;
2625
import de.lessvoid.coregl.spi.CoreSetup;
@@ -63,7 +62,7 @@ public String format(final LogRecord record) {
6362
throwable.printStackTrace();
6463
}
6564
return
66-
record.getMillis() + " " +
65+
record.getMillis() + " " +
6766
record.getLevel() + " [" +
6867
record.getSourceClassName() + "] " +
6968
record.getMessage() + "\n";
@@ -167,6 +166,7 @@ private void initGraphics(final String title, final int requestedWidth, final in
167166
centerWindow();
168167
newtScreen.removeReference();
169168
glWin.setVisible(true);
169+
glWin.windowRepaint(0, 0, requestedWidth, requestedHeight);
170170
logMode("current mode: ", newtScreen.getMainMonitor(new Rectangle(0,0,requestedWidth,requestedHeight)).getCurrentMode());
171171
}
172172

@@ -239,7 +239,7 @@ public void init(GLAutoDrawable drawable) {
239239

240240
gl.glViewport(0, 0, glWin.getWidth(), glWin.getHeight());
241241

242-
gl.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
242+
gl.glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
243243
gl.glClear(gl.GL_COLOR_BUFFER_BIT());
244244
gl.glEnable(gl.GL_BLEND());
245245
gl.glBlendFunc(gl.GL_SRC_ALPHA(), gl.GL_ONE_MINUS_SRC_ALPHA());
@@ -249,7 +249,7 @@ public void init(GLAutoDrawable drawable) {
249249

250250
@Override
251251
public void dispose(GLAutoDrawable drawable) {
252-
252+
253253
}
254254

255255
@Override

‎coregl-utils-jogl/src/main/java/de/lessvoid/coregl/jogl/JoglCoreGL.java‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
11
package de.lessvoid.coregl.jogl;
22

3-
import java.nio.*;
3+
import java.nio.ByteBuffer;
4+
import java.nio.DoubleBuffer;
5+
import java.nio.FloatBuffer;
6+
import java.nio.IntBuffer;
7+
import java.nio.ShortBuffer;
48
import java.util.logging.Logger;
59

6-
import javax.media.opengl.*;
7-
import javax.media.opengl.glu.GLU;
10+
import com.jogamp.opengl.GL;
11+
import com.jogamp.opengl.GL2;
12+
import com.jogamp.opengl.GL2ES1;
13+
import com.jogamp.opengl.GL2ES2;
14+
import com.jogamp.opengl.GL2ES3;
15+
import com.jogamp.opengl.GL2GL3;
16+
import com.jogamp.opengl.GL3;
17+
import com.jogamp.opengl.GL3ES3;
18+
import com.jogamp.opengl.GLContext;
19+
import com.jogamp.opengl.glu.GLU;
820

921
import de.lessvoid.coregl.CoreGLException;
10-
import de.lessvoid.coregl.spi.*;
22+
import de.lessvoid.coregl.spi.CoreGL;
23+
import de.lessvoid.coregl.spi.CoreUtil;
1124

1225
/**
1326
* @author Aaron Mahan &lt;aaron@forerunnergames.com&gt;
@@ -206,7 +219,7 @@ public int GL_TEXTURE_2D() {
206219

207220
@Override
208221
public int GL_TEXTURE_2D_ARRAY() {
209-
return GL.GL_TEXTURE_2D_ARRAY;
222+
return GL2.GL_TEXTURE_2D_ARRAY;
210223
}
211224

212225
@Override

‎coregl-utils-jogl/src/main/java/de/lessvoid/coregl/jogl/JoglCoreUtil.java‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,44 @@
11
package de.lessvoid.coregl.jogl;
22

3-
import java.nio.*;
4-
5-
import javax.media.opengl.*;
6-
import javax.media.opengl.glu.GLU;
3+
import java.nio.ByteBuffer;
4+
import java.nio.DoubleBuffer;
5+
import java.nio.FloatBuffer;
6+
import java.nio.IntBuffer;
7+
import java.nio.ShortBuffer;
78

89
import com.jogamp.common.nio.Buffers;
910
import com.jogamp.common.util.VersionNumber;
11+
import com.jogamp.opengl.GL;
12+
import com.jogamp.opengl.GLContext;
1013
import com.jogamp.opengl.GLExtensions;
14+
import com.jogamp.opengl.glu.GLU;
1115

12-
import de.lessvoid.coregl.*;
16+
import de.lessvoid.coregl.CoreVersion;
1317
import de.lessvoid.coregl.CoreVersion.GLSLVersion;
1418
import de.lessvoid.coregl.CoreVersion.GLVersion;
15-
import de.lessvoid.coregl.spi.*;
19+
import de.lessvoid.coregl.spi.CoreUtil;
1620

1721
/**
1822
* @author Brian Groenke
1923
*/
2024
class JoglCoreUtil implements CoreUtil {
21-
25+
2226
@Override
2327
public int gluBuild2DMipmaps(int target, int internalFormat, int width,
2428
int height, int format, int type, ByteBuffer data) {
2529
return GLU.createGLU().gluBuild2DMipmaps(target, internalFormat, width, height, format, type, data);
2630
}
27-
31+
2832
@Override
2933
public ByteBuffer createByteBuffer(byte[] data) {
3034
return Buffers.newDirectByteBuffer(data);
3135
}
32-
36+
3337
@Override
3438
public IntBuffer createIntBuffer(int[] data) {
3539
return Buffers.newDirectIntBuffer(data);
3640
}
37-
41+
3842
@Override
3943
public ShortBuffer createShortBuffer(short[] data) {
4044
return Buffers.newDirectShortBuffer(data);
@@ -44,12 +48,12 @@ public ShortBuffer createShortBuffer(short[] data) {
4448
public FloatBuffer createFloatBuffer(float[] data) {
4549
return Buffers.newDirectFloatBuffer(data);
4650
}
47-
51+
4852
@Override
4953
public DoubleBuffer createDoubleBuffer(double[] data) {
5054
return Buffers.newDirectDoubleBuffer(data);
5155
}
52-
56+
5357
@Override
5458
public ByteBuffer createByteBuffer(ByteBuffer data) {
5559
int npos = data.position();
@@ -58,7 +62,7 @@ public ByteBuffer createByteBuffer(ByteBuffer data) {
5862
data.position(npos);
5963
return Buffers.newDirectByteBuffer(arr);
6064
}
61-
65+
6266
@Override
6367
public IntBuffer createIntBuffer(IntBuffer data) {
6468
int npos = data.position();
@@ -67,7 +71,7 @@ public IntBuffer createIntBuffer(IntBuffer data) {
6771
data.position(npos);
6872
return Buffers.newDirectIntBuffer(arr);
6973
}
70-
74+
7175
@Override
7276
public ShortBuffer createShortBuffer(ShortBuffer data) {
7377
int npos = data.position();
@@ -76,7 +80,7 @@ public ShortBuffer createShortBuffer(ShortBuffer data) {
7680
data.position(npos);
7781
return Buffers.newDirectShortBuffer(arr);
7882
}
79-
83+
8084
@Override
8185
public FloatBuffer createFloatBuffer(FloatBuffer data) {
8286
int npos = data.position();
@@ -94,7 +98,7 @@ public DoubleBuffer createDoubleBuffer(DoubleBuffer data) {
9498
data.position(npos);
9599
return Buffers.newDirectDoubleBuffer(arr);
96100
}
97-
101+
98102
@Override
99103
public IntBuffer createIntBuffer(int size) {
100104
return Buffers.newDirectIntBuffer(size);
@@ -109,7 +113,7 @@ public FloatBuffer createFloatBuffer(int size) {
109113
public ByteBuffer createByteBuffer(int size) {
110114
return Buffers.newDirectByteBuffer(size);
111115
}
112-
116+
113117
@Override
114118
public DoubleBuffer createDoubleBuffer(int size) {
115119
return Buffers.newDirectDoubleBuffer(size);
@@ -119,37 +123,37 @@ public DoubleBuffer createDoubleBuffer(int size) {
119123
public ShortBuffer createShortBuffer(int size) {
120124
return Buffers.newDirectShortBuffer(size);
121125
}
122-
126+
123127
// JOGL annoyingly doesn't have a built in function for singular glGet(s)
124-
128+
125129
public static int glGetInteger(GL gl, int pname) {
126130
int[] store = new int[1];
127131
gl.glGetIntegerv(pname, store, 0);
128132
return store[0];
129133
}
130-
134+
131135
public static float glGetFloat(GL gl, int pname) {
132136
float[] store = new float[1];
133137
gl.glGetFloatv(pname, store, 0);
134138
return store[0];
135139
}
136-
140+
137141
@Override
138142
public boolean isNPOTSupported() {
139143
return getGLVersion().checkAgainst(GLVersion.GL20) || isNPOTHardwareSupported();
140144
}
141-
145+
142146
@Override
143147
public boolean isNPOTHardwareSupported() {
144148
return GLContext.getCurrentGL().isExtensionAvailable(GLExtensions.ARB_texture_non_power_of_two);
145149
}
146-
150+
147151
@Override
148152
public GLVersion getGLVersion() {
149153
VersionNumber glVersion = GLContext.getCurrent().getGLVersionNumber();
150154
return CoreVersion.getGLVersion(glVersion.getMajor(), glVersion.getMinor());
151155
}
152-
156+
153157
@Override
154158
public GLSLVersion getGLSLVersion() {
155159
VersionNumber glslVersion = GLContext.getCurrent().getGLSLVersionNumber();

0 commit comments

Comments
 (0)