From 8f5e1bd6261664aff4c71b6cde87697a73228265 Mon Sep 17 00:00:00 2001 From: Torsten Dreyer Date: Wed, 23 Mar 2016 11:00:18 +0100 Subject: [PATCH] Move marker.xml, marker.ac to Aircraft/Generic also adjust (hopefully) all references to the old location --- .../Hurricane/Models/hurricane_model.xml | 2 +- AI/Aircraft/Spitfire/Models/seafire_model.xml | 2 +- .../Spitfire/Models/spitfire_model.xml | 2 +- Aircraft/Generic/marker.ac | 339 ++++++++++++++++++ Aircraft/Generic/marker.xml | 98 +++++ Aircraft/c172p/Models/c172p.xml | 2 +- Docs/README.tutorials | 2 +- 7 files changed, 442 insertions(+), 5 deletions(-) create mode 100644 Aircraft/Generic/marker.ac create mode 100644 Aircraft/Generic/marker.xml diff --git a/AI/Aircraft/Hurricane/Models/hurricane_model.xml b/AI/Aircraft/Hurricane/Models/hurricane_model.xml index b7f7b143a..ce1c86fee 100644 --- a/AI/Aircraft/Hurricane/Models/hurricane_model.xml +++ b/AI/Aircraft/Hurricane/Models/hurricane_model.xml @@ -570,7 +570,7 @@ $Id$ - Models/Aircraft/marker.xml + Aircraft/Generic/marker.xml diff --git a/AI/Aircraft/Spitfire/Models/seafire_model.xml b/AI/Aircraft/Spitfire/Models/seafire_model.xml index 69b42a5c5..e31ac02e0 100644 --- a/AI/Aircraft/Spitfire/Models/seafire_model.xml +++ b/AI/Aircraft/Spitfire/Models/seafire_model.xml @@ -411,7 +411,7 @@ $Id$ - Models/Aircraft/marker.xml + Aircraft/Generic/marker.xml diff --git a/AI/Aircraft/Spitfire/Models/spitfire_model.xml b/AI/Aircraft/Spitfire/Models/spitfire_model.xml index 35dc71832..3ebe04827 100644 --- a/AI/Aircraft/Spitfire/Models/spitfire_model.xml +++ b/AI/Aircraft/Spitfire/Models/spitfire_model.xml @@ -414,7 +414,7 @@ $Id$ - Models/Aircraft/marker.xml + Aircraft/Generic/marker.xml diff --git a/Aircraft/Generic/marker.ac b/Aircraft/Generic/marker.ac new file mode 100644 index 000000000..dcce38a9b --- /dev/null +++ b/Aircraft/Generic/marker.ac @@ -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 diff --git a/Aircraft/Generic/marker.xml b/Aircraft/Generic/marker.xml new file mode 100644 index 000000000..2994c5cd8 --- /dev/null +++ b/Aircraft/Generic/marker.xml @@ -0,0 +1,98 @@ + + + + marker.ac + + + + cross + x + y + z + + + + marker + cross + arrow + false + + + + noshadow + marker + + + + billboard + arrow + + + + scale + arrow + sim/model/marker/scale/value + 1 + 1 + 1 + 0 + 0 + 0 + + + + timed + arrow + null + 0.5 + + + + select + arrow + + sim/model/marker/arrow-enabled + + + + + select + cross + + sim/model/marker/cross-enabled + + + + + translate + marker + sim/model/marker/x/value + + 1 + 0 + 0 + + + + + translate + marker + sim/model/marker/y/value + + 0 + 1 + 0 + + + + + translate + marker + sim/model/marker/z/value + + 0 + 0 + 1 + + + diff --git a/Aircraft/c172p/Models/c172p.xml b/Aircraft/c172p/Models/c172p.xml index 5a75c87cb..b918988c9 100644 --- a/Aircraft/c172p/Models/c172p.xml +++ b/Aircraft/c172p/Models/c172p.xml @@ -713,7 +713,7 @@ - Models/Aircraft/marker.xml + Aircraft/Generic/marker.xml diff --git a/Docs/README.tutorials b/Docs/README.tutorials index 2d17e02bb..18722bfad 100644 --- a/Docs/README.tutorials +++ b/Docs/README.tutorials @@ -377,7 +377,7 @@ model in its animation xml file: lightning-f1a.ac - Models/Aircraft/marker.xml + Aircraft/Generic/marker.xml ...