Merge branch 'master' into test
commit
a0247b12a0
@ -0,0 +1,217 @@
|
||||
package net.minecraft.src;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import static net.minecraft.src.Constants.*;
|
||||
|
||||
public class NoiseGeneratorPerlin16 extends NoiseGenerator
|
||||
{
|
||||
private int[] permutations;
|
||||
public double xCoord;
|
||||
public double yCoord;
|
||||
public double zCoord;
|
||||
|
||||
public NoiseGeneratorPerlin16()
|
||||
{
|
||||
this(new Random());
|
||||
}
|
||||
|
||||
public NoiseGeneratorPerlin16(Random par1Random)
|
||||
{
|
||||
this.permutations = new int[512];
|
||||
this.xCoord = par1Random.nextDouble() * 256.0D;
|
||||
this.yCoord = par1Random.nextDouble() * 256.0D;
|
||||
this.zCoord = par1Random.nextDouble() * 256.0D;
|
||||
int var2;
|
||||
|
||||
for (var2 = 0; var2 < 256; this.permutations[var2] = var2++)
|
||||
{
|
||||
;
|
||||
}
|
||||
|
||||
for (var2 = 0; var2 < 256; ++var2)
|
||||
{
|
||||
int var3 = par1Random.nextInt(256 - var2) + var2;
|
||||
int var4 = this.permutations[var2];
|
||||
this.permutations[var2] = this.permutations[var3];
|
||||
this.permutations[var3] = var4;
|
||||
this.permutations[var2 + 256] = this.permutations[var2];
|
||||
}
|
||||
}
|
||||
|
||||
public final double lerp(double par1, double par3, double par5)
|
||||
{
|
||||
return par3 + par1 * (par5 - par3);
|
||||
}
|
||||
|
||||
public final double grad2d(int par1, double par2, double par4)
|
||||
{
|
||||
int var6 = par1 & 15;
|
||||
double var7 = (double)(1 - ((var6 & 8) >> 3)) * par2;
|
||||
double var9 = var6 < 4 ? 0.0D : (var6 != 12 && var6 != 14 ? par4 : par2);
|
||||
return ((var6 & 1) == 0 ? var7 : -var7) + ((var6 & 2) == 0 ? var9 : -var9);
|
||||
}
|
||||
|
||||
public final double grad3d(int par1, double par2, double par4, double par6)
|
||||
{
|
||||
int var8 = par1 & 15;
|
||||
double var9 = var8 < 8 ? par2 : par4;
|
||||
double var11 = var8 < 4 ? par4 : (var8 != 12 && var8 != 14 ? par6 : par2);
|
||||
return ((var8 & 1) == 0 ? var9 : -var9) + ((var8 & 2) == 0 ? var11 : -var11);
|
||||
}
|
||||
|
||||
private double floor(double value) {
|
||||
return MathHelper.clamp_double(value < 0 ? Math.floor(value) + 1 : Math.floor(value), -32768D, 32767D);
|
||||
}
|
||||
|
||||
/**
|
||||
* pars: noiseArray , xOffset , yOffset , zOffset , xSize , ySize , zSize , xScale, yScale , zScale , noiseScale.
|
||||
* noiseArray should be xSize*ySize*zSize in size
|
||||
*/
|
||||
public void populateNoiseArray(double[] par1ArrayOfDouble, double par2, double par4, double par6, int par8, int par9, int par10, double par11, double par13, double par15, double par17)
|
||||
{
|
||||
int var10001;
|
||||
int var19;
|
||||
int var22;
|
||||
double var31;
|
||||
double var35;
|
||||
int var37;
|
||||
double var38;
|
||||
int var41;
|
||||
double var42;
|
||||
int var75;
|
||||
|
||||
if (par9 == 1)
|
||||
{
|
||||
boolean var64 = false;
|
||||
boolean var65 = false;
|
||||
boolean var21 = false;
|
||||
boolean var68 = false;
|
||||
double var70 = 0.0D;
|
||||
double var73 = 0.0D;
|
||||
var75 = 0;
|
||||
double var77 = 1.0D / par17;
|
||||
|
||||
for (int var30 = 0; var30 < par8; ++var30)
|
||||
{
|
||||
var31 = par2 + (double)var30 * par11 + this.xCoord;
|
||||
double var78 = floor(var31);
|
||||
|
||||
if (var31 < (double)var78)
|
||||
{
|
||||
--var78;
|
||||
}
|
||||
|
||||
int var34 = (int) (var78 % 256D) & 255;
|
||||
var31 -= (double)var78;
|
||||
var35 = var31 * var31 * var31 * (var31 * (var31 * 6.0D - 15.0D) + 10.0D);
|
||||
|
||||
for (var37 = 0; var37 < par10; ++var37)
|
||||
{
|
||||
var38 = par6 + (double)var37 * par15 + this.zCoord;
|
||||
double var40 = floor(var38);
|
||||
|
||||
if (var38 < (double)var40)
|
||||
{
|
||||
--var40;
|
||||
}
|
||||
|
||||
var41 = (int) (var40 % 256D) & 255;
|
||||
var38 -= (double)var40;
|
||||
var42 = var38 * var38 * var38 * (var38 * (var38 * 6.0D - 15.0D) + 10.0D);
|
||||
var19 = this.permutations[var34] + 0;
|
||||
int var66 = this.permutations[var19] + var41;
|
||||
int var67 = this.permutations[var34 + 1] + 0;
|
||||
var22 = this.permutations[var67] + var41;
|
||||
var70 = this.lerp(var35, this.grad2d(this.permutations[var66], var31, var38), this.grad3d(this.permutations[var22], var31 - 1.0D, 0.0D, var38));
|
||||
var73 = this.lerp(var35, this.grad3d(this.permutations[var66 + 1], var31, 0.0D, var38 - 1.0D), this.grad3d(this.permutations[var22 + 1], var31 - 1.0D, 0.0D, var38 - 1.0D));
|
||||
double var79 = this.lerp(var42, var70, var73);
|
||||
var10001 = var75++;
|
||||
par1ArrayOfDouble[var10001] += FLOAT_PERLIN_GENERATOR ? (float) (var79 * var77) : var79 * var77;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var19 = 0;
|
||||
double var20 = 1.0D / par17;
|
||||
var22 = -1;
|
||||
boolean var23 = false;
|
||||
boolean var24 = false;
|
||||
boolean var25 = false;
|
||||
boolean var26 = false;
|
||||
boolean var27 = false;
|
||||
boolean var28 = false;
|
||||
double var29 = 0.0D;
|
||||
var31 = 0.0D;
|
||||
double var33 = 0.0D;
|
||||
var35 = 0.0D;
|
||||
|
||||
for (var37 = 0; var37 < par8; ++var37)
|
||||
{
|
||||
var38 = par2 + (double)var37 * par11 + this.xCoord;
|
||||
double var40 = floor(var38);
|
||||
|
||||
if (var38 < (double)var40)
|
||||
{
|
||||
--var40;
|
||||
}
|
||||
|
||||
var41 = (int) (var40 % 256D) & 255;
|
||||
var38 -= (double)var40;
|
||||
var42 = var38 * var38 * var38 * (var38 * (var38 * 6.0D - 15.0D) + 10.0D);
|
||||
|
||||
for (int var44 = 0; var44 < par10; ++var44)
|
||||
{
|
||||
double var45 = par6 + (double)var44 * par15 + this.zCoord;
|
||||
double var47 = floor(var45);
|
||||
|
||||
if (var45 < (double)var47)
|
||||
{
|
||||
--var47;
|
||||
}
|
||||
|
||||
int var48 = (int) (var47 % 256D) & 255;
|
||||
var45 -= (double)var47;
|
||||
double var49 = var45 * var45 * var45 * (var45 * (var45 * 6.0D - 15.0D) + 10.0D);
|
||||
|
||||
for (int var51 = 0; var51 < par9; ++var51)
|
||||
{
|
||||
double var52 = par4 + (double)var51 * par13 + this.yCoord;
|
||||
double var54 = floor(var52);
|
||||
|
||||
if (var52 < (double)var54)
|
||||
{
|
||||
--var54;
|
||||
}
|
||||
|
||||
int var55 = (int) (var54 % 256D) & 255;
|
||||
var52 -= (double)var54;
|
||||
double var56 = var52 * var52 * var52 * (var52 * (var52 * 6.0D - 15.0D) + 10.0D);
|
||||
|
||||
if (var51 == 0 || var55 != var22)
|
||||
{
|
||||
var22 = var55;
|
||||
int var69 = this.permutations[var41] + var55;
|
||||
int var71 = this.permutations[var69] + var48;
|
||||
int var72 = this.permutations[var69 + 1] + var48;
|
||||
int var74 = this.permutations[var41 + 1] + var55;
|
||||
var75 = this.permutations[var74] + var48;
|
||||
int var76 = this.permutations[var74 + 1] + var48;
|
||||
var29 = this.lerp(var42, this.grad3d(this.permutations[var71], var38, var52, var45), this.grad3d(this.permutations[var75], var38 - 1.0D, var52, var45));
|
||||
var31 = this.lerp(var42, this.grad3d(this.permutations[var72], var38, var52 - 1.0D, var45), this.grad3d(this.permutations[var76], var38 - 1.0D, var52 - 1.0D, var45));
|
||||
var33 = this.lerp(var42, this.grad3d(this.permutations[var71 + 1], var38, var52, var45 - 1.0D), this.grad3d(this.permutations[var75 + 1], var38 - 1.0D, var52, var45 - 1.0D));
|
||||
var35 = this.lerp(var42, this.grad3d(this.permutations[var72 + 1], var38, var52 - 1.0D, var45 - 1.0D), this.grad3d(this.permutations[var76 + 1], var38 - 1.0D, var52 - 1.0D, var45 - 1.0D));
|
||||
}
|
||||
|
||||
double var58 = this.lerp(var56, var29, var31);
|
||||
double var60 = this.lerp(var56, var33, var35);
|
||||
double var62 = this.lerp(var49, var58, var60);
|
||||
var10001 = var19++;
|
||||
par1ArrayOfDouble[var10001] += FLOAT_PERLIN_GENERATOR ? (float) (var62 * var20) : var62 * var20;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,217 @@
|
||||
package net.minecraft.src;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import static net.minecraft.src.Constants.*;
|
||||
|
||||
public class NoiseGeneratorPerlinFloat extends NoiseGenerator
|
||||
{
|
||||
private int[] permutations;
|
||||
public double xCoord;
|
||||
public double yCoord;
|
||||
public double zCoord;
|
||||
|
||||
public NoiseGeneratorPerlinFloat()
|
||||
{
|
||||
this(new Random());
|
||||
}
|
||||
|
||||
public NoiseGeneratorPerlinFloat(Random par1Random)
|
||||
{
|
||||
this.permutations = new int[512];
|
||||
this.xCoord = par1Random.nextDouble() * 256.0D;
|
||||
this.yCoord = par1Random.nextDouble() * 256.0D;
|
||||
this.zCoord = par1Random.nextDouble() * 256.0D;
|
||||
int var2;
|
||||
|
||||
for (var2 = 0; var2 < 256; this.permutations[var2] = var2++)
|
||||
{
|
||||
;
|
||||
}
|
||||
|
||||
for (var2 = 0; var2 < 256; ++var2)
|
||||
{
|
||||
int var3 = par1Random.nextInt(256 - var2) + var2;
|
||||
int var4 = this.permutations[var2];
|
||||
this.permutations[var2] = this.permutations[var3];
|
||||
this.permutations[var3] = var4;
|
||||
this.permutations[var2 + 256] = this.permutations[var2];
|
||||
}
|
||||
}
|
||||
|
||||
public final double lerp(double par1, double par3, double par5)
|
||||
{
|
||||
return par3 + par1 * (par5 - par3);
|
||||
}
|
||||
|
||||
public final double grad2d(int par1, double par2, double par4)
|
||||
{
|
||||
int var6 = par1 & 15;
|
||||
double var7 = (double)(1 - ((var6 & 8) >> 3)) * par2;
|
||||
double var9 = var6 < 4 ? 0.0D : (var6 != 12 && var6 != 14 ? par4 : par2);
|
||||
return ((var6 & 1) == 0 ? var7 : -var7) + ((var6 & 2) == 0 ? var9 : -var9);
|
||||
}
|
||||
|
||||
public final double grad3d(int par1, double par2, double par4, double par6)
|
||||
{
|
||||
int var8 = par1 & 15;
|
||||
double var9 = var8 < 8 ? par2 : par4;
|
||||
double var11 = var8 < 4 ? par4 : (var8 != 12 && var8 != 14 ? par6 : par2);
|
||||
return ((var8 & 1) == 0 ? var9 : -var9) + ((var8 & 2) == 0 ? var11 : -var11);
|
||||
}
|
||||
|
||||
private double floor(double value) {
|
||||
return (float) value < 0 ? Math.floor(value) + 1 : Math.floor(value);
|
||||
}
|
||||
|
||||
/**
|
||||
* pars: noiseArray , xOffset , yOffset , zOffset , xSize , ySize , zSize , xScale, yScale , zScale , noiseScale.
|
||||
* noiseArray should be xSize*ySize*zSize in size
|
||||
*/
|
||||
public void populateNoiseArray(double[] par1ArrayOfDouble, double par2, double par4, double par6, int par8, int par9, int par10, double par11, double par13, double par15, double par17)
|
||||
{
|
||||
int var10001;
|
||||
int var19;
|
||||
int var22;
|
||||
double var31;
|
||||
double var35;
|
||||
int var37;
|
||||
double var38;
|
||||
int var41;
|
||||
double var42;
|
||||
int var75;
|
||||
|
||||
if (par9 == 1)
|
||||
{
|
||||
boolean var64 = false;
|
||||
boolean var65 = false;
|
||||
boolean var21 = false;
|
||||
boolean var68 = false;
|
||||
double var70 = 0.0D;
|
||||
double var73 = 0.0D;
|
||||
var75 = 0;
|
||||
double var77 = 1.0D / par17;
|
||||
|
||||
for (int var30 = 0; var30 < par8; ++var30)
|
||||
{
|
||||
var31 = par2 + (double)var30 * par11 + this.xCoord;
|
||||
double var78 = floor(var31);
|
||||
|
||||
if (var31 < (double)var78)
|
||||
{
|
||||
--var78;
|
||||
}
|
||||
|
||||
int var34 = (int) (var78 % 256D) & 255;
|
||||
var31 -= (double)var78;
|
||||
var35 = var31 * var31 * var31 * (var31 * (var31 * 6.0D - 15.0D) + 10.0D);
|
||||
|
||||
for (var37 = 0; var37 < par10; ++var37)
|
||||
{
|
||||
var38 = par6 + (double)var37 * par15 + this.zCoord;
|
||||
double var40 = floor(var38);
|
||||
|
||||
if (var38 < (double)var40)
|
||||
{
|
||||
--var40;
|
||||
}
|
||||
|
||||
var41 = (int) (var40 % 256D) & 255;
|
||||
var38 -= (double)var40;
|
||||
var42 = var38 * var38 * var38 * (var38 * (var38 * 6.0D - 15.0D) + 10.0D);
|
||||
var19 = this.permutations[var34] + 0;
|
||||
int var66 = this.permutations[var19] + var41;
|
||||
int var67 = this.permutations[var34 + 1] + 0;
|
||||
var22 = this.permutations[var67] + var41;
|
||||
var70 = this.lerp(var35, this.grad2d(this.permutations[var66], var31, var38), this.grad3d(this.permutations[var22], var31 - 1.0D, 0.0D, var38));
|
||||
var73 = this.lerp(var35, this.grad3d(this.permutations[var66 + 1], var31, 0.0D, var38 - 1.0D), this.grad3d(this.permutations[var22 + 1], var31 - 1.0D, 0.0D, var38 - 1.0D));
|
||||
double var79 = this.lerp(var42, var70, var73);
|
||||
var10001 = var75++;
|
||||
par1ArrayOfDouble[var10001] += FLOAT_PERLIN_GENERATOR ? (float) (var79 * var77) : var79 * var77;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var19 = 0;
|
||||
double var20 = 1.0D / par17;
|
||||
var22 = -1;
|
||||
boolean var23 = false;
|
||||
boolean var24 = false;
|
||||
boolean var25 = false;
|
||||
boolean var26 = false;
|
||||
boolean var27 = false;
|
||||
boolean var28 = false;
|
||||
double var29 = 0.0D;
|
||||
var31 = 0.0D;
|
||||
double var33 = 0.0D;
|
||||
var35 = 0.0D;
|
||||
|
||||
for (var37 = 0; var37 < par8; ++var37)
|
||||
{
|
||||
var38 = par2 + (double)var37 * par11 + this.xCoord;
|
||||
double var40 = floor(var38);
|
||||
|
||||
if (var38 < (double)var40)
|
||||
{
|
||||
--var40;
|
||||
}
|
||||
|
||||
var41 = (int) (var40 % 256D) & 255;
|
||||
var38 -= (double)var40;
|
||||
var42 = var38 * var38 * var38 * (var38 * (var38 * 6.0D - 15.0D) + 10.0D);
|
||||
|
||||
for (int var44 = 0; var44 < par10; ++var44)
|
||||
{
|
||||
double var45 = par6 + (double)var44 * par15 + this.zCoord;
|
||||
double var47 = floor(var45);
|
||||
|
||||
if (var45 < (double)var47)
|
||||
{
|
||||
--var47;
|
||||
}
|
||||
|
||||
int var48 = (int) (var47 % 256D) & 255;
|
||||
var45 -= (double)var47;
|
||||
double var49 = var45 * var45 * var45 * (var45 * (var45 * 6.0D - 15.0D) + 10.0D);
|
||||
|
||||
for (int var51 = 0; var51 < par9; ++var51)
|
||||
{
|
||||
double var52 = par4 + (double)var51 * par13 + this.yCoord;
|
||||
double var54 = floor(var52);
|
||||
|
||||
if (var52 < (double)var54)
|
||||
{
|
||||
--var54;
|
||||
}
|
||||
|
||||
int var55 = (int) (var54 % 256D) & 255;
|
||||
var52 -= (double)var54;
|
||||
double var56 = var52 * var52 * var52 * (var52 * (var52 * 6.0D - 15.0D) + 10.0D);
|
||||
|
||||
if (var51 == 0 || var55 != var22)
|
||||
{
|
||||
var22 = var55;
|
||||
int var69 = this.permutations[var41] + var55;
|
||||
int var71 = this.permutations[var69] + var48;
|
||||
int var72 = this.permutations[var69 + 1] + var48;
|
||||
int var74 = this.permutations[var41 + 1] + var55;
|
||||
var75 = this.permutations[var74] + var48;
|
||||
int var76 = this.permutations[var74 + 1] + var48;
|
||||
var29 = this.lerp(var42, this.grad3d(this.permutations[var71], var38, var52, var45), this.grad3d(this.permutations[var75], var38 - 1.0D, var52, var45));
|
||||
var31 = this.lerp(var42, this.grad3d(this.permutations[var72], var38, var52 - 1.0D, var45), this.grad3d(this.permutations[var76], var38 - 1.0D, var52 - 1.0D, var45));
|
||||
var33 = this.lerp(var42, this.grad3d(this.permutations[var71 + 1], var38, var52, var45 - 1.0D), this.grad3d(this.permutations[var75 + 1], var38 - 1.0D, var52, var45 - 1.0D));
|
||||
var35 = this.lerp(var42, this.grad3d(this.permutations[var72 + 1], var38, var52 - 1.0D, var45 - 1.0D), this.grad3d(this.permutations[var76 + 1], var38 - 1.0D, var52 - 1.0D, var45 - 1.0D));
|
||||
}
|
||||
|
||||
double var58 = this.lerp(var56, var29, var31);
|
||||
double var60 = this.lerp(var56, var33, var35);
|
||||
double var62 = this.lerp(var49, var58, var60);
|
||||
var10001 = var19++;
|
||||
par1ArrayOfDouble[var10001] += FLOAT_PERLIN_GENERATOR ? (float) (var62 * var20) : var62 * var20;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue