# [Bf-extensions-cvs] [1c7bbbd] master: update ant landscape by @jimmyhaze

Mon Aug 8 14:17:45 CEST 2016

```Commit: 1c7bbbd872c38797567171d7d437145c7b1392f9
Author: meta-androcto
Date:   Mon Aug 8 22:17:24 2016 +1000
Branches: master
https://developer.blender.org/rBA1c7bbbd872c38797567171d7d437145c7b1392f9

update ant landscape by @jimmyhaze

===================================================================

===================================================================

index 262d06a..bd528b9 100644
@@ -26,9 +26,8 @@ bl_info = {
"warning": "", # used for warning icon and text in addons panel
"wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/"
-}
+    }

"""
Another Noise Tool: Landscape mesh generator
@@ -132,12 +131,12 @@ def shapes(x,y,shape=0):
# swirl
x = x*2
y = y*2
-        s = (( x*sin( x*x+y*y ) + y*cos( x*x+y*y ) ) / (x**2+y**2+0.5))
+        s = ((x*sin( x*x+y*y) + y*cos(x*x+y*y)) / (x**2+y**2+0.5))
elif shape == 3:
# bumps
x = x*2
y = y*2
-        s = ((cos( x*pi ) + cos( y*pi ))-0.5)
+        s = ((cos( x*pi) + cos(y*pi))-0.5)
elif shape == 4:
s = (y*pi)
@@ -150,7 +149,7 @@ def shapes(x,y,shape=0):
return s

# marble_noise
-def marble_noise(x,y,z, origin, size, shape, bias, sharpnes, turb, depth, hard, basis ):
+def marble_noise(x,y,z, origin, size, shape, bias, sharpnes, turb, depth, hard, basis):
x = x / size
y = y / size
z = z / size
@@ -159,21 +158,21 @@ def marble_noise(x,y,z, origin, size, shape, bias, sharpnes, turb, depth, hard,
x += origin[0]
y += origin[1]
z += origin[2]
-    value = s + turb * turbulence_vector((x,y,z), depth, hard, basis )[0]
+    value = s + turb * turbulence_vector((x,y,z), depth, hard, basis)[0]

if bias == 1:
-        value = tri_bias( value )
+        value = tri_bias(value)
elif bias == 2:
-        value = saw_bias( value )
+        value = saw_bias(value)
else:
-        value = sin_bias( value )
+        value = sin_bias(value)

if sharpnes == 1:
-        value = sharp( value )
+        value = sharp(value)
elif sharpnes == 2:
-        value = sharper( value )
+        value = sharper(value)
else:
-        value = soft( value )
+        value = soft(value)

return value

@@ -181,17 +180,17 @@ def marble_noise(x,y,z, origin, size, shape, bias, sharpnes, turb, depth, hard,
# custom noise types

# shattered_hterrain:
-def shattered_hterrain( x,y,z, H, lacunarity, octaves, offset, distort, basis ):
-    d = ( turbulence_vector( ( x, y, z ), 6, 0, 0 )[0] * 0.5 + 0.5 )*distort*0.5
-    t1 = ( turbulence_vector( ( x+d, y+d, z ), 0, 0, 7 )[0] + 0.5 )
-    t2 = ( hetero_terrain(( x*2, y*2, z*2 ), H, lacunarity, octaves, offset, basis )*0.5 )
-    return (( t1*t2 )+t2*0.5) * 0.5
+def shattered_hterrain(x,y,z, H, lacunarity, octaves, offset, distort, basis):
+    d = (turbulence_vector((x, y, z), 6, 0, 0)[0] * 0.5 + 0.5)*distort*0.5
+    t1 = (turbulence_vector((x+d, y+d, z), 0, 0, 7)[0] + 0.5)
+    t2 = (hetero_terrain((x*2, y*2, z*2), H, lacunarity, octaves, offset, basis)*0.5)
+    return ((t1*t2)+t2*0.5) * 0.5

# strata_hterrain
-def strata_hterrain( x,y,z, H, lacunarity, octaves, offset, distort, basis ):
-    value = hetero_terrain(( x, y, z ), H, lacunarity, octaves, offset, basis )*0.5
-    steps = ( sin( value*(distort*5)*pi ) * ( 0.1/(distort*5)*pi ) )
-    return ( value * (1.0-0.5) + steps*0.5 )
+def strata_hterrain(x,y,z, H, lacunarity, octaves, offset, distort, basis):
+    value = hetero_terrain((x, y, z), H, lacunarity, octaves, offset, basis)*0.5
+    steps = (sin( value*(distort*5)*pi) * (0.1/(distort*5)*pi))
+    return (value * (1.0-0.5) + steps*0.5)

def planet_noise(coords, oct=6, hard=0, noisebasis=1, nabla=0.001):
@@ -217,8 +216,8 @@ def landscape_gen(x,y,z,falloffsize,options=[0,1.0,'multi_fractal', 0,0,1.0,0,6,
rseed    = options[0]
nsize    = options[1]
ntype      = options[2]
-    nbasis     = int( options[3][0] )
-    vlbasis    = int( options[4][0] )
+    nbasis     = int(options[3][0])
+    vlbasis    = int(options[4][0])
distortion = options[5]
hardnoise  = options[6]
depth      = options[7]
@@ -226,13 +225,13 @@ def landscape_gen(x,y,z,falloffsize,options=[0,1.0,'multi_fractal', 0,0,1.0,0,6,
lacunarity = options[9]
offset     = options[10]
gain       = options[11]
-    marblebias     = int( options[12][0] )
-    marblesharpnes = int( options[13][0] )
-    marbleshape    = int( options[14][0] )
+    marblebias     = int(options[12][0])
+    marblesharpnes = int(options[13][0])
+    marbleshape    = int(options[14][0])
invert       = options[15]
height       = options[16]
heightoffset = options[17]
-    falloff      = int( options[18][0] )
+    falloff      = int(options[18][0])
sealevel     = options[19]
platlevel    = options[20]
strata       = options[21]
@@ -249,30 +248,54 @@ def landscape_gen(x,y,z,falloffsize,options=[0,1.0,'multi_fractal', 0,0,1.0,0,6,
origin_z = 0.0
else:
# randomise origin
-        seed_set( rseed )
+        seed_set(rseed)
origin = random_unit_vector()
-        origin_x = (( 0.5 - origin[0] ) * 1000.0) + x_offset
-        origin_y = (( 0.5 - origin[1] ) * 1000.0) + y_offset
-        origin_z = ( 0.5 - origin[2] ) * 1000.0
+        origin_x = ((0.5 - origin[0]) * 1000.0) + x_offset
+        origin_y = ((0.5 - origin[1]) * 1000.0) + y_offset
+        origin_z = (0.5 - origin[2]) * 1000.0

# adjust noise size and origin
-    ncoords = ( x / nsize + origin_x, y / nsize + origin_y, z / nsize + origin_z )
+    ncoords = (x / nsize + origin_x, y / nsize + origin_y, z / nsize + origin_z)

# noise basis type's
-    if nbasis == 9: nbasis = 14  # to get cellnoise basis you must set 14 instead of 9
-    if vlbasis ==9: vlbasis = 14
+    if nbasis == 9:
+        nbasis = 14  # to get cellnoise basis you must set 14 instead of 9
+    if vlbasis ==9:
+        vlbasis = 14
+
# noise type's
-    if ntype ==   'multi_fractal':          value = multi_fractal(        ncoords, dimension, lacunarity, depth, nbasis ) * 0.5
-    elif ntype == 'ridged_multi_fractal':   value = ridged_multi_fractal( ncoords, dimension, lacunarity, depth, offset, gain, nbasis ) * 0.5
-    elif ntype == 'hybrid_multi_fractal':   value = hybrid_multi_fractal( ncoords, dimension, lacunarity, depth, offset, gain, nbasis ) * 0.5
-    elif ntype == 'hetero_terrain':         value = hetero_terrain(       ncoords, dimension, lacunarity, depth, offset, nbasis ) * 0.25
-    elif ntype == 'fractal':                value = fractal(              ncoords, dimension, lacunarity, depth, nbasis )
-    elif ntype == 'turbulence_vector':      value = turbulence_vector(    ncoords, depth, hardnoise, nbasis )[0]
-    elif ntype == 'variable_lacunarity':    value = variable_lacunarity(  ncoords, distortion, nbasis, vlbasis ) + 0.5
-    elif ntype == 'marble_noise':           value = marble_noise( x*2.0/falloffsize,y*2.0/falloffsize,z*2/falloffsize, origin, nsize, marbleshape, marblebias, marblesharpnes, distortion, depth, hardnoise, nbasis )
-    elif ntype == 'shattered_hterrain':     value = shattered_hterrain( ncoords[0], ncoords[1], ncoords[2], dimension, lacunarity, depth, offset, distortion, nbasis )
-    elif ntype == 'strata_hterrain':        value = strata_hterrain( ncoords[0], ncoords[1], ncoords[2], dimension, lacunarity, depth, offset, distortion, nbasis )
-    elif ntype == 'planet_noise':           value = planet_noise(ncoords, depth, hardnoise, nbasis)[2]*0.5+0.5
+    if ntype ==   'multi_fractal':
+        value = multi_fractal(ncoords, dimension, lacunarity, depth, nbasis) * 0.5
+
+    elif ntype == 'ridged_multi_fractal':
+        value = ridged_multi_fractal(ncoords, dimension, lacunarity, depth, offset, gain, nbasis) * 0.5
+
+    elif ntype == 'hybrid_multi_fractal':
+        value = hybrid_multi_fractal(ncoords, dimension, lacunarity, depth, offset, gain, nbasis) * 0.5
+
+    elif ntype == 'hetero_terrain':
+        value = hetero_terrain(ncoords, dimension, lacunarity, depth, offset, nbasis) * 0.25
+
+    elif ntype == 'fractal':
+        value = fractal(ncoords, dimension, lacunarity, depth, nbasis)
+
+    elif ntype == 'turbulence_vector':
+        value = turbulence_vector(ncoords, depth, hardnoise, nbasis)[0]
+
+    elif ntype == 'variable_lacunarity':
+        value = variable_lacunarity(ncoords, distortion, nbasis, vlbasis) + 0.5
+
+    elif ntype == 'marble_noise':
+        value = marble_noise(ncoords[0]*2.0/falloffsize,ncoords[1]*2.0/falloffsize,ncoords[2]*2/falloffsize, origin, nsize, marbleshape, marblebias, marblesharpnes, distortion, depth, hardnoise, nbasis)
+
+    elif ntype == 'shattered_hterrain':
+        value = shattered_hterrain(ncoords[0], ncoords[1], ncoords[2], dimension, lacunarity, depth, offset, distortion, nbasis)
+
+    elif ntype == 'strata_hterrain':
+        value = strata_hterrain(ncoords[0], ncoords[1], ncoords[2], dimension, lacunarity, depth, offset, distortion, nbasis)
+
+    elif ntype == 'planet_noise':
+        value = planet_noise(ncoords, depth, hardnoise, nbasis)[2]*0.5+0.5
else:
value = 0.0

@@ -291,39 +314,46 @@ def landscape_gen(x,y,z,falloffsize,options=[0,1.0,'multi_fractal', 0,0,1.0,0,6,
else:
+
value = value - sealevel
-            if( dist < radius ):
-                dist = ( (dist) * (dist) * ( 3-2*(dist) ) )
-                value = ( value - value * dist ) + sealevel
+                dist = (dist * dist * (3-2 * dist))
+                value = (value - value * dist) + sealevel
else:
value = sealevel

# strata / terrace / layered
if stratatype !='0':
strata = strata / height
+
if stratatype == '1':
strata *= 2
-        steps = ( sin( value*strata*pi ) * ( 0.1/strata*pi ) )
-        value = ( value * (1.0-0.5) + steps*0.5 ) * 2.0
+        steps = (sin( value*strata*pi) * (0.1/strata*pi))
+

@@ Diff output truncated at 10240 characters. @@

```