Skip to content

Commit

Permalink
Texture fixes round 5.
Browse files Browse the repository at this point in the history
  • Loading branch information
Chicken-Bones committed Aug 14, 2013
1 parent c25c570 commit b6157da
Show file tree
Hide file tree
Showing 51 changed files with 2 additions and 14 deletions.
16 changes: 2 additions & 14 deletions common/mrtjp/projectred/transmission/RenderWire.java
Original file line number Diff line number Diff line change
Expand Up @@ -214,22 +214,10 @@ private Vertex5[] generateInternal(int r) {
verts[2].uv.set(8-tw, 24+tw);
verts[3].uv.set(8+tw, 24+tw);

//retexture top
verts[4].uv.set(8-tw, 8);
verts[5].uv.set(8+tw, 8);
verts[6].uv.set(8+tw, 16-tw);
verts[7].uv.set(8-tw, 16-tw);

reflectSide(verts, r);

if((r+reorientSide[side])%4 >= 2) {//just like reflect side, but flips on x axis
UVT flip = new UVT(new Scale(1, 1, -1).at(new Vector3(0, 0, 16)));
for(int i = 8; i < 16; i++)
verts[i].apply(flip);
}

//offset side textures
for(int i = 8; i < 16; i++)
for(int i = 4; i < 16; i++)
verts[i].apply(new UVTranslation(16, 0));

return verts;
Expand Down Expand Up @@ -307,7 +295,7 @@ else if(connMask == 10)
i = addVerts(model, verts, i);
}

private static UVT sideReflect = new UVT(new Scale(-1, 1, 1).at(new Vector3(8, 0, 0)));
private static UVT sideReflect = new UVT(Rotation.quarterRotations[2].at(new Vector3(8, 0, 16)));
private void reflectSide(Vertex5[] verts, int r) {
if((r+reorientSide[side])%4 >= 2)//invert the texture about the y center
for(Vertex5 vert : verts)
Expand Down
Binary file modified resources/assets/projectred/textures/blocks/wires/bundled/black.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/assets/projectred/textures/blocks/wires/bundled/blue.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/assets/projectred/textures/blocks/wires/bundled/brown.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/assets/projectred/textures/blocks/wires/bundled/cyan.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/assets/projectred/textures/blocks/wires/bundled/green.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/assets/projectred/textures/blocks/wires/bundled/grey.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/assets/projectred/textures/blocks/wires/bundled/lime.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/assets/projectred/textures/blocks/wires/bundled/pink.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/assets/projectred/textures/blocks/wires/bundled/red.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/assets/projectred/textures/blocks/wires/bundled/white.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/assets/projectred/textures/blocks/wires/redalloy.png

0 comments on commit b6157da

Please sign in to comment.