Begin CTM refactor. Submaps working, lighting not so much

This commit is contained in:
tterrag1098 committed 2015-02-18 15:27:57 -05:00
1 parent 312a323f96
commit 8e2adef0ab
12 files changed
+638 -427

No files matched your search

@@ -5,8 +5,96 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon;
import org.apache.commons.lang3.tuple.Triple;
import static com.cricketcraft.chisel.client.render.RenderBlocksCTM.Vert.*;
import static com.cricketcraft.chisel.client.render.RenderBlocksCTM.SubSide.*;
public class RenderBlocksCTM extends RenderBlocks {
/**
* An enum for all possible 26 sub-side vertices.
* <p>
* The naming scheme is as follows:
* <ul>
* <li>ZERO and ONE are special cases, they are the absolute min and absolute max of the block.</li>
* <li>X, Y, Z, or any combination means that the axes listed in the name are at 1.</li>
* <li>X, Y, Z, or any combination followed by HALF means that those axes are at 0.5.</li>
* <li>X, Y, Z, or any combination after a HALF means those axes are at 1.</li>
* </ul>
*/
enum Vert {
ZERO(0, 0, 0),
ONE(1, 1, 1),
X(1, 0, 0),
Y(0, 1, 0),
Z(0, 0, 1),
XY(1, 1, 0),
YZ(0, 1, 1),
XZ(1, 0, 1),
X_HALF(0.5, 0, 0),
Y_HALF(0, 0.5, 0),
Z_HALF(0, 0, 0.5),
XY_HALF(0.5, 0.5, 0),
YZ_HALF(0, 0.5, 0.5),
XZ_HALF(0.5, 0, 0.5),
X_HALF_Y(0.5, 1, 0),
X_HALF_Z(0.5, 0, 1),
Y_HALF_X(1, 0.5, 0),
Y_HALF_Z(0, 0.5, 1),
Z_HALF_X(1, 0, 0.5),
Z_HALF_Y(0, 1, 0.5),
X_HALF_YZ(0.5, 1, 1),
Y_HALF_XZ(1, 0.5, 1),
Z_HALF_XY(1, 1, 0.5),
XY_HALF_Z(0.5, 0.5, 1),
YZ_HALF_X(1, 0.5, 0.5),
XZ_HALF_Y(0.5, 1, 0.5);
private double x, y, z;
private Vert(double x, double y, double z) {
this.x = x;
this.y = y;
this.z = z;
}
void render(RenderBlocksCTM inst, int cacheID) {
if (inst.enableAO) {
// inst.tessellator.setColorOpaque_F(inst.redCache[cacheID], inst.greenCache[cacheID], inst.blueCache[cacheID]);
inst.tessellator.setBrightness(inst.lightingCache[cacheID]);
}
inst.tessellator.addVertexWithUV(x, y, z, inst.uCache[cacheID], inst.vCache[cacheID]);
}
}
/**
* Each side is divided into 4 sub-sides. LB(left bottom), RB(right bottom), LT(right top), and RT(right top).
* <p>
* Each sub-side contains 4 {@link Vert} objects representing its position on the block.
*/
enum SubSide {
XNEG_LB(ZERO, Z_HALF, YZ_HALF, Y_HALF), XNEG_RB(Z_HALF, Z, Y_HALF_Z, YZ_HALF), XNEG_LT(Y_HALF, YZ_HALF, Z_HALF_Y, Y), XNEG_RT(YZ_HALF, Y_HALF_Z, YZ, Z_HALF_Y);
private Vert xmin, xmax, ymin, ymax;
SubSide(Vert xmin, Vert ymin, Vert ymax, Vert xmax) {
this.xmin = xmin;
this.ymin = ymin;
this.ymax = ymax;
this.xmax = xmax;
}
void render(RenderBlocksCTM inst) {
xmin.render(inst, 0);
ymin.render(inst, 1);
ymax.render(inst, 2);
xmax.render(inst, 3);
}
}
// globals added to save the JVM some trouble. No need to constantly create
// and destroy ints if we don't have to
int blockLightBitChannel = 0;
@@ -17,20 +105,15 @@ public class RenderBlocksCTM extends RenderBlocks {
RenderBlocksCTM() {
super();
resetVertices();
}
Tessellator tessellator;
double[] X = new double[26];
double[] Y = new double[26];
double[] Z = new double[26];
double[] U = new double[26];
double[] V = new double[26];
int[] L = new int[26];
float[] R = new float[26];
float[] G = new float[26];
float[] B = new float[26];
double[] uCache = new double[4];
double[] vCache = new double[4];
int[] lightingCache = new int[4];
float[] redCache = new float[4];
float[] greenCache = new float[4];
float[] blueCache = new float[4];
TextureSubmap submap;
TextureSubmap submapSmall;
RenderBlocks rendererOld;
@@ -55,66 +138,60 @@ public class RenderBlocksCTM extends RenderBlocks {
return res;
}
void setupSides(int a, int b, int c, int d, int xa, int xb, int xc, int xd, int e) {
L[a] = brightnessBottomLeft;
L[b] = brightnessBottomRight;
L[c] = brightnessTopRight;
L[d] = brightnessTopLeft;
void updateLighting() {
lightingCache[0] = brightnessBottomLeft;
lightingCache[1] = brightnessBottomRight;
lightingCache[2] = brightnessTopRight;
lightingCache[3] = brightnessTopLeft;
// Updated to safely average light and color channels
L[e] = averageBrightnessChannels(brightnessBottomLeft, brightnessTopLeft, brightnessTopRight, brightnessBottomRight);
L[xa] = averageBrightnessChannels(L[a], L[b]);
L[xb] = averageBrightnessChannels(L[b], L[c]);
L[xc] = averageBrightnessChannels(L[c], L[d]);
L[xd] = averageBrightnessChannels(L[d], L[a]);
R[a] = colorRedBottomLeft;
R[b] = colorRedBottomRight;
R[c] = colorRedTopRight;
R[d] = colorRedTopLeft;
R[e] = (colorRedBottomLeft + colorRedTopLeft + colorRedTopRight + colorRedBottomRight) / 4;
R[xa] = (R[a] + R[b]) / 2;
R[xb] = (R[b] + R[c]) / 2;
R[xc] = (R[c] + R[d]) / 2;
R[xd] = (R[d] + R[a]) / 2;
G[a] = colorGreenBottomLeft;
G[b] = colorGreenBottomRight;
G[c] = colorGreenTopRight;
G[d] = colorGreenTopLeft;
G[e] = (colorGreenBottomLeft + colorGreenTopLeft + colorGreenTopRight + colorGreenBottomRight) / 4;
G[xa] = (G[a] + G[b]) / 2;
G[xb] = (G[b] + G[c]) / 2;
G[xc] = (G[c] + G[d]) / 2;
G[xd] = (G[d] + G[a]) / 2;
B[a] = colorBlueBottomLeft;
B[b] = colorBlueBottomRight;
B[c] = colorBlueTopRight;
B[d] = colorBlueTopLeft;
B[e] = (colorBlueBottomLeft + colorBlueTopLeft + colorBlueTopRight + colorBlueBottomRight) / 4;
B[xa] = (B[a] + B[b]) / 2;
B[xb] = (B[b] + B[c]) / 2;
B[xc] = (B[c] + B[d]) / 2;
B[xd] = (B[d] + B[a]) / 2;
// // Updated to safely average light and color channels
// L[e] = averageBrightnessChannels(brightnessBottomLeft, brightnessTopLeft, brightnessTopRight, brightnessBottomRight);
// L[xa] = averageBrightnessChannels(L[a], L[b]);
// L[xb] = averageBrightnessChannels(L[b], L[c]);
// L[xc] = averageBrightnessChannels(L[c], L[d]);
// L[xd] = averageBrightnessChannels(L[d], L[a]);
//
// Rcache[a] = colorRedBottomLeft;
// Rcache[b] = colorRedBottomRight;
// Rcache[c] = colorRedTopRight;
// Rcache[d] = colorRedTopLeft;
// Rcache[e] = (colorRedBottomLeft + colorRedTopLeft + colorRedTopRight + colorRedBottomRight) / 4;
// Rcache[xa] = (Rcache[a] + Rcache[b]) / 2;
// Rcache[xb] = (Rcache[b] + Rcache[c]) / 2;
// Rcache[xc] = (Rcache[c] + Rcache[d]) / 2;
// Rcache[xd] = (Rcache[d] + Rcache[a]) / 2;
//
// Gcache[a] = colorGreenBottomLeft;
// Gcache[b] = colorGreenBottomRight;
// Gcache[c] = colorGreenTopRight;
// Gcache[d] = colorGreenTopLeft;
// Gcache[e] = (colorGreenBottomLeft + colorGreenTopLeft + colorGreenTopRight + colorGreenBottomRight) / 4;
// Gcache[xa] = (Gcache[a] + Gcache[b]) / 2;
// Gcache[xb] = (Gcache[b] + Gcache[c]) / 2;
// Gcache[xc] = (Gcache[c] + Gcache[d]) / 2;
// Gcache[xd] = (Gcache[d] + Gcache[a]) / 2;
//
// Bcache[a] = colorBlueBottomLeft;
// Bcache[b] = colorBlueBottomRight;
// Bcache[c] = colorBlueTopRight;
// Bcache[d] = colorBlueTopLeft;
// Bcache[e] = (colorBlueBottomLeft + colorBlueTopLeft + colorBlueTopRight + colorBlueBottomRight) / 4;
// Bcache[xa] = (Bcache[a] + Bcache[b]) / 2;
// Bcache[xb] = (Bcache[b] + Bcache[c]) / 2;
// Bcache[xc] = (Bcache[c] + Bcache[d]) / 2;
// Bcache[xd] = (Bcache[d] + Bcache[a]) / 2;
}
/*
* Takes in a variable number of packed light-integers, and computes the
* average value of each 4 bit channel
/**
* Takes in a variable number of packed light-integers, and computes the average value of each 4 bit channel
*
* For vanilla, these look like: (S = skylight and L = block light) 0000
* 0000 SSSS 0000 0000 0000 LLLL 0000 With the Colored Light Core installed,
* these look like: (B = Blue, G = Green, R = Red) 0000 0000 SSSS BBBB GGGG
* RRRR LLLL 0000
* For vanilla, these look like: (S = skylight and L = block light) 0000 0000 SSSS 0000 0000 0000 LLLL 0000 With the Colored Light Core installed, these look like: (B = Blue, G = Green, R = Red)
* 0000 0000 SSSS BBBB GGGG RRRR LLLL 0000
*
* This method will average all of the values appropriately for the more
* complex case, by separating each color channel into a running total, then
* it will combine the final results together using integer division and a
* lot of bit-cramming.
* This method will average all of the values appropriately for the more complex case, by separating each color channel into a running total, then it will combine the final results together using
* integer division and a lot of bit-cramming.
*
* While slightly more complex, the runtime should not be drastically
* effected, and the averaging routine remains compatible with vanilla.
* While slightly more complex, the runtime should not be drastically effected, and the averaging routine remains compatible with vanilla.
*
* Authored: CptSpaceToaster - 12/19/2014
*/
@@ -137,37 +214,25 @@ public class RenderBlocksCTM extends RenderBlocks {
| ((blueBitChannel / lightVals.length) & 0xF0000) | ((sunlightBitChannel / lightVals.length) & 0xF00000);
}
void side(int a, int b, int c, int d, int iconIndex, boolean flip) {
void side(SubSide side, int iconIndex, boolean flip) {
IIcon icon = iconIndex >= 16 ? submapSmall.icons[iconIndex - 16] : submap.icons[iconIndex];
double u0 = icon.getMaxU();
double u1 = icon.getMinU();
double v0 = icon.getMaxV();
double v1 = icon.getMinV();
double umax = icon.getMaxU();
double umin = icon.getMinU();
double vmax = icon.getMaxV();
double vmin = icon.getMinV();
U[a] = flip ? u1 : u1;
U[b] = flip ? u0 : u1;
U[c] = flip ? u0 : u0;
U[d] = flip ? u1 : u0;
uCache[0] = flip ? umax : umin;
uCache[1] = umax;
uCache[2] = flip ? umin : umax;
uCache[3] = umin;
V[a] = flip ? v1 : v1;
V[b] = flip ? v1 : v0;
V[c] = flip ? v0 : v0;
V[d] = flip ? v0 : v1;
vCache[0] = flip ? vmin : vmax;
vCache[1] = vmax;
vCache[2] = flip ? vmax : vmin;
vCache[3] = vmin;
vert(a);
vert(b);
vert(c);
vert(d);
}
void vert(int index) {
if (enableAO) {
tessellator.setColorOpaque_F(R[index], G[index], B[index]);
tessellator.setBrightness(L[index]);
}
tessellator.addVertexWithUV(X[index], Y[index], Z[index], U[index], V[index]);
side.render(this);
}
@Override
@@ -182,11 +247,11 @@ public class RenderBlocksCTM extends RenderBlocks {
} else {
int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 4);
setupSides(1, 0, 4, 5, 14, 19, 17, 23, 9);
side(1, 14, 9, 23, tex[0], false);
side(23, 9, 17, 5, tex[1], false);
side(9, 19, 4, 17, tex[3], false);
side(14, 0, 19, 9, tex[2], false);
updateLighting();
side(XNEG_LB, tex[2], false);
side(XNEG_RB, tex[3], false);
side(XNEG_RT, tex[1], false);
side(XNEG_LT, tex[0], false);
}
}
@@ -202,11 +267,11 @@ public class RenderBlocksCTM extends RenderBlocks {
} else {
int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 5);
setupSides(3, 2, 6, 7, 15, 25, 16, 21, 11);
side(11, 21, 3, 15, tex[3], false);
side(16, 7, 21, 11, tex[2], false);
side(25, 11, 15, 2, tex[1], false);
side(6, 16, 11, 25, tex[0], false);
updateLighting();
// side(11, 21, 3, 15, tex[3], false);
// side(16, 7, 21, 11, tex[2], false);
// side(25, 11, 15, 2, tex[1], false);
// side(6, 16, 11, 25, tex[0], false);
}
}
@@ -222,11 +287,11 @@ public class RenderBlocksCTM extends RenderBlocks {
} else {
int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 2);
setupSides(2, 3, 0, 1, 15, 18, 14, 22, 8);
side(2, 15, 8, 22, tex[0], false);
side(15, 3, 18, 8, tex[2], false);
side(8, 18, 0, 14, tex[3], false);
side(22, 8, 14, 1, tex[1], false);
updateLighting();
// side(2, 15, 8, 22, tex[0], false);
// side(15, 3, 18, 8, tex[2], false);
// side(8, 18, 0, 14, tex[3], false);
// side(22, 8, 14, 1, tex[1], false);
}
}
@@ -242,11 +307,11 @@ public class RenderBlocksCTM extends RenderBlocks {
} else {
int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 3);
setupSides(4, 7, 6, 5, 20, 16, 24, 17, 10);
side(17, 4, 20, 10, tex[2], false);
side(5, 17, 10, 24, tex[0], false);
side(24, 10, 16, 6, tex[1], false);
side(10, 20, 7, 16, tex[3], false);
updateLighting();
// side(17, 4, 20, 10, tex[2], false);
// side(5, 17, 10, 24, tex[0], false);
// side(24, 10, 16, 6, tex[1], false);
// side(10, 20, 7, 16, tex[3], false);
}
}
@@ -262,11 +327,11 @@ public class RenderBlocksCTM extends RenderBlocks {
} else {
int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 0);
setupSides(0, 3, 7, 4, 18, 21, 20, 19, 13);
side(13, 21, 7, 20, tex[3], true);
side(19, 13, 20, 4, tex[2], true);
side(0, 18, 13, 19, tex[0], true);
side(18, 3, 21, 13, tex[1], true);
updateLighting();
// side(13, 21, 7, 20, tex[3], true);
// side(19, 13, 20, 4, tex[2], true);
// side(0, 18, 13, 19, tex[0], true);
// side(18, 3, 21, 13, tex[1], true);
}
}
@@ -282,117 +347,12 @@ public class RenderBlocksCTM extends RenderBlocks {
} else {
int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 1);
setupSides(2, 1, 5, 6, 22, 23, 24, 25, 12);
side(12, 24, 6, 25, tex[3], false);
side(22, 12, 25, 2, tex[1], false);
side(1, 23, 12, 22, tex[0], false);
side(23, 5, 24, 12, tex[2], false);
updateLighting();
// side(12, 24, 6, 25, tex[3], false);
// side(22, 12, 25, 2, tex[1], false);
// side(1, 23, 12, 22, tex[0], false);
// side(23, 5, 24, 12, tex[2], false);
}
}
void resetVertices() {
X[0] = 0;
Z[0] = 0;
Y[0] = 0;
X[1] = 0;
Z[1] = 0;
Y[1] = 1;
X[2] = 1;
Z[2] = 0;
Y[2] = 1;
X[3] = 1;
Z[3] = 0;
Y[3] = 0;
X[4] = 0;
Z[4] = 1;
Y[4] = 0;
X[5] = 0;
Z[5] = 1;
Y[5] = 1;
X[6] = 1;
Z[6] = 1;
Y[6] = 1;
X[7] = 1;
Z[7] = 1;
Y[7] = 0;
X[8] = 0.5;
Z[8] = 0;
Y[8] = 0.5;
X[9] = 0;
Z[9] = 0.5;
Y[9] = 0.5;
X[10] = 0.5;
Z[10] = 1;
Y[10] = 0.5;
X[11] = 1;
Z[11] = 0.5;
Y[11] = 0.5;
X[12] = 0.5;
Z[12] = 0.5;
Y[12] = 1;
X[13] = 0.5;
Z[13] = 0.5;
Y[13] = 0;
X[14] = 0;
Z[14] = 0;
Y[14] = 0.5;
X[15] = 1;
Z[15] = 0;
Y[15] = 0.5;
X[16] = 1;
Z[16] = 1;
Y[16] = 0.5;
X[17] = 0;
Z[17] = 1;
Y[17] = 0.5;
X[18] = 0.5;
Z[18] = 0;
Y[18] = 0;
X[19] = 0;
Z[19] = 0.5;
Y[19] = 0;
X[20] = 0.5;
Z[20] = 1;
Y[20] = 0;
X[21] = 1;
Z[21] = 0.5;
Y[21] = 0;
X[22] = 0.5;
Z[22] = 0;
Y[22] = 1;
X[23] = 0;
Z[23] = 0.5;
Y[23] = 1;
X[24] = 0.5;
Z[24] = 1;
Y[24] = 1;
X[25] = 1;
Z[25] = 0.5;
Y[25] = 1;
}
}