fly/fgdata
1
0
Fork 0
Code Activity

Move marker.xml, marker.ac to Aircraft/Generic

Browse source 
also adjust (hopefully) all references to the old location
This commit is contained in:
Torsten Dreyer 2016-03-23 11:00:18 +01:00
parent 0d623d5f5e
commit 8f5e1bd626
7 changed files with 442 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AI/Aircraft/Hurricane/Models/hurricane_model.xml
View file

@ -570,7 +570,7 @@ $Id$
<!-- Tutorial Marker -->
<model>
<path>Models/Aircraft/marker.xml</path>
<path>Aircraft/Generic/marker.xml</path>
</model>
<!-- hide all of the model not visible from the cockpit -->

2
AI/Aircraft/Spitfire/Models/seafire_model.xml
View file

@ -411,7 +411,7 @@ $Id$
<!-- Tutorial -->
<model>
<path>Models/Aircraft/marker.xml</path>
<path>Aircraft/Generic/marker.xml</path>
</model>
<!-- hide all of the model not visible from the cockpit -->

2
AI/Aircraft/Spitfire/Models/spitfire_model.xml
View file

@ -414,7 +414,7 @@ $Id$
<!-- Tutorial -->
<model>
<path>Models/Aircraft/marker.xml</path>
<path>Aircraft/Generic/marker.xml</path>
</model>
<!-- hide all of the model not visible from the cockpit -->

339
Aircraft/Generic/marker.ac Normal file
View file

@ -0,0 +1,339 @@
AC3Db
MATERIAL "cross" rgb 1 0 0 amb 1 0 0 emis 1 0 0 spec 0 0 0 shi 72 trans 0.1
MATERIAL "arrow" rgb 1 0 1 amb 1 0 1 emis 1 0 1 spec 0 0 0 shi 72 trans 0.2
OBJECT world
kids 5
OBJECT poly
name "z"
numvert 2
1e-06 -4.999999 0
2e-06 5 0
numsurf 1
SURF 0x02
mat 0
refs 2
0 0 0
1 0 0
kids 0
OBJECT poly
name "arrow"
numvert 64
0.009488 0.009488 0.01014
0.011156 0.007454 0.01014
0.012396 0.005135 0.01014
0.01316 0.002618 0.01014
0.013418 0 0.01014
0.01316 -0.002618 0.01014
0.012396 -0.005135 0.01014
0.011156 -0.007454 0.01014
0.009488 -0.009488 0.01014
0.007454 -0.011156 0.01014
0.005135 -0.012396 0.01014
0.002618 -0.01316 0.01014
0 -0.013418 0.01014
-0.002618 -0.01316 0.01014
-0.005135 -0.012396 0.01014
-0.007454 -0.011156 0.01014
-0.009488 -0.009488 0.01014
-0.011156 -0.007454 0.01014
-0.012396 -0.005135 0.01014
-0.01316 -0.002618 0.01014
-0.013418 0 0.01014
-0.01316 0.002618 0.01014
-0.012396 0.005135 0.01014
-0.011156 0.007454 0.01014
-0.009488 0.009488 0.01014
-0.007454 0.011156 0.01014
-0.005135 0.012396 0.01014
-0.002618 0.01316 0.01014
0 0.013418 0.01014
0.002618 0.01316 0.01014
0.005135 0.012396 0.01014
0.007454 0.011156 0.01014
0.007557 0.007557 0.01014
0.008886 0.005937 0.01014
0.009874 0.00409 0.01014
0.010482 0.002085 0.01014
0.010687 0 0.01014
0.010482 -0.002085 0.01014
0.009874 -0.00409 0.01014
0.008886 -0.005937 0.01014
0.007557 -0.007557 0.01014
0.005937 -0.008886 0.01014
0.00409 -0.009874 0.01014
0.002085 -0.010482 0.01014
0 -0.010687 0.01014
-0.002085 -0.010482 0.01014
-0.00409 -0.009874 0.01014
-0.005937 -0.008886 0.01014
-0.007557 -0.007557 0.01014
-0.008886 -0.005937 0.01014
-0.009874 -0.00409 0.01014
-0.010482 -0.002085 0.01014
-0.010687 0 0.01014
-0.010482 0.002085 0.01014
-0.009874 0.00409 0.01014
-0.008886 0.005937 0.01014
-0.007557 0.007557 0.01014
-0.005937 0.008886 0.01014
-0.00409 0.009874 0.01014
-0.002085 0.010482 0.01014
0 0.010687 0.01014
0.002085 0.010482 0.01014
0.00409 0.009874 0.01014
0.005937 0.008886 0.01014
numsurf 32
SURF 0x20
mat 1
refs 4
1 0 0
0 0 0
32 0 0
33 0 0
SURF 0x20
mat 1
refs 4
2 0 0
1 0 0
33 0 0
34 0 0
SURF 0x20
mat 1
refs 4
3 0 0
2 0 0
34 0 0
35 0 0
SURF 0x20
mat 1
refs 4
4 0 0
3 0 0
35 0 0
36 0 0
SURF 0x20
mat 1
refs 4
5 0 0
4 0 0
36 0 0
37 0 0
SURF 0x20
mat 1
refs 4
6 0 0
5 0 0
37 0 0
38 0 0
SURF 0x20
mat 1
refs 4
7 0 0
6 0 0
38 0 0
39 0 0
SURF 0x20
mat 1
refs 4
8 0 0
7 0 0
39 0 0
40 0 0
SURF 0x20
mat 1
refs 4
9 0 0
8 0 0
40 0 0
41 0 0
SURF 0x20
mat 1
refs 4
10 0 0
9 0 0
41 0 0
42 0 0
SURF 0x20
mat 1
refs 4
11 0 0
10 0 0
42 0 0
43 0 0
SURF 0x20
mat 1
refs 4
12 0 0
11 0 0
43 0 0
44 0 0
SURF 0x20
mat 1
refs 4
13 0 0
12 0 0
44 0 0
45 0 0
SURF 0x20
mat 1
refs 4
14 0 0
13 0 0
45 0 0
46 0 0
SURF 0x20
mat 1
refs 4
15 0 0
14 0 0
46 0 0
47 0 0
SURF 0x20
mat 1
refs 4
16 0 0
15 0 0
47 0 0
48 0 0
SURF 0x20
mat 1
refs 4
17 0 0
16 0 0
48 0 0
49 0 0
SURF 0x20
mat 1
refs 4
18 0 0
17 0 0
49 0 0
50 0 0
SURF 0x20
mat 1
refs 4
19 0 0
18 0 0
50 0 0
51 0 0
SURF 0x20
mat 1
refs 4
20 0 0
19 0 0
51 0 0
52 0 0
SURF 0x20
mat 1
refs 4
21 0 0
20 0 0
52 0 0
53 0 0
SURF 0x20
mat 1
refs 4
22 0 0
21 0 0
53 0 0
54 0 0
SURF 0x20
mat 1
refs 4
23 0 0
22 0 0
54 0 0
55 0 0
SURF 0x20
mat 1
refs 4
24 0 0
23 0 0
55 0 0
56 0 0
SURF 0x20
mat 1
refs 4
25 0 0
24 0 0
56 0 0
57 0 0
SURF 0x20
mat 1
refs 4
26 0 0
25 0 0
57 0 0
58 0 0
SURF 0x20
mat 1
refs 4
27 0 0
26 0 0
58 0 0
59 0 0
SURF 0x20
mat 1
refs 4
28 0 0
27 0 0
59 0 0
60 0 0
SURF 0x20
mat 1
refs 4
29 0 0
28 0 0
60 0 0
61 0 0
SURF 0x20
mat 1
refs 4
30 0 0
29 0 0
61 0 0
62 0 0
SURF 0x20
mat 1
refs 4
31 0 0
30 0 0
62 0 0
63 0 0
SURF 0x20
mat 1
refs 4
0 0 0
31 0 0
63 0 0
32 0 0
kids 0
OBJECT poly
name "x"
numvert 2
-4.999999 -1e-06 0
5 -2e-06 0
numsurf 1
SURF 0x02
mat 0
refs 2
0 0 0
1 0 0
kids 0
OBJECT poly
name "y"
numvert 2
1e-06 0 4.999999
2e-06 0 -5
numsurf 1
SURF 0x02
mat 0
refs 2
0 0 0
1 0 0
kids 0
OBJECT poly
name "null"
numvert 0
numsurf 0
kids 0

98
Aircraft/Generic/marker.xml Normal file
View file

@ -0,0 +1,98 @@
<?xml version="1.0"?>
<PropertyList>
<!-- marker for tutorial system -->
<path>marker.ac</path>
<nopreview/>
<animation>
<name>cross</name>
<object-name>x</object-name>
<object-name>y</object-name>
<object-name>z</object-name>
</animation>
<animation>
<name>marker</name>
<object-name>cross</object-name>
<object-name>arrow</object-name>
<enable-hot>false</enable-hot>
</animation>
<animation>
<type>noshadow</type>
<object-name>marker</object-name>
</animation>
<animation>
<type>billboard</type>
<object-name>arrow</object-name>
</animation>
<animation>
<type>scale</type>
<object-name>arrow</object-name>
<property>sim/model/marker/scale/value</property>
<x-factor>1</x-factor>
<y-factor>1</y-factor>
<z-factor>1</z-factor>
<x-offset>0</x-offset>
<y-offset>0</y-offset>
<z-offset>0</z-offset>
</animation>
<animation>
<type>timed</type>
<object-name>arrow</object-name>
<object-name>null</object-name>
<duration-sec>0.5</duration-sec>
</animation>
<animation>
<type>select</type>
<object-name>arrow</object-name>
<condition>
<property>sim/model/marker/arrow-enabled</property>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>cross</object-name>
<condition>
<property>sim/model/marker/cross-enabled</property>
</condition>
</animation>
<animation>
<type>translate</type>
<object-name>marker</object-name>
<property>sim/model/marker/x/value</property>
<axis>
<x>1</x>
<y>0</y>
<z>0</z>
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>marker</object-name>
<property>sim/model/marker/y/value</property>
<axis>
<x>0</x>
<y>1</y>
<z>0</z>
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>marker</object-name>
<property>sim/model/marker/z/value</property>
<axis>
<x>0</x>
<y>0</y>
<z>1</z>
</axis>
</animation>
</PropertyList>

2
Aircraft/c172p/Models/c172p.xml
View file

@ -713,7 +713,7 @@
</model>
<model>
<path>Models/Aircraft/marker.xml</path>
<path>Aircraft/Generic/marker.xml</path>
</model>
<!-- Breakers and avionics switch -->

2
Docs/README.tutorials
View file

@ -377,7 +377,7 @@ model in its animation xml file:
<path>lightning-f1a.ac</path>
<model>
<path>Models/Aircraft/marker.xml</path>
<path>Aircraft/Generic/marker.xml</path>
</model>
...