Skip to content

Commit

Permalink
add new redstone torch
Browse files Browse the repository at this point in the history
  • Loading branch information
@leMaik
leMaik committed Oct 27, 2024
1 parent d9fe92f commit d21c47a
Show file tree
Hide file tree
Showing 2 changed files with 163 additions and 1 deletion.
6 changes: 5 additions & 1 deletion chunky/src/java/se/llbit/chunky/block/minecraft/RedstoneTorch.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,18 @@

package se.llbit.chunky.block.minecraft;

import se.llbit.chunky.block.AbstractModelBlock;
import se.llbit.chunky.model.minecraft.RedstoneTorchModel;
import se.llbit.chunky.resources.Texture;

public class RedstoneTorch extends Torch {
public class RedstoneTorch extends AbstractModelBlock {
private final boolean lit;

public RedstoneTorch(boolean lit) {
super("redstone_torch", lit ? Texture.redstoneTorchOn : Texture.redstoneTorchOff);
this.lit = lit;
solid = false;
model = new RedstoneTorchModel(lit);
}

public boolean isLit() {
Expand Down
158 changes: 158 additions & 0 deletions chunky/src/java/se/llbit/chunky/model/minecraft/RedstoneTorchModel.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
package se.llbit.chunky.model.minecraft;

import se.llbit.chunky.model.QuadModel;
import se.llbit.chunky.renderer.scene.Scene;
import se.llbit.chunky.resources.Texture;
import se.llbit.math.Quad;
import se.llbit.math.Ray;
import se.llbit.math.Vector3;
import se.llbit.math.Vector4;

import java.util.Arrays;

public class RedstoneTorchModel extends QuadModel {
private static final Quad[] quads = new Quad[]{
new Quad(
new Vector3(7 / 16.0, 10 / 16.0, 9 / 16.0),
new Vector3(9 / 16.0, 10 / 16.0, 9 / 16.0),
new Vector3(7 / 16.0, 10 / 16.0, 7 / 16.0),
new Vector4(7 / 16.0, 9 / 16.0, 8 / 16.0, 10 / 16.0)
),
new Quad(
new Vector3(7 / 16.0, 0 / 16.0, 7 / 16.0),
new Vector3(9 / 16.0, 0 / 16.0, 7 / 16.0),
new Vector3(7 / 16.0, 0 / 16.0, 9 / 16.0),
new Vector4(7 / 16.0, 9 / 16.0, 1 / 16.0, 3 / 16.0)
),
new Quad(
new Vector3(7 / 16.0, 10 / 16.0, 9 / 16.0),
new Vector3(7 / 16.0, 10 / 16.0, 7 / 16.0),
new Vector3(7 / 16.0, 0 / 16.0, 9 / 16.0),
new Vector4(9 / 16.0, 7 / 16.0, 10 / 16.0, 0 / 16.0)
),
new Quad(
new Vector3(9 / 16.0, 10 / 16.0, 7 / 16.0),
new Vector3(9 / 16.0, 10 / 16.0, 9 / 16.0),
new Vector3(9 / 16.0, 0 / 16.0, 7 / 16.0),
new Vector4(9 / 16.0, 7 / 16.0, 10 / 16.0, 0 / 16.0)
),
new Quad(
new Vector3(7 / 16.0, 10 / 16.0, 7 / 16.0),
new Vector3(9 / 16.0, 10 / 16.0, 7 / 16.0),
new Vector3(7 / 16.0, 0 / 16.0, 7 / 16.0),
new Vector4(9 / 16.0, 7 / 16.0, 10 / 16.0, 0 / 16.0)
),
new Quad(
new Vector3(9 / 16.0, 10 / 16.0, 9 / 16.0),
new Vector3(7 / 16.0, 10 / 16.0, 9 / 16.0),
new Vector3(9 / 16.0, 0 / 16.0, 9 / 16.0),
new Vector4(9 / 16.0, 7 / 16.0, 10 / 16.0, 0 / 16.0)
),
new Quad(
new Vector3(6.5 / 16.0, 7.5 / 16.0, 9.5 / 16.0),
new Vector3(9.5 / 16.0, 7.5 / 16.0, 9.5 / 16.0),
new Vector3(6.5 / 16.0, 7.5 / 16.0, 6.5 / 16.0),
new Vector4(8 / 16.0, 9 / 16.0, 10 / 16.0, 11 / 16.0),
true
),
new Quad(
new Vector3(6.5 / 16.0, 10.5 / 16.0, 6.5 / 16.0),
new Vector3(9.5 / 16.0, 10.5 / 16.0, 6.5 / 16.0),
new Vector3(6.5 / 16.0, 10.5 / 16.0, 9.5 / 16.0),
new Vector4(7 / 16.0, 8 / 16.0, 10 / 16.0, 11 / 16.0),
true
),
new Quad(
new Vector3(9.5 / 16.0, 10.5 / 16.0, 6.5 / 16.0),
new Vector3(6.5 / 16.0, 10.5 / 16.0, 6.5 / 16.0),
new Vector3(9.5 / 16.0, 7.5 / 16.0, 6.5 / 16.0),
new Vector4(10 / 16.0, 9 / 16.0, 10 / 16.0, 9 / 16.0),
true
),
new Quad(
new Vector3(9.5 / 16.0, 10.5 / 16.0, 9.5 / 16.0),
new Vector3(9.5 / 16.0, 10.5 / 16.0, 6.5 / 16.0),
new Vector3(9.5 / 16.0, 7.5 / 16.0, 9.5 / 16.0),
new Vector4(7 / 16.0, 6 / 16.0, 9 / 16.0, 8 / 16.0),
true
),
new Quad(
new Vector3(6.5 / 16.0, 10.5 / 16.0, 9.5 / 16.0),
new Vector3(9.5 / 16.0, 10.5 / 16.0, 9.5 / 16.0),
new Vector3(6.5 / 16.0, 7.5 / 16.0, 9.5 / 16.0),
new Vector4(7 / 16.0, 6 / 16.0, 10 / 16.0, 9 / 16.0),
true
),
new Quad(
new Vector3(6.5 / 16.0, 10.5 / 16.0, 6.5 / 16.0),
new Vector3(6.5 / 16.0, 10.5 / 16.0, 9.5 / 16.0),
new Vector3(6.5 / 16.0, 7.5 / 16.0, 6.5 / 16.0),
new Vector4(10 / 16.0, 9 / 16.0, 9 / 16.0, 8 / 16.0),
true
)
};

private final Texture[] textures;

public RedstoneTorchModel(boolean isLit) {
this.textures = new Texture[quads.length];
Arrays.fill(this.textures, isLit ? Texture.redstoneTorchOn : Texture.redstoneTorchOff);
}

@Override
public Quad[] getQuads() {
return quads;
}

@Override
public Texture[] getTextures() {
return textures;
}

@Override
public boolean intersect(Ray ray, Scene scene) {
boolean hit = false;
int hitQuadIndex = -1;
ray.t = Double.POSITIVE_INFINITY;

Quad[] quads = getQuads();
Texture[] textures = getTextures();

float[] color = null;
int count = 0;
for (int i = 0; i < quads.length; ++i) {
Quad quad = quads[i];
if (quad.intersect(ray)) {
if (i>=6) {
count++;
}
float[] c = textures[i].getColor(ray.u, ray.v);
if (c[3] > Ray.EPSILON) {
if (ray.d.dot(quad.n) < 0) {
color = c;
ray.t = ray.tNext;
ray.setNormal(quad.n);
hit = true;
hitQuadIndex = i;
}
}
}
}

if (hit && (count != 1 || hitQuadIndex < 6)) {
double px = ray.o.x - Math.floor(ray.o.x + ray.d.x * Ray.OFFSET) + ray.d.x * ray.tNext;
double py = ray.o.y - Math.floor(ray.o.y + ray.d.y * Ray.OFFSET) + ray.d.y * ray.tNext;
double pz = ray.o.z - Math.floor(ray.o.z + ray.d.z * Ray.OFFSET) + ray.d.z * ray.tNext;
if (px < E0 || px > E1 || py < E0 || py > E1 || pz < E0 || pz > E1) {
// TODO this check is only really needed for wall torches
return false;
}

ray.color.set(color);
ray.distance += ray.t;
ray.o.scaleAdd(ray.t, ray.d);
return true;
}
return false;
}
}

0 comments on commit d21c47a

Please sign in to comment.