fly/fgdata
1
0
Fork 0
Code Activity

Merge /u/amalon/fgdata/ branch vr_1 into next

Browse source 
https://sourceforge.net/p/flightgear/fgdata/merge-requests/238/
This commit is contained in:
b'Fernando Garc\xc3\xada Li\xc3\xb1\xc3\xa1n 2021-09-03 22:23:20 +00:00
commit 25068efaee
8 changed files with 158 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Nasal/gui.nas
View file

@ -1387,6 +1387,7 @@ menuEnable("joystick-info", size(props.globals.getNode("/input/joysticks", 1).ge
menuEnable("rendering-buffers", getprop("/sim/rendering/rembrandt/enabled"));
menuEnable("rembrandt-buffers-choice", getprop("/sim/rendering/rembrandt/enabled"));
menuEnable("stereoscopic-options", !getprop("/sim/rendering/rembrandt/enabled"));
menuEnable("vr-options", !getprop("/sim/rendering/rembrandt/enabled") and getprop("/sim/vr/built"));
menuEnable("sound-config", getprop("/sim/sound/working"));
menuEnable("swift_connection", getprop("/sim/swift/available"));

1
Translations/default/menu.xml
View file

@ -37,6 +37,7 @@
<replay>Instant Replay</replay>
<earthview>Earthview orbital rendering</earthview>
<stereoscopic-options>Stereoscopic View Options</stereoscopic-options>
<vr-options>VR Options</vr-options>
<als-filter-effects>ALS Filter Effects</als-filter-effects>
<!-- Location menu -->

2
Translations/default/options.xml
View file

@ -71,6 +71,8 @@
<enable-anti-alias-hud-desc>Enable anti-aliased HUD</enable-anti-alias-hud-desc>
<disable-hud-3d-desc>Disable 3D HUD</disable-hud-3d-desc>
<enable-hud-3d-desc>Enable 3D HUD</enable-hud-3d-desc>
<disable-vr-desc>Disable VR</disable-vr-desc>
<enable-vr-desc>Enable VR</enable-vr-desc>
<!-- Aircraft options -->
<aircraft-options>Aircraft</aircraft-options>

12
Translations/en_US/FlightGear-nonQt.xlf
View file

@ -483,6 +483,10 @@
<source>View Options</source>
<target />
</trans-unit>
<trans-unit id="menu/vr-options:0" translate="yes" approved="no">
<source>VR Options</source>
<target />
</trans-unit>
<trans-unit id="menu/view-push:0" translate="yes" approved="no">
<source>Push Pair View</source>
<target />
@ -757,6 +761,10 @@
<source>Disable textures</source>
<target />
</trans-unit>
<trans-unit id="options/disable-vr-desc:" translate="yes" approved="no">
<source>Disable VR</source>
<target />
</trans-unit>
<trans-unit id="options/disable-wireframe-desc:0" translate="yes" approved="no">
<source>Disable wireframe drawing mode</source>
<target />
@ -889,6 +897,10 @@
<source>Enable textures</source>
<target />
</trans-unit>
<trans-unit id="options/enable-vr-desc:" translate="yes" approved="no">
<source>Enable VR</source>
<target />
</trans-unit>
<trans-unit id="options/enable-wireframe-desc:0" translate="yes" approved="no">
<source>Enable wireframe drawing mode</source>
<target />

7
defaults.xml
View file

@ -400,6 +400,13 @@ Started September 2000 by David Megginson, david@megginson.com
</hdr>
<composite-viewer-enabled type="bool">true</composite-viewer-enabled>
</rendering>
<vr>
<depth-info type="bool" userarchive="y">true</depth-info>
<enabled type="bool" userarchive="y">false</enabled>
<mode type="string" userarchive="y">AUTOMATIC</mode>
<swapchain-mode type="string" userarchive="y">AUTOMATIC</swapchain-mode>
<validation-layer type="bool" userarchive="y">false</validation-layer>
</vr>
<model-hz type="int">120</model-hz>
<sound>
<volume type="float" userarchive="y">0.8</volume>

116
gui/dialogs/vr-options.xml Normal file
View file

@ -0,0 +1,116 @@
<?xml version="1.0"?>
<PropertyList>
<name>vr-options</name>
<modal>false</modal>
<resizable>false</resizable>
<layout>vbox</layout>
<default-padding>3</default-padding>
<group>
<layout>hbox</layout>
<default-padding>1</default-padding>
<empty>
<stretch>true</stretch>
</empty>
<text>
<label>VR Options</label>
</text>
<empty>
<stretch>true</stretch>
</empty>
<button>
<legend></legend>
<key>Esc</key>
<pref-width>16</pref-width>
<pref-height>16</pref-height>
<border>2</border>
<binding>
<command>dialog-close</command>
</binding>
</button>
</group>
<hrule/>
<empty>
<stretch>true</stretch>
</empty>
<group>
<layout>vbox</layout>
<padding>6</padding>
<checkbox>
<halign>left</halign>
<label>Enable VR</label>
<property>/sim/vr/enabled</property>
<live>false</live>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
</group>
<text>
<halign>center</halign>
<label>OpenXR Information</label>
<enable><property>/sim/vr/present</property></enable>
</text>
<group>
<layout>vbox</layout>
<border>10</border>
<halign>center</halign>
<default-padding>2</default-padding>
<text>
<halign>left</halign>
<label>OpenXR Runtime: MMMMMMMMMMMMMMMMMMMMMMMM</label>
<format>OpenXR Runtime: %s</format>
<property>/sim/vr/openxr/runtime/name</property>
<live>true</live>
<enable><property>/sim/vr/present</property></enable>
</text>
<text>
<halign>left</halign>
<label>OpenXR System: MMMMMMMMMMMMMMMMMMMMMMMM</label>
<format>OpenXR System: %s</format>
<property>/sim/vr/openxr/system/name</property>
<live>true</live>
<enable><property>/sim/vr/present</property></enable>
</text>
<text>
<halign>left</halign>
<label>VR State: MMMMMMMMMMMMMMMMMMMMMMMM</label>
<format>VR State: %s</format>
<property>/sim/vr/state-string</property>
<live>true</live>
<enable><property>/sim/vr/present</property></enable>
</text>
</group>
<empty>
<stretch>true</stretch>
</empty>
<hrule/>
<button>
<legend>Close</legend>
<default>true</default>
<key>Esc</key>
<binding>
<command>dialog-close</command>
</binding>
</button>
</PropertyList>

9
gui/menubar.xml
View file

@ -199,6 +199,15 @@
<enabled>false</enabled>
</item>
<item>
<name>vr-options</name>
<binding>
<command>dialog-show</command>
<dialog-name>vr-options</dialog-name>
</binding>
<enabled>false</enabled>
</item>
<item>
<enabled>
<property>/sim/rendering/shaders/skydome</property>

10
options.xml
View file

@ -319,6 +319,16 @@
<description>enable-clock-freeze-desc</description>
</option>
<option>
<name>disable-vr</name>
<description>disable-vr-desc</description>
</option>
<option>
<name>enable-vr</name>
<description>enable-vr-desc</description>
</option>
<option>
<name>failure</name>
<arg>{pitot|static|vacuum|electrical}</arg>