aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/dev/figboot/cuberender/state/Framebuffer.java12
-rw-r--r--src/main/java/dev/figboot/cuberender/state/Mesh.java7
-rw-r--r--src/main/java/dev/figboot/cuberender/state/Sampleable.java1
-rw-r--r--src/main/java/dev/figboot/cuberender/state/Texture.java3
-rw-r--r--src/main/java/dev/figboot/cuberender/test/GraphicsPanel.java4
5 files changed, 12 insertions, 15 deletions
diff --git a/src/main/java/dev/figboot/cuberender/state/Framebuffer.java b/src/main/java/dev/figboot/cuberender/state/Framebuffer.java
index 3c2a1ad..17f4870 100644
--- a/src/main/java/dev/figboot/cuberender/state/Framebuffer.java
+++ b/src/main/java/dev/figboot/cuberender/state/Framebuffer.java
@@ -1,8 +1,6 @@
package dev.figboot.cuberender.state;
-import dev.figboot.cuberender.math.Matrix3f;
import dev.figboot.cuberender.math.Matrix4f;
-import dev.figboot.cuberender.math.Vector3f;
import dev.figboot.cuberender.math.Vector4f;
import lombok.Getter;
import lombok.Setter;
@@ -12,12 +10,12 @@ import java.awt.image.BufferedImage;
import java.util.Arrays;
public class Framebuffer {
- public static int FB_CLEAR_COLOR = 0x01;
- public static int FB_CLEAR_DEPTH = 0x02;
+ public static final int FB_CLEAR_COLOR = 0x01;
+ public static final int FB_CLEAR_DEPTH = 0x02;
- public static int FB_DEPTH_USE = 0x01;
- public static int FB_DEPTH_COMMIT = 0x02;
- public static int FB_DEPTH_COMMIT_TRANSPARENT = 0x04;
+ public static final int FB_DEPTH_USE = 0x01;
+ public static final int FB_DEPTH_COMMIT = 0x02;
+ public static final int FB_DEPTH_COMMIT_TRANSPARENT = 0x04;
@Getter private final int width, height;
diff --git a/src/main/java/dev/figboot/cuberender/state/Mesh.java b/src/main/java/dev/figboot/cuberender/state/Mesh.java
index c18fe04..061f662 100644
--- a/src/main/java/dev/figboot/cuberender/state/Mesh.java
+++ b/src/main/java/dev/figboot/cuberender/state/Mesh.java
@@ -3,7 +3,6 @@ package dev.figboot.cuberender.state;
import dev.figboot.cuberender.math.MathUtil;
import dev.figboot.cuberender.math.Vector2f;
import dev.figboot.cuberender.math.Vector4f;
-import dev.figboot.cuberender.math.Vector4f;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
@@ -107,7 +106,7 @@ public abstract class Mesh<T> implements Sampleable<T> {
}
private static class ColorMesh extends Mesh<Void> {
- int color;
+ final int color;
ColorMesh(Vector4f[] vertices, Vector4f[] normals, int[] indices, Map<AttachmentType, Object> attachments, int color) {
super(vertices, normals, indices, attachments);
@@ -126,8 +125,8 @@ public abstract class Mesh<T> implements Sampleable<T> {
}
private static class TextureMesh extends Mesh<Vector2f> {
- Texture texture;
- Vector2f[] texCoords;
+ final Texture texture;
+ final Vector2f[] texCoords;
TextureMesh(Vector4f[] vertices, Vector4f[] normals, int[] indices, Map<AttachmentType, Object> attachments, Texture tex, Vector2f[] texCoords) {
super(vertices, normals, indices, attachments);
diff --git a/src/main/java/dev/figboot/cuberender/state/Sampleable.java b/src/main/java/dev/figboot/cuberender/state/Sampleable.java
index 7b7ad7d..63b3e67 100644
--- a/src/main/java/dev/figboot/cuberender/state/Sampleable.java
+++ b/src/main/java/dev/figboot/cuberender/state/Sampleable.java
@@ -1,6 +1,5 @@
package dev.figboot.cuberender.state;
-import dev.figboot.cuberender.math.Vector3f;
import dev.figboot.cuberender.math.Vector4f;
public interface Sampleable<T> {
diff --git a/src/main/java/dev/figboot/cuberender/state/Texture.java b/src/main/java/dev/figboot/cuberender/state/Texture.java
index 70e66b2..3c69c58 100644
--- a/src/main/java/dev/figboot/cuberender/state/Texture.java
+++ b/src/main/java/dev/figboot/cuberender/state/Texture.java
@@ -4,7 +4,8 @@ import java.awt.image.BufferedImage;
public class Texture {
public final BufferedImage image;
- public transient int width, height;
+ public final transient int width;
+ public final transient int height;
public Texture(BufferedImage image) {
this.image = image;
diff --git a/src/main/java/dev/figboot/cuberender/test/GraphicsPanel.java b/src/main/java/dev/figboot/cuberender/test/GraphicsPanel.java
index 872b2f9..aa34853 100644
--- a/src/main/java/dev/figboot/cuberender/test/GraphicsPanel.java
+++ b/src/main/java/dev/figboot/cuberender/test/GraphicsPanel.java
@@ -23,8 +23,8 @@ public class GraphicsPanel extends JPanel {
private final EnumMap<BodyPart, Mesh<?>> meshes = new EnumMap<>(BodyPart.class);
private float xRot = 0, yRot = 0, capeRot = 0;
- private long[] clrTime = new long[32];
- private long[] meshTime = new long[32];
+ private final long[] clrTime = new long[32];
+ private final long[] meshTime = new long[32];
private int tidx = 0;
boolean rollOver = false;