1
0
Fork 0

Merge 3D into 3D-canvas

Signed-off-by: fly <merspieler@airmail.cc>
This commit is contained in:
fly 2021-08-03 13:42:00 +00:00
commit 26567be576
6 changed files with 471 additions and 199 deletions

View file

@ -17,6 +17,14 @@
<path>Aircraft/A320-family/Models/Fuselage/a320.cfm.xml</path> <path>Aircraft/A320-family/Models/Fuselage/a320.cfm.xml</path>
</model> </model>
<animation>
<type>material</type>
<object-name>EngineCFM56R.Placards</object-name>
<property-base>sim/model/livery/</property-base>
<texture-prop>texture-placards</texture-prop>
<texture>placards.png</texture>
</animation>
<!-- Nasal code --> <!-- Nasal code -->
<nasal> <nasal>
<load><![CDATA[ <load><![CDATA[

View file

@ -16,6 +16,14 @@
<path>Aircraft/A320-family/Models/Fuselage/a320.v2500.xml</path> <path>Aircraft/A320-family/Models/Fuselage/a320.v2500.xml</path>
</model> </model>
<animation>
<type>material</type>
<object-name>EngineIAEV2500L.Placards</object-name>
<property-base>sim/model/livery/</property-base>
<texture-prop>texture-placards</texture-prop>
<texture>placards.png</texture>
</animation>
<!-- Nasal code --> <!-- Nasal code -->
<nasal> <nasal>
<load><![CDATA[ <load><![CDATA[

View file

@ -876,42 +876,6 @@
</offsets> </offsets>
</model> </model>
<animation>
<type>select</type>
<object-name>Top beacon light</object-name>
<object-name>Bottom beacon light</object-name>
<object-name>Left nav light</object-name>
<object-name>Right nav light</object-name>
<object-name>Left strobe light</object-name>
<object-name>Right strobe light</object-name>
<object-name>Tail strobe light</object-name>
<object-name>Tail nav light</object-name>
<condition>
<not>
<property>sim/rendering/shaders/skydome</property>
</not>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>Top beacon light ALS</object-name>
<object-name>Bottom beacon light ALS</object-name>
<object-name>Left nav light ALS</object-name>
<object-name>Right nav light ALS</object-name>
<object-name>Left strobe light ALS</object-name>
<object-name>Right strobe light ALS</object-name>
<object-name>Port landing light ALS</object-name>
<object-name>Nosegear landing light ALS</object-name>
<object-name>Second Nosegear landing light ALS</object-name>
<object-name>Starboard landing light ALS</object-name>
<object-name>Tail strobe light ALS</object-name>
<object-name>Tail nav light ALS</object-name>
<condition>
<property>sim/rendering/shaders/skydome</property>
</condition>
</animation>
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>Nosegear landing light ALS</object-name> <object-name>Nosegear landing light ALS</object-name>

View file

@ -31369,128 +31369,420 @@ kids 0
OBJECT poly OBJECT poly
name "EngineCFM56R.Placards" name "EngineCFM56R.Placards"
data 12 data 12
Cylinder.050 Cylinder.055
crease 40.0 crease 40.0
texture "placards.png" texture "placards.png"
texrep 1 1 texrep 1 1
numvert 32 numvert 80
-5.59072 -2.84045 -6.55067 -5.26383 -2.82571 -6.53722
-5.59072 -3.07434 -6.38327 -5.26383 -3.05069 -4.88891
-5.59072 -3.0743 -4.87842 -5.26383 -2.82572 -4.72442
-5.59072 -2.84041 -4.71102 -5.26383 -1.98344 -4.62102
-5.59072 -2.84047 4.71095 -5.26383 -3.14076 -5.00077
-5.59072 -3.07436 4.87835 -5.26383 -2.42727 -4.60402
-5.59072 -3.07432 6.38325 -5.26383 -3.14076 -6.26087
-5.59072 -2.84044 6.55065 -5.59102 -2.27189 -6.69416
-5.45944 -2.83717 4.7173 -5.59102 -2.56503 -6.65828
-5.45944 -3.06744 6.37806 -5.59102 -2.83395 -6.55306
-5.45944 -2.83713 6.5443 -5.59102 -3.06784 -6.38565
-5.45944 -2.83711 -4.71737 -5.59102 -3.24729 -6.16749
-5.45944 -3.06746 -6.37808 -5.59102 -3.24729 -5.09416
-5.45944 -3.06748 4.88354 -5.59102 -3.06784 -4.87599
-5.45944 -3.06742 -4.88361 -5.59102 -2.83395 -4.70859
-5.45944 -2.83715 -6.54432 -5.59102 -2.56503 -4.60336
-6.03605 -3.08474 -6.38316 -5.59102 -2.27189 -4.56748
-6.03605 -2.84785 4.71108 -5.59102 -1.97709 -4.60337
-6.03605 -3.08476 4.87846 -5.59102 -1.97709 -6.65827
-6.03605 -3.0847 -4.87853 -6.21762 -2.56702 -6.65808
-6.03605 -2.8478 -4.71115 -6.21762 -2.84434 -6.55287
-6.03605 -3.08473 6.38314 -6.21762 -3.08247 -6.3855
-6.03605 -2.84784 -6.55054 -6.21762 -3.2652 -6.16739
-6.03605 -2.84782 6.55052 -6.21762 -3.2652 -5.09425
-6.03605 -3.22944 6.2095 -6.21762 -3.08247 -4.87614
-6.03605 -3.22944 -5.0522 -6.21762 -2.84434 -4.70878
-6.03605 -3.22944 -6.20953 -6.21762 -2.56702 -4.60357
-5.59072 -3.22944 -5.06703 -6.21762 -2.26943 -4.56768
-6.03605 -3.22944 5.05207 -6.21762 -1.97183 -4.60357
-5.59072 -3.22944 -6.19471 -6.21762 -1.97183 -6.65808
-5.59072 -3.22944 6.19467 -6.21762 -2.26943 -6.69396
-5.59072 -3.22944 5.06689 -5.26383 -2.56546 -6.64063
numsurf 12 -5.26383 -3.05068 -6.37273
-5.26383 -3.2233 -6.15836
-5.26383 -3.2233 -5.10328
-5.26383 -2.56546 -4.62102
-5.26383 -2.27863 -4.58575
-5.26383 -1.98344 -6.64063
-5.26383 -2.27863 -6.6759
-5.26383 -2.42727 -6.65762
-5.26383 -2.82571 4.72435
-5.26383 -3.05069 6.37266
-5.26383 -2.82572 6.53715
-5.26383 -1.98344 6.64056
-5.26383 -3.14076 6.2608
-5.26383 -2.42727 6.65755
-5.26383 -3.14076 5.00071
-5.59102 -2.27189 4.56741
-5.59102 -2.56503 4.60329
-5.59102 -2.83395 4.70852
-5.59102 -3.06784 4.87592
-5.59102 -3.24729 5.09409
-5.59102 -3.24729 6.16742
-5.59102 -3.06784 6.38558
-5.59102 -2.83395 6.55299
-5.59102 -2.56503 6.65821
-5.59102 -2.27189 6.69409
-5.59102 -1.97709 6.6582
-5.59102 -1.97709 4.6033
-6.21762 -2.56702 4.6035
-6.21762 -2.84434 4.7087
-6.21762 -3.08247 4.87607
-6.21762 -3.2652 5.09418
-6.21762 -3.2652 6.16732
-6.21762 -3.08247 6.38543
-6.21762 -2.84434 6.5528
-6.21762 -2.56702 6.65801
-6.21762 -2.26943 6.69389
-6.21762 -1.97183 6.65801
-6.21762 -1.97183 4.6035
-6.21762 -2.26943 4.56761
-5.26383 -2.56546 4.62094
-5.26383 -3.05068 4.88884
-5.26383 -3.2233 5.10321
-5.26383 -3.2233 6.15829
-5.26383 -2.56546 6.64056
-5.26383 -2.27863 6.67583
-5.26383 -1.98344 4.62095
-5.26383 -2.27863 4.58568
-5.26383 -2.42727 4.60395
numsurf 48
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
15 0.843104 0.878719 18 0.73237 0.662799
12 0.843104 0.821207 7 0.73237 0.607921
1 0.814886 0.821208 30 0.603717 0.607921
0 0.814886 0.878719 29 0.603717 0.662799
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
14 0.843185 0.928674 16 0.734102 0.918066
11 0.843185 0.98558 17 0.734102 0.972523
3 0.814966 0.98558 28 0.605449 0.972523
2 0.814966 0.928674 27 0.605449 0.918066
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
8 0.843103 0.878719 15 0.734102 0.860691
13 0.843103 0.821208 16 0.734102 0.918066
5 0.814886 0.821208 27 0.605449 0.918066
4 0.814886 0.878719 26 0.605449 0.860691
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
9 0.843185 0.928674 14 0.734102 0.804298
10 0.843184 0.98558 15 0.734102 0.860691
7 0.814966 0.98558 26 0.605449 0.860691
6 0.814966 0.928673 25 0.605449 0.804298
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
1 0.814886 0.821512 13 0.734102 0.749459
29 0.814886 0.771916 14 0.734102 0.804298
26 0.720004 0.775836 25 0.605449 0.804298
16 0.720004 0.821512 24 0.605449 0.749459
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
4 0.814886 0.878719 12 0.734102 0.694607
5 0.814886 0.821208 13 0.734102 0.749459
18 0.720004 0.821208 24 0.605449 0.749459
17 0.720004 0.878719 23 0.605449 0.694607
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
6 0.814966 0.928657 10 0.73237 0.438265
7 0.814966 0.985563 11 0.73237 0.382967
23 0.720085 0.985563 22 0.603717 0.382967
21 0.720085 0.928657 21 0.603717 0.438265
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
0 0.814886 0.879023 9 0.73237 0.493687
1 0.814886 0.821512 10 0.73237 0.438265
16 0.720004 0.821512 21 0.603717 0.438265
22 0.720004 0.879023 20 0.603717 0.493687
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
2 0.814966 0.928513 8 0.73237 0.5502
3 0.814966 0.98542 9 0.73237 0.493687
20 0.720085 0.98542 20 0.603717 0.493687
19 0.720085 0.928513 19 0.603717 0.550201
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
5 0.814886 0.821208 7 0.73237 0.607921
31 0.814886 0.771619 8 0.73237 0.5502
28 0.720004 0.775538 19 0.603717 0.550201
18 0.720004 0.821208 30 0.603717 0.607921
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
6 0.814966 0.928657 38 0.800147 0.607921
21 0.720085 0.928657 39 0.800147 0.576551
24 0.720085 0.883345 8 0.73237 0.5502
30 0.814966 0.879457 7 0.73237 0.607921
SURF 0X10
mat 3
refs 3
39 0.800147 0.576551
31 0.800147 0.550201
8 0.73237 0.5502
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
2 0.814966 0.928513 31 0.800147 0.550201
19 0.720085 0.928513 0 0.800147 0.493687
25 0.720086 0.883194 9 0.73237 0.493687
27 0.814966 0.879305 8 0.73237 0.5502
SURF 0X10
mat 3
refs 4
0 0.800147 0.493687
32 0.800147 0.438264
10 0.73237 0.438265
9 0.73237 0.493687
SURF 0X10
mat 3
refs 4
10 0.73237 0.438265
6 0.800147 0.409097
33 0.800147 0.382967
11 0.73237 0.382967
SURF 0X10
mat 3
refs 3
4 0.801878 0.720788
1 0.801878 0.74946
13 0.734102 0.749459
SURF 0X10
mat 3
refs 4
1 0.801878 0.74946
2 0.801878 0.804298
14 0.734102 0.804298
13 0.734102 0.749459
SURF 0X10
mat 3
refs 4
2 0.801878 0.804298
35 0.801878 0.860691
15 0.734102 0.860691
14 0.734102 0.804298
SURF 0X10
mat 3
refs 3
35 0.801878 0.860691
5 0.801878 0.886606
15 0.734102 0.860691
SURF 0X10
mat 3
refs 3
32 0.800147 0.438264
6 0.800147 0.409097
10 0.73237 0.438265
SURF 0X10
mat 3
refs 4
34 0.801878 0.694607
4 0.801878 0.720788
13 0.734102 0.749459
12 0.734102 0.694607
SURF 0X10
mat 3
refs 4
15 0.734102 0.860691
5 0.801878 0.886606
36 0.801878 0.918066
16 0.734102 0.918066
SURF 0X10
mat 3
refs 4
18 0.73237 0.662799
37 0.800147 0.662799
38 0.800147 0.607921
7 0.73237 0.607921
SURF 0X10
mat 3
refs 4
3 0.801878 0.972523
17 0.734102 0.972523
16 0.734102 0.918066
36 0.801878 0.918066
SURF 0X10
mat 3
refs 4
58 0.73237 0.662799
47 0.73237 0.607921
70 0.603717 0.607921
69 0.603717 0.662799
SURF 0X10
mat 3
refs 4
56 0.734102 0.918066
57 0.734102 0.972523
68 0.605449 0.972523
67 0.605449 0.918066
SURF 0X10
mat 3
refs 4
55 0.734102 0.860691
56 0.734102 0.918066
67 0.605449 0.918066
66 0.605449 0.860691
SURF 0X10
mat 3
refs 4
54 0.734102 0.804298
55 0.734102 0.860691
66 0.605449 0.860691
65 0.605449 0.804298
SURF 0X10
mat 3
refs 4
53 0.734102 0.749459
54 0.734102 0.804298
65 0.605449 0.804298
64 0.605449 0.749459
SURF 0X10
mat 3
refs 4
52 0.734102 0.694607
53 0.734102 0.749459
64 0.605449 0.749459
63 0.605449 0.694607
SURF 0X10
mat 3
refs 4
50 0.73237 0.438265
51 0.73237 0.382967
62 0.603717 0.382967
61 0.603717 0.438265
SURF 0X10
mat 3
refs 4
49 0.73237 0.493687
50 0.73237 0.438265
61 0.603717 0.438265
60 0.603717 0.493687
SURF 0X10
mat 3
refs 4
48 0.73237 0.5502
49 0.73237 0.493687
60 0.603717 0.493687
59 0.603717 0.550201
SURF 0X10
mat 3
refs 4
47 0.73237 0.607921
48 0.73237 0.5502
59 0.603717 0.550201
70 0.603717 0.607921
SURF 0X10
mat 3
refs 4
78 0.800147 0.607921
79 0.800147 0.576551
48 0.73237 0.5502
47 0.73237 0.607921
SURF 0X10
mat 3
refs 3
79 0.800147 0.576551
71 0.800147 0.550201
48 0.73237 0.5502
SURF 0X10
mat 3
refs 4
71 0.800147 0.550201
40 0.800147 0.493687
49 0.73237 0.493687
48 0.73237 0.5502
SURF 0X10
mat 3
refs 4
40 0.800147 0.493687
72 0.800147 0.438264
50 0.73237 0.438265
49 0.73237 0.493687
SURF 0X10
mat 3
refs 4
50 0.73237 0.438265
46 0.800147 0.409097
73 0.800147 0.382967
51 0.73237 0.382967
SURF 0X10
mat 3
refs 3
44 0.801878 0.720788
41 0.801878 0.74946
53 0.734102 0.749459
SURF 0X10
mat 3
refs 4
41 0.801878 0.74946
42 0.801878 0.804298
54 0.734102 0.804298
53 0.734102 0.749459
SURF 0X10
mat 3
refs 4
42 0.801878 0.804298
75 0.801878 0.860691
55 0.734102 0.860691
54 0.734102 0.804298
SURF 0X10
mat 3
refs 3
75 0.801878 0.860691
45 0.801878 0.886606
55 0.734102 0.860691
SURF 0X10
mat 3
refs 3
72 0.800147 0.438264
46 0.800147 0.409097
50 0.73237 0.438265
SURF 0X10
mat 3
refs 4
74 0.801878 0.694607
44 0.801878 0.720788
53 0.734102 0.749459
52 0.734102 0.694607
SURF 0X10
mat 3
refs 4
55 0.734102 0.860691
45 0.801878 0.886606
76 0.801878 0.918066
56 0.734102 0.918066
SURF 0X10
mat 3
refs 4
58 0.73237 0.662799
77 0.800147 0.662799
78 0.800147 0.607921
47 0.73237 0.607921
SURF 0X10
mat 3
refs 4
43 0.801878 0.972523
57 0.734102 0.972523
56 0.734102 0.918066
76 0.801878 0.918066
kids 0 kids 0
OBJECT poly OBJECT poly
name "EngineFairingL" name "EngineFairingL"

View file

@ -12658,143 +12658,143 @@ numsurf 20
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
1 0.860002 0.966189 1 0.831933 0.473945
0 0.860002 0.903776 0 0.831933 0.411533
5 0.92645 0.903776 5 0.898381 0.411533
2 0.92645 0.966189 2 0.898381 0.473945
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
0 0.860002 0.903776 0 0.831933 0.411533
40 0.860002 0.874434 40 0.831933 0.38219
37 0.92645 0.881368 37 0.898381 0.389125
5 0.92645 0.903776 5 0.898381 0.411533
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
7 0.860002 0.796589 7 0.831933 0.72174
6 0.860002 0.859002 6 0.831933 0.784152
3 0.92645 0.859002 3 0.898381 0.784152
4 0.92645 0.796589 4 0.898381 0.72174
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
6 0.860002 0.859002 6 0.831933 0.784152
22 0.860002 0.87218 22 0.831933 0.79733
16 0.92645 0.874248 16 0.898381 0.799399
3 0.92645 0.859002 3 0.898381 0.784152
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
2 0.92645 0.966189 2 0.898381 0.473945
5 0.92645 0.903776 5 0.898381 0.411533
28 0.98987 0.903776 28 0.961802 0.411533
29 0.989871 0.966189 29 0.961802 0.473945
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
4 0.92645 0.796589 4 0.898381 0.72174
3 0.92645 0.859002 3 0.898381 0.784152
33 0.989867 0.859002 33 0.961798 0.784152
24 0.989867 0.796589 24 0.961798 0.72174
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
3 0.92645 0.859002 3 0.898381 0.784152
16 0.92645 0.874248 16 0.898381 0.799399
32 0.989867 0.874169 32 0.961798 0.79932
33 0.989867 0.859002 33 0.961798 0.784152
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
9 0.860002 0.966271 9 0.831933 0.474028
8 0.860002 0.903859 8 0.831933 0.411615
13 0.92645 0.903859 13 0.898381 0.411615
10 0.92645 0.966271 10 0.898381 0.474028
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
8 0.860002 0.903859 8 0.831933 0.411615
42 0.860002 0.874517 42 0.831933 0.382274
38 0.92645 0.881452 38 0.898381 0.389209
13 0.92645 0.903859 13 0.898381 0.411615
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
15 0.860002 0.796507 15 0.831933 0.721657
14 0.860002 0.858919 14 0.831933 0.784069
11 0.92645 0.858919 11 0.898381 0.784069
12 0.92645 0.796507 12 0.898381 0.721657
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
14 0.860002 0.858919 14 0.831933 0.784069
21 0.860002 0.872094 21 0.831933 0.797244
23 0.92645 0.874163 23 0.898381 0.799313
11 0.92645 0.858919 11 0.898381 0.784069
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
10 0.92645 0.966271 10 0.898381 0.474028
13 0.92645 0.903859 13 0.898381 0.411615
26 0.98987 0.903859 26 0.961802 0.411615
27 0.989871 0.966271 27 0.961802 0.474028
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
12 0.92645 0.796507 12 0.898381 0.721657
11 0.92645 0.858919 11 0.898381 0.784069
31 0.989867 0.858919 31 0.961798 0.784069
35 0.989867 0.796507 35 0.961798 0.721657
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
11 0.92645 0.858919 11 0.898381 0.784069
23 0.92645 0.874163 23 0.898381 0.799313
30 0.989867 0.874084 30 0.961798 0.799234
31 0.989867 0.858919 31 0.961798 0.784069
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
18 0.92645 0.981434 18 0.898381 0.489191
20 0.860002 0.979474 20 0.831933 0.487231
1 0.860002 0.966189 1 0.831933 0.473945
2 0.92645 0.966189 2 0.898381 0.473945
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
17 0.92645 0.981518 17 0.898381 0.489274
19 0.860002 0.979558 19 0.831933 0.487314
9 0.860002 0.966271 9 0.831933 0.474028
10 0.92645 0.966271 10 0.898381 0.474028
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
29 0.989871 0.966189 29 0.961802 0.473945
25 0.989871 0.981355 25 0.961802 0.489112
18 0.92645 0.981434 18 0.898381 0.489191
2 0.92645 0.966189 2 0.898381 0.473945
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
27 0.989871 0.966271 27 0.961802 0.474028
34 0.989871 0.981439 34 0.961802 0.489195
17 0.92645 0.981518 17 0.898381 0.489274
10 0.92645 0.966271 10 0.898381 0.474028
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
43 0.92645 0.774096 43 0.898381 0.699247
36 0.860002 0.767161 36 0.831933 0.692311
15 0.860002 0.796507 15 0.831933 0.721657
12 0.92645 0.796507 12 0.898381 0.721657
SURF 0X10 SURF 0X10
mat 3 mat 3
refs 4 refs 4
39 0.92645 0.774182 39 0.898381 0.699333
41 0.860002 0.767247 41 0.831933 0.692398
7 0.860002 0.796589 7 0.831933 0.72174
4 0.92645 0.796589 4 0.898381 0.72174
kids 0 kids 0
OBJECT poly OBJECT poly
name "EngineIAEV2500R" name "EngineIAEV2500R"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 202 KiB

After

Width:  |  Height:  |  Size: 203 KiB