upstream/Chisel
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Chisel.git synced 2026-11-11 15:57:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #215 from AtomicBlom/brickTexturing

Browse Source 
change V4 and V9 textures to tiling instead of staircasing
This commit is contained in:
Cricket committed 2015-02-11 05:44:51 -08:00
2 parents 63ea14f44e 0425ac5b4d
commit f46b42e924
1 file changed
+32 -11
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java
+32 -11
View File
@@ -255,19 +255,40 @@ public class CarvableHelper {
else if (n)
return variation.seamsCtmVert.icons[reverse ? 3 : 2];
return variation.seamsCtmVert.icons[0];
case V9:
case V4:
int index = x + y + z;
if ((side==2)||(side==5))
{
index=-index;
}
while (index < 0)
{
index = index+10000;
case V9:
case V4:
int variationSize = (variation.kind == V9) ? 3 : 2;
int xModulus = x % variationSize;
int zModulus = z % variationSize;
//This ensures that blocks placed near 0,0 or it's axis' do not misbehave
int textureX = (xModulus < 0) ? (xModulus + variationSize) : xModulus;
int textureZ = (zModulus < 0) ? (zModulus + variationSize) : zModulus;
//Always invert the y index
int textureY = (variationSize - (y % variationSize) - 1);
if (side == 2 || side == 5) {
//For WEST, SOUTH reverse the indexes for both X and Z
textureX = (variationSize - textureX - 1);
textureZ = (variationSize - textureZ - 1);
} else if (side == 0) {
//For DOWN, reverse the indexes for only Z
textureZ = (variationSize - textureZ - 1);
}
return variation.variations9.icons[index % ((variation.kind == V9) ? 9 : 4)];
int index;
if (side == 0 || side == 1) {
// DOWN || UP
index = textureX + textureZ * variationSize;
} else if (side == 2 || side == 3) {
// NORTH || SOUTH
index = textureX + textureY * variationSize;
} else {
// WEST || EAST
index = textureZ + textureY * variationSize;
}
return variation.variations9.icons[index];
case CTMX:
return variation.icon;
case R16: