Merge branch 'integration'
Conflicts: gui/menubar.xml Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
This commit is contained in:
Vivian Meazza
commit
aca89b4c69
14 changed files with 763 additions and 222 deletions
|
|
@ -2,6 +2,43 @@
|
|||
<PropertyList>
|
||||
<name>Effects/water</name>
|
||||
<inherits-from>Effects/terrain-default</inherits-from>
|
||||
<parameters>
|
||||
<texture n="0">
|
||||
<image>Textures/Water/water-reflection.png</image>
|
||||
<filter>linear-mipmap-linear</filter>
|
||||
<wrap-s>repeat</wrap-s>
|
||||
<wrap-t>repeat</wrap-t>
|
||||
<internal-format>normalized</internal-format>
|
||||
</texture>
|
||||
<texture n="1">
|
||||
<image>Textures/Water/water-refraction.png</image>
|
||||
<filter>linear-mipmap-linear</filter>
|
||||
<wrap-s>repeat</wrap-s>
|
||||
<wrap-t>repeat</wrap-t>
|
||||
<internal-format>normalized</internal-format>
|
||||
</texture>
|
||||
<texture n="2">
|
||||
<image>Textures/Water/water-normalmap.png</image>
|
||||
<filter>linear-mipmap-linear</filter>
|
||||
<wrap-s>repeat</wrap-s>
|
||||
<wrap-t>repeat</wrap-t>
|
||||
<internal-format>normalized</internal-format>
|
||||
</texture>
|
||||
<texture n="3">
|
||||
<image>Textures/Water/water-dudv.png</image>
|
||||
<filter>linear-mipmap-linear</filter>
|
||||
<wrap-s>repeat</wrap-s>
|
||||
<wrap-t>repeat</wrap-t>
|
||||
<internal-format>normalized</internal-format>
|
||||
</texture>
|
||||
<texture n="4">
|
||||
<image>Textures/Water/water-depth.png</image>
|
||||
<filter>linear-mipmap-linear</filter>
|
||||
<wrap-s>repeat</wrap-s>
|
||||
<wrap-t>repeat</wrap-t>
|
||||
<internal-format>normalized</internal-format>
|
||||
</texture>
|
||||
</parameters>
|
||||
<technique n="9">
|
||||
<predicate>
|
||||
<and>
|
||||
|
|
@ -14,7 +51,7 @@
|
|||
</less-equal>
|
||||
<and>
|
||||
<extension-supported>GL_ARB_shader_objects</extension-supported>
|
||||
<extension-supported>GL_ARB_shading_language_100</extension-supported>
|
||||
<extension-supported>GL_ARB_shading_language_120</extension-supported>
|
||||
<extension-supported>GL_ARB_vertex_shader</extension-supported>
|
||||
<extension-supported>GL_ARB_fragment_shader</extension-supported>
|
||||
</and>
|
||||
|
|
@ -37,18 +74,93 @@
|
|||
<bin-number><use>render-bin/bin-number</use></bin-number>
|
||||
<bin-name><use>render-bin/bin-name</use></bin-name>
|
||||
</render-bin>
|
||||
<texture-unit>
|
||||
<texture-unit>
|
||||
<unit>0</unit>
|
||||
<type>noise</type>
|
||||
<image><use>texture[0]/image</use></image>
|
||||
<filter><use>texture[0]/filter</use></filter>
|
||||
<wrap-s><use>texture[0]/wrap-s</use></wrap-s>
|
||||
<wrap-t><use>texture[0]/wrap-t</use></wrap-t>
|
||||
<internal-format>
|
||||
<use>texture[0]/internal-format</use>
|
||||
</internal-format>
|
||||
</texture-unit>
|
||||
<texture-unit>
|
||||
<unit>1</unit>
|
||||
<image><use>texture[1]/image</use></image>
|
||||
<filter><use>texture[1]/filter</use></filter>
|
||||
<wrap-s><use>texture[1]/wrap-s</use></wrap-s>
|
||||
<wrap-t><use>texture[1]/wrap-t</use></wrap-t>
|
||||
<internal-format>
|
||||
<use>texture[1]/internal-format</use>
|
||||
</internal-format>
|
||||
</texture-unit>
|
||||
<texture-unit>
|
||||
<unit>2</unit>
|
||||
<image><use>texture[2]/image</use></image>
|
||||
<filter><use>texture[2]/filter</use></filter>
|
||||
<wrap-s><use>texture[2]/wrap-s</use></wrap-s>
|
||||
<wrap-t><use>texture[2]/wrap-t</use></wrap-t>
|
||||
<internal-format>
|
||||
<use>texture[2]/internal-format</use>
|
||||
</internal-format>
|
||||
</texture-unit>
|
||||
<texture-unit>
|
||||
<unit>3</unit>
|
||||
<image><use>texture[3]/image</use></image>
|
||||
<filter><use>texture[3]/filter</use></filter>
|
||||
<wrap-s><use>texture[3]/wrap-s</use></wrap-s>
|
||||
<wrap-t><use>texture[3]/wrap-t</use></wrap-t>
|
||||
<internal-format>
|
||||
<use>texture[3]/internal-format</use>
|
||||
</internal-format>
|
||||
</texture-unit>
|
||||
<texture-unit>
|
||||
<unit>4</unit>
|
||||
<image><use>texture[4]/image</use></image>
|
||||
<filter><use>texture[4]/filter</use></filter>
|
||||
<wrap-s><use>texture[4]/wrap-s</use></wrap-s>
|
||||
<wrap-t><use>texture[4]/wrap-t</use></wrap-t>
|
||||
<internal-format>
|
||||
<use>texture[4]/internal-format</use>
|
||||
</internal-format>
|
||||
</texture-unit>
|
||||
<program>
|
||||
<vertex-shader>Shaders/water.vert</vertex-shader>
|
||||
<fragment-shader>Shaders/water.frag</fragment-shader>
|
||||
</program>
|
||||
<uniform>
|
||||
<name>texture</name>
|
||||
<type>sampler-3d</type>
|
||||
<value type="int">0</value></uniform>
|
||||
<name>water_reflection</name>
|
||||
<type>sampler-2d</type>
|
||||
<value type="int">0</value>
|
||||
</uniform>
|
||||
<uniform>
|
||||
<name>water_refraction</name>
|
||||
<type>sampler-2d</type>
|
||||
<value type="int">1</value>
|
||||
</uniform>
|
||||
<uniform>
|
||||
<name>water_normalmap</name>
|
||||
<type>sampler-2d</type>
|
||||
<value type="int">2</value>
|
||||
</uniform>
|
||||
<uniform>
|
||||
<name>water_dudvmap</name>
|
||||
<type>sampler-2d</type>
|
||||
<value type="int">3</value>
|
||||
</uniform>
|
||||
<uniform>
|
||||
<name>water_depthmap</name>
|
||||
<type>sampler-2d</type>
|
||||
<value type="int">4</value>
|
||||
</uniform>
|
||||
<!--<uniform>
|
||||
<name>waterColor</name>
|
||||
<value type="float-vec4">0.0 0.0 1.0 1.0</value>
|
||||
</uniform>
|
||||
<uniform>
|
||||
<name>waterDepth</name>
|
||||
<value type="float-vec4">1.0 1.0 1.0 1.0</value>
|
||||
</uniform>-->
|
||||
</pass>
|
||||
</technique>
|
||||
</PropertyList>
|
||||
|
|
|
|||
|
|
@ -1,86 +1,106 @@
|
|||
#version 120
|
||||
uniform sampler2D water_normalmap;
|
||||
uniform sampler2D water_reflection;
|
||||
uniform sampler2D water_refraction;
|
||||
uniform sampler2D water_dudvmap;
|
||||
uniform sampler2D water_depthmap;
|
||||
|
||||
varying vec4 rawpos;
|
||||
varying vec4 ecPosition;
|
||||
varying vec3 VNormal;
|
||||
varying vec3 Normal;
|
||||
varying vec3 lightVec;
|
||||
vec4 waterColor = vec4(0.0,0.2,1.0,1.0);
|
||||
vec4 waterDepth = vec4(0.0,0.2,1.0,1.0);
|
||||
|
||||
uniform sampler3D NoiseTex;
|
||||
uniform float osg_SimulationTime;
|
||||
varying vec4 waterTex0; //lightpos
|
||||
varying vec4 waterTex1; //moving texcoords
|
||||
varying vec4 waterTex2; //moving texcoords
|
||||
varying vec4 waterTex3; //for projection
|
||||
varying vec4 waterTex4; //viewts
|
||||
varying float fogCoord;
|
||||
|
||||
//const float scale = 1.0;
|
||||
//unit 0 = water_reflection
|
||||
//unit 1 = water_refraction
|
||||
//unit 2 = water_normalmap
|
||||
//unit 3 = water_dudvmap
|
||||
//unit 4 = water_depthmap
|
||||
|
||||
void main (void)
|
||||
void main(void)
|
||||
{
|
||||
vec4 noisevecS = texture3D(NoiseTex, (rawpos.xyz)*0.0126);
|
||||
vec4 nvLS = texture3D(NoiseTex, (rawpos.xyz)*-0.0003323417);
|
||||
const vec4 sca = vec4(0.005, 0.005, 0.005, 0.005);
|
||||
const vec4 sca2 = vec4(0.02, 0.02, 0.02, 0.02);
|
||||
const vec4 tscale = vec4(0.25, 0.25, 0.25, 0.25);
|
||||
const vec4 two = vec4(2.0, 2.0, 2.0, 1.0);
|
||||
const vec4 mone = vec4(-1.0, -1.0, -1.0, 1.0);
|
||||
|
||||
vec4 noisevec = texture3D(NoiseTex, (rawpos.xyz)*0.00423+vec3(0.0,0.0,osg_SimulationTime*0.035217));
|
||||
vec4 nvL = texture3D(NoiseTex, (rawpos.xyz)*0.001223417+(0.0,0.0,osg_SimulationTime*-0.0212));
|
||||
const vec4 ofive = vec4(0.5,0.5,0.5,1.0);
|
||||
|
||||
float fogFactor;
|
||||
if (gl_Fog.density == 1.0)
|
||||
{
|
||||
fogFactor=1.0;
|
||||
}
|
||||
else
|
||||
{
|
||||
float fogCoord = ecPosition.z;
|
||||
const float LOG2 = 1.442695;
|
||||
fogFactor = exp2(-gl_Fog.density * gl_Fog.density * fogCoord * fogCoord * LOG2);
|
||||
fogFactor = clamp(fogFactor, 0.0, 1.0);
|
||||
}
|
||||
const float exponent = 64.0;
|
||||
|
||||
float a=1.0;
|
||||
float n=0.00;
|
||||
n += nvLS[0]*a;
|
||||
a/=2.0;
|
||||
n += nvLS[1]*a;
|
||||
a/=2.0;
|
||||
n += nvLS[2]*a;
|
||||
a/=2.0;
|
||||
n += nvLS[3]*a;
|
||||
float fogFactor = exp(-gl_Fog.density * gl_Fog.density * fogCoord * fogCoord);
|
||||
|
||||
a=4.0;
|
||||
float na=n;
|
||||
na += nvL[0]*1.1;
|
||||
a*=1.2;
|
||||
na += nvL[1]*a;
|
||||
a*=1.2;
|
||||
na += nvL[2]*a;
|
||||
a*=1.2;
|
||||
na += nvL[3]*a;
|
||||
a=2.0;
|
||||
na += noisevec[0]*a*0.2;
|
||||
a*=1.2;
|
||||
na += noisevec[1]*a;
|
||||
a*=1.2;
|
||||
na += noisevec[2]*a;
|
||||
a*=1.2;
|
||||
na += noisevec[3]*a;
|
||||
vec4 lightTS = normalize(waterTex0);
|
||||
vec4 viewt = normalize(waterTex4);
|
||||
vec4 disdis = texture2D(water_dudvmap, vec2(waterTex2 * tscale));
|
||||
vec4 dist = texture2D(water_dudvmap, vec2(waterTex1 + disdis*sca2));
|
||||
vec4 fdist = dist;
|
||||
fdist = fdist * two + mone;
|
||||
fdist = normalize(fdist);
|
||||
fdist *= sca;
|
||||
|
||||
vec4 c1;
|
||||
c1 = asin(vec4(smoothstep(0.0, 2.2, n), smoothstep(-0.1, 2.10, n), smoothstep(-0.2, 2.0, n), 1.0));
|
||||
//load normalmap
|
||||
vec4 nmap = texture2D(water_normalmap, vec2(waterTex1 + disdis*sca2));
|
||||
nmap = (nmap-ofive) * two;
|
||||
vec4 vNorm = nmap;
|
||||
vNorm = normalize(nmap);
|
||||
|
||||
vec3 Eye = normalize(-ecPosition.xyz);
|
||||
vec3 Reflected = normalize(reflect(-normalize(lightVec), normalize(VNormal+vec3(0.0,0.0,na*0.10-0.24))));
|
||||
//get projective texcoords
|
||||
vec4 tmp = vec4(1.0 / waterTex3.w);
|
||||
vec4 temp = tmp;
|
||||
|
||||
vec3 bump = normalize(VNormal+vec3(0.0, 0.0, na)-0.9);
|
||||
vec3 bumped = max(normalize(refract(lightVec, normalize(bump), 0.16)), 0.0);
|
||||
vec4 projCoord = waterTex3 * tmp;
|
||||
projCoord += vec4(1.0);
|
||||
projCoord *= vec4(0.5);
|
||||
tmp = projCoord + fdist;
|
||||
tmp = clamp(tmp, 0.001, 0.999);
|
||||
|
||||
vec4 ambientColor = gl_LightSource[0].ambient;
|
||||
vec4 light = ambientColor;
|
||||
c1 *= light;
|
||||
//load reflection,refraction and depth texture
|
||||
vec4 refTex = texture2D(water_reflection, vec2(tmp));
|
||||
vec4 refl = refTex;
|
||||
vec4 refr = texture2D(water_refraction, vec2(tmp));
|
||||
vec4 wdepth = texture2D(water_depthmap, vec2(tmp));
|
||||
|
||||
float bumpFact = (bumped.r+bumped.g+bumped.b);
|
||||
float ReflectedEye = max(dot(Reflected, Eye), 0.0);
|
||||
float eyeFact = pow(ReflectedEye, 20.0);
|
||||
c1 += 0.3 * gl_LightSource[0].diffuse * (1.0-eyeFact) * bumpFact*bumpFact;
|
||||
c1 += 0.4 * gl_LightSource[0].diffuse * eyeFact * 3*bumpFact;
|
||||
eyeFact = pow(eyeFact, 20.0);
|
||||
c1 += gl_LightSource[0].specular * eyeFact * 4*bumpFact;
|
||||
wdepth = vec4(pow(wdepth.x, 4.0));
|
||||
vec4 invdepth = 1.0 - wdepth;
|
||||
|
||||
vec4 finalColor = c1;
|
||||
gl_FragColor = mix(gl_Fog.color, finalColor, fogFactor);
|
||||
//calculate specular highlight
|
||||
vec4 vRef = normalize(reflect(lightTS, vNorm));
|
||||
float stemp =max(0.0, dot(viewt, vRef)*tan(0.788));
|
||||
stemp = pow(stemp, exponent);
|
||||
vec4 specular = vec4(stemp);
|
||||
|
||||
//calculate fresnel and inverted fresnel
|
||||
vec4 invfres = vec4( dot(vNorm, viewt) );
|
||||
vec4 fres = vec4(1.0) -invfres ;
|
||||
|
||||
//calculate reflection and refraction
|
||||
refr *= invfres;
|
||||
refr *= invdepth;
|
||||
temp = waterColor * wdepth * invfres;
|
||||
refr += temp;
|
||||
refl *= fres;
|
||||
|
||||
//add reflection and refraction
|
||||
tmp = refr + refl;
|
||||
|
||||
if(gl_Fog.density == 1.0)
|
||||
fogFactor=1.0;
|
||||
|
||||
vec4 finalColor = tmp + specular;
|
||||
|
||||
vec4 constantColor = vec4(1.0,1.0,1.0,1.0);
|
||||
|
||||
vec4 ambient_light = gl_LightSource[0].diffuse * constantColor + constantColor;
|
||||
|
||||
finalColor *= ambient_light;
|
||||
|
||||
if(gl_Fog.density == 1.0)
|
||||
fogFactor=1.0;
|
||||
|
||||
gl_FragColor = mix(gl_Fog.color,finalColor, fogFactor);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,47 @@
|
|||
varying vec4 rawpos;
|
||||
varying vec4 ecPosition;
|
||||
varying vec3 VNormal;
|
||||
varying vec3 Normal;
|
||||
varying vec4 waterTex0;
|
||||
varying vec4 waterTex1;
|
||||
varying vec4 waterTex2;
|
||||
varying vec4 waterTex3;
|
||||
varying vec4 waterTex4;
|
||||
uniform float osg_SimulationTime;
|
||||
varying vec3 lightVec;
|
||||
varying float fogCoord;
|
||||
varying vec4 ecPosition;
|
||||
|
||||
void main(void)
|
||||
{
|
||||
rawpos = gl_Vertex;
|
||||
ecPosition = gl_ModelViewMatrix * gl_Vertex;
|
||||
VNormal = normalize(gl_NormalMatrix * gl_Normal);
|
||||
Normal = normalize(gl_Normal);
|
||||
lightVec = normalize(gl_LightSource[0].position.xyz/* - ecPosition*/);
|
||||
gl_Position = ftransform();
|
||||
|
||||
lightVec = normalize(gl_LightSource[0].position.xyz);
|
||||
ecPosition = gl_ModelViewMatrix * gl_Vertex;
|
||||
vec4 lightpos = vec4(lightVec, 1.0);
|
||||
|
||||
vec4 temp;
|
||||
vec4 tangent = vec4(1.0, 0.0, 0.0, 0.0);
|
||||
vec4 norm = vec4(0.0, 1.0, 0.0, 0.0);
|
||||
vec4 binormal = vec4(0.0, 0.0, 1.0, 0.0);
|
||||
|
||||
temp = gl_ModelViewMatrix * gl_Vertex;
|
||||
waterTex4.x = dot(temp, tangent);
|
||||
waterTex4.y = dot(temp, binormal);
|
||||
waterTex4.z = dot(temp, norm);
|
||||
waterTex4.w = 0.0;
|
||||
|
||||
temp = lightpos;
|
||||
waterTex0.x = dot(temp, tangent);
|
||||
waterTex0.y = dot(temp, binormal);
|
||||
waterTex0.z = dot(temp, norm);
|
||||
waterTex0.w = 0.0;
|
||||
|
||||
|
||||
vec4 t1 = vec4(0.0, osg_SimulationTime*0.035217, 0.0,0.0);
|
||||
vec4 t2 = vec4(0.0, osg_SimulationTime*-0.0212, 0.0,0.0);
|
||||
|
||||
waterTex1 = gl_MultiTexCoord0 + t1;
|
||||
waterTex2 = gl_MultiTexCoord0 + t2;
|
||||
|
||||
waterTex3 = gl_MultiTexCoord0;
|
||||
|
||||
fogCoord = abs(ecPosition.z / ecPosition.w);
|
||||
|
||||
gl_Position = ftransform();
|
||||
}
|
||||
|
|
|
|||
BIN
Textures/Water/water-depth.png
Normal file
BIN
Textures/Water/water-depth.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
BIN
Textures/Water/water-dudv.png
Normal file
BIN
Textures/Water/water-dudv.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 502 KiB |
BIN
Textures/Water/water-normalmap.png
Normal file
BIN
Textures/Water/water-normalmap.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 745 KiB |
BIN
Textures/Water/water-reflection.png
Normal file
BIN
Textures/Water/water-reflection.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
BIN
Textures/Water/water-refraction.png
Normal file
BIN
Textures/Water/water-refraction.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
BIN
gui/FG-menu-structure.ods
Normal file
BIN
gui/FG-menu-structure.ods
Normal file
Binary file not shown.
221
gui/dialogs/AIcarrier.xml
Normal file
221
gui/dialogs/AIcarrier.xml
Normal file
|
|
@ -0,0 +1,221 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
<PropertyList>
|
||||
<name>AIcarrier</name>
|
||||
<modal>false</modal>
|
||||
<layout>vbox</layout>
|
||||
|
||||
|
||||
<!-- AI Carrier options -->
|
||||
|
||||
<text>
|
||||
<halign>left</halign>
|
||||
<label>AI Carrier</label>
|
||||
<color>
|
||||
<red>0.9</red>
|
||||
<green>0.9</green>
|
||||
<blue>0.9</blue>
|
||||
<alpha>1</alpha>
|
||||
</color>
|
||||
</text>
|
||||
|
||||
<group>
|
||||
<layout>hbox</layout>
|
||||
<empty>
|
||||
<pref-width>10</pref-width>
|
||||
</empty>
|
||||
|
||||
<group>
|
||||
<layout>vbox</layout>
|
||||
|
||||
<radio>
|
||||
<halign>left</halign>
|
||||
<label>Turn to launch course</label>
|
||||
<property>/ai/models/carrier/controls/turn-to-launch-hdg</property>
|
||||
<live>true</live>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
</binding>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
var v = getprop("/ai/models/carrier/controls/turn-to-launch-hdg");
|
||||
foreach (var c; props.globals.getNode("/ai/models").getChildren("carrier")){
|
||||
c.getNode("controls/turn-to-launch-hdg").setBoolValue(v);
|
||||
c.getNode("controls/turn-to-recovery-hdg").setBoolValue(0);
|
||||
c.getNode("controls/turn-to-base-course").setBoolValue(0);
|
||||
}
|
||||
</script>
|
||||
</binding>
|
||||
</radio>
|
||||
|
||||
<radio>
|
||||
<halign>left</halign>
|
||||
<label>Turn to recovery course</label>
|
||||
<property>/ai/models/carrier/controls/turn-to-recovery-hdg</property>
|
||||
<live>true</live>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
</binding>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
var v = getprop("/ai/models/carrier/controls/turn-to-recovery-hdg");
|
||||
foreach (var c; props.globals.getNode("/ai/models").getChildren("carrier")){
|
||||
c.getNode("controls/turn-to-recovery-hdg").setBoolValue(v);
|
||||
c.getNode("controls/turn-to-launch-hdg").setBoolValue(0);
|
||||
c.getNode("controls/turn-to-base-course").setBoolValue(0);
|
||||
}
|
||||
</script>
|
||||
</binding>
|
||||
</radio>
|
||||
|
||||
<radio>
|
||||
<halign>left</halign>
|
||||
<label>Turn to base course</label>
|
||||
<property>/ai/models/carrier/controls/turn-to-base-course</property>
|
||||
<live>true</live>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
</binding>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
var v = getprop("/ai/models/carrier/controls/turn-to-base-course");
|
||||
foreach (var c; props.globals.getNode("/ai/models").getChildren("carrier")){
|
||||
c.getNode("controls/turn-to-base-course").setBoolValue(v);
|
||||
c.getNode("controls/turn-to-recovery-hdg").setBoolValue(0);
|
||||
c.getNode("controls/turn-to-launch-hdg").setBoolValue(0);
|
||||
}
|
||||
</script>
|
||||
</binding>
|
||||
</radio>
|
||||
|
||||
<checkbox>
|
||||
<halign>left</halign>
|
||||
<label>Operate Deck Elevators</label>
|
||||
<property>/ai/models/carrier/controls/elevators</property>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
</binding>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
var v = getprop("/ai/models/carrier/controls/elevators");
|
||||
foreach (var c; props.globals.getNode("/ai/models").getChildren("carrier"))
|
||||
c.getNode("controls/elevators").setBoolValue(v);
|
||||
</script>
|
||||
</binding>
|
||||
</checkbox>
|
||||
|
||||
<checkbox>
|
||||
<halign>left</halign>
|
||||
<label>Enable LSO Communications</label>
|
||||
<property>/sim/current-view/lso-commentary</property>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
</binding>
|
||||
</checkbox>
|
||||
|
||||
<checkbox>
|
||||
<halign>left</halign>
|
||||
<label>Enable Deck Park</label>
|
||||
<property>/sim/current-view/deck-park</property>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
</binding>
|
||||
</checkbox>
|
||||
|
||||
<checkbox>
|
||||
<halign>left</halign>
|
||||
<label>Deck Lights</label>
|
||||
<property>/ai/models/carrier/controls/lighting/deck-lights</property>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
</binding>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
var v = getprop("/ai/models/carrier/controls/lighting/deck-lights");
|
||||
foreach (var c; props.globals.getNode("/ai/models").getChildren("carrier"))
|
||||
c.getNode("controls/lighting/deck-lights",1).setBoolValue(v);
|
||||
</script>
|
||||
</binding>
|
||||
</checkbox>
|
||||
|
||||
<text>
|
||||
<halign>left</halign>
|
||||
<label>Discrete Flightdeck Floodlights (Red)</label>
|
||||
</text>
|
||||
|
||||
<slider>
|
||||
<halign>left</halign>
|
||||
<width>75</width>
|
||||
<height>25</height>
|
||||
<property>/ai/models/carrier/controls/lighting/flood-lights-red-norm</property>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
var v = getprop("/ai/models/carrier/controls/lighting/flood-lights-red-norm");
|
||||
foreach (var c; props.globals.getNode("/ai/models").getChildren("carrier"))
|
||||
c.getNode("controls/lighting/flood-lights-red-norm",1).setDoubleValue(v);
|
||||
</script>
|
||||
</binding>
|
||||
</slider>
|
||||
|
||||
</group>
|
||||
|
||||
<empty>
|
||||
<stretch>true</stretch>
|
||||
</empty>
|
||||
</group>
|
||||
|
||||
<group>
|
||||
<layout>hbox</layout>
|
||||
<default-padding>6</default-padding>
|
||||
<empty>
|
||||
<stretch>true</stretch>
|
||||
</empty>
|
||||
|
||||
<button>
|
||||
<legend>OK</legend>
|
||||
<default>true</default>
|
||||
<equal>true</equal>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
</binding>
|
||||
<binding>
|
||||
<command>dialog-close</command>
|
||||
</binding>
|
||||
</button>
|
||||
|
||||
<button>
|
||||
<legend>Apply</legend>
|
||||
<equal>true</equal>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
</binding>
|
||||
</button>
|
||||
|
||||
<button>
|
||||
<legend>Reset</legend>
|
||||
<equal>true</equal>
|
||||
<binding>
|
||||
<command>dialog-update</command>
|
||||
</binding>
|
||||
</button>
|
||||
|
||||
<button>
|
||||
<legend>Cancel</legend>
|
||||
<equal>true</equal>
|
||||
<key>Esc</key>
|
||||
<binding>
|
||||
<command>dialog-close</command>
|
||||
</binding>
|
||||
</button>
|
||||
|
||||
<empty>
|
||||
<stretch>true</stretch>
|
||||
</empty>
|
||||
</group>
|
||||
</PropertyList>
|
||||
74
gui/dialogs/ai.xml
Normal file
74
gui/dialogs/ai.xml
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
<!-- General ATC/AI options -->
|
||||
|
||||
<PropertyList>
|
||||
<name>ai</name>
|
||||
<modal>false</modal>
|
||||
<layout>vbox</layout>
|
||||
|
||||
|
||||
|
||||
<button>
|
||||
<legend>-</legend>
|
||||
<pref-width>16</pref-width>
|
||||
<pref-height>16</pref-height>
|
||||
<halign>right</halign>
|
||||
<border>2</border>
|
||||
<binding>
|
||||
<command>dialog-close</command>
|
||||
</binding>
|
||||
</button>
|
||||
|
||||
<text>
|
||||
<!-- <label>ATC/AI Options</label> -->
|
||||
<label>AI Options</label>
|
||||
</text>
|
||||
|
||||
<hrule/>
|
||||
|
||||
<group>
|
||||
<layout>hbox</layout>
|
||||
<empty>
|
||||
<pref-width>10</pref-width>
|
||||
</empty>
|
||||
|
||||
<group>
|
||||
<layout>vbox</layout>
|
||||
|
||||
<!-- <checkbox>
|
||||
<halign>left</halign>
|
||||
<label>Enable ATC</label>
|
||||
<property>/sim/atc/enabled</property>
|
||||
</checkbox> -->
|
||||
|
||||
<checkbox>
|
||||
<halign>left</halign>
|
||||
<label>Enable AI traffic</label>
|
||||
<property>/sim/ai-traffic/enabled</property>
|
||||
</checkbox>
|
||||
|
||||
<group>
|
||||
<layout>hbox</layout>
|
||||
|
||||
<text>
|
||||
<halign>left</halign>
|
||||
<label>AI traffic density:</label>
|
||||
</text>
|
||||
|
||||
<combo>
|
||||
<halign>left</halign>
|
||||
<property>/sim/ai-traffic/level</property>
|
||||
<value>1</value>
|
||||
<value>2</value>
|
||||
<value>3</value>
|
||||
</combo>
|
||||
</group>
|
||||
|
||||
</group>
|
||||
|
||||
<empty>
|
||||
<stretch>true</stretch>
|
||||
</empty>
|
||||
</group>
|
||||
</PropertyList>
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
<layout>vbox</layout>
|
||||
|
||||
<text>
|
||||
<label>Configure Active Views</label>
|
||||
<label>Choose Active Views</label>
|
||||
</text>
|
||||
|
||||
<hrule/>
|
||||
|
|
|
|||
350
gui/menubar.xml
350
gui/menubar.xml
|
|
@ -1,10 +1,11 @@
|
|||
<?xml version="1.0"?>
|
||||
<PropertyList>
|
||||
|
||||
<menu>
|
||||
<label>File</label>
|
||||
<label>General</label>
|
||||
|
||||
<item>
|
||||
<label>Load</label>
|
||||
<label>Load Flight (Shift-F1)</label>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>gui.load_flight()</script>
|
||||
|
|
@ -12,33 +13,51 @@
|
|||
</item>
|
||||
|
||||
<item>
|
||||
<label>Save</label>
|
||||
<label>Save Flight (Shift-F2)</label>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>gui.save_flight()</script>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<!--
|
||||
<item>
|
||||
<label>Reset</label>
|
||||
<label>Scenario</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>scenario</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
-->
|
||||
<item>
|
||||
<label>Reset (Shift-Esc)</label>
|
||||
<binding>
|
||||
<command>reset</command>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<!-- <item>
|
||||
<label>Set Lat/Lon Format</label>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
var f = getprop(var d = "/sim/lon-lat-format") + 1;
|
||||
setprop(d, f < 0 ? 0 : f > 2 ? 0 : f);
|
||||
</script>
|
||||
</binding>
|
||||
</item>
|
||||
<label>High-Res Snapshot</label>
|
||||
<enabled>false</enabled>
|
||||
<binding>
|
||||
<command>hires-screen-capture</command>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
-->
|
||||
<item>
|
||||
<label>Snapshot</label>
|
||||
<label>Screenshot (F3)</label>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
gui.popdown();
|
||||
var success = fgcommand("screen-capture");
|
||||
var path = getprop("/sim/paths/screenshot-last");
|
||||
if (success)
|
||||
|
|
@ -48,14 +67,27 @@
|
|||
</script>
|
||||
</binding>
|
||||
</item>
|
||||
<!--
|
||||
<item>
|
||||
<label>Last snapshot</label>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
var path = getprop("/sim/paths/screenshot-last");
|
||||
if (path != nil) gui.popupTip(...) else gui.popupTip("no screenshots yet in this session")
|
||||
|
||||
gui.popupTip("Screenshot written to '" ~ path ~ "'");
|
||||
</script>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Print Screen</label>
|
||||
<label>Print Screen (F3)</label>
|
||||
<binding>
|
||||
<command>old-print-dialog</command>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
-->
|
||||
<item>
|
||||
<label>Sound Configuration</label>
|
||||
<binding>
|
||||
|
|
@ -65,23 +97,7 @@
|
|||
</item>
|
||||
|
||||
<item>
|
||||
<label>Browse Internal Properties</label>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>gui.property_browser()</script>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Logging</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>logging</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Quit</label>
|
||||
<label>Quit (Esc)</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>exit</dialog-name>
|
||||
|
|
@ -109,6 +125,16 @@
|
|||
</item>
|
||||
|
||||
<item>
|
||||
<!-- <item>
|
||||
<label>Set Lat/Lon Format</label>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
var f = getprop(var d = "/sim/lon-lat-format") + 1;
|
||||
setprop(d, f < 0 ? 0 : f > 2 ? 0 : f);
|
||||
</script>
|
||||
</binding>
|
||||
</item> -->
|
||||
<label>View Options</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
|
|
@ -124,6 +150,14 @@
|
|||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Adjust LOD Ranges</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>static-lod</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Adjust View Position</label>
|
||||
<binding>
|
||||
|
|
@ -141,28 +175,24 @@
|
|||
</item>
|
||||
|
||||
<item>
|
||||
<label>Instant Replay</label>
|
||||
<label>Toggle Glide Slope Tunnel</label>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
var p = "/sim/rendering/glide-slope-tunnel";
|
||||
setprop(p, var i = !getprop(p));
|
||||
gui.popupTip("Glide slope tunnel " ~ (i ? "enabled" : "disabled"));
|
||||
</script>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Instant Replay (Ctrl-R)</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>replay</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Adjust LOD Ranges</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>static-lod</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>OSG Display Settings</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>osg-display-settings</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
</menu>
|
||||
|
||||
<menu>
|
||||
|
|
@ -193,7 +223,7 @@
|
|||
</item>
|
||||
|
||||
<item>
|
||||
<label>Random Attitude</label>
|
||||
<label>Random Attitude</label>H
|
||||
<binding>
|
||||
<command>property-assign</command>
|
||||
<property>/sim/presets/trim</property>
|
||||
|
|
@ -234,7 +264,7 @@
|
|||
<name>autopilot</name>
|
||||
|
||||
<item>
|
||||
<label>Autopilot Settings</label>
|
||||
<label>Autopilot Settings (F11)</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>autopilot</dialog-name>
|
||||
|
|
@ -249,45 +279,42 @@
|
|||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<item>
|
||||
<label>Previous Waypoint</label>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>setprop("/autopilot/route-manager/input", "@previous")</script>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
|
||||
<item>
|
||||
<label>Next Waypoint</label>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>setprop("/autopilot/route-manager/input", "@next")</script>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Set Lat/Lon Format</label>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
var f = getprop(var d = "/sim/lon-lat-format") + 1;
|
||||
setprop(d, f < 0 ? 0 : f > 2 ? 0 : f);
|
||||
</script>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Map</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>map</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
</menu>
|
||||
|
||||
<menu>
|
||||
<label>Environment</label>
|
||||
|
||||
<item>
|
||||
<label>Weather Scenario</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>weather_scenario</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Weather Conditions</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>weather</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Global Weather</label>
|
||||
<binding>
|
||||
|
|
@ -296,30 +323,31 @@
|
|||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Local Weather</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>local_weather</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Local Weather Tiles</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>local_weather_tiles</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Time Settings</label>
|
||||
<item>
|
||||
<label>Local Weather</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>timeofday</dialog-name>
|
||||
<dialog-name>local_weather</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Local Weather Tiles</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>local_weather_tiles</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Local Weather Tiles</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>local_weather_tiles</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
|
||||
<item>
|
||||
<label>Wildfire Settings</label>
|
||||
<binding>
|
||||
|
|
@ -333,6 +361,22 @@
|
|||
<menu>
|
||||
<label>Equipment</label>
|
||||
|
||||
<item>
|
||||
<label>Map</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>map</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Stopwatch</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>stopwatch-dialog</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Fuel and Payload</label>
|
||||
<name>fuel-and-payload</name>
|
||||
|
|
@ -343,7 +387,7 @@
|
|||
</item>
|
||||
|
||||
<item>
|
||||
<label>Radio Settings</label>
|
||||
<label>Radio Settings (F12)</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>radios</dialog-name>
|
||||
|
|
@ -366,12 +410,10 @@
|
|||
</binding>
|
||||
</item>
|
||||
|
||||
|
||||
|
||||
<item>
|
||||
<label>Stopwatch</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>stopwatch-dialog</dialog-name>
|
||||
</binding>
|
||||
<label> --- Failures ---</label>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
|
|
@ -401,24 +443,25 @@
|
|||
|
||||
<menu>
|
||||
<label>ATC/AI</label>
|
||||
|
||||
<item>
|
||||
<label>Frequencies</label>
|
||||
<label>ATC Options</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>ai</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
<!-- Not working at present
|
||||
<item>
|
||||
<label>ATC Services in range</label>
|
||||
<binding>
|
||||
<command>ATC-freq-search</command>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Options</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>atc-ai</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
-->
|
||||
|
||||
<item>
|
||||
<label>Tanker</label>
|
||||
<label>AI Tanker</label>
|
||||
<name>tanker</name>
|
||||
<enabled>false</enabled>
|
||||
<binding>
|
||||
|
|
@ -428,20 +471,31 @@
|
|||
</item>
|
||||
|
||||
<item>
|
||||
<label>Scenario</label>
|
||||
<label>AI Carrier Options</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>AIcarrier</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>AI Scenario Select - takes effect on next run </label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>scenario</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
|
||||
|
||||
</menu>
|
||||
|
||||
<menu>
|
||||
<label>Network</label>
|
||||
<label>Multiplayer</label>
|
||||
<name>multiplayer</name>
|
||||
|
||||
<item>
|
||||
<label>Chat</label>
|
||||
<label>Chat Dialog</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>chat-full</dialog-name>
|
||||
|
|
@ -470,13 +524,15 @@
|
|||
<command>nasal</command>
|
||||
<script>
|
||||
if (contains(globals, "MPCarriers")) {
|
||||
MPCarriers.carrier_dialog.show();
|
||||
MPCarriers.carrier_dialog.show();
|
||||
} else {
|
||||
gui.popupTip("No MPCarriers around at the moment.");
|
||||
gui.popupTip("No MPCarriers around at the moment.");
|
||||
}
|
||||
</script>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
|
||||
</menu>
|
||||
|
||||
<menu>
|
||||
|
|
@ -513,13 +569,13 @@
|
|||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Reload Network</label>
|
||||
<binding>
|
||||
<command>reinit</command>
|
||||
<subsystem>io</subsystem>
|
||||
</binding>
|
||||
</item>
|
||||
<item>
|
||||
<label>Reload Network</label>
|
||||
<binding>
|
||||
<command>reinit</command>
|
||||
<subsystem>io</subsystem>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Nasal Console</label>
|
||||
|
|
@ -577,20 +633,42 @@
|
|||
<step type="int">1</step>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Browse Internal Properties</label>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>gui.property_browser()</script>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Logging</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>logging</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
|
||||
|
||||
|
||||
<item>
|
||||
<label>OSG Display Settings</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>osg-display-settings</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
</menu>
|
||||
|
||||
|
||||
<menu>
|
||||
<label>Help</label>
|
||||
|
||||
|
||||
<item>
|
||||
<label>About</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>about</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
<item>
|
||||
<label>Help</label>
|
||||
<label>Help (opens in browser)</label>
|
||||
<binding>
|
||||
<command>old-help-dialog</command>
|
||||
</binding>
|
||||
|
|
@ -606,7 +684,11 @@
|
|||
</item>
|
||||
|
||||
<item>
|
||||
<label>Basic Keys</label>
|
||||
<label> --- Key Reference ---</label>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>Basic Simulator Keys</label>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>gui.showHelpDialog("/sim/help/basic")</script>
|
||||
|
|
@ -622,7 +704,7 @@
|
|||
</item>
|
||||
|
||||
<item>
|
||||
<label>Aircraft Help</label>
|
||||
<label> Current Aircraft Keys (?)</label>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>gui.showHelpDialog("/sim/help")</script>
|
||||
|
|
@ -630,15 +712,7 @@
|
|||
</item>
|
||||
|
||||
<item>
|
||||
<label>Toggle Glide Slope Tunnel</label>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
var p = "/sim/rendering/glide-slope-tunnel";
|
||||
setprop(p, var i = !getprop(p));
|
||||
gui.popupTip("Glide slope tunnel " ~ (i ? "enabled" : "disabled"));
|
||||
</script>
|
||||
</binding>
|
||||
<label> ---------------------</label>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
|
|
@ -659,6 +733,14 @@
|
|||
<script>tutorial.stopTutorial()</script>
|
||||
</binding>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<label>About</label>
|
||||
<binding>
|
||||
<command>dialog-show</command>
|
||||
<dialog-name>about</dialog-name>
|
||||
</binding>
|
||||
</item>
|
||||
</menu>
|
||||
|
||||
</PropertyList>
|
||||
|
|
|
|||
|
|
@ -272,7 +272,7 @@ top down before the key bindings are parsed.
|
|||
|
||||
<key n="32">
|
||||
<name>SPACE</name>
|
||||
<desc>PTT - Push To Talk (via VoIP)</desc>
|
||||
<desc>PTT - Push To Talk (via FGCom)</desc>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>space(1, modifiers.getValue())</script>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue