fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'master' of gitorious.org:fg/fgdata

Browse source
This commit is contained in:
BARANGER Emmanuel 2013-05-17 00:57:18 +02:00
commit 847e49b3a5
15 changed files with 2360 additions and 2220 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
Aircraft/Instruments-3d/kx165/kx165-1.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<PropertyList>
<!--
@ -88,6 +88,52 @@
<object-name>Chassis</object-name>
</animation>
<animation>
<type>material</type>
<object-name>CommKnobs</object-name>
<object-name>CommKHz</object-name>
<object-name>CommMHz</object-name>
<object-name>CommToggle</object-name>
<object-name>CommVolume</object-name>
<object-name>CommStby</object-name>
<object-name>CommStby100K</object-name>
<object-name>CommStby100M</object-name>
<object-name>CommStby10K</object-name>
<object-name>CommStby10M</object-name>
<object-name>CommStby1M</object-name>
<object-name>CommStbyDot</object-name>
<object-name>CommUse</object-name>
<object-name>CommUse100K</object-name>
<object-name>CommUse100M</object-name>
<object-name>CommUse10K</object-name>
<object-name>CommUse10M</object-name>
<object-name>CommUse1M</object-name>
<object-name>CommUseDot</object-name>
<object-name>NavKnobs</object-name>
<object-name>NavKHz</object-name>
<object-name>NavMHz</object-name>
<object-name>NavToggle</object-name>
<object-name>NavVolume</object-name>
<object-name>NavStby</object-name>
<object-name>NavStby100K</object-name>
<object-name>NavStby100M</object-name>
<object-name>NavStby10K</object-name>
<object-name>NavStby10M</object-name>
<object-name>NavStby1M</object-name>
<object-name>NavStbyDot</object-name>
<object-name>NavUse</object-name>
<object-name>NavUse100K</object-name>
<object-name>NavUse100M</object-name>
<object-name>NavUse10K</object-name>
<object-name>NavUse10M</object-name>
<object-name>NavUse1M</object-name>
<object-name>NavUseDot</object-name>
<object-name>Chassis</object-name>
<property-base>/sim/instrumentation/comm[0]</property-base>
<texture-prop>texture-file</texture-prop>
</animation>
<animation>
<type>select</type>
<object-name>CommUse</object-name>

64
Aircraft/Instruments-3d/kx165/kx165-2.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<PropertyList>
<!--
@ -12,14 +12,14 @@
flightgear sessions
aircraft.data.add(
"instrumentation/comm[0]/volume",
"instrumentation/comm[0]/frequencies/selected-mhz",
"instrumentation/comm[0]/frequencies/standby-mhz",
"instrumentation/comm[0]/test-btn",
"instrumentation/nav[0]/audio-btn",
"instrumentation/nav[0]/power-btn",
"instrumentation/nav[0]/frequencies/selected-mhz",
"instrumentation/nav[0]/frequencies/standby-mhz",
"instrumentation/comm[1]/volume",
"instrumentation/comm[1]/frequencies/selected-mhz",
"instrumentation/comm[1]/frequencies/standby-mhz",
"instrumentation/comm[1]/test-btn",
"instrumentation/nav[1]/audio-btn",
"instrumentation/nav[1]/power-btn",
"instrumentation/nav[1]/frequencies/selected-mhz",
"instrumentation/nav[1]/frequencies/standby-mhz",
);
-->
@ -88,6 +88,52 @@
<object-name>Chassis</object-name>
</animation>
<animation>
<type>material</type>
<object-name>CommKnobs</object-name>
<object-name>CommKHz</object-name>
<object-name>CommMHz</object-name>
<object-name>CommToggle</object-name>
<object-name>CommVolume</object-name>
<object-name>CommStby</object-name>
<object-name>CommStby100K</object-name>
<object-name>CommStby100M</object-name>
<object-name>CommStby10K</object-name>
<object-name>CommStby10M</object-name>
<object-name>CommStby1M</object-name>
<object-name>CommStbyDot</object-name>
<object-name>CommUse</object-name>
<object-name>CommUse100K</object-name>
<object-name>CommUse100M</object-name>
<object-name>CommUse10K</object-name>
<object-name>CommUse10M</object-name>
<object-name>CommUse1M</object-name>
<object-name>CommUseDot</object-name>
<object-name>NavKnobs</object-name>
<object-name>NavKHz</object-name>
<object-name>NavMHz</object-name>
<object-name>NavToggle</object-name>
<object-name>NavVolume</object-name>
<object-name>NavStby</object-name>
<object-name>NavStby100K</object-name>
<object-name>NavStby100M</object-name>
<object-name>NavStby10K</object-name>
<object-name>NavStby10M</object-name>
<object-name>NavStby1M</object-name>
<object-name>NavStbyDot</object-name>
<object-name>NavUse</object-name>
<object-name>NavUse100K</object-name>
<object-name>NavUse100M</object-name>
<object-name>NavUse10K</object-name>
<object-name>NavUse10M</object-name>
<object-name>NavUse1M</object-name>
<object-name>NavUseDot</object-name>
<object-name>Chassis</object-name>
<property-base>/sim/instrumentation/comm[1]</property-base>
<texture-prop>texture-file</texture-prop>
</animation>
<animation>
<type>select</type>
<object-name>CommUse</object-name>

14
Effects/tree.eff
View file

@ -41,20 +41,17 @@
<and>
<property>/sim/rendering/shaders/skydome</property>
<property>/sim/rendering/random-vegetation</property>
<or>
<property>/sim/rendering/multi-sample-buffers</property>
<less-equal>
<value type="float">2.0</value>
<glversion/>
<value type="float">1.0</value>
<float-property>/sim/rendering/multi-samples</float-property>
</less-equal>
<and>
<extension-supported>GL_ARB_shader_objects</extension-supported>
<extension-supported>GL_ARB_shading_language_100</extension-supported>
<extension-supported>GL_ARB_vertex_shader</extension-supported>
<extension-supported>GL_ARB_fragment_shader</extension-supported>
<extension-supported>GL_ARB_multisample</extension-supported>
</and>
</or>
</and>
</predicate>
<pass>
@ -328,6 +325,11 @@
<predicate>
<and>
<property>/sim/rendering/random-vegetation</property>
<property>/sim/rendering/multi-sample-buffers</property>
<less-equal>
<value type="float">1.0</value>
<float-property>/sim/rendering/multi-samples</float-property>
</less-equal>
<extension-supported>GL_ARB_multisample</extension-supported>
<extension-supported>GL_ARB_vertex_shader</extension-supported>
<extension-supported>GL_ARB_fragment_shader</extension-supported>

28
Nasal/multiplayer.nas
View file

@ -160,10 +160,11 @@ var dialog = {
#
# "private"
var font = { name: "FIXED_8x13" };
me.header = ["chat", " callsign", "model", "brg", func dialog.dist_hdr, func dialog.alt_hdr ~ " ", "ignore" ~ " "];
me.header = ["chat", " callsign"," code"," model", " brg", func dialog.dist_hdr, func dialog.alt_hdr ~ " ", "ignore" ~ " "];
me.columns = [
{ type: "button", legend: "", halign: "right", callback: "multiplayer.compose_message", "pref-height": 14, "pref-width": 14},
{ type: "text", property: "callsign", format: " %s", label: "-----------", halign: "fill" },
{ type: "text", property: "id-code", format: " %s", label: "-----", halign: "fill" },
{ type: "text", property: "model-short", format: "%s", label: "--------------", halign: "fill" },
{ type: "text", property: "bearing-to", format: " %3.0f", label: "----", halign: "right", font: font },
{ type: "text", property: func dialog.dist_node, format:" %8.2f", label: "---------", halign: "right", font: font },
@ -279,7 +280,11 @@ var dialog = {
var z = n.getNode("position/global-z").getValue();
var ac = geo.Coord.new().set_xyz(x, y, z);
var distance = nil;
var idcode = "----";
idcode = me.IDCode(n.getNode("instrumentation/transponder/transmitted-id").getValue());
call(func distance = self.distance_to(ac), nil, var err = []);
if ((size(err))or(distance==nil)) {
# Oops, have errors. Bogus position data (and distance==nil).
if (me.cs_warnings[mp.callsign]!=1) {
@ -301,6 +306,7 @@ var dialog = {
"distance-to-nm": distance * M2NM,
"position/altitude-m": n.getNode("position/altitude-ft").getValue() * FT2M,
"controls/invisible": contains(ignore, mp.callsign),
"id-code": idcode
});
}
}
@ -364,6 +370,24 @@ var dialog = {
else
me.del();
},
IDCode: func(code){
var idcode= "----";
if (code != nil )
{
if (code < 0)
{
idcode = "----";
}
else
{
idcode = sprintf("%04d", code);
}
}
return idcode;
},
};
@ -373,7 +397,7 @@ var dialog = {
# "/sim/signals/multiplayer-updated" whenever an aircraft
# joined or left. Available data containers are:
#
# multiplayer.model.data: hash, key := /ai/models/* path
# multiplayer.model.data: hash, key := /ai/models/~ path
# multiplayer.model.callsign hash, key := callsign
# multiplayer.model.list vector, sorted alphabetically (ASCII, case insensitive)
#

BIN
Textures/Trees/coniferous.dds
View file

Binary file not shown.

BIN
Textures/Trees/coniferous.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 54 KiB

BIN
Textures/Trees/deciduous.dds
View file

Binary file not shown.

BIN
Textures/Trees/deciduous.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 65 KiB

After

Width:  |  Height:  |  Size: 63 KiB

BIN
Textures/Trees/mixed.dds
View file

Binary file not shown.

BIN
Textures/Trees/mixed.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 87 KiB

BIN
Textures/Trees/tropical-alt.dds
View file

Binary file not shown.

BIN
Textures/Trees/tropical-alt.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 75 KiB

After

Width:  |  Height:  |  Size: 81 KiB

BIN
Textures/Trees/tropical.dds
View file

Binary file not shown.

BIN
Textures/Trees/tropical.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 27 KiB

36
gui/dialogs/radios.xml
View file

@ -12,6 +12,18 @@
var modes = ['OFF', 'STANDBY', 'TEST', 'GROUND', 'ON', 'ALTITUDE'];
var v = getprop('/instrumentation/transponder/inputs/knob-mode');
setprop("/sim/gui/dialogs/radios/transponder-mode", modes[v]);
var poweroften = [1, 10, 100, 1000];
var idcode = getprop('/instrumentation/transponder/id-code');
if (idcode != nil)
{
for (var i = 0; i < 4 ; i = i+1)
{
setprop("/instrumentation/transponder/inputs/digit[" ~ i ~ "]", math.mod(idcode/poweroften[i], 10) );
}
}
]]>
</open>
</nasal>
@ -20,13 +32,17 @@
<group>
<layout>hbox</layout>
<empty><stretch>1</stretch></empty>
<empty>
<stretch>1</stretch>
</empty>
<text>
<label>Radio Frequencies</label>
</text>
<empty><stretch>1</stretch></empty>
<empty>
<stretch>1</stretch>
</empty>
<button>
<pref-width>16</pref-width>
@ -579,7 +595,8 @@
</binding>
</button>
</group> <!-- of TACAN group -->
</group>
<!-- of TACAN group -->
<!-- transponder controls -->
@ -668,7 +685,9 @@
</binding>
</combo>
<empty><stretch>true</stretch></empty>
<empty>
<stretch>true</stretch>
</empty>
<text>
@ -693,13 +712,15 @@
</binding>
<binding>
<command>nasal</command>
<script><![CDATA[
<script>
<![CDATA[
var v = getprop("/sim/gui/dialogs/radios/transponder-mode");
#var modes = ['OFF', 'STANDBY', 'TEST', 'GROUND', 'ON', 'ALTITUDE'];
var index=0;
for (; index<size(modes) and (v != modes[index]); index+=1) { }
setprop("/instrumentation/transponder/inputs/knob-mode", index);
]]></script>
]]>
</script>
</binding>
</combo>
@ -710,7 +731,8 @@
<command>dialog-apply</command>
</binding>
</button>
</group> <!-- Transponder group -->
</group>
<!-- Transponder group -->
<!-- bottom button box -->
<hrule/>