kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove most warnings in ORX

Browse Source 
Closes #61
This commit is contained in:
Edwin Jakobs
2020-04-09 16:00:27 +02:00
parent 8fc74555b3
commit d0d096d773
10 changed files with 55 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
orx-noise/src/main/kotlin/Fractal.kt
View File

@@ -8,17 +8,17 @@ inline fun fbm(seed: Int, x: Double, y: Double, z: Double, w: Double, crossinlin
var sum = noise(seed, x, y, z, w)
var amp = 1.0
var x = x
var y = y
var z = z
var w = w
var lx = x
var ly = y
var lz = z
var lw = w
for (i in 1 until octaves) {
x *= lacunarity
y *= lacunarity
z *= lacunarity
w *= lacunarity
lx *= lacunarity
ly *= lacunarity
lz *= lacunarity
lw *= lacunarity
amp *= gain
sum += noise(seed + i, x, y, z, w) * amp
sum += noise(seed + i, lx, ly, lz, lw) * amp
}
return sum
}
@@ -28,15 +28,15 @@ inline fun fbm(seed: Int, x: Double, y: Double, z: Double, crossinline noise: (I
var sum = noise(seed, x, y, z)
var amp = 1.0
var x = x
var y = y
var z = z
var lx = x
var ly = y
var lz = z
for (i in 1 until octaves) {
x *= lacunarity
y *= lacunarity
z *= lacunarity
lx *= lacunarity
ly *= lacunarity
lz *= lacunarity
amp *= gain
sum += noise(seed + i, x, y, z) * amp
sum += noise(seed + i, lx, ly, lz) * amp
}
return sum
}
@@ -46,13 +46,13 @@ inline fun fbm(seed: Int, x: Double, y: Double, crossinline noise: (Int, Double,
var sum = noise(seed, x, y)
var amp = 1.0
var x = x
var y = y
var lx = x
var ly = y
for (i in 1 until octaves) {
x *= lacunarity
y *= lacunarity
lx *= lacunarity
ly *= lacunarity
amp *= gain
sum += noise(seed + i, x, y) * amp
sum += noise(seed + i, lx, ly) * amp
}
return sum
}
@@ -62,11 +62,11 @@ inline fun fbm(seed: Int, x: Double, crossinline noise: (Int, Double) -> Double,
var sum = noise(seed, x)
var amp = 1.0
var x = x
var lx = x
for (i in 1 until octaves) {
x *= lacunarity
lx *= lacunarity
amp *= gain
sum += noise(seed + i, x) * amp
sum += noise(seed + i, lx) * amp
}
return sum
}

32
orx-noise/src/main/kotlin/SimplexNoise3D.kt
View File

@@ -56,43 +56,43 @@ fun simplex(seed: Int, x: Double, y: Double, z: Double): Double {
val n0: Double
run {
var t = 0.6 - x0 * x0 - y0 * y0 - z0 * z0
if (t < 0) {
var lt = 0.6 - x0 * x0 - y0 * y0 - z0 * z0
if (lt < 0) {
n0 = 0.0
} else {
t *= t
n0 = t * t * gradCoord3D(seed, i, j, k, x0, y0, z0)
lt *= lt
n0 = lt * lt * gradCoord3D(seed, i, j, k, x0, y0, z0)
}
}
val n1: Double
run {
var t = 0.6 - x1 * x1 - y1 * y1 - z1 * z1
if (t < 0) {
var lt = 0.6 - x1 * x1 - y1 * y1 - z1 * z1
if (lt < 0) {
n1 = 0.0
} else {
t *= t
n1 = t * t * gradCoord3D(seed, i + i1, j + j1, k + k1, x1, y1, z1)
lt *= lt
n1 = lt * lt * gradCoord3D(seed, i + i1, j + j1, k + k1, x1, y1, z1)
}
}
val n2: Double
run {
var t = 0.6 - x2 * x2 - y2 * y2 - z2 * z2
if (t < 0) {
var lt = 0.6 - x2 * x2 - y2 * y2 - z2 * z2
if (lt < 0) {
n2 = 0.0
} else {
t *= t
n2 = t * t * gradCoord3D(seed, i + i2, j + j2, k + k2, x2, y2, z2)
lt *= lt
n2 = lt * lt * gradCoord3D(seed, i + i2, j + j2, k + k2, x2, y2, z2)
}
}
val n3: Double
run {
var t = 0.6 - x3 * x3 - y3 * y3 - z3 * z3
if (t < 0)
var lt = 0.6 - x3 * x3 - y3 * y3 - z3 * z3
if (lt < 0)
n3 = 0.0
else {
t *= t
n3 = t * t * gradCoord3D(seed, i + 1, j + 1, k + 1, x3, y3, z3)
lt *= lt
n3 = lt * lt * gradCoord3D(seed, i + 1, j + 1, k + 1, x3, y3, z3)
}
}
return 32 * (n0 + n1 + n2 + n3)