Skip to content

Commit

Permalink
Almost unnoticeable fixes, but better I guess.
Browse files Browse the repository at this point in the history
  • Loading branch information
@XyperCode
XyperCode committed Feb 2, 2024
1 parent 4d2396b commit eb4426b
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 60 deletions.
5 changes: 4 additions & 1 deletion common/src/main/java/com/ultreon/devices/cef/BrowserFramework.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.ultreon.devices.cef;

import com.jogamp.opengl.GLEventListener;
import com.jogamp.opengl.awt.GLCanvas;
import com.mojang.blaze3d.systems.RenderSystem;
import com.ultreon.devices.Devices;
Expand Down Expand Up @@ -125,7 +126,9 @@ public static CefBrowser createBrowser() {
SwingUtilities.invokeLater(() -> {
java.awt.Component uiComponent = browser.getUIComponent();
GLCanvas canvas = (GLCanvas) uiComponent;
canvas.addGLEventListener(new BrowserGraphics(canvas));
GLEventListener glEventListener = canvas.getGLEventListener(0);
canvas.removeGLEventListener(glEventListener);
canvas.addGLEventListener(new BrowserGraphics(canvas, glEventListener));

frame.add(uiComponent);
frame.revalidate();
Expand Down
118 changes: 59 additions & 59 deletions common/src/main/java/com/ultreon/devices/cef/BrowserGraphics.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,26 @@
import java.awt.image.BufferedImage;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.BufferUnderflowException;
import java.nio.ByteBuffer;
import java.nio.IntBuffer;
import java.nio.file.Path;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;

import static com.ultreon.devices.cef.BrowserFramework.dimension;
import static org.lwjgl.opengl.GL11C.*;

public class BrowserGraphics implements GLEventListener {
public static final ResourceLocation RES = Devices.id("dynamic/app/browser");
private final java.awt.Component uiComponent;
private final java.awt.Component canvas;

private static final Object bufferLock = new Object();
static ByteBuffer buffer;
private final GLEventListener parent;
private int bufferWidth;
private int bufferHeight;
private boolean init;

public BrowserGraphics(GLCanvas uiComponent) {
this.uiComponent = uiComponent;
public BrowserGraphics(GLCanvas canvas, GLEventListener parent) {
this.canvas = canvas;
this.parent = parent;
}

public static void locked(Runnable r) {
Expand All @@ -50,11 +48,7 @@ public static void locked(Runnable r) {

@Override
public void init(GLAutoDrawable drawable) {
synchronized (bufferLock) {
buffer = GLBuffers.newDirectByteBuffer(uiComponent.getWidth() * uiComponent.getHeight() * 4);
bufferWidth = uiComponent.getWidth();
bufferHeight = uiComponent.getHeight();
}
this.parent.init(drawable);
}

@Override
Expand All @@ -65,17 +59,26 @@ public void dispose(GLAutoDrawable drawable) {
bufferWidth = 0;
bufferHeight = 0;
}

this.parent.dispose(drawable);
}

@Override
public void display(GLAutoDrawable drawable) {
saveImage((GL3) drawable.getGL(), uiComponent.getWidth(), uiComponent.getHeight());
this.parent.display(drawable);

synchronized (bufferLock) {
saveImage((GL3) drawable.getGL(), dimension.width, dimension.height);
}
}

@Override
public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {
this.parent.reshape(drawable, x, y, width, height);

synchronized (bufferLock) {
buffer.clear();
if (buffer != null)
buffer.clear();
buffer = GLBuffers.newDirectByteBuffer(width * height * 4);
dimension.width = width;
dimension.height = height;
Expand All @@ -84,59 +87,56 @@ public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height
}

protected void saveImage(GL3 gl3, int width, int height) {
if (buffer == null) return;

synchronized (bufferLock) {
if (buffer == null) return;
if (bufferWidth != width || bufferHeight != height || buffer.capacity() != width * height * 4) {
buffer = GLBuffers.newDirectByteBuffer(width * height * 4);
}

if (bufferWidth != width || bufferHeight != height) {
buffer.clear();
buffer = GLBuffers.newDirectByteBuffer(width * height * 4);
bufferWidth = width;
bufferHeight = height;
bufferWidth = width;
bufferHeight = height;

// be sure you are reading from the right fbo (here is supposed to be the default one)
// bind the right buffer to read from
gl3.glReadBuffer(GL_BACK);
// if the width is not multiple of 4, set unpackPixel = 1
gl3.glPixelStorei(GL_UNPACK_ALIGNMENT, width % 4 == 0 ? 0 : 1);
buffer.position(0);

// read pixels
gl3.glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, buffer);

Devices.LOGGER.info("Buffer size: " + buffer.capacity());
Devices.LOGGER.info("Display size: " + width + "x" + height);

int position = buffer.position();
if (position < buffer.capacity()) {
Devices.LOGGER.error("Buffer underflow! " + position + " < " + buffer.capacity());
IntBuffer intBuffer = buffer.asIntBuffer();
int[] ints = new int[intBuffer.capacity()];
BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
for (int i = 0; i < ints.length; i++) {
ints[i] = intBuffer.get();
image.setRGB(i % width, height - i / width - 1, ints[i]);
}

// be sure you are reading from the right fbo (here is supposed to be the default one)
// bind the right buffer to read from
gl3.glReadBuffer(GL_BACK);
// if the width is not multiple of 4, set unpackPixel = 1
gl3.glPixelStorei(GL_UNPACK_ALIGNMENT, width % 4 == 0 ? 0 : 1);
buffer.position(0);

// read pixels
gl3.glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, buffer);

Devices.LOGGER.info("Buffer size: " + buffer.capacity());
Devices.LOGGER.info("Display size: " + width + "x" + height);

int position = buffer.position();
if (position < buffer.capacity()) {
Devices.LOGGER.error("Buffer underflow! " + position + " < " + buffer.capacity());
IntBuffer intBuffer = buffer.asIntBuffer();
int[] ints = new int[intBuffer.capacity()];
BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
for (int i = 0; i < ints.length; i++) {
ints[i] = intBuffer.get();
image.setRGB(i % width, height - i / width - 1, ints[i]);
}

BMPFile bmpFile = new BMPFile();
bmpFile.saveBitmap("buffer.bmp", ints, width, height);
BMPFile bmpFile = new BMPFile();
bmpFile.saveBitmap("buffer.bmp", ints, width, height);

try {
ImageIO.write(image, "png", Path.of("buffer.png").toFile());
} catch (IOException e) {
Devices.LOGGER.error("Failed to dump display buffer as png", e);
}
try {
ImageIO.write(image, "png", Path.of("buffer.png").toFile());
} catch (IOException e) {
Devices.LOGGER.error("Failed to dump display buffer as png", e);
}

buffer.position(0);
buffer.position(0);

try (FileOutputStream f = new FileOutputStream(Path.of("buffer.bin").toFile())) {
for (int i = 0; i < buffer.capacity(); i++) {
f.write(buffer.get(i));
}
} catch (IOException e) {
Devices.LOGGER.error("Failed to dump display buffer", e);
try (FileOutputStream f = new FileOutputStream(Path.of("buffer.bin").toFile())) {
for (int i = 0; i < buffer.capacity(); i++) {
f.write(buffer.get(i));
}
} catch (IOException e) {
Devices.LOGGER.error("Failed to dump display buffer", e);
}
}
}
Expand Down

0 comments on commit eb4426b

Please sign in to comment.