Menu
▾
▴
[Flightgear-fgaddon-commitlogs] r11953 - trunk/Aircraft/F4F-Wildcat: Grumman F4F Wildcat : Improved multiplayer rendering.
|
From: <fli...@li...> - 2025-05-05 21:43:02
|
Revision: 11953
http://sourceforge.net/p/flightgear/fgaddon/11953
Author: helijah
Date: 2025-05-01 21:22:22 +0000 (Thu, 01 May 2025)
Log Message:
-----------
Grumman F4F Wildcat : Improved multiplayer rendering. Added AI version.
Modified Paths:
--------------
trunk/Aircraft/F4F-Wildcat/Models/Effects/Weapons/release.xml
trunk/Aircraft/F4F-Wildcat/Models/Interior/Panel/Instruments/revi/revi.ac
trunk/Aircraft/F4F-Wildcat/Read-Me.txt
trunk/Aircraft/F4F-Wildcat/Systems/engines.xml
trunk/Aircraft/F4F-Wildcat/Systems/f4f-base.xml
trunk/Aircraft/F4F-Wildcat/Systems/f4f-keyboard.xml
trunk/Aircraft/F4F-Wildcat/Systems/gears.xml
trunk/Aircraft/F4F-Wildcat/Systems/help.xml
trunk/Aircraft/F4F-Wildcat/Systems/views.xml
trunk/Aircraft/F4F-Wildcat/f4f-set.xml
Modified: trunk/Aircraft/F4F-Wildcat/Models/Effects/Weapons/release.xml
===================================================================
--- trunk/Aircraft/F4F-Wildcat/Models/Effects/Weapons/release.xml 2025-05-01 12:03:20 UTC (rev 11952)
+++ trunk/Aircraft/F4F-Wildcat/Models/Effects/Weapons/release.xml 2025-05-01 21:22:22 UTC (rev 11953)
@@ -7,48 +7,40 @@
<!-- <trigger>controls/armament/trigger</trigger> -->
<trigger>sim/multiplay/generic/int[10]</trigger>
<speed>2755.9</speed>
+ <cd>0.193</cd>
+ <eda>0.00338158219</eda>
+ <weight>0.286600941</weight>
+ <life>40</life>
<repeat>true</repeat>
- <delay>0.21</delay>
- <count>-1</count>
- <life>20</life>
+ <delay>0.41</delay>
+ <count>-1</count> <!-- -1 = infini -->
<wind>false</wind>
- <weight>0.13007235</weight>
- <cd>0.193</cd>
- <eda>0.00571198</eda>
- <fuse-range>0</fuse-range>
<collision>true</collision>
- <collision-report>sim/ai/aircraft/collision/gun</collision-report>
- <expiry>true</expiry>
<impact>true</impact>
+ <collision-report>sim/ai/aircraft/collision/cannon</collision-report>
<impact-reports>ai/models/model-impact</impact-reports>
<submodel-path>Aircraft/F4F-Wildcat/Models/Effects/Weapons/guns/12mm/12mm-submodel.xml</submodel-path>
- <yaw-offset>0</yaw-offset>
- <pitch-offset>0.1</pitch-offset>
</cannon>
<!-- Left exterior -->
<submodel>
- <name>Exterior left gun</name>
+ <name>cannon Exterior left</name>
<model alias="../../cannon/model"/>
<trigger alias="../../cannon/trigger"/>
<speed alias="../../cannon/speed"/>
+ <cd alias="../../cannon/cd"/>
+ <eda alias="../../cannon/eda"/>
+ <weight alias="../../cannon/weight"/>
+ <life alias="../../cannon/life"/>
<repeat alias="../../cannon/repeat"/>
<delay alias="../../cannon/delay"/>
<count alias="../../cannon/count"/>
- <life alias="../../cannon/life"/>
<wind alias="../../cannon/wind"/>
- <weight alias="../../cannon/weight"/>
- <cd alias="../../cannon/cd"/>
- <eda alias="../../cannon/eda"/>
- <fuse-range alias="../../cannon/fuse-range"/>
<collision alias="../../cannon/collision"/>
+ <impact alias="../../cannon/impact"/>
<collision-report alias="../../cannon/collision-report"/>
- <expiry alias="../../cannon/expiry"/>
- <impact alias="../../cannon/impact"/>
<impact-reports alias="../../cannon/impact-reports"/>
<submodel-path alias="../../cannon/submodel-path"/>
- <yaw-offset alias="../../cannon/yaw-offset"/>
- <pitch-offset alias="../../cannon/pitch-offset"/>
<offsets>
<x-m> -2.29198 </x-m>
<y-m> -3.06363 </y-m>
@@ -58,27 +50,23 @@
<!-- Left center -->
<submodel>
- <name>Center left gun</name>
+ <name>cannon Center left</name>
<model alias="../../cannon/model"/>
<trigger alias="../../cannon/trigger"/>
<speed alias="../../cannon/speed"/>
+ <cd alias="../../cannon/cd"/>
+ <eda alias="../../cannon/eda"/>
+ <weight alias="../../cannon/weight"/>
+ <life alias="../../cannon/life"/>
<repeat alias="../../cannon/repeat"/>
<delay alias="../../cannon/delay"/>
<count alias="../../cannon/count"/>
- <life alias="../../cannon/life"/>
<wind alias="../../cannon/wind"/>
- <weight alias="../../cannon/weight"/>
- <cd alias="../../cannon/cd"/>
- <eda alias="../../cannon/eda"/>
- <fuse-range alias="../../cannon/fuse-range"/>
<collision alias="../../cannon/collision"/>
+ <impact alias="../../cannon/impact"/>
<collision-report alias="../../cannon/collision-report"/>
- <expiry alias="../../cannon/expiry"/>
- <impact alias="../../cannon/impact"/>
<impact-reports alias="../../cannon/impact-reports"/>
<submodel-path alias="../../cannon/submodel-path"/>
- <yaw-offset alias="../../cannon/yaw-offset"/>
- <pitch-offset alias="../../cannon/pitch-offset"/>
<offsets>
<x-m> -2.33442 </x-m>
<y-m> -2.17166 </y-m>
@@ -88,27 +76,23 @@
<!-- Left interior -->
<submodel>
- <name>Interior left gun</name>
+ <name>cannon Interior left</name>
<model alias="../../cannon/model"/>
<trigger alias="../../cannon/trigger"/>
<speed alias="../../cannon/speed"/>
+ <cd alias="../../cannon/cd"/>
+ <eda alias="../../cannon/eda"/>
+ <weight alias="../../cannon/weight"/>
+ <life alias="../../cannon/life"/>
<repeat alias="../../cannon/repeat"/>
<delay alias="../../cannon/delay"/>
<count alias="../../cannon/count"/>
- <life alias="../../cannon/life"/>
<wind alias="../../cannon/wind"/>
- <weight alias="../../cannon/weight"/>
- <cd alias="../../cannon/cd"/>
- <eda alias="../../cannon/eda"/>
- <fuse-range alias="../../cannon/fuse-range"/>
<collision alias="../../cannon/collision"/>
+ <impact alias="../../cannon/impact"/>
<collision-report alias="../../cannon/collision-report"/>
- <expiry alias="../../cannon/expiry"/>
- <impact alias="../../cannon/impact"/>
<impact-reports alias="../../cannon/impact-reports"/>
<submodel-path alias="../../cannon/submodel-path"/>
- <yaw-offset alias="../../cannon/yaw-offset"/>
- <pitch-offset alias="../../cannon/pitch-offset"/>
<offsets>
<x-m> -2.34212 </x-m>
<y-m> -1.97448 </y-m>
@@ -118,27 +102,23 @@
<!-- Right interior -->
<submodel>
- <name>Interior right gun</name>
+ <name>cannon Interior right</name>
<model alias="../../cannon/model"/>
<trigger alias="../../cannon/trigger"/>
<speed alias="../../cannon/speed"/>
+ <cd alias="../../cannon/cd"/>
+ <eda alias="../../cannon/eda"/>
+ <weight alias="../../cannon/weight"/>
+ <life alias="../../cannon/life"/>
<repeat alias="../../cannon/repeat"/>
<delay alias="../../cannon/delay"/>
<count alias="../../cannon/count"/>
- <life alias="../../cannon/life"/>
<wind alias="../../cannon/wind"/>
- <weight alias="../../cannon/weight"/>
- <cd alias="../../cannon/cd"/>
- <eda alias="../../cannon/eda"/>
- <fuse-range alias="../../cannon/fuse-range"/>
<collision alias="../../cannon/collision"/>
+ <impact alias="../../cannon/impact"/>
<collision-report alias="../../cannon/collision-report"/>
- <expiry alias="../../cannon/expiry"/>
- <impact alias="../../cannon/impact"/>
<impact-reports alias="../../cannon/impact-reports"/>
<submodel-path alias="../../cannon/submodel-path"/>
- <yaw-offset alias="../../cannon/yaw-offset"/>
- <pitch-offset alias="../../cannon/pitch-offset"/>
<offsets>
<x-m> -2.34212 </x-m>
<y-m> 1.97448 </y-m>
@@ -148,27 +128,23 @@
<!-- Right center -->
<submodel>
- <name>center right gun</name>
+ <name>cannon center right</name>
<model alias="../../cannon/model"/>
<trigger alias="../../cannon/trigger"/>
<speed alias="../../cannon/speed"/>
+ <cd alias="../../cannon/cd"/>
+ <eda alias="../../cannon/eda"/>
+ <weight alias="../../cannon/weight"/>
+ <life alias="../../cannon/life"/>
<repeat alias="../../cannon/repeat"/>
<delay alias="../../cannon/delay"/>
<count alias="../../cannon/count"/>
- <life alias="../../cannon/life"/>
<wind alias="../../cannon/wind"/>
- <weight alias="../../cannon/weight"/>
- <cd alias="../../cannon/cd"/>
- <eda alias="../../cannon/eda"/>
- <fuse-range alias="../../cannon/fuse-range"/>
<collision alias="../../cannon/collision"/>
+ <impact alias="../../cannon/impact"/>
<collision-report alias="../../cannon/collision-report"/>
- <expiry alias="../../cannon/expiry"/>
- <impact alias="../../cannon/impact"/>
<impact-reports alias="../../cannon/impact-reports"/>
<submodel-path alias="../../cannon/submodel-path"/>
- <yaw-offset alias="../../cannon/yaw-offset"/>
- <pitch-offset alias="../../cannon/pitch-offset"/>
<offsets>
<x-m> -2.33442 </x-m>
<y-m> 2.17166 </y-m>
@@ -178,27 +154,23 @@
<!-- Right exterior -->
<submodel>
- <name>Exterior right gun</name>
+ <name>cannon Exterior right</name>
<model alias="../../cannon/model"/>
<trigger alias="../../cannon/trigger"/>
<speed alias="../../cannon/speed"/>
+ <cd alias="../../cannon/cd"/>
+ <eda alias="../../cannon/eda"/>
+ <weight alias="../../cannon/weight"/>
+ <life alias="../../cannon/life"/>
<repeat alias="../../cannon/repeat"/>
<delay alias="../../cannon/delay"/>
<count alias="../../cannon/count"/>
- <life alias="../../cannon/life"/>
<wind alias="../../cannon/wind"/>
- <weight alias="../../cannon/weight"/>
- <cd alias="../../cannon/cd"/>
- <eda alias="../../cannon/eda"/>
- <fuse-range alias="../../cannon/fuse-range"/>
<collision alias="../../cannon/collision"/>
+ <impact alias="../../cannon/impact"/>
<collision-report alias="../../cannon/collision-report"/>
- <expiry alias="../../cannon/expiry"/>
- <impact alias="../../cannon/impact"/>
<impact-reports alias="../../cannon/impact-reports"/>
<submodel-path alias="../../cannon/submodel-path"/>
- <yaw-offset alias="../../cannon/yaw-offset"/>
- <pitch-offset alias="../../cannon/pitch-offset"/>
<offsets>
<x-m> -2.29198 </x-m>
<y-m> 3.06363 </y-m>
Modified: trunk/Aircraft/F4F-Wildcat/Models/Interior/Panel/Instruments/revi/revi.ac
===================================================================
--- trunk/Aircraft/F4F-Wildcat/Models/Interior/Panel/Instruments/revi/revi.ac 2025-05-01 12:03:20 UTC (rev 11952)
+++ trunk/Aircraft/F4F-Wildcat/Models/Interior/Panel/Instruments/revi/revi.ac 2025-05-01 21:22:22 UTC (rev 11953)
@@ -1,6 +1,6 @@
AC3Db
MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
-MATERIAL "transparent" rgb 1 1 1 amb 0.5 0.5 0.5 emis 0 0 0 spec 1 1 1 shi 64 trans 0.85
+MATERIAL "transparent" rgb 1 1 1 amb 0.5 0.5 0.5 emis 0 0 0 spec 1 1 1 shi 64 trans 0.7
OBJECT world
kids 13
OBJECT poly
@@ -6795,7 +6795,7 @@
kids 0
OBJECT poly
name "crosshair"
-loc 0.031038 0.148772 -0
+loc 0.01639 0.136619 -0
data 9
crosshair
texture "revi.png"
Modified: trunk/Aircraft/F4F-Wildcat/Read-Me.txt
===================================================================
--- trunk/Aircraft/F4F-Wildcat/Read-Me.txt 2025-05-01 12:03:20 UTC (rev 11952)
+++ trunk/Aircraft/F4F-Wildcat/Read-Me.txt 2025-05-01 21:22:22 UTC (rev 11953)
@@ -38,6 +38,7 @@
March, 14, 2025
March, 21, 2025
March, 24, 2025
+May, 01, 2025
http://helijah.free.fr/flightgear/hangar.htm
http://embaranger.free.fr
@@ -83,6 +84,7 @@
14 Mars 2025
21 Mars 2025
24 Mars 2025
+01 Mai 2025
http://helijah.free.fr/flightgear/hangar.htm
http://embaranger.free.fr
Modified: trunk/Aircraft/F4F-Wildcat/Systems/engines.xml
===================================================================
--- trunk/Aircraft/F4F-Wildcat/Systems/engines.xml 2025-05-01 12:03:20 UTC (rev 11952)
+++ trunk/Aircraft/F4F-Wildcat/Systems/engines.xml 2025-05-01 21:22:22 UTC (rev 11953)
@@ -6,7 +6,6 @@
<engine-num type="int">0</engine-num>
<rpm type="float">0</rpm>
<running type="bool">false</running>
- <on-fire >0</on-fire>
</engine>
</PropertyList>
Modified: trunk/Aircraft/F4F-Wildcat/Systems/f4f-base.xml
===================================================================
--- trunk/Aircraft/F4F-Wildcat/Systems/f4f-base.xml 2025-05-01 12:03:20 UTC (rev 11952)
+++ trunk/Aircraft/F4F-Wildcat/Systems/f4f-base.xml 2025-05-01 21:22:22 UTC (rev 11953)
@@ -47,8 +47,7 @@
<int n="4" type="int">0</int>
<int n="5" type="int">0</int>
<!-- -->
- <bool n="0" alias="/sim/model/show-yoke"/>
- <bool n="1" alias="/sim/model/zkv1000"/>
+ <bool n="0" alias="/controls/armament/master-arm"/>
<bool n="2" alias="/sim/rendering/hdr/hdr-enabled"/>
<bool n="3" alias="/gear/gear[0]/wow"/>
<bool n="4" alias="/gear/gear[1]/wow"/>
Modified: trunk/Aircraft/F4F-Wildcat/Systems/f4f-keyboard.xml
===================================================================
--- trunk/Aircraft/F4F-Wildcat/Systems/f4f-keyboard.xml 2025-05-01 12:03:20 UTC (rev 11952)
+++ trunk/Aircraft/F4F-Wildcat/Systems/f4f-keyboard.xml 2025-05-01 21:22:22 UTC (rev 11953)
@@ -13,16 +13,36 @@
</binding>
</key>
+ <key n="114">
+ <name>r</name>
+ <desc>Masterarm</desc>
+ <binding>
+ <command>property-toggle</command>
+ <!-- <property>controls/armament/master-arm</property> -->
+ <property>sim/multiplay/generic/bool[0]</property>
+ </binding>
+ <binding>
+ <command>nasal</command>
+ <script>
+ screen.log.write("Master-arm "~(getprop("sim/multiplay/generic/bool[0]")==0?"OFF":"ON"), 0.5, 0.5, 1);
+ </script>
+ </binding>
+ </key>
+
<key n="101">
<name>e</name>
<desc>Guns</desc>
<binding>
<condition>
- <equals>
- <!-- <property>sim/model/door-positions/wings/position-norm</property> -->
- <property>sim/multiplay/generic/float[1]</property>
- <value>0</value>
- </equals>
+ <and>
+ <equals>
+ <!-- <property>sim/model/door-positions/wings/position-norm</property> -->
+ <property>sim/multiplay/generic/float[1]</property>
+ <value>0</value>
+ </equals>
+ <!-- <property>controls/armament/master-arm</property> -->
+ <property>sim/multiplay/generic/bool[0]</property>
+ </and>
</condition>
<command>property-assign</command>
<!-- <property>controls/armament/trigger</property> -->
@@ -59,6 +79,24 @@
</binding>
</key>
+ <key n="108">
+ <name>l</name>
+ <desc>REVI pos</desc>
+ <binding>
+ <command>property-cycle</command>
+ <property>controls/armament/revi/position-norm</property>
+ <value> 0.0 </value>
+ <value> 0.1 </value>
+ <value> 0.2 </value>
+ <value> 0.3 </value>
+ <value> 0.5 </value>
+ <value> 0.7 </value>
+ <value> 0.8 </value>
+ <value> 0.9 </value>
+ <value> 1.0 </value>
+ </binding>
+ </key>
+
<key n="70">
<name>F</name>
<desc>Close cowl flaps</desc>
Modified: trunk/Aircraft/F4F-Wildcat/Systems/gears.xml
===================================================================
--- trunk/Aircraft/F4F-Wildcat/Systems/gears.xml 2025-05-01 12:03:20 UTC (rev 11952)
+++ trunk/Aircraft/F4F-Wildcat/Systems/gears.xml 2025-05-01 21:22:22 UTC (rev 11953)
@@ -3,7 +3,7 @@
<PropertyList>
<!-- Thanks to OO ZVY for this work -->
- <toe-left>-0.035</toe-left>
- <toe-right>0.035</toe-right>
+ <toe-left> -0.035 </toe-left>
+ <toe-right> 0.035 </toe-right>
</PropertyList>
Modified: trunk/Aircraft/F4F-Wildcat/Systems/help.xml
===================================================================
--- trunk/Aircraft/F4F-Wildcat/Systems/help.xml 2025-05-01 12:03:20 UTC (rev 11952)
+++ trunk/Aircraft/F4F-Wildcat/Systems/help.xml 2025-05-01 21:22:22 UTC (rev 11953)
@@ -21,6 +21,18 @@
<desc>Close cowl flaps</desc>
</key>
<key>
+ <name>r</name>
+ <desc>Masterarm ON/OFF</desc>
+ </key>
+ <key>
+ <name>l</name>
+ <desc>Revi pos</desc>
+ </key>
+ <key>
+ <name>e</name>
+ <desc>Guns fire</desc>
+ </key>
+ <key>
<name>w</name>
<desc>Open/Close wings</desc>
</key>
@@ -29,7 +41,7 @@
<desc>Hook up/down</desc>
</key>
<key>
- <name>shift q (Q)</name>
+ <name>shift+q (Q)</name>
<desc>Reset view</desc>
</key>
Modified: trunk/Aircraft/F4F-Wildcat/Systems/views.xml
===================================================================
--- trunk/Aircraft/F4F-Wildcat/Systems/views.xml 2025-05-01 12:03:20 UTC (rev 11952)
+++ trunk/Aircraft/F4F-Wildcat/Systems/views.xml 2025-05-01 21:22:22 UTC (rev 11953)
@@ -16,7 +16,7 @@
<z-offset-m archive="y"> 9.227 </z-offset-m> <!--Back-->
<ground-level-nearplane-m type="double">0.01f</ground-level-nearplane-m>
<default-field-of-view-deg type="double">30</default-field-of-view-deg>
- <pitch-offset-deg>-5</pitch-offset-deg>
+ <pitch-offset-deg type="double">-5</pitch-offset-deg>
</config>
</view>
Modified: trunk/Aircraft/F4F-Wildcat/f4f-set.xml
===================================================================
--- trunk/Aircraft/F4F-Wildcat/f4f-set.xml 2025-05-01 12:03:20 UTC (rev 11952)
+++ trunk/Aircraft/F4F-Wildcat/f4f-set.xml 2025-05-01 21:22:22 UTC (rev 11953)
@@ -17,7 +17,7 @@
</author>
</authors>
- <aircraft-version>0.6</aircraft-version>
+ <aircraft-version>0.7</aircraft-version>
<status>Alpha</status>
<minimum-fg-version>2018.2.0</minimum-fg-version>
|
