1
0
Fork 0

Glider Vario S3: improve model and texture (minor changes)

This commit is contained in:
Benedikt Wolf 2023-06-17 10:33:53 +02:00
parent 549507874b
commit 98cf650541
7 changed files with 8206 additions and 8540 deletions

View file

@ -1,4 +1,4 @@
# Copyright 2020 Benedikt Wolf
# Copyright 2020-2023 Benedikt Wolf
# with parts by Gilberto Agonstinho, WooT, Joshau Davidsonm, Colin Geniet
# This file is part of FlightGear.
#

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 213 KiB

After

Width:  |  Height:  |  Size: 84 KiB

View file

@ -5,7 +5,7 @@
Joshua Davidson (canvas basic structure from A320)
Colin Geniet (SoundPitchController)
#### Version 05/2020
#### Version 06/2023
-->
<PropertyList>
<name>S3</name>
@ -32,7 +32,7 @@
<!-- Main Knob -->
<animation>
<type>pick</type>
<object-name>main.knob</object-name>
<object-name>S3.main_knob</object-name>
<action>
<button>0</button>
<binding>
@ -91,7 +91,7 @@
</animation>
<animation>
<type>translate</type>
<object-name>main.knob</object-name>
<object-name>S3.main_knob</object-name>
<property>instrumentation/s3/knob-pushed</property>
<factor>-0.001</factor>
<axis>
@ -100,7 +100,7 @@
</animation>
<animation>
<type>rotate</type>
<object-name>main.knob</object-name>
<object-name>S3.main_knob</object-name>
<property>instrumentation/s3/knob</property>
<factor>5</factor>
<center>
@ -116,7 +116,7 @@
<!-- Vario needle -->
<animation>
<type>rotate</type>
<object-name>vario.needle</object-name>
<object-name>S3.vario_needle</object-name>
<property>instrumentation/s3/needle-deg</property>
<center>
<y-m>0.0</y-m>
@ -130,7 +130,7 @@
</animation>
<animation>
<type>rotate</type>
<object-name>vario.needle</object-name>
<object-name>S3.vario_needle</object-name>
<property>instrumentation/s3/start</property>
<interpolation>
<entry><ind> 0 </ind><dep> 0 </dep></entry>

View file

@ -2,147 +2,192 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg2"
version="1.1"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
inkscape:version="1.2.2 (1:1.2.2+202305151914+b0a8486541)"
width="1280"
height="1280"
viewBox="0 0 1280 1280"
sodipodi:docname="S3_img.svg"
inkscape:export-filename="/home/delta/Aircraft/Sky-sportster/Models/Interior/Panel/Instruments/S3/S3.png.png"
inkscape:export-filename="../S3.png"
inkscape:export-xdpi="72"
inkscape:export-ydpi="72">
<metadata
id="metadata8">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs6" />
<sodipodi:namedview
pagecolor="#575757"
inkscape:export-ydpi="72"
xml:space="preserve"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
id="metadata8"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
id="defs6"><linearGradient
inkscape:collect="always"
id="linearGradient1557"><stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop1553" /><stop
style="stop-color:#000000;stop-opacity:1;"
offset="0.87204063"
id="stop1561" /><stop
style="stop-color:#262626;stop-opacity:1;"
offset="1"
id="stop1555" /></linearGradient><radialGradient
inkscape:collect="always"
xlink:href="#linearGradient1557"
id="radialGradient1559"
cx="640"
cy="640"
fx="640"
fy="640"
r="640"
gradientUnits="userSpaceOnUse" /><radialGradient
inkscape:collect="always"
xlink:href="#linearGradient1454"
id="radialGradient1456"
cx="938.64685"
cy="81.843765"
fx="938.64685"
fy="81.843765"
r="79.524063"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-859.1228,-2.319703)" /><linearGradient
inkscape:collect="always"
id="linearGradient1454"><stop
style="stop-color:#404040;stop-opacity:1;"
offset="0"
id="stop1450" /><stop
style="stop-color:#0d0d0d;stop-opacity:1;"
offset="1"
id="stop1452" /></linearGradient><filter
inkscape:collect="always"
style="color-interpolation-filters:sRGB"
id="filter1557"
x="-0.11890103"
y="-0.11698172"
width="1.2378021"
height="1.2339634"><feGaussianBlur
inkscape:collect="always"
stdDeviation="2.1254046"
id="feGaussianBlur1559" /></filter></defs><sodipodi:namedview
pagecolor="#808080"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
inkscape:window-width="1600"
inkscape:window-height="1135"
inkscape:window-width="1680"
inkscape:window-height="977"
id="namedview4"
showgrid="false"
inkscape:zoom="0.184375"
inkscape:cx="-1043.6317"
inkscape:cy="270.50544"
inkscape:cx="802.71186"
inkscape:cy="1014.2373"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg2" />
<path
inkscape:current-layer="svg2"
inkscape:showpageshadow="2"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#575757" /><circle
style="opacity:1;fill:url(#radialGradient1559);stroke:none;stroke-width:4;fill-opacity:1"
id="path442"
cx="640"
cy="640"
r="640" /><rect
style="opacity:1;fill:#ff4a0d;fill-opacity:1;stroke:none;stroke-width:4"
id="rect1812"
width="270.26105"
height="117.60828"
x="1009.739"
y="0" /><rect
style="opacity:1;fill:#0d0d0d;fill-opacity:1;stroke:none;stroke-width:4.41825"
id="rect1710"
width="165.20248"
height="259.50241"
x="0"
y="1020.4976" /><path
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:17.33534622;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 181.25891,640.88497 -123.626588,0"
id="path4238"
inkscape:connector-curvature="0"
inkscape:transform-center-x="519.69059"
inkscape:transform-center-y="2.0338983" />
<circle
inkscape:transform-center-y="2.0338983" /><circle
style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="path4240"
cx="639.23395"
cy="638.41144"
r="9.4285431" />
<circle
r="9.4285431" /><circle
r="607.04761"
cy="641.76721"
cx="639.23395"
id="circle4244"
style="display:none;opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2.95066071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
style="display:none;opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2.95066071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /><path
inkscape:transform-center-y="-209.51915"
inkscape:transform-center-x="475.58824"
inkscape:connector-curvature="0"
id="path4258"
d="M 220.01722,454.47366 107.07871,404.19019"
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:17.33534622;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:17.33534622;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:17.33534622;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 331.24501,299.94288 248.52268,208.07041"
id="path4260"
inkscape:connector-curvature="0"
inkscape:transform-center-x="349.25236"
inkscape:transform-center-y="-384.84443" />
<path
inkscape:transform-center-y="-384.84443" /><path
inkscape:transform-center-y="-493.62661"
inkscape:transform-center-x="162.52758"
inkscape:connector-curvature="0"
id="path4262"
d="M 495.70998,204.0124 457.50728,86.436521"
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:17.33534622;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:17.33534622;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:17.33534622;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 684.97465,183.26947 697.89717,60.320127"
id="path4264"
inkscape:connector-curvature="0"
inkscape:transform-center-x="-52.2997"
inkscape:transform-center-y="-517.05627" />
<path
inkscape:transform-center-y="-517.05627" /><path
inkscape:transform-center-y="-451.0822"
inkscape:transform-center-x="-258.08389"
inkscape:connector-curvature="0"
id="path4266"
d="M 866.31344,241.30074 928.12675,134.23699"
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:17.33534622;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:17.33534622;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
inkscape:transform-center-y="213.23526"
inkscape:transform-center-x="473.93372"
inkscape:connector-curvature="0"
id="path4268"
d="m 221.67174,826.9446 -112.9385,50.28347"
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:17.33534622;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:17.33534622;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:17.33534622;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 334.26797,980.48116 -82.72233,91.87244"
id="path4270"
inkscape:connector-curvature="0"
inkscape:transform-center-x="346.22941"
inkscape:transform-center-y="387.56631" />
<path
inkscape:transform-center-y="387.56631" /><path
inkscape:transform-center-y="494.88363"
inkscape:transform-center-x="158.65888"
inkscape:connector-curvature="0"
id="path4272"
d="m 499.57869,1074.9468 -38.20272,117.5758"
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:17.33534622;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:17.33534622;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:17.33534622;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 689.02018,1094.0075 12.92247,122.9493"
id="path4274"
inkscape:connector-curvature="0"
inkscape:transform-center-x="-56.345205"
inkscape:transform-center-y="516.63108" />
<path
inkscape:transform-center-y="516.63108" /><path
inkscape:transform-center-y="449.04833"
inkscape:transform-center-x="-261.6067"
inkscape:connector-curvature="0"
id="path4276"
d="m 869.83628,1034.3675 61.81325,107.0638"
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:17.33534622;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<text
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:17.33534622;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="207.05858"
@ -152,8 +197,7 @@
id="tspan4280"
x="207.05858"
y="686.51581"
style="font-size:113.73278809px;line-height:1.25">0</tspan></text>
<text
style="font-size:113.733px;line-height:1.25">0</tspan></text><text
id="text4282"
y="500.5162"
x="241.56371"
@ -163,8 +207,7 @@
x="241.56371"
id="tspan4284"
sodipodi:role="line"
style="font-size:93.33547211px;line-height:1.25">1</tspan></text>
<text
style="font-size:93.3355px;line-height:1.25">1</tspan></text><text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="341.66678"
@ -174,8 +217,7 @@
id="tspan4288"
x="341.66678"
y="363.30704"
style="font-size:104.0231781px;line-height:1.25">2</tspan></text>
<text
style="font-size:104.023px;line-height:1.25">2</tspan></text><text
id="text4294"
y="286.39609"
x="496.92099"
@ -185,8 +227,7 @@
x="496.92099"
id="tspan4296"
sodipodi:role="line"
style="font-size:104.0231781px;line-height:1.25">3</tspan></text>
<text
style="font-size:104.023px;line-height:1.25">3</tspan></text><text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="666.41254"
@ -196,8 +237,7 @@
id="tspan4300"
x="666.41254"
y="267.69382"
style="font-size:104.0231781px;line-height:1.25">4</tspan></text>
<text
style="font-size:104.023px;line-height:1.25">4</tspan></text><text
id="text4302"
y="280.95236"
x="800.73792"
@ -207,8 +247,7 @@
x="800.73792"
id="tspan4304"
sodipodi:role="line"
style="font-size:104.0231781px;line-height:1.25">5</tspan></text>
<text
style="font-size:104.023px;line-height:1.25">5</tspan></text><text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="241.56371"
@ -218,8 +257,7 @@
id="tspan4308"
x="241.56371"
y="847.63483"
style="font-size:93.33547211px;line-height:1.25">1</tspan></text>
<text
style="font-size:93.3355px;line-height:1.25">1</tspan></text><text
id="text4310"
y="989.74774"
x="341.66678"
@ -229,8 +267,7 @@
x="341.66678"
id="tspan4312"
sodipodi:role="line"
style="font-size:104.0231781px;line-height:1.25">2</tspan></text>
<text
style="font-size:104.023px;line-height:1.25">2</tspan></text><text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="496.92099"
@ -240,8 +277,7 @@
id="tspan4316"
x="496.92099"
y="1059.5782"
style="font-size:104.0231781px;line-height:1.25">3</tspan></text>
<text
style="font-size:104.023px;line-height:1.25">3</tspan></text><text
id="text4318"
y="1078.8138"
x="666.41254"
@ -251,8 +287,7 @@
x="666.41254"
id="tspan4320"
sodipodi:role="line"
style="font-size:104.0231781px;line-height:1.25">4</tspan></text>
<text
style="font-size:104.023px;line-height:1.25">4</tspan></text><text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="800.73792"
@ -262,5 +297,22 @@
id="tspan4324"
x="800.73792"
y="1057.9696"
style="font-size:104.0231781px;line-height:1.25">5</tspan></text>
</svg>
style="font-size:104.023px;line-height:1.25">5</tspan></text><g
id="g2889"
transform="scale(1.3301434)"><path
style="fill:url(#radialGradient1456);fill-opacity:1;fill-rule:evenodd;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:2.1"
id="path1448"
sodipodi:type="arc"
sodipodi:cx="79.524063"
sodipodi:cy="79.524063"
sodipodi:rx="79.524063"
sodipodi:ry="79.524063"
sodipodi:start="2.3533845"
sodipodi:end="2.3533671"
sodipodi:open="true"
sodipodi:arc-type="arc"
d="M 23.450292,135.91386 A 79.524063,79.524063 0 0 1 23.134026,23.450537 79.524063,79.524063 0 0 1 135.59734,23.133782 79.524063,79.524063 0 0 1 135.91459,135.5971 79.524063,79.524063 0 0 1 23.451273,135.91483" /><path
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter1557)"
d="m 58.094239,84.700667 c -0.99654,-5.17661 1.51907,-8.46989 4.45497,-11.74608 2.93589,-3.27618 3.39157,-9.93003 5.77968,-11.10292 2.38811,-1.1729 5.02555,-4.3085 8.77347,-4.09829 3.74792,0.2102 7.25004,1.61212 9.083597,4.90935 1.83355,3.29724 5.19005,2.87577 7.46945,3.8279 2.2794,0.95213 4.6048,2.30444 5.29401,5.39706 0.68921,3.09262 2.965334,9.08765 1.114354,11.53363 -1.850994,2.44599 -4.980034,2.45703 -6.207814,5.50467 -1.22779,3.04763 -1.38154,5.61531 -1.55164,7.54372 -0.17009,1.92841 -5.99609,3.806003 -9.388177,4.055463 -3.39209,0.24945 -8.29971,2.14324 -9.91889,-0.832543 -1.61919,-2.97578 -0.0286,-5.27996 -4.11703,-5.78894 -4.08841,-0.50899 -4.90278,0.21578 -7.1325,-2.38081 -2.22973,-2.5966 -3.65348,-6.82221 -3.65348,-6.82221 z"
id="path1555"
transform="matrix(1.5750208,0,0,1.5750208,-45.612309,-45.740447)" /></g></svg>

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 17 KiB