|
From: <fli...@li...> - 2020-06-12 19:37:56
|
Revision: 4947
http://sourceforge.net/p/flightgear/fgaddon/4947
Author: wlbragg
Date: 2020-06-12 19:37:48 +0000 (Fri, 12 Jun 2020)
Log Message:
-----------
J3Cub: Correct MP aerotow, fix effects path, floats variant seaport location option
Modified Paths:
--------------
trunk/Aircraft/J3Cub/J3Cub-float-set.xml
trunk/Aircraft/J3Cub/J3Cub-keyboard.xml
trunk/Aircraft/J3Cub/J3Cub-main.xml
trunk/Aircraft/J3Cub/J3Cub.xml
trunk/Aircraft/J3Cub/Models/Interior/alt/alt.xml
trunk/Aircraft/J3Cub/Models/Interior/asi/asi.xml
trunk/Aircraft/J3Cub/Models/Interior/compass/compass.xml
trunk/Aircraft/J3Cub/Models/Interior/oil/oil.xml
trunk/Aircraft/J3Cub/Models/Interior/slip/slip.xml
trunk/Aircraft/J3Cub/Models/Interior/tach/tach.xml
trunk/Aircraft/J3Cub/Models/J3Cub.ac
trunk/Aircraft/J3Cub/PA-18-float-set.xml
Modified: trunk/Aircraft/J3Cub/J3Cub-float-set.xml
===================================================================
--- trunk/Aircraft/J3Cub/J3Cub-float-set.xml 2020-06-11 16:21:29 UTC (rev 4946)
+++ trunk/Aircraft/J3Cub/J3Cub-float-set.xml 2020-06-12 19:37:48 UTC (rev 4947)
@@ -11,6 +11,7 @@
<sim>
<variant-of>J3Cub</variant-of>
<description>Piper J-3 Cub (95hp) Float (JSBSim)</description>
+ <type type="string">seaplane</type>
<previews>
<preview>
<type>exterior</type>
Modified: trunk/Aircraft/J3Cub/J3Cub-keyboard.xml
===================================================================
--- trunk/Aircraft/J3Cub/J3Cub-keyboard.xml 2020-06-11 16:21:29 UTC (rev 4946)
+++ trunk/Aircraft/J3Cub/J3Cub-keyboard.xml 2020-06-12 19:37:48 UTC (rev 4947)
@@ -20,10 +20,14 @@
<key n="79">
<name>O</name>
<desc>Open aerotow hook</desc>
- <binding>
+ <!--binding>
<command>property-assign</command>
<property>/sim/hitches/aerotow/open</property>
<value type="bool">true</value>
+ </binding-->
+ <binding>
+ <command>nasal</command>
+ <script>towing.releaseHitch("aerotow")</script>
</binding>
</key>
Modified: trunk/Aircraft/J3Cub/J3Cub-main.xml
===================================================================
--- trunk/Aircraft/J3Cub/J3Cub-main.xml 2020-06-11 16:21:29 UTC (rev 4946)
+++ trunk/Aircraft/J3Cub/J3Cub-main.xml 2020-06-12 19:37:48 UTC (rev 4947)
@@ -418,28 +418,13 @@
</view>
<hitches>
- <!-- make sure some properties do exist, when the list for multiplayer transfer is defined-->
- <!-- they need to be in the same value, as they are initilized in the FDM, to get the same values after reset
- should fix this somehow-->
<aerotow>
- <tow>
- <length type="float">60</length>
- <elastic-constant type="float">10000</elastic-constant>
- <weight-per-m-kg-m type="float">1</weight-per-m-kg-m>
- <dist type="float">1</dist>
- <connected-to-property-node type="bool"></connected-to-property-node>
- <brake-force type="float">100000</brake-force>
- <connected-to-ai-or-mp-callsign type ="string">*</connected-to-ai-or-mp-callsign>
- <end-force-x type ="float">0</end-force-x>
- <end-force-y type ="float">0</end-force-y>
- <end-force-z type ="float">0</end-force-z>
- </tow>
- <speed-in-tow-direction type="float">0</speed-in-tow-direction>
- <open type="bool">true</open>
- <local-pos-x type="float">0</local-pos-x>
- <local-pos-y type="float">0</local-pos-y>
- <local-pos-z type="float">0</local-pos-z>
- <is-slave type="bool">false</is-slave>
+ <force_name_jsbsim type="string">aerotow</force_name_jsbsim>
+ <force-is-calculated-by-other type="bool">true</force-is-calculated-by-other>
+ <mp-auto-connect-period type="float">1.0</mp-auto-connect-period>
+ <local-pos-x type="float">-5.15</local-pos-x>
+ <local-pos-y type="float"> 0.0</local-pos-y>
+ <local-pos-z type="float">-0.5</local-pos-z>
</aerotow>
</hitches>
Modified: trunk/Aircraft/J3Cub/J3Cub.xml
===================================================================
--- trunk/Aircraft/J3Cub/J3Cub.xml 2020-06-11 16:21:29 UTC (rev 4946)
+++ trunk/Aircraft/J3Cub/J3Cub.xml 2020-06-12 19:37:48 UTC (rev 4947)
@@ -1994,6 +1994,19 @@
<z> 0.0 </z>
</direction>
</force>
+
+ <force name="aerotow" frame="BODY" unit="LBS">
+ <location unit="M">
+ <x>5.15</x>
+ <y>0.0</y>
+ <z>0.0</z>
+ </location>
+ <direction>
+ <x>0.0</x>
+ <y>0.0</y>
+ <z>0.0</z>
+ </direction>
+ </force>
</external_reactions>
<system file="Conventional Controls.xml"/>
Modified: trunk/Aircraft/J3Cub/Models/Interior/alt/alt.xml
===================================================================
--- trunk/Aircraft/J3Cub/Models/Interior/alt/alt.xml 2020-06-11 16:21:29 UTC (rev 4946)
+++ trunk/Aircraft/J3Cub/Models/Interior/alt/alt.xml 2020-06-12 19:37:48 UTC (rev 4947)
@@ -24,7 +24,7 @@
</effect>
<effect>
- <inherits-from>Effects/interior/interior-glass-reflection-panel-front</inherits-from>
+ <inherits-from>Aircraft/J3Cub/Models/Effects/interior/interior-glass-reflection-panel-front</inherits-from>
<object-name>glass</object-name>
</effect>
Modified: trunk/Aircraft/J3Cub/Models/Interior/asi/asi.xml
===================================================================
--- trunk/Aircraft/J3Cub/Models/Interior/asi/asi.xml 2020-06-11 16:21:29 UTC (rev 4946)
+++ trunk/Aircraft/J3Cub/Models/Interior/asi/asi.xml 2020-06-12 19:37:48 UTC (rev 4947)
@@ -18,7 +18,7 @@
</effect>
<effect>
- <inherits-from>Effects/interior/interior-glass-reflection-panel-front</inherits-from>
+ <inherits-from>Aircraft/J3Cub/Models/Effects/interior/interior-glass-reflection-panel-front</inherits-from>
<object-name>glass</object-name>
</effect>
Modified: trunk/Aircraft/J3Cub/Models/Interior/compass/compass.xml
===================================================================
--- trunk/Aircraft/J3Cub/Models/Interior/compass/compass.xml 2020-06-11 16:21:29 UTC (rev 4946)
+++ trunk/Aircraft/J3Cub/Models/Interior/compass/compass.xml 2020-06-12 19:37:48 UTC (rev 4947)
@@ -17,7 +17,7 @@
</effect>
<effect>
- <inherits-from>Effects/interior/interior-glass-reflection-panel-front</inherits-from>
+ <inherits-from>Aircraft/J3Cub/Models/Effects/interior/interior-glass-reflection-panel-front</inherits-from>
<object-name>glass</object-name>
</effect>
Modified: trunk/Aircraft/J3Cub/Models/Interior/oil/oil.xml
===================================================================
--- trunk/Aircraft/J3Cub/Models/Interior/oil/oil.xml 2020-06-11 16:21:29 UTC (rev 4946)
+++ trunk/Aircraft/J3Cub/Models/Interior/oil/oil.xml 2020-06-12 19:37:48 UTC (rev 4947)
@@ -20,7 +20,7 @@
</effect>
<effect>
- <inherits-from>Effects/interior/interior-glass-reflection-panel-front</inherits-from>
+ <inherits-from>Aircraft/J3Cub/Models/Effects/interior/interior-glass-reflection-panel-front</inherits-from>
<object-name>glass</object-name>
</effect>
Modified: trunk/Aircraft/J3Cub/Models/Interior/slip/slip.xml
===================================================================
--- trunk/Aircraft/J3Cub/Models/Interior/slip/slip.xml 2020-06-11 16:21:29 UTC (rev 4946)
+++ trunk/Aircraft/J3Cub/Models/Interior/slip/slip.xml 2020-06-12 19:37:48 UTC (rev 4947)
@@ -15,7 +15,7 @@
</effect>
<effect>
- <inherits-from>Effects/interior/interior-glass-reflection-panel-front</inherits-from>
+ <inherits-from>Aircraft/J3Cub/Models/Effects/interior/interior-glass-reflection-panel-front</inherits-from>
<object-name>glass</object-name>
</effect>
Modified: trunk/Aircraft/J3Cub/Models/Interior/tach/tach.xml
===================================================================
--- trunk/Aircraft/J3Cub/Models/Interior/tach/tach.xml 2020-06-11 16:21:29 UTC (rev 4946)
+++ trunk/Aircraft/J3Cub/Models/Interior/tach/tach.xml 2020-06-12 19:37:48 UTC (rev 4947)
@@ -23,7 +23,7 @@
</effect>
<effect>
- <inherits-from>Effects/interior/interior-glass-reflection-panel-front</inherits-from>
+ <inherits-from>Aircraft/J3Cub/Models/Effects/interior/interior-glass-reflection-panel-front</inherits-from>
<object-name>glass</object-name>
</effect>
Modified: trunk/Aircraft/J3Cub/Models/J3Cub.ac
===================================================================
--- trunk/Aircraft/J3Cub/Models/J3Cub.ac 2020-06-11 16:21:29 UTC (rev 4946)
+++ trunk/Aircraft/J3Cub/Models/J3Cub.ac 2020-06-12 19:37:48 UTC (rev 4947)
@@ -15,7 +15,7 @@
MATERIAL "invisible" rgb 0.000 0.000 0.000 amb 0.000 0.000 0.000 emis 0.000 0.000 0.000 spec 0.000 0.000 0.000 shi 0 trans 1.000
OBJECT world
name "Blender_exporter_v2.26__J3Cub.ac"
-kids 208
+kids 209
OBJECT poly
name "aileron_cable_centre"
data 20
@@ -148942,6 +148942,64 @@
4 0 0
kids 0
OBJECT poly
+name "TiedownHotSpotTail"
+data 8
+Cube.020
+crease 40.0
+numvert 8
+4.76257 -0.5586 0.06589
+4.76042 -0.5584 -0.07009
+4.8969 -0.54842 -0.07223
+4.89905 -0.54862 0.06374
+4.7607 -0.53293 0.06595
+4.75854 -0.53273 -0.07002
+4.89502 -0.52275 -0.07216
+4.89718 -0.52295 0.06381
+numsurf 6
+SURF 0X0
+mat 13
+refs 4
+4 0 0
+5 0 0
+1 0 0
+0 0 0
+SURF 0X0
+mat 13
+refs 4
+5 0 0
+6 0 0
+2 0 0
+1 0 0
+SURF 0X0
+mat 13
+refs 4
+6 0 0
+7 0 0
+3 0 0
+2 0 0
+SURF 0X0
+mat 13
+refs 4
+7 0 0
+4 0 0
+0 0 0
+3 0 0
+SURF 0X0
+mat 13
+refs 4
+0 0 0
+1 0 0
+2 0 0
+3 0 0
+SURF 0X0
+mat 13
+refs 4
+7 0 0
+6 0 0
+5 0 0
+4 0 0
+kids 0
+OBJECT poly
name "trim_base"
data 8
Cube.001
Modified: trunk/Aircraft/J3Cub/PA-18-float-set.xml
===================================================================
--- trunk/Aircraft/J3Cub/PA-18-float-set.xml 2020-06-11 16:21:29 UTC (rev 4946)
+++ trunk/Aircraft/J3Cub/PA-18-float-set.xml 2020-06-12 19:37:48 UTC (rev 4947)
@@ -11,6 +11,7 @@
<sim>
<variant-of>J3Cub</variant-of>
<description>Piper PA-18 Super Cub (95hp) Float (JSBSim)</description>
+ <type type="string">seaplane</type>
<previews>
<preview>
<type>panel</type>
|