X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fnoise.c;h=63bfa82e5e3851daf5140a6e1dd47bb81298de02;hb=e23b27a06797d931992ab9b8d21055f789371e2a;hp=b3b3f9c60c330461dcafdf0944d640444a3b6ffd;hpb=3b52c25b520e0e1b9143cafaee2670e57c89ef0d;p=dosdemo

diff --git a/src/noise.c b/src/noise.c
index b3b3f9c..63bfa82 100644
--- a/src/noise.c
+++ b/src/noise.c
@@ -186,12 +186,12 @@ float noise3(float x, float y, float z)
 	c = lerp(a, b, sy);
 
 	/* interpolate along the bottom slice of the cell */
-	u = dotgrad3(grad3[b00 + bz0], rx0, ry0, rz1);
-	v = dotgrad3(grad3[b10 + bz0], rx1, ry0, rz1);
+	u = dotgrad3(grad3[b00 + bz1], rx0, ry0, rz1);
+	v = dotgrad3(grad3[b10 + bz1], rx1, ry0, rz1);
 	a = lerp(u, v, sx);
 
-	u = dotgrad3(grad3[b01 + bz0], rx0, ry1, rz1);
-	v = dotgrad3(grad3[b11 + bz0], rx1, ry1, rz1);
+	u = dotgrad3(grad3[b01 + bz1], rx0, ry1, rz1);
+	v = dotgrad3(grad3[b11 + bz1], rx1, ry1, rz1);
 	b = lerp(u, v, sx);
 
 	d = lerp(a, b, sy);
@@ -298,12 +298,12 @@ float pnoise3(float x, float y, float z, int per_x, int per_y, int per_z)
 	c = lerp(a, b, sy);
 
 	/* interpolate along the bottom slice of the cell */
-	u = dotgrad3(grad3[b00 + bz0], rx0, ry0, rz1);
-	v = dotgrad3(grad3[b10 + bz0], rx1, ry0, rz1);
+	u = dotgrad3(grad3[b00 + bz1], rx0, ry0, rz1);
+	v = dotgrad3(grad3[b10 + bz1], rx1, ry0, rz1);
 	a = lerp(u, v, sx);
 
-	u = dotgrad3(grad3[b01 + bz0], rx0, ry1, rz1);
-	v = dotgrad3(grad3[b11 + bz0], rx1, ry1, rz1);
+	u = dotgrad3(grad3[b01 + bz1], rx0, ry1, rz1);
+	v = dotgrad3(grad3[b11 + bz1], rx1, ry1, rz1);
 	b = lerp(u, v, sx);
 
 	d = lerp(a, b, sy);
@@ -320,8 +320,9 @@ float pnoise4(float x, float y, float z, float w, int per_x, int per_y, int per_
 
 float fbm1(float x, int octaves)
 {
+	int i;
 	float res = 0.0f, freq = 1.0f;
-	for(int i=0; i<octaves; i++) {
+	for(i=0; i<octaves; i++) {
 		res += noise1(x * freq) / freq;
 		freq *= 2.0f;
 	}
@@ -330,8 +331,9 @@ float fbm1(float x, int octaves)
 
 float fbm2(float x, float y, int octaves)
 {
+	int i;
 	float res = 0.0f, freq = 1.0f;
-	for(int i=0; i<octaves; i++) {
+	for(i=0; i<octaves; i++) {
 		res += noise2(x * freq, y * freq) / freq;
 		freq *= 2.0f;
 	}
@@ -340,8 +342,9 @@ float fbm2(float x, float y, int octaves)
 
 float fbm3(float x, float y, float z, int octaves)
 {
+	int i;
 	float res = 0.0f, freq = 1.0f;
-	for(int i=0; i<octaves; i++) {
+	for(i=0; i<octaves; i++) {
 		res += noise3(x * freq, y * freq, z * freq) / freq;
 		freq *= 2.0f;
 	}
@@ -351,8 +354,9 @@ float fbm3(float x, float y, float z, int octaves)
 
 float fbm4(float x, float y, float z, float w, int octaves)
 {
+	int i;
 	float res = 0.0f, freq = 1.0f;
-	for(int i=0; i<octaves; i++) {
+	for(i=0; i<octaves; i++) {
 		res += noise4(x * freq, y * freq, z * freq, w * freq) / freq;
 		freq *= 2.0f;
 	}
@@ -362,8 +366,9 @@ float fbm4(float x, float y, float z, float w, int octaves)
 
 float pfbm1(float x, int per, int octaves)
 {
+	int i;
 	float res = 0.0f, freq = 1.0f;
-	for(int i=0; i<octaves; i++) {
+	for(i=0; i<octaves; i++) {
 		res += pnoise1(x * freq, per) / freq;
 		freq *= 2.0f;
 		per *= 2;
@@ -373,8 +378,9 @@ float pfbm1(float x, int per, int octaves)
 
 float pfbm2(float x, float y, int per_x, int per_y, int octaves)
 {
+	int i;
 	float res = 0.0f, freq = 1.0f;
-	for(int i=0; i<octaves; i++) {
+	for(i=0; i<octaves; i++) {
 		res += pnoise2(x * freq, y * freq, per_x, per_y) / freq;
 		freq *= 2.0f;
 		per_x *= 2;
@@ -385,8 +391,9 @@ float pfbm2(float x, float y, int per_x, int per_y, int octaves)
 
 float pfbm3(float x, float y, float z, int per_x, int per_y, int per_z, int octaves)
 {
+	int i;
 	float res = 0.0f, freq = 1.0f;
-	for(int i=0; i<octaves; i++) {
+	for(i=0; i<octaves; i++) {
 		res += pnoise3(x * freq, y * freq, z * freq, per_x, per_y, per_z) / freq;
 		freq *= 2.0f;
 		per_x *= 2;
@@ -398,8 +405,9 @@ float pfbm3(float x, float y, float z, int per_x, int per_y, int per_z, int octa
 
 float pfbm4(float x, float y, float z, float w, int per_x, int per_y, int per_z, int per_w, int octaves)
 {
+	int i;
 	float res = 0.0f, freq = 1.0f;
-	for(int i=0; i<octaves; i++) {
+	for(i=0; i<octaves; i++) {
 		res += pnoise4(x * freq, y * freq, z * freq, w * freq,
 				per_x, per_y, per_z, per_w) / freq;
 		freq *= 2.0f;
@@ -414,8 +422,9 @@ float pfbm4(float x, float y, float z, float w, int per_x, int per_y, int per_z,
 
 float turbulence1(float x, int octaves)
 {
+	int i;
 	float res = 0.0f, freq = 1.0f;
-	for(int i=0; i<octaves; i++) {
+	for(i=0; i<octaves; i++) {
 		res += fabs(noise1(x * freq) / freq);
 		freq *= 2.0f;
 	}
@@ -424,8 +433,9 @@ float turbulence1(float x, int octaves)
 
 float turbulence2(float x, float y, int octaves)
 {
+	int i;
 	float res = 0.0f, freq = 1.0f;
-	for(int i=0; i<octaves; i++) {
+	for(i=0; i<octaves; i++) {
 		res += fabs(noise2(x * freq, y * freq) / freq);
 		freq *= 2.0f;
 	}
@@ -434,8 +444,9 @@ float turbulence2(float x, float y, int octaves)
 
 float turbulence3(float x, float y, float z, int octaves)
 {
+	int i;
 	float res = 0.0f, freq = 1.0f;
-	for(int i=0; i<octaves; i++) {
+	for(i=0; i<octaves; i++) {
 		res += fabs(noise3(x * freq, y * freq, z * freq) / freq);
 		freq *= 2.0f;
 	}
@@ -444,8 +455,9 @@ float turbulence3(float x, float y, float z, int octaves)
 
 float turbulence4(float x, float y, float z, float w, int octaves)
 {
+	int i;
 	float res = 0.0f, freq = 1.0f;
-	for(int i=0; i<octaves; i++) {
+	for(i=0; i<octaves; i++) {
 		res += fabs(noise4(x * freq, y * freq, z * freq, w * freq) / freq);
 		freq *= 2.0f;
 	}
@@ -455,8 +467,9 @@ float turbulence4(float x, float y, float z, float w, int octaves)
 
 float pturbulence1(float x, int per, int octaves)
 {
+	int i;
 	float res = 0.0f, freq = 1.0f;
-	for(int i=0; i<octaves; i++) {
+	for(i=0; i<octaves; i++) {
 		res += fabs(pnoise1(x * freq, per) / freq);
 		freq *= 2.0f;
 		per *= 2;
@@ -466,8 +479,9 @@ float pturbulence1(float x, int per, int octaves)
 
 float pturbulence2(float x, float y, int per_x, int per_y, int octaves)
 {
+	int i;
 	float res = 0.0f, freq = 1.0f;
-	for(int i=0; i<octaves; i++) {
+	for(i=0; i<octaves; i++) {
 		res += fabs(pnoise2(x * freq, y * freq, per_x, per_y) / freq);
 		freq *= 2.0f;
 		per_x *= 2;
@@ -478,8 +492,9 @@ float pturbulence2(float x, float y, int per_x, int per_y, int octaves)
 
 float pturbulence3(float x, float y, float z, int per_x, int per_y, int per_z, int octaves)
 {
+	int i;
 	float res = 0.0f, freq = 1.0f;
-	for(int i=0; i<octaves; i++) {
+	for(i=0; i<octaves; i++) {
 		res += fabs(pnoise3(x * freq, y * freq, z * freq, per_x, per_y, per_z) / freq);
 		freq *= 2.0f;
 		per_x *= 2;
@@ -491,8 +506,9 @@ float pturbulence3(float x, float y, float z, int per_x, int per_y, int per_z, i
 
 float pturbulence4(float x, float y, float z, float w, int per_x, int per_y, int per_z, int per_w, int octaves)
 {
+	int i;
 	float res = 0.0f, freq = 1.0f;
-	for(int i=0; i<octaves; i++) {
+	for(i=0; i<octaves; i++) {
 		res += fabs(pnoise4(x * freq, y * freq, z * freq, w * freq,
 				per_x, per_y, per_z, per_w) / freq);
 		freq *= 2.0f;