fly/fgdata
1
0
Fork 0
Code Activity

Jim Wilson:

Browse source 
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
This commit is contained in:
curt 2003-02-06 19:46:48 +00:00
parent 02b4b4a3f0
commit de1c84c8c0
3 changed files with 51 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
keyboard.xml
View file

@ -350,8 +350,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
</binding> </binding>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>/sim/current-view/pitch-offset-deg</property> <property>/sim/current-view/goal-pitch-offset-deg</property>
<value alias="/sim/view/config/default-pitch-deg"/> <value alias="/sim/view/config/pitch-offset-deg"/>
</binding> </binding>
</mod-shift> </mod-shift>
</key> </key>
@ -373,8 +373,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
</binding> </binding>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>/sim/current-view/pitch-offset-deg</property> <property>/sim/current-view/goal-pitch-offset-deg</property>
<value alias="/sim/view/config/default-pitch-deg"/> <value alias="/sim/view/config/pitch-offset-deg"/>
</binding> </binding>
</mod-shift> </mod-shift>
</key> </key>
@ -396,8 +396,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
</binding> </binding>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>/sim/current-view/pitch-offset-deg</property> <property>/sim/current-view/goal-pitch-offset-deg</property>
<value alias="/sim/view/config/default-pitch-deg"/> <value alias="/sim/view/config/pitch-offset-deg"/>
</binding> </binding>
</mod-shift> </mod-shift>
</key> </key>
@ -419,8 +419,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
</binding> </binding>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>/sim/current-view/pitch-offset-deg</property> <property>/sim/current-view/goal-pitch-offset-deg</property>
<value alias="/sim/view/config/default-pitch-deg"/> <value alias="/sim/view/config/pitch-offset-deg"/>
</binding> </binding>
</mod-shift> </mod-shift>
</key> </key>
@ -462,8 +462,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
</binding> </binding>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>/sim/current-view/pitch-offset-deg</property> <property>/sim/current-view/goal-pitch-offset-deg</property>
<value alias="/sim/view/config/default-pitch-deg"/> <value alias="/sim/view/config/pitch-offset-deg"/>
</binding> </binding>
</mod-shift> </mod-shift>
</key> </key>
@ -485,8 +485,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
</binding> </binding>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>/sim/current-view/pitch-offset-deg</property> <property>/sim/current-view/goal-pitch-offset-deg</property>
<value alias="/sim/view/config/default-pitch-deg"/> <value alias="/sim/view/config/pitch-offset-deg"/>
</binding> </binding>
</mod-shift> </mod-shift>
</key> </key>
@ -508,8 +508,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
</binding> </binding>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>/sim/current-view/pitch-offset-deg</property> <property>/sim/current-view/goal-pitch-offset-deg</property>
<value alias="/sim/view/config/default-pitch-deg"/> <value alias="/sim/view/config/pitch-offset-deg"/>
</binding> </binding>
</mod-shift> </mod-shift>
</key> </key>
@ -531,8 +531,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
</binding> </binding>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>/sim/current-view/pitch-offset-deg</property> <property>/sim/current-view/goal-pitch-offset-deg</property>
<value alias="/sim/view/config/default-pitch-deg"/> <value alias="/sim/view/config/pitch-offset-deg"/>
</binding> </binding>
</mod-shift> </mod-shift>
</key> </key>
@ -637,6 +637,16 @@ calculated by adding 256 to the GLUT key value in glut.h.
</binding> </binding>
</key> </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"> <key n="87">
<name>W</name> <name>W</name>
<desc>(Temporary) Toggle fullscreen for 3DFX only.</desc> <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>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>/sim/current-view/pitch-offset-deg</property> <property>/sim/current-view/goal-pitch-offset-deg</property>
<value alias="/sim/view/config/default-pitch-deg"/> <value alias="/sim/view/config/pitch-offset-deg"/>
</binding> </binding>
</mod-shift> </mod-shift>
</key> </key>
@ -1175,8 +1185,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
</binding> </binding>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>/sim/current-view/pitch-offset-deg</property> <property>/sim/current-view/goal-pitch-offset-deg</property>
<value alias="/sim/view/config/default-pitch-deg"/> <value alias="/sim/view/config/pitch-offset-deg"/>
</binding> </binding>
</mod-shift> </mod-shift>
</key> </key>
@ -1198,8 +1208,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
</binding> </binding>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>/sim/current-view/pitch-offset-deg</property> <property>/sim/current-view/goal-pitch-offset-deg</property>
<value alias="/sim/view/config/default-pitch-deg"/> <value alias="/sim/view/config/pitch-offset-deg"/>
</binding> </binding>
</mod-shift> </mod-shift>
</key> </key>
@ -1221,8 +1231,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
</binding> </binding>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>/sim/current-view/pitch-offset-deg</property> <property>/sim/current-view/goal-pitch-offset-deg</property>
<value alias="/sim/view/config/default-pitch-deg"/> <value alias="/sim/view/config/pitch-offset-deg"/>
</binding> </binding>
</mod-shift> </mod-shift>
</key> </key>
@ -1244,8 +1254,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
</binding> </binding>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>/sim/current-view/pitch-offset-deg</property> <property>/sim/current-view/goal-pitch-offset-deg</property>
<value alias="/sim/view/config/default-pitch-deg"/> <value alias="/sim/view/config/pitch-offset-deg"/>
</binding> </binding>
</mod-shift> </mod-shift>
</key> </key>
@ -1267,8 +1277,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
</binding> </binding>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>/sim/current-view/pitch-offset-deg</property> <property>/sim/current-view/goal-pitch-offset-deg</property>
<value alias="/sim/view/config/default-pitch-deg"/> <value alias="/sim/view/config/pitch-offset-deg"/>
</binding> </binding>
</mod-shift> </mod-shift>
</key> </key>
@ -1290,8 +1300,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
</binding> </binding>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>/sim/current-view/pitch-offset-deg</property> <property>/sim/current-view/goal-pitch-offset-deg</property>
<value alias="/sim/view/config/default-pitch-deg"/> <value alias="/sim/view/config/pitch-offset-deg"/>
</binding> </binding>
</mod-shift> </mod-shift>
</key> </key>
@ -1313,8 +1323,8 @@ calculated by adding 256 to the GLUT key value in glut.h.
</binding> </binding>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>/sim/current-view/pitch-offset-deg</property> <property>/sim/current-view/goal-pitch-offset-deg</property>
<value alias="/sim/view/config/default-pitch-deg"/> <value alias="/sim/view/config/pitch-offset-deg"/>
</binding> </binding>
</mod-shift> </mod-shift>
</key> </key>

4
mice.xml
View file

@ -191,8 +191,8 @@ The current mode for each mouse is held in the
</binding> </binding>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>/sim/current-view/pitch-offset-deg</property> <property>/sim/current-view/goal-pitch-offset-deg</property>
<value alias="/sim/view/config/default-pitch-deg"/> <property>/sim/current-view/config/pitch-offset-deg</property>
</binding> </binding>
</button> </button>

8
preferences.xml
View file

@ -37,7 +37,7 @@ Started September 2000 by David Megginson, david@megginson.com
<sound type="bool">true</sound> <sound type="bool">true</sound>
<speed-up type="double">1.0</speed-up> <speed-up type="double">1.0</speed-up>
<current-view> <current-view>
<field-of-view type="double">55.0</field-of-view> <field-of-view type="double">50.0</field-of-view>
</current-view> </current-view>
<panel> <panel>
<path>Aircraft/c172/Panels/c172-vfr-panel.xml</path> <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> <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-field-of-view-deg type="double">55.0</default-field-of-view-deg>
<default-pitch-deg type="double">0</default-pitch-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-direction-deg type="double">0</front-direction-deg>
<front-left-direction-deg type="double">45</front-left-direction-deg> <front-left-direction-deg type="double">45</front-left-direction-deg>
<left-direction-deg type="double">90</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 type="bool">true</at-model>
<at-model-idx type="int">0</at-model-idx> <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> <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> <x-offset-m type="double">0</x-offset-m>
<y-offset-m type="double">0</y-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> <at-model-idx type="int">0</at-model-idx>
<ground-level-nearplane-m type="double">10.0f</ground-level-nearplane-m> <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> <x-offset-m type="double">0</x-offset-m>
<y-offset-m type="double">0</y-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> <eye-heading-deg-path>/sim/tower/heading-deg</eye-heading-deg-path>
<ground-level-nearplane-m type="double">10.0f</ground-level-nearplane-m> <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> <x-offset-m type="double">0</x-offset-m>
<y-offset-m type="double">0</y-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> <at-model-idx type="int">0</at-model-idx>
<ground-level-nearplane-m type="double">0.5f</ground-level-nearplane-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">2</x-offset-m> <x-offset-m type="double">2</x-offset-m>
<y-offset-m type="double">25</y-offset-m> <y-offset-m type="double">25</y-offset-m>