From 03a0ad18eb79bb8de5768548f9cba542fc14e8b6 Mon Sep 17 00:00:00 2001
From: david <david>
Date: Sat, 2 Nov 2002 21:41:53 +0000
Subject: [PATCH] Finished setting up configurable default viewing properties,
 and implement them for the C172P 3D model.  Look near the top of
 preferences.xml for an example.  The recognized properties are as follow,
 with vanilla defaults in parentheses:

  /sim/view/config/default-field-of-view-deg (30)
  /sim/view/config/default-pitch-deg (0)
  /sim/view/config/front-direction-deg (0)
  /sim/view/config/front-left-direction-deg (45)
  /sim/view/config/left-direction-deg (90)
  /sim/view/config/back-left-direction-deg (135)
  /sim/view/config/back-direction-deg (180)
  /sim/view/config/back-right-direction-deg (225)
  /sim/view/config/right-direction-deg (270)
  /sim/view/config/front-right-direction-deg (315)

These are particularly useful for the view from inside a 3D aircraft
model.
---
 Aircraft/c172p-3d-set.xml | 19 +++++++--
 keyboard.xml              | 82 ++++++++++++++++++++++++++++++++++++++-
 preferences.xml           | 19 ++++-----
 3 files changed, 107 insertions(+), 13 deletions(-)

diff --git a/Aircraft/c172p-3d-set.xml b/Aircraft/c172p-3d-set.xml
index 1eabbfe86..441de07fb 100644
--- a/Aircraft/c172p-3d-set.xml
+++ b/Aircraft/c172p-3d-set.xml
@@ -41,14 +41,27 @@ October 23 2001 John Check, fgpanels@rockfish.net
   <view>
    <internal archive="y">true</internal>
    <config>
-     <x-offset-m archive="y">-0.4</x-offset-m>
-     <y-offset-m archive="y">0.3</y-offset-m>
+     <goal-heading-deg>3</goal-heading-deg>
+     <x-offset-m archive="y">-0.15</x-offset-m>
+     <y-offset-m archive="y">0.25</y-offset-m>
      <z-offset-m archive="y">0.1</z-offset-m>
+     <default-field-of-view-deg>50.0</default-field-of-view-deg>
+     <default-pitch-deg>-9.5</default-pitch-deg>
+     <front-direction-deg>-1.5</front-direction-deg>
+     <front-left-direction-deg>45</front-left-direction-deg>
+     <left-direction-deg>90</left-direction-deg>
+     <back-left-direction-deg>135</back-left-direction-deg>
+     <back-direction-deg>180</back-direction-deg>
+     <back-right-direction-deg>225</back-right-direction-deg>
+     <right-direction-deg>270</right-direction-deg>
+     <front-right-direction-deg>315</front-right-direction-deg>
    </config>
   </view>
 
   <current-view>
-   <pitch-offset-deg>-13</pitch-offset-deg>
+   <field-of-view>50</field-of-view>
+   <heading-offset-deg>-1.5</heading-offset-deg>
+   <pitch-offset-deg>-9.5</pitch-offset-deg>
   </current-view>
 
  </sim>
diff --git a/keyboard.xml b/keyboard.xml
index b52bec6a8..ffac5b8fc 100644
--- a/keyboard.xml
+++ b/keyboard.xml
@@ -330,6 +330,11 @@ calculated by adding 256 to the GLUT key value in glut.h.
      <property>/sim/current-view/goal-heading-offset-deg</property>
      <value alias="/sim/view/config/back-left-direction-deg"/>
     </binding>
+    <binding>
+     <command>property-assign</command>
+     <property>/sim/current-view/pitch-offset-deg</property>
+     <value alias="/sim/view/config/default-pitch-deg"/>
+    </binding>
   </mod-shift>
  </key>
 
@@ -348,6 +353,11 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/current-view/goal-heading-offset-deg</property>
     <value alias="/sim/view/config/back-direction-deg"/>
    </binding>
+   <binding>
+    <command>property-assign</command>
+    <property>/sim/current-view/pitch-offset-deg</property>
+    <value alias="/sim/view/config/default-pitch-deg"/>
+   </binding>
   </mod-shift>
  </key>
 
@@ -366,6 +376,11 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/current-view/goal-heading-offset-deg</property>
     <value alias="/sim/view/config/back-right-direction-deg"/>
    </binding>
+   <binding>
+    <command>property-assign</command>
+    <property>/sim/current-view/pitch-offset-deg</property>
+    <value alias="/sim/view/config/default-pitch-deg"/>
+   </binding>
   </mod-shift>
  </key>
 
@@ -384,6 +399,11 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/current-view/goal-heading-offset-deg</property>
     <value alias="/sim/view/config/left-direction-deg"/>
    </binding>
+   <binding>
+    <command>property-assign</command>
+    <property>/sim/current-view/pitch-offset-deg</property>
+    <value alias="/sim/view/config/default-pitch-deg"/>
+   </binding>
   </mod-shift>
  </key>
 
@@ -422,6 +442,11 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/current-view/goal-heading-offset-deg</property>
     <value alias="/sim/view/config/right-direction-deg"/>
    </binding>
+   <binding>
+    <command>property-assign</command>
+    <property>/sim/current-view/pitch-offset-deg</property>
+    <value alias="/sim/view/config/default-pitch-deg"/>
+   </binding>
   </mod-shift>
  </key>
 
@@ -440,6 +465,11 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/current-view/goal-heading-offset-deg</property>
     <value alias="/sim/view/config/front-left-direction-deg"/>
    </binding>
+   <binding>
+    <command>property-assign</command>
+    <property>/sim/current-view/pitch-offset-deg</property>
+    <value alias="/sim/view/config/default-pitch-deg"/>
+   </binding>
   </mod-shift>
  </key>
 
@@ -458,6 +488,11 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/current-view/goal-heading-offset-deg</property>
     <value alias="/sim/view/config/front-direction-deg"/>
    </binding>
+   <binding>
+    <command>property-assign</command>
+    <property>/sim/current-view/pitch-offset-deg</property>
+    <value alias="/sim/view/config/default-pitch-deg"/>
+   </binding>
   </mod-shift>
  </key>
 
@@ -476,6 +511,11 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/current-view/goal-heading-offset-deg</property>
     <value alias="/sim/view/config/front-right-direction-deg"/>
    </binding>
+   <binding>
+    <command>property-assign</command>
+    <property>/sim/current-view/pitch-offset-deg</property>
+    <value alias="/sim/view/config/default-pitch-deg"/>
+   </binding>
   </mod-shift>
  </key>
 
@@ -485,7 +525,7 @@ calculated by adding 256 to the GLUT key value in glut.h.
   <binding>
    <command>property-assign</command>
    <property>/sim/current-view/field-of-view</property>
-   <value type="double">55.0</value>
+   <value alias="/sim/view/config/default-field-of-view-deg"/>
   </binding>
  </key>
 
@@ -1054,6 +1094,11 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/current-view/goal-heading-offset-deg</property>
     <value alias="/sim/view/config/left-direction-deg"/>
    </binding>
+   <binding>
+    <command>property-assign</command>
+    <property>/sim/current-view/pitch-offset-deg</property>
+    <value alias="/sim/view/config/default-pitch-deg"/>
+   </binding>
   </mod-shift>
  </key>
 
@@ -1072,6 +1117,11 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/current-view/goal-heading-offset-deg</property>
     <value alias="/sim/view/config/front-direction-deg"/>
    </binding>
+   <binding>
+    <command>property-assign</command>
+    <property>/sim/current-view/pitch-offset-deg</property>
+    <value alias="/sim/view/config/default-pitch-deg"/>
+   </binding>
   </mod-shift>
  </key>
 
@@ -1090,6 +1140,11 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/current-view/goal-heading-offset-deg</property>
     <value alias="/sim/view/config/right-direction-deg"/>
    </binding>
+   <binding>
+    <command>property-assign</command>
+    <property>/sim/current-view/pitch-offset-deg</property>
+    <value alias="/sim/view/config/default-pitch-deg"/>
+   </binding>
   </mod-shift>
  </key>
 
@@ -1108,6 +1163,11 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/current-view/goal-heading-offset-deg</property>
     <value alias="/sim/view/config/back-direction-deg"/>
    </binding>
+   <binding>
+    <command>property-assign</command>
+    <property>/sim/current-view/pitch-offset-deg</property>
+    <value alias="/sim/view/config/default-pitch-deg"/>
+   </binding>
   </mod-shift>
  </key>
 
@@ -1126,6 +1186,11 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/current-view/goal-heading-offset-deg</property>
     <value alias="/sim/view/config/front-right-direction-deg"/>
    </binding>
+   <binding>
+    <command>property-assign</command>
+    <property>/sim/current-view/pitch-offset-deg</property>
+    <value alias="/sim/view/config/default-pitch-deg"/>
+   </binding>
   </mod-shift>
  </key>
 
@@ -1144,6 +1209,11 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/current-view/goal-heading-offset-deg</property>
     <value alias="/sim/view/config/back-right-direction-deg"/>
    </binding>
+   <binding>
+    <command>property-assign</command>
+    <property>/sim/current-view/pitch-offset-deg</property>
+    <value alias="/sim/view/config/default-pitch-deg"/>
+   </binding>
   </mod-shift>
  </key>
 
@@ -1162,6 +1232,11 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/current-view/goal-heading-offset-deg</property>
     <value alias="/sim/view/config/front-left-direction-deg"/>
    </binding>
+   <binding>
+    <command>property-assign</command>
+    <property>/sim/current-view/pitch-offset-deg</property>
+    <value alias="/sim/view/config/default-pitch-deg"/>
+   </binding>
   </mod-shift>
  </key>
 
@@ -1180,6 +1255,11 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/current-view/goal-heading-offset-deg</property>
     <value alias="/sim/view/config/back-left-direction-deg"/>
    </binding>
+   <binding>
+    <command>property-assign</command>
+    <property>/sim/current-view/pitch-offset-deg</property>
+    <value alias="/sim/view/config/default-pitch-deg"/>
+   </binding>
   </mod-shift>
  </key>
 
diff --git a/preferences.xml b/preferences.xml
index bf1fa003e..ae35bf90d 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -91,15 +91,16 @@ Started September 2000 by David Megginson, david@megginson.com
       <from-model type="bool">true</from-model>
       <from-model-idx type="int">0</from-model-idx>
       <ground-level-nearplane-m type="double">0.5f</ground-level-nearplane-m>
-      <default-pitch-deg>0</default-pitch-deg>
-      <front-direction-deg>0</front-direction-deg>
-      <front-left-direction-deg>45</front-left-direction-deg>
-      <left-direction-deg>90</left-direction-deg>
-      <back-left-direction-deg>135</back-left-direction-deg>
-      <back-direction-deg>180</back-direction-deg>
-      <back-right-direction-deg>225</back-right-direction-deg>
-      <right-direction-deg>270</right-direction-deg>
-      <front-right-direction-deg>315</front-right-direction-deg>
+      <default-field-of-view-deg type="double">55.0</default-field-of-view-deg>
+      <default-pitch-deg type="double">0</default-pitch-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>
+      <back-left-direction-deg type="double">135</back-left-direction-deg>
+      <back-direction-deg type="double">180</back-direction-deg>
+      <back-right-direction-deg type="double">225</back-right-direction-deg>
+      <right-direction-deg type="double">270</right-direction-deg>
+      <front-right-direction-deg type="double">315</front-right-direction-deg>
     </config>
   </view>