Skip to content

JogAmp JOGL 2.3.1 update #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xranby wants to merge 1 commit into
base: master
Choose a base branch
from
+148 −146
Open

JogAmp JOGL 2.3.1 update #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
<dependency>
<groupId>org.jogamp.gluegen</groupId>
<artifactId>gluegen-rt-main</artifactId>
<version>2.0.2</version>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.jogamp.jogl</groupId>
<artifactId>jogl-all-main</artifactId>
<version>2.0.2</version>
<version>2.3.1</version>
</dependency>
</dependencies>

Expand Down
14 changes: 7 additions & 7 deletions src/main/java/quantum/Quantum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
import java.util.ArrayList;

import javax.imageio.ImageIO;
import javax.media.opengl.GL;
import javax.media.opengl.GLAutoDrawable;
import javax.media.opengl.GLCapabilities;
import javax.media.opengl.GLEventListener;
import javax.media.opengl.GLProfile;
import javax.media.opengl.awt.GLCanvas;
import com.jogamp.opengl.GL;
import com.jogamp.opengl.GLAutoDrawable;
import com.jogamp.opengl.GLCapabilities;
import com.jogamp.opengl.GLEventListener;
import com.jogamp.opengl.GLProfile;
import com.jogamp.opengl.awt.GLCanvas;
import javax.swing.JFrame;
import javax.swing.SwingUtilities;

Expand Down Expand Up @@ -218,7 +218,7 @@ public void closeServerAndClient () {

public void display (GLAutoDrawable drawable) {
synchronized (drawable) {
drawable.getGL().glViewport(0, 0, drawable.getWidth(), drawable.getHeight());
drawable.getGL().glViewport(0, 0, drawable.getSurfaceWidth(), drawable.getSurfaceHeight());
drawable.getGL().glClearColor(0, 0, 0, 1);
drawable.getGL().glClear(GL.GL_COLOR_BUFFER_BIT);

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/quantum/forms/CreateMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

package quantum.forms;

import javax.media.opengl.awt.GLCanvas;
import com.jogamp.opengl.awt.GLCanvas;

import quantum.Quantum;
import quantum.Quantum.DisplayListener;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/quantum/forms/Editor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
import java.io.FileOutputStream;
import java.util.ArrayList;

import javax.media.opengl.GL;
import javax.media.opengl.GL2;
import javax.media.opengl.awt.GLCanvas;
import com.jogamp.opengl.GL;
import com.jogamp.opengl.GL2;
import com.jogamp.opengl.awt.GLCanvas;
import javax.swing.JFileChooser;
import javax.swing.filechooser.FileFilter;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/quantum/forms/JoinMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import java.net.URISyntaxException;
import java.util.List;

import javax.media.opengl.awt.GLCanvas;
import com.jogamp.opengl.awt.GLCanvas;

import quantum.Quantum;
import quantum.Quantum.DisplayListener;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/quantum/forms/LobbyMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import java.util.ArrayList;
import java.util.HashMap;

import javax.media.opengl.awt.GLCanvas;
import com.jogamp.opengl.awt.GLCanvas;

import quantum.Quantum;
import quantum.Quantum.DisplayListener;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/quantum/forms/LocalGame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import java.util.Collections;
import java.util.List;

import javax.media.opengl.awt.GLCanvas;
import com.jogamp.opengl.awt.GLCanvas;

import quantum.Quantum;
import quantum.Quantum.DisplayListener;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/quantum/forms/LoginMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

package quantum.forms;

import javax.media.opengl.awt.GLCanvas;
import com.jogamp.opengl.awt.GLCanvas;

import quantum.Quantum;
import quantum.Quantum.DisplayListener;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/quantum/forms/MapMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import java.io.FilenameFilter;
import java.util.HashMap;

import javax.media.opengl.awt.GLCanvas;
import com.jogamp.opengl.awt.GLCanvas;

import quantum.Quantum;
import quantum.Quantum.DisplayListener;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/quantum/forms/NetworkedGame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
import java.util.ArrayList;
import java.util.Calendar;

import javax.media.opengl.GL;
import javax.media.opengl.GL2;
import javax.media.opengl.awt.GLCanvas;
import com.jogamp.opengl.GL;
import com.jogamp.opengl.GL2;
import com.jogamp.opengl.awt.GLCanvas;

import quantum.Quantum;
import quantum.Quantum.DisplayListener;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/quantum/forms/Replay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import java.io.FilenameFilter;
import java.util.zip.GZIPInputStream;

import javax.media.opengl.awt.GLCanvas;
import com.jogamp.opengl.awt.GLCanvas;

import quantum.Quantum;
import quantum.Quantum.DisplayListener;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/quantum/forms/StartMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import java.io.EOFException;
import java.util.zip.GZIPInputStream;

import javax.media.opengl.awt.GLCanvas;
import com.jogamp.opengl.awt.GLCanvas;

import quantum.Quantum;
import quantum.Quantum.DisplayListener;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/quantum/forms/Tutorial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

package quantum.forms;

import javax.media.opengl.awt.GLCanvas;
import com.jogamp.opengl.awt.GLCanvas;

import quantum.Quantum;
import quantum.Quantum.DisplayListener;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/quantum/forms/UpdateMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

import java.io.File;

import javax.media.opengl.awt.GLCanvas;
import com.jogamp.opengl.awt.GLCanvas;

import quantum.Quantum;
import quantum.Quantum.DisplayListener;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/quantum/game/Boid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
import java.io.DataInputStream;
import java.io.DataOutputStream;

import javax.media.opengl.GL;
import javax.media.opengl.GL2;
import javax.media.opengl.awt.GLCanvas;
import com.jogamp.opengl.GL;
import com.jogamp.opengl.GL2;
import com.jogamp.opengl.awt.GLCanvas;

import quantum.math.Vector2D;

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/quantum/game/Creature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
import java.io.DataInputStream;
import java.io.DataOutputStream;

import javax.media.opengl.GL;
import javax.media.opengl.GL2;
import javax.media.opengl.awt.GLCanvas;
import com.jogamp.opengl.GL;
import com.jogamp.opengl.GL2;
import com.jogamp.opengl.awt.GLCanvas;

import quantum.gfx.Color;
import quantum.math.Vector2D;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/quantum/game/GameInterface.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
import java.util.ArrayList;
import java.util.List;

import javax.media.opengl.GL;
import javax.media.opengl.GL2;
import javax.media.opengl.GLContext;
import javax.media.opengl.awt.GLCanvas;
import com.jogamp.opengl.GL;
import com.jogamp.opengl.GL2;
import com.jogamp.opengl.GLContext;
import com.jogamp.opengl.awt.GLCanvas;

import quantum.gfx.Color;
import quantum.gfx.Font;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/quantum/game/GameLoop.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

package quantum.game;

import javax.media.opengl.awt.GLCanvas;
import com.jogamp.opengl.awt.GLCanvas;

import quantum.gfx.Renderer;
import quantum.net.Client;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/quantum/game/GameObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import java.io.DataInputStream;
import java.io.DataOutputStream;

import javax.media.opengl.awt.GLCanvas;
import com.jogamp.opengl.awt.GLCanvas;

import quantum.math.Vector2D;

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/quantum/game/Planet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
import java.util.List;
import java.util.Set;

import javax.media.opengl.GL;
import javax.media.opengl.GL2;
import javax.media.opengl.awt.GLCanvas;
import com.jogamp.opengl.GL;
import com.jogamp.opengl.GL2;
import com.jogamp.opengl.awt.GLCanvas;

import quantum.gfx.Renderer;
import quantum.math.Vector2D;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/quantum/game/Simulation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
import java.util.Map;
import java.util.Set;

import javax.media.opengl.GL;
import javax.media.opengl.GL2;
import javax.media.opengl.GLContext;
import com.jogamp.opengl.GL;
import com.jogamp.opengl.GL2;
import com.jogamp.opengl.GLContext;

import quantum.game.commands.ChainCommand;
import quantum.game.commands.Command;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/quantum/game/Tree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
import java.io.DataInputStream;
import java.io.DataOutputStream;

import javax.media.opengl.GL;
import javax.media.opengl.GL2;
import javax.media.opengl.GLContext;
import javax.media.opengl.awt.GLCanvas;
import com.jogamp.opengl.GL;
import com.jogamp.opengl.GL2;
import com.jogamp.opengl.GLContext;
import com.jogamp.opengl.awt.GLCanvas;

import quantum.gfx.Color;
import quantum.gfx.Renderer;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/quantum/gfx/Color.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
import java.io.Serializable;
import java.nio.FloatBuffer;

import javax.media.opengl.GL;
import javax.media.opengl.GL2;
import com.jogamp.opengl.GL;
import com.jogamp.opengl.GL2;

/** a simple rgba color class. colors are given in the range [0,1].
*
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/quantum/gfx/Font.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
import java.io.InputStream;
import java.util.HashMap;

import javax.media.opengl.GL;
import javax.media.opengl.GL2;
import javax.media.opengl.GLContext;
import com.jogamp.opengl.GL;
import com.jogamp.opengl.GL2;
import com.jogamp.opengl.GLContext;

/** a simple font class for drawing system fonts as textured quads.
*
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/quantum/gfx/FrameBufferObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

package quantum.gfx;

import javax.media.opengl.GL;
import javax.media.opengl.GL2;
import javax.media.opengl.GLContext;
import com.jogamp.opengl.GL;
import com.jogamp.opengl.GL2;
import com.jogamp.opengl.GLContext;

import quantum.gfx.Texture;
import quantum.utils.Log;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/quantum/gfx/InterleavedVertexArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

import java.nio.FloatBuffer;

import javax.media.opengl.GL;
import javax.media.opengl.GL2;
import javax.media.opengl.GLContext;
import com.jogamp.opengl.GL;
import com.jogamp.opengl.GL2;
import com.jogamp.opengl.GLContext;

import com.jogamp.common.nio.Buffers;

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/quantum/gfx/Mesh.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
import java.util.ArrayList;
import java.util.List;

import javax.media.opengl.GL;
import javax.media.opengl.GL2;
import javax.media.opengl.GLContext;
import com.jogamp.opengl.GL;
import com.jogamp.opengl.GL2;
import com.jogamp.opengl.GLContext;

import com.jogamp.common.nio.Buffers;

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/quantum/gfx/OrthoCamera.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
import java.awt.event.MouseWheelListener;
import java.util.HashSet;

import javax.media.opengl.GL;
import javax.media.opengl.GL2;
import javax.media.opengl.GLContext;
import javax.media.opengl.awt.GLCanvas;
import com.jogamp.opengl.GL;
import com.jogamp.opengl.GL2;
import com.jogamp.opengl.GLContext;
import com.jogamp.opengl.awt.GLCanvas;

import quantum.game.GameInterface;
import quantum.math.Bounds;
Expand Down
16 changes: 9 additions & 7 deletions src/main/java/quantum/gfx/Renderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
import java.awt.image.BufferedImage;
import java.util.HashMap;

import javax.media.opengl.GL;
import javax.media.opengl.GL2;
import javax.media.opengl.GLContext;
import javax.media.opengl.awt.GLCanvas;
import com.jogamp.opengl.GL;
import com.jogamp.opengl.GL2;
import com.jogamp.opengl.GLContext;
import com.jogamp.opengl.awt.GLCanvas;

import quantum.game.Constants;
import quantum.game.Creature;
Expand All @@ -33,7 +33,7 @@
import quantum.utils.Log;
import quantum.utils.Timer;

import com.jogamp.opengl.util.awt.Screenshot;
import com.jogamp.opengl.util.awt.AWTGLReadBufferUtil;

public class Renderer {
FrameBufferObject offscreen_fbo;
Expand Down Expand Up @@ -187,7 +187,8 @@ public BufferedImage takeCenteredScreenShot (GLCanvas canvas, Simulation sim) {
fbo.renderFullScreenQuad();
gl.glDisable(GL.GL_BLEND);
gl.glDepthMask(true);
BufferedImage img = Screenshot.readToBufferedImage(256, 256);
AWTGLReadBufferUtil screenshot = new AWTGLReadBufferUtil(canvas.getGLProfile(), false /* alpha */);
BufferedImage img = screenshot.readPixelsToBufferedImage(gl, 0, 0, 256, 256, true /* awtOrientation */);
screen_fbo.unbind();
return img;
} else {
Expand All @@ -200,7 +201,8 @@ public BufferedImage takeCenteredScreenShot (GLCanvas canvas, Simulation sim) {
renderPass(sim, null, canvas);
gl.glDepthMask(true);
GLContext.getCurrent().getGL().glViewport(old_dim[0], old_dim[1], old_dim[2], old_dim[3]);
BufferedImage img = Screenshot.readToBufferedImage(256, 256);
AWTGLReadBufferUtil screenshot = new AWTGLReadBufferUtil(canvas.getGLProfile(), false /* alpha */);
BufferedImage img = screenshot.readPixelsToBufferedImage(gl, 0, 0, 256, 256, true /* awtOrientation */);
gl.glClear(GL.GL_COLOR_BUFFER_BIT);

return img;
Expand Down
Loading