Export frame buffer to PNG, allow transparency

This commit is contained in:
Pazaz 2022-04-25 18:42:32 -04:00
parent 3a90dfc1b3
commit 237c187ce8
5 changed files with 74 additions and 19 deletions

1
.gitignore vendored
View file

@ -4,3 +4,4 @@
bin/ bin/
build/ build/
dump/

View file

@ -128,6 +128,10 @@ public final class Keyboard implements KeyListener, FocusListener {
CODE_MAP[KeyEvent.VK_INSERT] = 100; CODE_MAP[KeyEvent.VK_INSERT] = 100;
} }
public static boolean getKey(int key) {
return pressedKeys[CODE_MAP[key]];
}
@OriginalMember(owner = "client!s", name = "e", descriptor = "[I") @OriginalMember(owner = "client!s", name = "e", descriptor = "[I")
public static final int[] typedCodeQueue = new int[128]; public static final int[] typedCodeQueue = new int[128];

View file

@ -24,7 +24,7 @@ public final class Npc extends PathingEntity {
@OriginalMember(owner = "client!km", name = "a", descriptor = "(IIIIIIIIJILclient!ga;)V") @OriginalMember(owner = "client!km", name = "a", descriptor = "(IIIIIIIIJILclient!ga;)V")
@Override @Override
public final void render(@OriginalArg(0) int orientation, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int x, @OriginalArg(6) int z, @OriginalArg(7) int y, @OriginalArg(8) long arg8, @OriginalArg(9) int arg9, @OriginalArg(10) ParticleSystem arg10) { public final void render(@OriginalArg(0) int orientation, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int x, @OriginalArg(6) int z, @OriginalArg(7) int y, @OriginalArg(8) long key, @OriginalArg(9) int arg9, @OriginalArg(10) ParticleSystem arg10) {
if (this.type == null) { if (this.type == null) {
return; return;
} }
@ -91,7 +91,7 @@ public final class Npc extends PathingEntity {
body.aBoolean303 = true; body.aBoolean303 = true;
} }
body.render(orientation, arg1, arg2, arg3, arg4, x, z, y, arg8, arg9, this.aClass47_Sub1_5); body.render(orientation, arg1, arg2, arg3, arg4, x, z, y, key, arg9, this.aClass47_Sub1_5);
return; return;
} }
@ -99,13 +99,13 @@ public final class Npc extends PathingEntity {
body.aBoolean303 = true; body.aBoolean303 = true;
} }
body.render(orientation, arg1, arg2, arg3, arg4, x, z, y, arg8, arg9, this.aClass47_Sub1_5); body.render(orientation, arg1, arg2, arg3, arg4, x, z, y, key, arg9, this.aClass47_Sub1_5);
if (model != null) { if (model != null) {
if (this.type.size == 1) { if (this.type.size == 1) {
model.aBoolean303 = true; model.aBoolean303 = true;
} }
model.render(orientation, arg1, arg2, arg3, arg4, x, z, y, arg8, arg9, this.aClass47_Sub1_5); model.render(orientation, arg1, arg2, arg3, arg4, x, z, y, key, arg9, this.aClass47_Sub1_5);
} }
} }

View file

@ -179,6 +179,12 @@ public final class SoftwareRaster {
} }
} }
public static void clear(int color) {
for (int i = 0; i < width * height; ++i) {
pixels[i] = color;
}
}
@OriginalMember(owner = "client!kb", name = "b", descriptor = "(IIIII)V") @OriginalMember(owner = "client!kb", name = "b", descriptor = "(IIIII)V")
private static void method2493(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { private static void method2493(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
if (arg1 < clipTop || arg1 >= clipBottom) { if (arg1 < clipTop || arg1 >= clipBottom) {

View file

@ -2,7 +2,12 @@ package com.itspazaz.rt4;
import rt4.*; import rt4.*;
import java.awt.image.Raster; import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.color.ColorSpace;
import java.awt.event.KeyEvent;
import java.awt.image.*;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.net.Socket; import java.net.Socket;
@ -75,13 +80,7 @@ public class Playground extends GameShell {
public NpcType npcType; public NpcType npcType;
public Npc npc; public Npc npc;
@Override public void stateLoop() {
protected void mainLoop() {
Keyboard.loop();
Mouse.loop();
js5NetLoop();
if (state == 0) { if (state == 0) {
LoadingBarAwt.render(null, true, JagString.parse("Connecting to update server"), 1); LoadingBarAwt.render(null, true, JagString.parse("Connecting to update server"), 1);
@ -182,8 +181,53 @@ public class Playground extends GameShell {
npc.setNpcType(npcType); npc.setNpcType(npcType);
state++; state++;
} }
}
GameShell.frame.setTitle(state + ""); private void exportImage(int[] pixels, String filename) {
byte[] raw = new byte[pixels.length * 4];
int offset = 0;
for (int rgb : pixels) {
raw[offset++] = (byte) (rgb >> 16); // red
raw[offset++] = (byte) (rgb >> 8); // green
raw[offset++] = (byte) (rgb); // blue
// set transparency for background color
if (rgb >> 24 == 0x7F) {
raw[offset++] = (byte) 0;
} else {
raw[offset++] = (byte) 0xFF;
}
}
try {
DataBuffer buffer = new DataBufferByte(raw, raw.length);
int samplesPerPixel = 4;
int[] bandOffsets = { 0, 1, 2, 3 };
ColorModel colorModel = new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB), true, false, Transparency.TRANSLUCENT, DataBuffer.TYPE_BYTE);
WritableRaster raster = Raster.createInterleavedRaster(buffer, GameShell.canvasWidth, GameShell.canvasHeight, samplesPerPixel * GameShell.canvasWidth, samplesPerPixel, bandOffsets, null);
BufferedImage image = new BufferedImage(colorModel, raster, colorModel.isAlphaPremultiplied(), null);
ImageIO.write(image, "PNG", new File(filename + ".png"));
} catch (Exception ex) {
ex.printStackTrace();
}
}
int exportCounter = 0;
public void inputLoop() {
if (Keyboard.getKey(KeyEvent.VK_BACK_SLASH)) {
exportImage(SoftwareRaster.pixels, "dump/" + exportCounter++);
}
}
@Override
protected void mainLoop() {
Keyboard.loop();
Mouse.loop();
js5NetLoop();
stateLoop();
inputLoop();
} }
public int js5ConnectState = 0; public int js5ConnectState = 0;
@ -254,13 +298,13 @@ public class Playground extends GameShell {
@Override @Override
protected void mainRedraw() { protected void mainRedraw() {
if (state == 8) { if (state == 8) {
SoftwareRaster.clear(); SoftwareRaster.clear(0x7F333333);
if (npc != null) { if (npc != null) {
int orientation = 512; int orientation = 384;
int x = 256; int x = 128;
int z = 256; int z = 192;
int y = 256; int y = 128;
npc.render(orientation, 25079, 60547, -44308, 48222, x, z, y, 0L, 0, null); npc.render(orientation, 25079, 60547, -44308, 48222, x, z, y, 0L, 0, null);
} }