From ccdd2e04fda5ead8365d357b8cfba76e433ebb4f Mon Sep 17 00:00:00 2001
From: Niklas Korz <korz.niklask@gmail.com>
Date: Tue, 19 Oct 2021 11:54:21 +0200
Subject: [PATCH] Adjust function parameters

---
 src/application.rs | 4 ++--
 src/functions.rs   | 6 +++---
 src/main_view.rs   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/application.rs b/src/application.rs
index 0e8f592..cf78271 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -174,8 +174,8 @@ impl Application {
             overlay_mode: OverlayMode::Disabled,
             central_difference_delta: 1,
             lyapunov_scaling: 50.0,
-            predefined_function: PredefinedFunction::MirageSpherical,
-            field_function: PredefinedFunction::MirageSpherical.to_code(),
+            predefined_function: PredefinedFunction::MirageSphericalSigmoid,
+            field_function: PredefinedFunction::MirageSphericalSigmoid.to_code(),
         })
     }
 
diff --git a/src/functions.rs b/src/functions.rs
index e18ce97..2c1d5bf 100644
--- a/src/functions.rs
+++ b/src/functions.rs
@@ -34,7 +34,7 @@ impl PredefinedFunction {
         match self {
             Self::Custom => "".to_string(),
             Self::MirageSpherical => "let t_env = 15.0; // °C
-let t_src = 100.0; // °C
+let t_src = 200.0; // °C
 let max_dist = 0.25;
 let center = vec3<f32>(-0.5, 0.5, -0.5);
 
@@ -65,7 +65,7 @@ let t_out = part_out * t_env + (1.0 - part_out) * t_src;
 return refraction(t_in, t_out, v, plane_n);"
                 .to_string(),
             Self::MirageSphericalSigmoid => "let t_env = 15.0; // °C
-let t_src = 100.0; // °C
+let t_src = 200.0; // °C
 let max_dist = 0.25;
 let center = vec3<f32>(-0.5, 0.5, -0.5);
 
@@ -105,7 +105,7 @@ let dy = 0.0;
 let dz = 0.5 * t;
 return translate(v0, dx, dy, dz);"
                 .to_string(),
-            Self::Rotation => "return normalize(v0 + rotateZ(v0, PI / 2.0 * t));".to_string(),
+            Self::Rotation => "return normalize(v0 + rotateZ(v0, PI * t));".to_string(),
             Self::LorenzAttractor => "let rho = 28.0;
 let sigma = 10.0;
 let beta = 8.0 / 3.0;
diff --git a/src/main_view.rs b/src/main_view.rs
index 60bb46a..53c9f0b 100644
--- a/src/main_view.rs
+++ b/src/main_view.rs
@@ -90,7 +90,7 @@ impl MainView {
             label: Some("compute_shader"),
             source: wgpu::ShaderSource::Wgsl(Cow::Borrowed(&with_field_function(
                 shader_src,
-                &PredefinedFunction::MirageSpherical.to_code(),
+                &PredefinedFunction::MirageSphericalSigmoid.to_code(),
             ))),
         });
 
-- 
2.51.2