Menu
▾
▴
[Flightgear-fgaddon-commitlogs] r735 - trunk/Aircraft/ju52: ju52: added failures, FDM adjustments
|
From: <fli...@li...> - 2015-06-16 17:37:29
|
Revision: 735
http://sourceforge.net/p/flightgear/fgaddon/735
Author: dfaber-fg
Date: 2015-06-16 17:37:26 +0000 (Tue, 16 Jun 2015)
Log Message:
-----------
ju52: added failures, FDM adjustments
Modified Paths:
--------------
trunk/Aircraft/ju52/Models/Ju-52.xml
trunk/Aircraft/ju52/Models/interiour.xml
trunk/Aircraft/ju52/Models/ju52.ac
trunk/Aircraft/ju52/Nasal/bmw132.nas
trunk/Aircraft/ju52/Nasal/ju52.nas
trunk/Aircraft/ju52/ju52-set.xml
trunk/Aircraft/ju52/ju52-yasim.xml
Added Paths:
-----------
trunk/Aircraft/ju52/Nasal/failure.nas
Modified: trunk/Aircraft/ju52/Models/Ju-52.xml
===================================================================
--- trunk/Aircraft/ju52/Models/Ju-52.xml 2015-06-16 17:35:26 UTC (rev 734)
+++ trunk/Aircraft/ju52/Models/Ju-52.xml 2015-06-16 17:37:26 UTC (rev 735)
@@ -89,7 +89,7 @@
<path>ju52.ac</path>
<!-- Effects-->
<effect>
- <inherits-from>Effects/ju52_effect</inherits-from> <!--FGFS 2.0 -->
+ <inherits-from>Effects/ju52_effect</inherits-from>
<object-name>fuselage</object-name>
<object-name>roofhatch</object-name>
<object-name>cowling.L</object-name>
@@ -138,6 +138,35 @@
<path>Aircraft/ju52/Models/interiour.xml</path>
</model>
+ <model>
+ <name>interiour</name>
+ <path>Aircraft/ju52/Models/skis.xml</path>
+ </model>
+ <animation>
+ <type>select</type>
+ <object-name>wheel.L</object-name>
+ <object-name>wheel.R</object-name>
+ <object-name>tailwheel</object-name>
+ <condition>
+ <not-equals>
+ <property>sim/model/skis</property>
+ <value>1</value>
+ </not-equals>
+ </condition>
+ </animation>
+ <animation>
+ <type>select</type>
+ <object-name>ski.L</object-name>
+ <object-name>ski.R</object-name>
+ <object-name>ski.B</object-name>
+ <condition>
+ <equals>
+ <property>sim/model/skis</property>
+ <value>1</value>
+ </equals>
+ </condition>
+ </animation>
+
<model>
<path>Aircraft/Generic/Human/Models/pilot.xml</path>
<name>pilot</name>
@@ -395,7 +424,7 @@
<animation>
<type>rotate</type>
<object-name>aileron.R</object-name>
- <property>controls/flight/aileron</property>
+ <property>surface-positions/aileron-pos-norm</property>
<factor>30.0</factor>
<center>
<x-m>7.064</x-m>
@@ -415,7 +444,7 @@
<animation>
<type>rotate</type>
<object-name>aileron.L</object-name>
- <property>controls/flight/aileron</property>
+ <property>surface-positions/aileron-pos-norm</property>
<factor>30.0</factor>
<center>
<x-m>7.064</x-m>
@@ -631,7 +660,7 @@
<type>rotate</type>
<object-name>leftdoor</object-name>
<object-name>leftdoorglass</object-name>
- <property>controls/gear/ldoor-pos-norm</property>
+ <property>controls/doors/doorL/position-norm</property>
<interpolation>
<entry>
<ind>0.0</ind>
@@ -654,11 +683,27 @@
</axis>
</animation>
+<animation>
+ <type>pick</type>
+ <object-name>leftdoor</object-name>
+ <visible>true</visible>
+ <action>
+ <button>0</button>
+ <repeatable>false</repeatable>
+
+ <binding>
+ <command>nasal</command>
+
+<script>ju52.leftdoor.toggle();</script>
+ </binding>
+ </action>
+ </animation>
+
<animation>
<type>rotate</type>
<object-name>rightdoor</object-name>
<object-name>rightdoorglass</object-name>
- <property>controls/gear/rdoor-pos-norm</property>
+ <property>controls/doors/doorR/position-norm</property>
<interpolation>
<entry>
<ind>0.0</ind>
@@ -681,6 +726,22 @@
</axis>
</animation>
+<animation>
+ <type>pick</type>
+ <object-name>rightdoor</object-name>
+ <visible>true</visible>
+ <action>
+ <button>0</button>
+ <repeatable>false</repeatable>
+
+ <binding>
+ <command>nasal</command>
+
+<script>ju52.rightdoor.toggle();</script>
+ </binding>
+ </action>
+ </animation>
+
<animation>
<type>rotate</type>
<object-name>rear.door2</object-name>
@@ -726,6 +787,23 @@
</axis>
</animation>
+
+<animation>
+ <type>pick</type>
+ <object-name>pick.rear</object-name>
+ <visible>false</visible>
+ <action>
+ <button>0</button>
+ <repeatable>false</repeatable>
+
+ <binding>
+ <command>nasal</command>
+
+<script>walk.get_in(9.5,-0.4, -0.73);</script>
+ </binding>
+ </action>
+ </animation>
+
<animation>
<type>material</type>
<object-name>fuselage</object-name>
Modified: trunk/Aircraft/ju52/Models/interiour.xml
===================================================================
--- trunk/Aircraft/ju52/Models/interiour.xml 2015-06-16 17:35:26 UTC (rev 734)
+++ trunk/Aircraft/ju52/Models/interiour.xml 2015-06-16 17:37:26 UTC (rev 735)
@@ -407,7 +407,7 @@
<type>rotate</type>
<object-name>leftdoor.I</object-name>
<object-name>leftdoor2.I</object-name>
- <property>controls/gear/ldoor-pos-norm</property>
+ <property>controls/doors/doorL/position-norm</property>
<interpolation>
<entry>
<ind>0.0</ind>
@@ -434,7 +434,7 @@
<type>rotate</type>
<object-name>rightdoor.I</object-name>
<object-name>rightdoor2.I</object-name>
- <property>controls/gear/rdoor-pos-norm</property>
+ <property>controls/doors/doorR/position-norm</property>
<interpolation>
<entry>
<ind>0.0</ind>
Modified: trunk/Aircraft/ju52/Models/ju52.ac
===================================================================
--- trunk/Aircraft/ju52/Models/ju52.ac 2015-06-16 17:35:26 UTC (rev 734)
+++ trunk/Aircraft/ju52/Models/ju52.ac 2015-06-16 17:37:26 UTC (rev 735)
@@ -15,7 +15,7 @@
MATERIAL "filter" rgb 0.193615 0.185461 0.182971 amb 1 1 1 emis 0 0 0 spec 0.292551 0.267285 0.279918 shi 64 trans 0
MATERIAL "wheel" rgb 0.236491 0.261535 0.274058 amb 1 1 1 emis 0 0 0 spec 0.160997 0 0.060818 shi 64 trans 0
OBJECT world
-kids 73
+kids 68
OBJECT poly
name "B132"
loc 0.043835 0 -0
@@ -74560,121 +74560,6 @@
93 0.017373325303 0.946007728577
kids 0
OBJECT poly
-name "cabin.glass"
-loc 0.028758 -0.035575 -1.900077
-data 11
-cabin.glass
-crease 179.000000
-numvert 38
-2.649416 0.988616 2.615064
-2.394694 1.115174 2.356238
-3.214568 1.12448 2.653673
-3.214568 1.286375 2.370432
-3.214568 1.286375 1.42972
-3.214568 1.12448 1.14648
-2.394694 1.115174 1.443914
-2.649416 0.988616 1.184449
-2.624696 0.972668 2.622396
-2.299646 1.147824 1.914305
-2.299646 1.147824 1.885846
-2.341065 1.118173 2.278666
-2.341065 1.118173 1.521486
-2.348287 1.110856 1.484352
-2.348287 1.110856 2.315801
-2.624939 0.972652 1.177759
-2.209896 1.028948 2.28049
-2.209896 1.028948 1.517098
-2.191094 1.045154 1.914305
-2.191094 1.045154 1.885846
-2.216341 1.024107 1.484352
-2.216341 1.024107 2.315801
-2.489522 0.885764 1.140265
-2.489285 0.88579 2.630166
-2.19479 1.008028 2.28049
-2.194791 1.008028 1.517098
-2.175284 1.023683 1.914305
-2.175284 1.023683 1.885846
-2.06266 0.736121 2.278666
-2.06266 0.736121 1.521486
-2.059973 0.764935 1.914306
-2.059973 0.764935 1.885846
-2.610707 0.925085 2.670013
-2.610706 0.925085 1.129736
-2.652857 0.960044 2.646881
-2.652857 0.960043 1.152632
-3.214182 1.102231 1.131451
-3.214182 1.102231 2.668702
-numsurf 10
-SURF 0x10
-mat 2
-refs 4
-20 0.89749032259 0.893770694733
-13 0.114836737514 0.611435711384
-15 0.107298150659 0.606598675251
-22 0.092959165573 0.617427945137
-SURF 0x10
-mat 2
-refs 4
-10 0.897911190987 0.895934581757
-12 0.905554533005 0.895678818226
-17 0.906650185585 0.917166233063
-19 0.900324702263 0.917166233063
-SURF 0x10
-mat 2
-refs 4
-11 0.900324702263 0.91882455349
-9 0.906650185585 0.918824613094
-18 0.905554533005 0.940162599087
-16 0.897911190987 0.9400562644
-SURF 0x10
-mat 2
-refs 4
-23 0.114823177457 0.611436605453
-8 0.100304484367 0.622257232666
-14 0.905178964138 0.942220151424
-21 0.10728494823 0.606600165367
-SURF 0x10
-mat 2
-refs 4
-24 0.907571434975 0.918824613094
-26 0.915200173855 0.918824613094
-30 0.916727542877 0.895892381668
-28 0.906434774399 0.940162599087
-SURF 0x10
-mat 2
-refs 4
-27 0.906434774399 0.895678818226
-25 0.915043652058 0.895934581757
-29 0.916883707047 0.918711721897
-31 0.907571434975 0.917166233063
-SURF 0x10
-mat 2
-refs 4
-1 0.116199329495 0.612324416637
-0 0.147660955787 0.619887828827
-2 0.147660955787 0.628900468349
-3 0.894786179066 0.944576561451
-SURF 0x10
-mat 2
-refs 4
-6 0.847920536995 0.890587210655
-4 0.147660955787 0.619887828827
-5 0.116199329495 0.612324416637
-7 0.102887913585 0.622497558594
-SURF 0x10
-mat 2
-refs 3
-32 0.114044383168 0.60878765583
-37 0.147639468312 0.618649303913
-34 0.116390883923 0.610733807087
-SURF 0x10
-mat 2
-refs 3
-33 0.114044383168 0.60878765583
-35 0.116390883923 0.610733807087
-36 0.147639468312 0.618649303913
-kids 0
-OBJECT poly
name "cabinroof"
loc 0.028758 -0.035575 -1.900077
data 9
@@ -75617,59 +75502,6 @@
13 1.875113964081 -1.058394670486
kids 0
OBJECT poly
-name "cabinroof.glass"
-loc 0.028758 -0.035575 -1.900077
-data 15
-cabinroof.glass
-crease 179.000000
-numvert 16
-3.214568 1.341147 2.144391
-3.214568 1.32419 2.315491
-3.214568 1.341147 1.655761
-3.214568 1.32419 1.484661
-3.214568 1.341191 2.125386
-3.214568 1.341191 1.674765
-3.214568 1.364553 1.915689
-3.214568 1.364553 1.884462
-2.351129 1.143411 2.144391
-2.372528 1.1213 2.315491
-2.351129 1.143411 1.655761
-2.372528 1.1213 1.484661
-2.350029 1.143455 2.125386
-2.350029 1.143455 1.674765
-2.333762 1.168848 1.915689
-2.333762 1.168848 1.884462
-numsurf 4
-SURF 0x10
-mat 2
-refs 4
-11 0.89959102869 0.904217123985
-10 0.89959102869 0.904217123985
-2 0.850307703018 0.893933176994
-3 0.850307703018 0.893933176994
-SURF 0x10
-mat 2
-refs 4
-13 0.899650812149 0.90524917841
-15 0.900534212589 0.917917013168
-7 0.850307703018 0.90524917841
-5 0.850307703018 0.90524917841
-SURF 0x10
-mat 2
-refs 4
-12 0.900534212589 0.919612884521
-4 0.899650812149 0.931000828743
-6 0.850307703018 0.919612884521
-14 0.850307703018 0.919612884521
-SURF 0x10
-mat 2
-refs 4
-9 0.896628916264 0.942316770554
-1 0.896628916264 0.942316770554
-0 0.850307703018 0.932032883167
-8 0.850307703018 0.932032883167
-kids 0
-OBJECT poly
name "cowling.L"
loc 8.413755 -1.421027 1.603013
data 9
@@ -85150,135 +84982,6 @@
6 0.481979131699 0.180816873908
kids 0
OBJECT poly
-name "frontwindows"
-loc 0.028758 -0.035575 -1.900077
-data 12
-frontwindows
-crease 179.000000
-numvert 36
-2.363648 0.477615 1.090769
-2.202109 1.002314 1.484352
-2.202109 1.002314 2.315801
-2.476676 0.858408 1.138045
-2.47644 0.858434 2.631704
-2.064227 0.71272 1.484352
-2.064227 0.71272 2.315801
-2.363932 0.475855 2.688163
-2.359657 0.930142 1.28458
-2.359657 0.930141 2.503394
-2.205279 0.600383 2.499674
-2.205279 0.600383 1.272187
-2.904033 0.962038 1.124601
-2.903843 0.617992 1.05461
-2.878664 0.955682 1.124601
-2.878474 0.611636 1.05461
-2.441242 0.497929 1.090411
-2.551675 0.849823 1.122621
-3.214568 1.048684 1.120737
-3.216206 0.708861 1.043603
-2.904033 0.962038 1.124601
-2.903843 0.617992 1.05461
-2.878664 0.955682 1.124601
-2.878474 0.611636 1.05461
-2.904033 0.962038 2.675551
-2.903843 0.617992 2.745543
-2.878664 0.955682 2.675551
-2.878474 0.611636 2.745543
-2.551675 0.849823 2.677128
-2.441242 0.497929 2.709338
-3.214568 1.048684 2.679416
-3.216206 0.708861 2.75655
-2.904033 0.962038 2.675551
-2.903843 0.617992 2.745543
-2.878664 0.955682 2.675551
-2.878474 0.611636 2.745543
-numsurf 12
-SURF 0x10
-mat 2
-refs 4
-9 0.906008303165 0.942220151424
-2 0.914952278137 0.942220151424
-6 0.9078733325 0.883354842663
-10 0 0
-SURF 0x10
-mat 2
-refs 4
-4 0.10058991611 0.60993796587
-9 0 0
-10 0.097636461258 0.583085119724
-7 0.106569886208 0.605077326298
-SURF 0x10
-mat 2
-refs 4
-1 0.89719158411 0.882129728794
-8 0 0
-11 0.916636526585 0.942035019398
-5 0.906008303165 0.893770694733
-SURF 0x10
-mat 2
-refs 4
-0 0.907468557358 0.826809227467
-11 0 0
-8 0.106582969427 0.605075776577
-3 0.100290834904 0.583877325058
-SURF 0x10
-mat 2
-refs 4
-14 0 0
-15 0.895951271057 0.820883333683
-16 0.110758125782 0.60459792614
-17 0.128961414099 0.610490977764
-SURF 0x10
-mat 2
-refs 4
-12 0 0
-13 0.8713799119 0.827584207058
-15 0 0
-14 0.130373671651 0.61084485054
-SURF 0x10
-mat 2
-refs 4
-20 0 0
-21 0.8713799119 0.827584207058
-23 0 0
-22 0.130373671651 0.61084485054
-SURF 0x10
-mat 2
-refs 4
-20 0.147660955787 0.615668296814
-18 0.147752135992 0.596750676632
-19 0.868629395962 0.82840937376
-21 0 0
-SURF 0x10
-mat 2
-refs 4
-27 0 0
-26 0.110758140683 0.60459792614
-28 0.104610428214 0.585008203983
-29 0.125962853432 0.590515315533
-SURF 0x10
-mat 2
-refs 4
-25 0 0
-24 0.128961414099 0.610491037369
-26 0 0
-27 0.128711402416 0.591339886189
-SURF 0x10
-mat 2
-refs 4
-30 0.130373671651 0.61084485054
-32 0 0
-33 0.146852135658 0.596617162228
-31 0.147660955787 0.615668416023
-SURF 0x10
-mat 2
-refs 4
-33 0 0
-32 0.128961414099 0.610491037369
-34 0 0
-35 0.128711402416 0.591339886189
-kids 0
-OBJECT poly
name "fuselage"
loc 0.028758 -0.035575 -1.900077
data 8
@@ -99085,26 +98788,6 @@
7 0.490835547447 0.58885627985
kids 0
OBJECT poly
-name "leftdoorglass"
-loc 0.028758 -0.035575 -1.900077
-data 13
-leftdoorglass
-crease 179.000000
-numvert 4
-9.704114 0.57523 2.769284
-9.703767 0.172534 2.769284
-9.137297 0.172534 2.769284
-9.139212 0.57523 2.769284
-numsurf 1
-SURF 0x30
-mat 2
-refs 4
-1 0 0
-0 0 0.998509883881
-3 1 1.000894069672
-2 1 0
-kids 0
-OBJECT poly
name "leftgear1"
loc 2.715481 -0.697993 2.71824
data 9
@@ -104246,6 +103929,46 @@
73 0.076470591128 0.617417037487
kids 0
OBJECT poly
+name "pick.front"
+loc 9.489283 -0.68065 -0
+data 10
+pick.front
+crease 179.000000
+numvert 4
+-6.033125 0.174795 0.130886
+-5.112706 0.174795 0.130886
+-6.033125 0.174795 -0.789532
+-5.112706 0.174795 -0.789532
+numsurf 1
+SURF 0x00
+mat 0
+refs 4
+0 0 0
+1 0 0
+3 0 0
+2 0 0
+kids 0
+OBJECT poly
+name "pick.rear"
+loc 9.489283 -0.68065 -0
+data 9
+pick.rear
+crease 179.000000
+numvert 4
+-0.460209 0 0.811412
+0.460209 0 0.811412
+-0.460209 0 -0.109006
+0.460209 0 -0.109006
+numsurf 1
+SURF 0x00
+mat 0
+refs 4
+0 0 0
+1 0 0
+3 0 0
+2 0 0
+kids 0
+OBJECT poly
name "rear.door1"
loc 2.656494 0.341942 -0
data 10
@@ -104500,37 +104223,6 @@
0 0.446852266788 0.985104322433
kids 0
OBJECT poly
-name "rear.wglass"
-loc 0.028758 -0.035575 -1.900077
-data 11
-rear.wglass
-crease 179.000000
-numvert 8
-8.151846 0.639307 1.030869
-8.151846 0.26525 1.030869
-8.736012 0.639307 1.030869
-8.735868 0.26525 1.030869
-9.164883 0.622306 1.030869
-9.165848 0.270472 1.030869
-9.682612 0.622306 1.030869
-9.682612 0.270472 1.030869
-numsurf 2
-SURF 0x30
-mat 2
-refs 4
-1 0 1
-0 0 0
-2 1 0
-3 1 1
-SURF 0x30
-mat 2
-refs 4
-6 1 0
-7 1 1
-5 0 1
-4 0 0
-kids 0
-OBJECT poly
name "rear.windows"
loc 0.028758 -0.035575 -1.900077
data 12
@@ -104850,26 +104542,6 @@
19 0.79968392849 0.831345379353
kids 0
OBJECT poly
-name "rightdoorglass"
-loc 0.028758 -0.035575 -1.900077
-data 14
-rightdoorglass
-crease 179.000000
-numvert 4
-4.09018 0.66851 1.030869
-3.494347 0.672249 1.030869
-3.494347 0.295489 1.030869
-4.09018 0.29175 1.030869
-numsurf 1
-SURF 0x30
-mat 2
-refs 4
-1 0.834311544895 0.831562697887
-0 0.79968392849 0.831345379353
-3 0.79968392849 0.809449374676
-2 0.834311544895 0.809666574001
-kids 0
-OBJECT poly
name "rightgear1"
loc 2.715481 -0.697993 2.71824
data 10
@@ -105758,12 +105430,12 @@
crease 179.000000
numvert 10
6.106161 1.353237 1.404308
-6.106161 1.353237 2.395844
+6.106163 1.353237 2.395847
6.106161 1.41336 1.900076
6.106161 1.393319 1.652192
6.106161 1.393319 2.14796
7.92176 1.320187 1.404308
-7.92176 1.320187 2.395844
+7.921762 1.320185 2.395847
7.92176 1.360269 1.652192
7.92176 1.380309 1.900076
7.92176 1.360269 2.14796
@@ -115518,219 +115190,6 @@
21 0.061828456819 0.616096258163
kids 0
OBJECT poly
-name "windows"
-loc 0.028758 -0.035575 -1.900077
-data 7
-windows
-crease 179.000000
-numvert 54
-7.776536 0.500809 1.030851
-7.163804 0.275787 1.030851
-7.163804 0.637222 1.030851
-7.783352 0.637222 1.030851
-7.619767 0.275787 1.030851
-4.09018 0.66851 2.769284
-3.494347 0.672249 2.769284
-3.494347 0.295489 2.769284
-4.09018 0.29175 2.769284
-5.01877 0.675101 2.769284
-5.01877 0.283985 2.769284
-4.402173 0.675101 2.769284
-4.538495 0.283985 2.769284
-4.402173 0.527256 2.769284
-5.947991 0.667397 2.769284
-5.947991 0.291689 2.769284
-5.322235 0.667397 2.769284
-5.322235 0.291689 2.769284
-6.875561 0.664029 2.769284
-6.875561 0.281425 2.769284
-6.261162 0.664029 2.769284
-6.261162 0.281425 2.769284
-7.619767 0.275787 2.769302
-7.783352 0.637222 2.769302
-7.163804 0.637222 2.769302
-7.163804 0.275787 2.769302
-7.776536 0.500809 2.769302
-8.735868 0.26525 2.769284
-8.736012 0.639307 2.769284
-8.151846 0.26525 2.769284
-8.151846 0.639307 2.769284
-10.834783 0.637222 1.062914
-10.734725 0.366974 1.058309
-10.671197 0.275787 1.055378
-10.829197 0.500818 1.067093
-10.215234 0.483466 1.034343
-10.215234 0.325507 1.034343
-10.48195 0.275787 1.046647
-10.215234 0.275787 1.034343
-10.215234 0.637222 1.034343
-10.466222 0.637222 1.045922
-5.01877 0.675101 1.030869
-5.01877 0.283985 1.030869
-4.402173 0.675101 1.030869
-4.538495 0.283985 1.030869
-4.402173 0.527256 1.030869
-5.947991 0.667397 1.030869
-5.947991 0.291688 1.030869
-5.322235 0.667397 1.030869
-5.322235 0.291688 1.030869
-6.875561 0.664029 1.030869
-6.875561 0.281425 1.030869
-6.261162 0.664029 1.030869
-6.261162 0.281425 1.030869
-numsurf 24
-SURF 0x10
-mat 2
-refs 3
-0 1 0.499999970198
-4 1 1
-1 0 1
-SURF 0x10
-mat 2
-refs 3
-3 1 0
-0 1 0.499999970198
-2 0 0
-SURF 0x10
-mat 2
-refs 3
-0 1 0.499999970198
-1 0 1
-2 0 0
-SURF 0x10
-mat 2
-refs 4
-5 1 0
-6 0 0
-7 0 1
-8 1 1
-SURF 0x10
-mat 2
-refs 3
-13 0.5 1
-10 1 0
-9 0 0
-SURF 0x10
-mat 2
-refs 3
-11 0 1
-13 0.5 1
-9 0 0
-SURF 0x10
-mat 2
-refs 3
-13 0.5 1
-12 1 1
-10 1 0
-SURF 0x10
-mat 2
-refs 4
-16 0 1
-17 1 1
-15 1 0
-14 0 0
-SURF 0x10
-mat 2
-refs 4
-20 0 1
-21 1 1
-19 1 0
-18 0 0
-SURF 0x10
-mat 2
-refs 3
-26 0.5 0
-24 0 1
-25 1 1
-SURF 0x10
-mat 2
-refs 3
-22 1 0
-26 0.5 0
-25 1 1
-SURF 0x10
-mat 2
-refs 3
-26 0.5 0
-23 0 0
-24 0 1
-SURF 0x10
-mat 2
-refs 4
-30 0 1
-29 1 1
-27 1 0
-28 0 0
-SURF 0x00
-mat 2
-refs 3
-38 0 0
-39 1 1
-40 1 0
-SURF 0x00
-mat 2
-refs 3
-38 0 0
-40 1 1
-37 1 0
-SURF 0x00
-mat 2
-refs 3
-40 0 0
-31 1 0
-37 1 1
-SURF 0x00
-mat 2
-refs 3
-37 0 0
-31 1 0
-33 1 1
-SURF 0x00
-mat 2
-refs 3
-33 0 0
-31 1 0
-32 1 1
-SURF 0x00
-mat 2
-refs 3
-31 0 0
-34 1 0
-32 1 1
-SURF 0x10
-mat 2
-refs 3
-45 0.000000029802 0.499999970198
-41 1 0
-42 1 1
-SURF 0x10
-mat 2
-refs 3
-44 0 1
-45 0.000000029802 0.499999970198
-42 1 1
-SURF 0x10
-mat 2
-refs 3
-45 0.000000029802 0.499999970198
-43 0 0
-41 1 0
-SURF 0x10
-mat 2
-refs 4
-49 0 1
-48 0 0
-46 1 0
-47 1 1
-SURF 0x10
-mat 2
-refs 4
-53 0 1
-52 0 0
-50 1 0
-51 1 1
-kids 0
-OBJECT poly
name "wing0.L"
loc 8.413755 -1.421027 1.603013
data 7
Modified: trunk/Aircraft/ju52/Nasal/bmw132.nas
===================================================================
--- trunk/Aircraft/ju52/Nasal/bmw132.nas 2015-06-16 17:35:26 UTC (rev 734)
+++ trunk/Aircraft/ju52/Nasal/bmw132.nas 2015-06-16 17:37:26 UTC (rev 735)
@@ -36,13 +36,15 @@
settimer(main_loop, looptime);
}
var main_loop = func {
+ updateHobbs();
# print ("engstat: ", engstat.getValue());
if (engstat.getValue() == 1){
engine_update();
fluid_update();
check_engine();
- }
- check_startup();
+ } else {
+ check_startup();
+ }
settimer(main_loop, looptime);
}
@@ -118,7 +120,7 @@
}
if (rs > 300000 ) {
setprop("/engines/engine["~ en ~"]/overrev", 1);
- kill_engine();
+ failure.kill_engine();
}
#check for overboost
if (mp > 55) {
@@ -222,5 +224,21 @@
setprop("/controls/engines/engine["~ en ~"]/starter",0);}
}
+# Hobbs Counter
+var updateHobbs = func{
+ var running = engine_running_Node.getValue();
+ if(running){
+ hobbs_engine.start();
+ } else {
+ hobbs_engine.stop();
+ }
+
+}
+
+var hobbs_engine = aircraft.timer.new("sim/time/hobbs/engine["~ en ~"]", 60, 0);
+var engine_running_Node = props.globals.initNode("engines/engine["~ en ~"]/running", 1, "BOOL");
+
+hobbs_engine.reset();
+
setlistener("/sim/signals/fdm-initialized",init);
Added: trunk/Aircraft/ju52/Nasal/failure.nas
===================================================================
--- trunk/Aircraft/ju52/Nasal/failure.nas (rev 0)
+++ trunk/Aircraft/ju52/Nasal/failure.nas 2015-06-16 17:37:26 UTC (rev 735)
@@ -0,0 +1,91 @@
+var looptime = 0.3;
+
+
+var bendload = props.globals.getNode("sim/failure/bendload");
+var breakload = props.globals.getNode("sim/failure/breakload");
+var breakspeed = props.globals.getNode("sim/failure/breakspeed");
+var maxpermrpm = props.globals.getNode("sim/failure/max-permiss-rpm");
+var maxpermboost = props.globals.getNode("sim/failure/max-permiss-boost");
+var flapoverspeed = props.globals.getNode("sim/failure/flapoverspeed");
+var emptyweight = props.globals.getNode("sim/failure/emptyweight");
+var airspeed = props.globals.getNode("velocities/airspeed-kt");
+var aileron = props.globals.getNode("controls/flight/aileron");
+var rstrain = props.globals.getNode("sim/failure/engines/engine[0]/rev-strain");
+var oboost = props.globals.getNode("sim/failure/engines/engine[0]/boost-strain");
+var nofuel = props.globals.getNode("engines/engine[0]/out-of-fuel",1 );
+var gload = props.globals.getNode("accelerations/pilot-g",1);
+var weight = props.globals.getNode("yasim/gross-weight-lbs",1);
+var turn = props.globals.getNode("instrumentation/turn-indicator/indicated-turn-rate");
+var fail_r = props.globals.getNode("sim/failure/controls/flight/aileron/fail-norm");
+var flappos = props.globals.getNode("controls/flight/flaps",1);
+
+
+var main_loop = func {
+ check_airframe();
+ settimer(main_loop, looptime);
+}
+
+var check_airframe = func {
+ var gl = gload.getValue();
+ var gw = weight.getValue();
+ var as = airspeed.getValue();
+ var slip = turn.getValue();
+ var fail = fail_r.getValue();
+ var ow = gw - emptyweight.getValue();
+
+# check flap deployment and failure due to overspeed
+ if ( flappos.getValue() > 0 ) {
+
+ if (as > flapoverspeed.getValue()) {
+ print ("flaps overspeed!");
+ var load = as - flapoverspeed.getValue();
+ print (load*flappos.getValue());
+ if (load * flappos.getValue() > 20 ) {
+ if (flappos.getValue() >= 0.5 ) {
+ flappos.setValue(0);
+ flappos.setAttribute("writable",0);
+ setprop ("/sim/failure/flaps", "1");
+ }
+ flappos.setValue(0);
+ }
+ }
+ }
+
+# check for excessive g-load or overspeed
+ #print(gl, breakload - 0.0004 * ow );
+ if (gl > (breakload.getValue() - 0.0003 * ow) or (as > breakspeed.getValue())) {
+ print ("break");
+ aileron.setAttribute("writable",0);
+ if (slip < 0) {
+ setprop ("sim/failure/left-wing-torn", "1");
+ fail_r.setValue(1);
+ } else {
+ setprop ("sim/failure/right-wing-torn", "1");
+ fail_r.setValue(-1);
+ }
+ }
+ if (gl > (bendload.getValue() - 0.0004 * ow)) {
+ print ("bend");
+ if (slip < 0) {
+ flappos.setAttribute("writable",0);
+ # } else {
+ # gear1.setAttribute("writable",0);
+ }
+ }
+}
+
+
+var kill_engine = func {
+ nofuel.setValue(1);
+ nofuel.setAttribute("writable", 0);
+ interpolate ("/engines/engine[0]/fuel-press", 0, 1);
+ interpolate ("/engines/engine[0]/mp-osi", 0, 1.5);
+}
+
+var init = func {
+
+ print ("Los gehts!");
+ }
+ settimer(main_loop, looptime);
+
+setlistener("/sim/signals/fdm-initialized",init);
Modified: trunk/Aircraft/ju52/Nasal/ju52.nas
===================================================================
--- trunk/Aircraft/ju52/Nasal/ju52.nas 2015-06-16 17:35:26 UTC (rev 734)
+++ trunk/Aircraft/ju52/Nasal/ju52.nas 2015-06-16 17:37:26 UTC (rev 735)
@@ -41,3 +41,7 @@
setlistener("/sim/signals/fdm-initialized",update_mp_props);
aircraft.livery.init("Aircraft/ju52/Models/Liveries");
+
+var leftdoor = aircraft.door.new ("/controls/doors/doorL/",1.5);
+
+var rightdoor = aircraft.door.new ("/controls/doors/doorR/",1.5);
Modified: trunk/Aircraft/ju52/ju52-set.xml
===================================================================
--- trunk/Aircraft/ju52/ju52-set.xml 2015-06-16 17:35:26 UTC (rev 734)
+++ trunk/Aircraft/ju52/ju52-set.xml 2015-06-16 17:37:26 UTC (rev 735)
@@ -9,7 +9,7 @@
************************************************************************
-->
-<PropertyList include="Aircraft/Generic/Human/Include/walker-include.xml">
+<PropertyList>
<sim>
<description>Junkers Ju-52-3m</description>
@@ -66,15 +66,56 @@
<gender>0</gender>
<character>0</character>
<outfit>2</outfit>
+ <headgear>1</headgear>
+ <hair>1</hair>
</pilot>
<pilot n="1">
<pose include = "Include/ju52_pilot.xml"></pose>
<gender>1</gender>
<character>0</character>
<outfit>0</outfit>
+ <headgear>1</headgear>
+ <eyewear>1</eyewear>
+ <hair>1</hair>
</pilot>
</crew>
</model>
+
+ <failure>
+ <emptyweight type ="float">12158</emptyweight>
+ <max-permiss-rpm type="float">2500</max-permiss-rpm>
+ <max-permiss-boost type="float">35</max-permiss-boost>
+ <bendload type="float">4</bendload>
+ <breakload type="float">5.5</breakload>
+ <breakspeed type="float">295</breakspeed>
+ <flapoverspeed type="float">110</flapoverspeed>
+ <controls>
+ <flight>
+ <aileron>
+ <fail-norm>0</fail-norm>
+ </aileron>
+ </flight>
+ <left-wing-failure type ="float">0</left-wing-failure>
+ <right-wing-failure type ="float">0</right-wing-failure>
+ </controls>
+ <engines>
+ <engine n="0">
+ <boost-strain type="float">0</boost-strain>
+ <rev-strain type="float">0</rev-strain>
+ <overboost type="bool">false</overboost>
+ <overrev type="bool">false</overrev>
+ </engine>
+ </engines>
+ <gear>
+ <gear n="0">
+
+ </gear>
+ </gear>
+ <structural>
+ <left-wing-torn type="bool">false</left-wing-torn>
+ <right-wing-torn type="bool">false</right-wing-torn>
+ </structural>
+ </failure>
<rendering>
<refl_correction type="string">-0.1</refl_correction>
</rendering>
@@ -260,8 +301,7 @@
</engines>
<gear>
<tailwheel-lock>true</tailwheel-lock>
- <rdoor-pos-norm type="float">0.0</rdoor-pos-norm>
- <ldoor-pos-norm type="float">0.0</ldoor-pos-norm>
+ <brake-parking type="bool">true</brake-parking>
</gear>
</controls>
@@ -369,6 +409,9 @@
<ju52>
<file>Aircraft/ju52/Nasal/ju52.nas</file>
</ju52>
+ <failure>
+ <file>Aircraft/ju52/Nasal/failure.nas</file>
+ </failure>
<engine0>
<file>Aircraft/ju52/Nasal/bmw132.nas</file>
</engine0>
Modified: trunk/Aircraft/ju52/ju52-yasim.xml
===================================================================
--- trunk/Aircraft/ju52/ju52-yasim.xml 2015-06-16 17:35:26 UTC (rev 734)
+++ trunk/Aircraft/ju52/ju52-yasim.xml 2015-06-16 17:37:26 UTC (rev 735)
@@ -5,7 +5,7 @@
YASim aerodynamic model for a Ju-52 3/m
-->
-<airplane mass="12158">
+<airplane mass="12158" version="YASIM_VERSION_CURRENT">
<!-- Approach configuration -->
<approach speed="60" aoa="12">
@@ -60,19 +60,29 @@
<wing x="-6.1" y="0.9" z="-1.1" taper="0.3" incidence="2" dihedral="5.5"
length="12.5" chord="5.4" sweep="1.8" idrag="0.8" camber="0.05">
<stall aoa="12" width="6" peak="1.9"/>
- <flap0 start="0.048" end="0.33" lift="1.4" drag="2.0"/>
+ <flap0 start="0.048" end="0.33" lift="1.4" drag="2.7"/>
<flap1 start="0.33" end="1.0" lift="1.4" drag="1.4"/>
+ <spoiler start="0.33" end="1.0" lift="1.4" drag="1.4"/>
<control-input axis="/controls/flight/flaps" control="FLAP0"/>
+<!--
+ <control-input axis="/sim/failure/controls/flight/aileron/fail-norm" control="FLAP1" split="true"/>
+-->
<control-output control="FLAP0" prop="/surface-positions/flap-pos-norm"/>
<control-speed control="FLAP0" transition-time="10"/>
<control-input axis="/controls/flight/aileron" control="FLAP1" split="true"/>
<control-input axis="/controls/flight/aileron-trim" control="FLAP1" split="true"/>
+ <control-input axis="/controls/flight/flaps" control="SPOILER"
+ src0="0" src1="1"
+ dst0="0" dst1="1"/>
+ <control-output control="FLAP1" prop="/surface-positions/aileron-pos-norm"/>
+ <control-speed control="SPOILER" transition-time="10"/>
</wing>
<hstab x="-16.34" y="0.4" z="0.84" taper="0.7"
length="4.34" chord="2.3" sweep="3" >
<stall aoa="14" width="4" peak="2.0"/>
- <flap0 start="0.0" end="1.0" lift="2.2" drag="1.6" />
+ <flap0 start="0.0" end="1.0" lift="2.3" drag="1.6" />
+ <control-speed control="FLAP0" transition-time="3"/>
<control-input axis="/controls/flight/elevator" control="FLAP0" square="true"/>
<control-input axis="/controls/flight/elevator-trim" control="FLAP0"/>
<control-output control="FLAP0" prop="/surface-positions/elevator-pos-norm"/>
|
