[Bf-extensions-cvs] [1fd6f67b] master: ant landscape: fix regeneration

[Jimmy Hazevoet]

Commit: 1fd6f67b33414c0db101255f61df30cf6de1e471
Author: Jimmy Hazevoet
Date:   Wed Jul 12 11:07:50 2017 +1000
Branches: master
https://developer.blender.org/rBA1fd6f67b33414c0db101255f61df30cf6de1e471

ant landscape: fix regeneration

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

M	ant_landscape/ant_noise.py
M	presets/operator/mesh.landscape_add/canion.py
M	presets/operator/mesh.landscape_add/tech_effect.py
M	presets/operator/mesh.landscape_add/vulcano.py

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

diff --git a/ant_landscape/ant_noise.py b/ant_landscape/ant_noise.py
index 22a308a1..78c8b770 100644
--- a/ant_landscape/ant_noise.py
+++ b/ant_landscape/ant_noise.py
@@ -395,7 +395,7 @@ def Effect_Basis_Function(coords, type, bias):
         effect = offset + iscale * effect
     ## sparse cracks noise:
     elif type == 14:
-        effect = 2.5 * abs(noise((x * 0.5, y * 0.5, 0), 1)) - 0.1
+        effect = 2.5 * abs(noise((x, y, 0), 1)) - 0.1
         if effect > 0.25:
             effect = 0.25
         effect = offset + iscale * (effect * 2.5)
@@ -410,7 +410,7 @@ def Effect_Basis_Function(coords, type, bias):
         effect = 0.25 + 1.5 * voronoi((x, y, 0), 1)[0][0]
         if effect > 0.5:
             effect = 0.5
-        effect = offset + iscale * effect
+        effect = offset + iscale * effect * 2
     ## cosine noise:
     elif type == 17:
         effect = cos(5 * noise((x, y, 0), 0))
@@ -639,14 +639,15 @@ def noise_gen(coords, props):
         value = 0.5
 
     # Effect mix
-    if fx_type != "0":
+    val = value
+    if fx_type in [0,"0"]:
+        fx_mixfactor = -1.0
+        fxval = val
+    else:
         fxcoords = Trans_Effect((x, y, z), fx_size, (fx_loc_x, fx_loc_y))        
         effect = Effect_Function(fxcoords, fx_type, fx_bias, fx_turb, fx_depth, fx_frequency, fx_amplitude)
         effect = Height_Scale(effect, fx_height, fx_offset, fx_invert)
-        fxval = Mix_Modes(value, effect, fx_mixfactor, fx_mix_mode)
-    else:
-        fx_mixfactor = 0.0
-        fxval = value
+        fxval = Mix_Modes(val, effect, fx_mixfactor, fx_mix_mode)
     value = fxval
 
     # Adjust height
diff --git a/presets/operator/mesh.landscape_add/canion.py b/presets/operator/mesh.landscape_add/canion.py
index 1debf9a9..1d63470c 100644
--- a/presets/operator/mesh.landscape_add/canion.py
+++ b/presets/operator/mesh.landscape_add/canion.py
@@ -9,14 +9,14 @@ op.at_cursor = True
 op.smooth_mesh = True
 op.tri_face = False
 op.sphere_mesh = False
-op.subdivision_x = 128
-op.subdivision_y = 128
+op.subdivision_x = 200
+op.subdivision_y = 200
 op.mesh_size = 2.0
 op.mesh_size_x = 2.0
 op.mesh_size_y = 2.0
 op.random_seed = 5
 op.noise_offset_x = 0.0
-op.noise_offset_y = 0.0
+op.noise_offset_y = -0.25
 op.noise_offset_z = 0.0
 op.noise_size_x = 1.0
 op.noise_size_y = 1.25
@@ -41,19 +41,19 @@ op.height = 0.6000000238418579
 op.height_invert = False
 op.height_offset = 0.0
 op.fx_mixfactor = 0.0
-op.fx_mix_mode = '0'
-op.fx_type = '0'
+op.fx_mix_mode = '8'
+op.fx_type = '20'
 op.fx_bias = '0'
 op.fx_turb = 0.0
-op.fx_depth = 0
+op.fx_depth = 3
 op.fx_amplitude = 0.5
-op.fx_frequency = 2.0
-op.fx_size = 1.0
-op.fx_loc_x = 0.0
-op.fx_loc_y = 0.0
-op.fx_height = 0.5
+op.fx_frequency = 1.649999976158142
+op.fx_size = 1.5
+op.fx_loc_x = 3.0
+op.fx_loc_y = 2.0
+op.fx_height = 0.25
 op.fx_invert = False
-op.fx_offset = 0.0
+op.fx_offset = 0.05000000074505806
 op.edge_falloff = '2'
 op.falloff_x = 4.0
 op.falloff_y = 4.0
@@ -61,7 +61,7 @@ op.edge_level = 0.15000000596046448
 op.maximum = 0.5
 op.minimum = -0.20000000298023224
 op.vert_group = ''
-op.strata = 4.0
+op.strata = 6.0
 op.strata_type = '2'
 op.water_plane = False
 op.water_level = 0.009999999776482582
diff --git a/presets/operator/mesh.landscape_add/tech_effect.py b/presets/operator/mesh.landscape_add/tech_effect.py
index 96785f5f..03c282c8 100644
--- a/presets/operator/mesh.landscape_add/tech_effect.py
+++ b/presets/operator/mesh.landscape_add/tech_effect.py
@@ -34,7 +34,7 @@ op.dimension = 1.0
 op.lacunarity = 2.0
 op.offset = 1.0
 op.gain = 1.0
-op.marble_bias = '1'
+op.marble_bias = '2'
 op.marble_sharp = '3'
 op.marble_shape = '7'
 op.height = 1.0
@@ -62,7 +62,7 @@ op.maximum = 1.0
 op.minimum = -1.0
 op.vert_group = ''
 op.strata = 9.0
-op.strata_type = '3'
+op.strata_type = '0'
 op.water_plane = False
 op.water_level = 0.009999999776482582
 op.remove_double = False
diff --git a/presets/operator/mesh.landscape_add/vulcano.py b/presets/operator/mesh.landscape_add/vulcano.py
index a5929b4f..e5c3de29 100644
--- a/presets/operator/mesh.landscape_add/vulcano.py
+++ b/presets/operator/mesh.landscape_add/vulcano.py
@@ -37,23 +37,23 @@ op.gain = 2.0
 op.marble_bias = '2'
 op.marble_sharp = '3'
 op.marble_shape = '1'
-op.height = 0.800000011920929
+op.height = 0.6000000238418579
 op.height_invert = False
 op.height_offset = 0.0
 op.fx_mixfactor = 0.0
-op.fx_mix_mode = '0'
-op.fx_type = '0'
+op.fx_mix_mode = '1'
+op.fx_type = '14'
 op.fx_bias = '0'
-op.fx_turb = 0.0
-op.fx_depth = 0
-op.fx_amplitude = 0.5
+op.fx_turb = 0.5
+op.fx_depth = 2
+op.fx_amplitude = 0.3799999952316284
 op.fx_frequency = 1.5
-op.fx_size = 1.0
-op.fx_loc_x = 0.0
-op.fx_loc_y = 0.0
+op.fx_size = 1.1500000953674316
+op.fx_loc_x = -1.0
+op.fx_loc_y = 1.0
 op.fx_height = 0.5
 op.fx_invert = False
-op.fx_offset = 0.0
+op.fx_offset = 0.05999999865889549
 op.edge_falloff = '3'
 op.falloff_x = 2.0
 op.falloff_y = 2.0