From dfb4316b439abb3608dca5c0eb692eaa5f2e84bb Mon Sep 17 00:00:00 2001
From: mfranz <mfranz>
Date: Sun, 11 Feb 2007 16:56:15 +0000
Subject: [PATCH] - make duration of view change configurable (default 0.2
 seconds) - extract some constants

---
 Nasal/dynamic_view.nas | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/Nasal/dynamic_view.nas b/Nasal/dynamic_view.nas
index 8b3945c10..a38f0888e 100644
--- a/Nasal/dynamic_view.nas
+++ b/Nasal/dynamic_view.nas
@@ -27,13 +27,13 @@
 #
 # The following commands move smoothly to a fixed view position and back.
 # All values are relative to aircraft origin (absolute), not relative to
-# the default cockpit view position. The field-of-view argument is optional.
+# the default cockpit view position. The speed and field-of-view argument
+# is optional.
 #
-#   dynamic_view.lookat(hdg, pitch, roll, x, y, z [, fov=55]);
+#   dynamic_view.lookat(hdg, pitch, roll, x, y, z [, speed=0.2 [, fov=55]]);
 #   dynamic_view.resume();
 
 
-
 var sin = func(a) { math.sin(a * math.pi / 180.0) }
 var cos = func(a) { math.cos(a * math.pi / 180.0) }
 var sigmoid = func(x) { 1 / (1 + math.exp(-x)) }
@@ -55,6 +55,12 @@ var normdeg = func(a) {
 
 
 
+
+var FREEZE_DURATION = 2;
+var BLEND_SPEED = 0.2;
+
+
+
 # Class that reads a property value, applies factor & offset, clamps to min & max,
 # and optionally lowpass filters.
 #
@@ -170,6 +176,7 @@ var ViewManager = {
 		# "lookat" blending
 		m.blendN = props.globals.getNode("/sim/view/dynamic/blend", 1);
 		m.blendN.setDoubleValue(0);
+		m.blendspeed = BLEND_SPEED;
 		m.frozen = 0;
 
 		if (props.globals.getNode("rotors", 0) != nil) {
@@ -232,7 +239,7 @@ var ViewManager = {
 		me.z_axis.apply(me.z);
 		me.fov_axis.apply(me.fov);
 	},
-	lookat : func(heading, pitch, roll, x, y, z, fov = 0) {
+	lookat : func(heading, pitch, roll, x, y, z, speed, fov) {
 		me.target_heading = me.heading_axis.static(heading);
 		me.target_pitch = me.pitch_axis.static(pitch);
 		me.target_roll = me.roll_axis.static(roll);
@@ -240,10 +247,14 @@ var ViewManager = {
 		me.target_y = me.y_axis.static(y);
 		me.target_z = me.z_axis.static(z);
 		me.target_fov = me.fov_axis.static(fov);
-		interpolate(me.blendN, 1, 0.2);
+
+		me.blendspeed = speed;
+		me.blendN.setValue(0);
+		interpolate(me.blendN, 1, me.blendspeed);
 	},
 	resume : func {
-		interpolate(me.blendN, 0, 0.2);
+		interpolate(me.blendN, 0, me.blendspeed);
+		me.blendspeed = BLEND_SPEED;
 	},
 	freeze : func {
 		if (!me.frozen) {
@@ -256,7 +267,7 @@ var ViewManager = {
 			me.target_fov = me.fov;
 			me.blendN.setDoubleValue(1);
 		}
-		me.frozen = me.elapsedN.getValue() + 2;
+		me.frozen = me.elapsedN.getValue() + FREEZE_DURATION;
 	},
 	unfreeze : func {
 		me.frozen = 0;
@@ -352,8 +363,8 @@ var reset = func {
 	view_manager.reset();
 }
 
-var lookat = func(h, p, r, x, y, z, f = 55) {
-	view_manager.lookat(h, p, r, x, y, z, f);
+var lookat = func(h, p, r, x, y, z, s = BLEND_SPEED, f = 55) {
+	view_manager.lookat(h, p, r, x, y, z, s, f);
 }
 
 var resume = func {