From de1c84c8c041e914e0cbd862ffaa8be278da70ae Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Thu, 6 Feb 2003 19:46:48 +0000
Subject: [PATCH] Jim Wilson:

There are a number of little changes.  Tested with current cvs as of 20:30EST
04Feb.  Actually been running since the beginning of January with these
patches.  All changes work without crashing with the current base package cvs,
but there are some visual problems with the views (other than pilot view)
without changes to the base package.

As soon as you can build test and commit I can add in those base package
updates that will make it all work nicely.  I will also go through all the 3D
Aircraft configs to make sure the change in the "pitch-offset" for cockpit
views (see below) are made to maintain current behavior.

Here are the files (changes listed below):
http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz
http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
---
 keyboard.xml    | 74 ++++++++++++++++++++++++++++---------------------
 mice.xml        |  4 +--
 preferences.xml |  8 +++++-
 3 files changed, 51 insertions(+), 35 deletions(-)

diff --git a/keyboard.xml b/keyboard.xml
index fc66eb89b..b656a8b39 100644
--- a/keyboard.xml
+++ b/keyboard.xml
@@ -350,8 +350,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
     </binding>
     <binding>
      <command>property-assign</command>
-     <property>/sim/current-view/pitch-offset-deg</property>
-     <value alias="/sim/view/config/default-pitch-deg"/>
+     <property>/sim/current-view/goal-pitch-offset-deg</property>
+     <value alias="/sim/view/config/pitch-offset-deg"/>
     </binding>
   </mod-shift>
  </key>
@@ -373,8 +373,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/sim/current-view/pitch-offset-deg</property>
-    <value alias="/sim/view/config/default-pitch-deg"/>
+    <property>/sim/current-view/goal-pitch-offset-deg</property>
+    <value alias="/sim/view/config/pitch-offset-deg"/>
    </binding>
   </mod-shift>
  </key>
@@ -396,8 +396,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/sim/current-view/pitch-offset-deg</property>
-    <value alias="/sim/view/config/default-pitch-deg"/>
+    <property>/sim/current-view/goal-pitch-offset-deg</property>
+    <value alias="/sim/view/config/pitch-offset-deg"/>
    </binding>
   </mod-shift>
  </key>
@@ -419,8 +419,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/sim/current-view/pitch-offset-deg</property>
-    <value alias="/sim/view/config/default-pitch-deg"/>
+    <property>/sim/current-view/goal-pitch-offset-deg</property>
+    <value alias="/sim/view/config/pitch-offset-deg"/>
    </binding>
   </mod-shift>
  </key>
@@ -462,8 +462,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/sim/current-view/pitch-offset-deg</property>
-    <value alias="/sim/view/config/default-pitch-deg"/>
+    <property>/sim/current-view/goal-pitch-offset-deg</property>
+    <value alias="/sim/view/config/pitch-offset-deg"/>
    </binding>
   </mod-shift>
  </key>
@@ -485,8 +485,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/sim/current-view/pitch-offset-deg</property>
-    <value alias="/sim/view/config/default-pitch-deg"/>
+    <property>/sim/current-view/goal-pitch-offset-deg</property>
+    <value alias="/sim/view/config/pitch-offset-deg"/>
    </binding>
   </mod-shift>
  </key>
@@ -508,8 +508,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/sim/current-view/pitch-offset-deg</property>
-    <value alias="/sim/view/config/default-pitch-deg"/>
+    <property>/sim/current-view/goal-pitch-offset-deg</property>
+    <value alias="/sim/view/config/pitch-offset-deg"/>
    </binding>
   </mod-shift>
  </key>
@@ -531,8 +531,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/sim/current-view/pitch-offset-deg</property>
-    <value alias="/sim/view/config/default-pitch-deg"/>
+    <property>/sim/current-view/goal-pitch-offset-deg</property>
+    <value alias="/sim/view/config/pitch-offset-deg"/>
    </binding>
   </mod-shift>
  </key>
@@ -637,6 +637,16 @@ calculated by adding 256 to the GLUT key value in glut.h.
   </binding>
  </key>
 
+ <key n="86">
+  <name>V</name>
+  <desc>Select initial view (view 0).</desc>
+  <binding>
+   <command>property-assign</command>
+   <property>/sim/current-view/view-number</property>
+   <value>0</value>
+  </binding>
+ </key>
+
  <key n="87">
   <name>W</name>
   <desc>(Temporary) Toggle fullscreen for 3DFX only.</desc>
@@ -1152,8 +1162,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/sim/current-view/pitch-offset-deg</property>
-    <value alias="/sim/view/config/default-pitch-deg"/>
+    <property>/sim/current-view/goal-pitch-offset-deg</property>
+    <value alias="/sim/view/config/pitch-offset-deg"/>
    </binding>
   </mod-shift>
  </key>
@@ -1175,8 +1185,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/sim/current-view/pitch-offset-deg</property>
-    <value alias="/sim/view/config/default-pitch-deg"/>
+    <property>/sim/current-view/goal-pitch-offset-deg</property>
+    <value alias="/sim/view/config/pitch-offset-deg"/>
    </binding>
   </mod-shift>
  </key>
@@ -1198,8 +1208,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/sim/current-view/pitch-offset-deg</property>
-    <value alias="/sim/view/config/default-pitch-deg"/>
+    <property>/sim/current-view/goal-pitch-offset-deg</property>
+    <value alias="/sim/view/config/pitch-offset-deg"/>
    </binding>
   </mod-shift>
  </key>
@@ -1221,8 +1231,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/sim/current-view/pitch-offset-deg</property>
-    <value alias="/sim/view/config/default-pitch-deg"/>
+    <property>/sim/current-view/goal-pitch-offset-deg</property>
+    <value alias="/sim/view/config/pitch-offset-deg"/>
    </binding>
   </mod-shift>
  </key>
@@ -1244,8 +1254,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/sim/current-view/pitch-offset-deg</property>
-    <value alias="/sim/view/config/default-pitch-deg"/>
+    <property>/sim/current-view/goal-pitch-offset-deg</property>
+    <value alias="/sim/view/config/pitch-offset-deg"/>
    </binding>
   </mod-shift>
  </key>
@@ -1267,8 +1277,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/sim/current-view/pitch-offset-deg</property>
-    <value alias="/sim/view/config/default-pitch-deg"/>
+    <property>/sim/current-view/goal-pitch-offset-deg</property>
+    <value alias="/sim/view/config/pitch-offset-deg"/>
    </binding>
   </mod-shift>
  </key>
@@ -1290,8 +1300,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/sim/current-view/pitch-offset-deg</property>
-    <value alias="/sim/view/config/default-pitch-deg"/>
+    <property>/sim/current-view/goal-pitch-offset-deg</property>
+    <value alias="/sim/view/config/pitch-offset-deg"/>
    </binding>
   </mod-shift>
  </key>
@@ -1313,8 +1323,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/sim/current-view/pitch-offset-deg</property>
-    <value alias="/sim/view/config/default-pitch-deg"/>
+    <property>/sim/current-view/goal-pitch-offset-deg</property>
+    <value alias="/sim/view/config/pitch-offset-deg"/>
    </binding>
   </mod-shift>
  </key>
diff --git a/mice.xml b/mice.xml
index 452b689af..9c0ae8ab1 100644
--- a/mice.xml
+++ b/mice.xml
@@ -191,8 +191,8 @@ The current mode for each mouse is held in the
     </binding>
     <binding>
      <command>property-assign</command>
-     <property>/sim/current-view/pitch-offset-deg</property>
-     <value alias="/sim/view/config/default-pitch-deg"/>
+     <property>/sim/current-view/goal-pitch-offset-deg</property>
+     <property>/sim/current-view/config/pitch-offset-deg</property>
     </binding>
    </button>
 
diff --git a/preferences.xml b/preferences.xml
index 391abe1c1..d87e12b53 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -37,7 +37,7 @@ Started September 2000 by David Megginson, david@megginson.com
   <sound type="bool">true</sound>
   <speed-up type="double">1.0</speed-up>
   <current-view>
-    <field-of-view type="double">55.0</field-of-view>
+    <field-of-view type="double">50.0</field-of-view>
   </current-view>
   <panel>
    <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
@@ -96,6 +96,7 @@ Started September 2000 by David Megginson, david@megginson.com
       <ground-level-nearplane-m type="double">0.5f</ground-level-nearplane-m>
       <default-field-of-view-deg type="double">55.0</default-field-of-view-deg>
       <default-pitch-deg type="double">0</default-pitch-deg>
+      <default-heading-deg type="double">0</default-heading-deg>
       <front-direction-deg type="double">0</front-direction-deg>
       <front-left-direction-deg type="double">45</front-left-direction-deg>
       <left-direction-deg type="double">90</left-direction-deg>
@@ -121,8 +122,10 @@ Started September 2000 by David Megginson, david@megginson.com
 
       <at-model type="bool">true</at-model>
       <at-model-idx type="int">0</at-model-idx>
+      <target-z-offset-m type="double">0</target-z-offset-m>
 
       <ground-level-nearplane-m type="double">0.5f</ground-level-nearplane-m>
+      <default-field-of-view-deg type="double">55.0</default-field-of-view-deg>
 
       <x-offset-m type="double">0</x-offset-m>
       <y-offset-m type="double">0</y-offset-m>
@@ -146,6 +149,7 @@ Started September 2000 by David Megginson, david@megginson.com
       <at-model-idx type="int">0</at-model-idx>
 
       <ground-level-nearplane-m type="double">10.0f</ground-level-nearplane-m>
+      <default-field-of-view-deg type="double">55.0</default-field-of-view-deg>
 
       <x-offset-m type="double">0</x-offset-m>
       <y-offset-m type="double">0</y-offset-m>
@@ -165,6 +169,7 @@ Started September 2000 by David Megginson, david@megginson.com
       <eye-heading-deg-path>/sim/tower/heading-deg</eye-heading-deg-path>
 
       <ground-level-nearplane-m type="double">10.0f</ground-level-nearplane-m>
+      <default-field-of-view-deg type="double">55.0</default-field-of-view-deg>
 
       <x-offset-m type="double">0</x-offset-m>
       <y-offset-m type="double">0</y-offset-m>
@@ -186,6 +191,7 @@ Started September 2000 by David Megginson, david@megginson.com
       <at-model-idx type="int">0</at-model-idx>
 
       <ground-level-nearplane-m type="double">0.5f</ground-level-nearplane-m>
+      <default-field-of-view-deg type="double">55.0</default-field-of-view-deg>
 
       <x-offset-m type="double">2</x-offset-m>
       <y-offset-m type="double">25</y-offset-m>