CVS: data/Aircraft/C-2A/Models/light StrobeGreen.xml, NONE, 1.1 StrobeRed.xml, NONE, 1.1 StrobeRed2.xml, NONE, 1.1 StrobeWhite.xml, NONE, 1.1 WhiteLight.xml, NONE, 1.1 light-cone.ac, NONE, 1.1 light-cone.xml, NONE, 1.1 light-gradient-lamp.png, NONE, 1.1 GreenLight.ac, 1.1, 1.2 GreenLight.xml, 1.1, 1.2 RedLight.ac, 1.1, 1.2 RedLight.xml, 1.1, 1.2 WhiteLight.ac, 1.1, 1.2 beacon.xml, 1.1, 1.2 Whitelight.xml, 1.1, NONE
Emmanuel Baranger <[email protected]> Wed, 21 Apr 2010 12:33:23 -0500
| Newsgroups | gmane.games.flightgear.cvc |
|---|---|
| Message-ID | <[email protected]> |
Update of /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/light
In directory baron.flightgear.org:/tmp/cvs-serv29031/Models/light
Modified Files:
GreenLight.ac GreenLight.xml RedLight.ac RedLight.xml
WhiteLight.ac beacon.xml
Added Files:
StrobeGreen.xml StrobeRed.xml StrobeRed2.xml StrobeWhite.xml
WhiteLight.xml light-cone.ac light-cone.xml
light-gradient-lamp.png
Removed Files:
Whitelight.xml
Log Message:
- little update on FDM (thanks to Melchior for the YASim_import script)
- Add Nav light and light Cone
- Add shadow
--- NEW FILE "StrobeGreen.xml" ---
<?xml version="1.0" encoding="UTF-8"?>
<PropertyList>
<path>GreenLight.ac</path>
<animation>
<type>noshadow</type>
<object-name>Light</object-name>
</animation>
<animation>
<type>alpha-test</type>
<alpha-factor>0.01</alpha-factor>
</animation>
<animation>
<type>billboard</type>
<object-name>Light</object-name>
<spherical type="bool">true</spherical>
</animation>
<animation>
<type>select</type>
<object-name>Light</object-name>
<condition>
<property>/sim/model/lights/sbc1/state</property>
</condition>
</animation>
<animation>
<type>dist-scale</type>
<object-name>Light</object-name>
<interpolation>
<entry>
<ind>0</ind>
<dep>0.25</dep>
</entry>
<entry>
<ind>20</ind>
<dep>0.5</dep>
</entry>
<entry>
<ind>1500</ind>
<dep>5</dep>
</entry>
</interpolation>
</animation>
</PropertyList>
--- NEW FILE "StrobeRed.xml" ---
<?xml version="1.0" encoding="UTF-8"?>
<PropertyList>
<path>RedLight.ac</path>
<animation>
<type>noshadow</type>
<object-name>Light</object-name>
</animation>
<animation>
<type>alpha-test</type>
<alpha-factor>0.01</alpha-factor>
</animation>
<animation>
<type>billboard</type>
<object-name>Light</object-name>
<spherical type="bool">true</spherical>
</animation>
<animation>
<type>select</type>
<object-name>Light</object-name>
<condition>
<property>/sim/model/lights/sbc2/state</property>
</condition>
</animation>
<animation>
<type>dist-scale</type>
<object-name>Light</object-name>
<interpolation>
<entry>
<ind>0</ind>
<dep>0.25</dep>
</entry>
<entry>
<ind>20</ind>
<dep>0.5</dep>
</entry>
<entry>
<ind>1500</ind>
<dep>5</dep>
</entry>
</interpolation>
</animation>
</PropertyList>
--- NEW FILE "StrobeRed2.xml" ---
<?xml version="1.0" encoding="UTF-8"?>
<PropertyList>
<path>RedLight.ac</path>
<animation>
<type>noshadow</type>
<object-name>Light</object-name>
</animation>
<animation>
<type>alpha-test</type>
<alpha-factor>0.01</alpha-factor>
</animation>
<animation>
<type>billboard</type>
<object-name>Light</object-name>
<spherical type="bool">true</spherical>
</animation>
<animation>
<type>select</type>
<object-name>Light</object-name>
<condition>
<property>/sim/model/lights/beacon/state</property>
</condition>
</animation>
<animation>
<type>dist-scale</type>
<object-name>Light</object-name>
<interpolation>
<entry>
<ind>0</ind>
<dep>0.25</dep>
</entry>
<entry>
<ind>20</ind>
<dep>0.5</dep>
</entry>
<entry>
<ind>1500</ind>
<dep>5</dep>
</entry>
</interpolation>
</animation>
</PropertyList>
--- NEW FILE "StrobeWhite.xml" ---
<?xml version="1.0" encoding="UTF-8"?>
<PropertyList>
<path>WhiteLight.ac</path>
<animation>
<type>noshadow</type>
<object-name>Light</object-name>
</animation>
<animation>
<type>alpha-test</type>
<alpha-factor>0.01</alpha-factor>
</animation>
<animation>
<type>billboard</type>
<object-name>Light</object-name>
<spherical type="bool">true</spherical>
</animation>
<animation>
<type>select</type>
<object-name>Light</object-name>
<condition>
<property>/sim/model/lights/sbc1/state</property>
</condition>
</animation>
<animation>
<type>material</type>
<object-name>Light</object-name>
<emission>
<red> 1.0 </red>
<green> 1.0 </green>
<blue> 1.0 </blue>
<factor-prop>/systems/electrical/outputs/instrument-lights</factor-prop>
</emission>
</animation>
<animation>
<type>dist-scale</type>
<object-name>Light</object-name>
<interpolation>
<entry><ind> 0 </ind><dep> 0.25 </dep></entry>
<entry><ind> 20 </ind><dep> 0.50 </dep></entry>
<entry><ind> 1500 </ind><dep> 5.00 </dep></entry>
</interpolation>
</animation>
</PropertyList>
--- NEW FILE "WhiteLight.xml" ---
<?xml version="1.0" encoding="UTF-8"?>
<PropertyList>
<path>WhiteLight.ac</path>
<animation>
<type>noshadow</type>
<object-name>Light</object-name>
</animation>
<animation>
<type>alpha-test</type>
<alpha-factor>0.01</alpha-factor>
</animation>
<animation>
<type>billboard</type>
<object-name>Light</object-name>
<spherical type="bool">true</spherical>
</animation>
<animation>
<type>material</type>
<object-name>Light</object-name>
<emission>
<red> 1.0 </red>
<green> 1.0 </green>
<blue> 1.0 </blue>
<factor-prop>/systems/electrical/outputs/instrument-lights</factor-prop>
</emission>
</animation>
<animation>
<type>dist-scale</type>
<object-name>Light</object-name>
<interpolation>
<entry><ind> 0 </ind><dep> 0.25 </dep></entry>
<entry><ind> 20 </ind><dep> 0.50 </dep></entry>
<entry><ind> 1500 </ind><dep> 5.00 </dep></entry>
</interpolation>
</animation>
</PropertyList>
--- NEW FILE "light-cone.ac" ---
AC3Db
MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
MATERIAL "lightcone" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 1 0.969 0.847 shi 64 trans 0.808
MATERIAL "lightcone2" rgb 0 0 0 amb 0 0 0 emis 1 1 1 spec 0 0 0 shi 60 trans 0.804
MATERIAL "light" rgb 0.2 0.2 0.2 amb 0.2 0.2 0.2 emis 1 1 1 spec 0 0 0 shi 128 trans 0
OBJECT world
kids 3
OBJECT poly
name "Cone"
data 4
Cone
crease 45.000000
numvert 193
-24.8113 0 0
-19.96805 6e-06 4.08375
-19.96805 -0.796695 4.0053
-19.96805 -1.562775 3.772915
-19.96805 -2.268801 3.395515
-19.96805 -2.88764 2.88765
[...3229 lines suppressed...]
32 0.5 0.527458012104
SURF 0x10
mat 3
refs 3
29 0.915733993053 0.245857998729
30 0.961937010288 0.333485990763
32 0.5 0.527458012104
SURF 0x10
mat 3
refs 3
30 0.961937010288 0.333485990763
31 0.990395009518 0.428577005863
32 0.5 0.527458012104
SURF 0x10
mat 3
refs 3
31 0.990395009518 0.428577005863
0 1.0 0.527458012104
32 0.5 0.527458012104
kids 0
--- NEW FILE "light-cone.xml" ---
<?xml version="1.0" encoding="UTF-8"?>
<PropertyList>
<path>light-cone.ac</path>
<effect>
<inherits-from>Effects/light-cone</inherits-from>
<object-name>Cone</object-name>
</effect>
</PropertyList>
--- NEW BINARY FILE "light-gradient-lamp.png" ---
Index: GreenLight.ac
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/light/GreenLight.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GreenLight.ac 20 Dec 2008 14:20:07 -0000 1.1
+++ GreenLight.ac 21 Apr 2010 17:22:25 -0000 1.2
@@ -1,6 +1,6 @@
AC3Db
MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
-MATERIAL "ac3dmat1" rgb 1 1 1 amb 0.2 0.2 0.2 emis 1 1 1 spec 0 0 0 shi 10 trans 0
+MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
OBJECT world
kids 1
OBJECT poly
Index: GreenLight.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/light/GreenLight.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GreenLight.xml 20 Dec 2008 14:20:08 -0000 1.1
+++ GreenLight.xml 21 Apr 2010 17:23:20 -0000 1.2
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<PropertyList>
@@ -21,29 +21,23 @@
</animation>
<animation>
- <type>select</type>
+ <type>material</type>
<object-name>Light</object-name>
- <condition>
- <property>/sim/model/lights/sbc1/state</property>
- </condition>
+ <emission>
+ <red> 1.0 </red>
+ <green> 1.0 </green>
+ <blue> 1.0 </blue>
+ <factor-prop>/systems/electrical/outputs/instrument-lights</factor-prop>
+ </emission>
</animation>
<animation>
<type>dist-scale</type>
<object-name>Light</object-name>
<interpolation>
- <entry>
- <ind>0</ind>
- <dep>0.25</dep>
- </entry>
- <entry>
- <ind>20</ind>
- <dep>0.5</dep>
- </entry>
- <entry>
- <ind>1500</ind>
- <dep>5</dep>
- </entry>
+ <entry><ind> 0 </ind><dep> 0.25 </dep></entry>
+ <entry><ind> 20 </ind><dep> 0.50 </dep></entry>
+ <entry><ind> 1500 </ind><dep> 5.00 </dep></entry>
</interpolation>
</animation>
Index: RedLight.ac
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/light/RedLight.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RedLight.ac 20 Dec 2008 14:20:08 -0000 1.1
+++ RedLight.ac 21 Apr 2010 17:23:48 -0000 1.2
@@ -1,6 +1,6 @@
AC3Db
MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
-MATERIAL "ac3dmat1" rgb 1 1 1 amb 0.2 0.2 0.2 emis 1 1 1 spec 0 0 0 shi 10 trans 0
+MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
OBJECT world
kids 1
OBJECT poly
@@ -27,22 +27,22 @@
SURF 0x20
mat 1
refs 4
-0 0.442211866379 0.43821194768
-1 0.0567888170481 0.438211858273
-2 0.0567888170481 0.0527888052166
-3 0.442211866379 0.0527887605131
+0 0.448961138725 0.442461937666
+1 0.0635380744934 0.442461848259
+2 0.0635380744934 0.0570387989283
+3 0.448961138725 0.0570387542248
SURF 0x20
mat 1
refs 4
-7 0.442211985588 0.0527888350189
-6 0.442211985588 0.43821194768
-5 0.0567888170481 0.43821194768
-4 0.0567888170481 0.0527887605131
+7 0.448961257935 0.0570388287306
+6 0.448961257935 0.442461937666
+5 0.0635380744934 0.442461937666
+4 0.0635380744934 0.0570387542248
SURF 0x20
mat 1
refs 4
-11 0.442211985588 0.43821194768
-10 0.0567889362574 0.43821194768
-9 0.0567888170481 0.0527888350189
-8 0.442211985588 0.0527887605131
+11 0.448961257935 0.442461937666
+10 0.0635381937027 0.442461937666
+9 0.0635380744934 0.0570388287306
+8 0.448961257935 0.0570387542248
kids 0
Index: RedLight.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/light/RedLight.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RedLight.xml 20 Dec 2008 14:20:09 -0000 1.1
+++ RedLight.xml 21 Apr 2010 17:24:45 -0000 1.2
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<PropertyList>
@@ -21,29 +21,23 @@
</animation>
<animation>
- <type>select</type>
+ <type>material</type>
<object-name>Light</object-name>
- <condition>
- <property>/sim/model/lights/sbc1/state</property>
- </condition>
+ <emission>
+ <red> 1.0 </red>
+ <green> 1.0 </green>
+ <blue> 1.0 </blue>
+ <factor-prop>/systems/electrical/outputs/instrument-lights</factor-prop>
+ </emission>
</animation>
<animation>
<type>dist-scale</type>
<object-name>Light</object-name>
<interpolation>
- <entry>
- <ind>0</ind>
- <dep>0.25</dep>
- </entry>
- <entry>
- <ind>20</ind>
- <dep>0.5</dep>
- </entry>
- <entry>
- <ind>1500</ind>
- <dep>5</dep>
- </entry>
+ <entry><ind> 0 </ind><dep> 0.25 </dep></entry>
+ <entry><ind> 20 </ind><dep> 0.50 </dep></entry>
+ <entry><ind> 1500 </ind><dep> 5.00 </dep></entry>
</interpolation>
</animation>
Index: WhiteLight.ac
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/light/WhiteLight.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WhiteLight.ac 20 Dec 2008 14:20:10 -0000 1.1
+++ WhiteLight.ac 21 Apr 2010 17:28:24 -0000 1.2
@@ -1,6 +1,6 @@
AC3Db
MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
-MATERIAL "ac3dmat1" rgb 1 1 1 amb 0.2 0.2 0.2 emis 1 1 1 spec 0 0 0 shi 10 trans 0
+MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
OBJECT world
kids 1
OBJECT poly
@@ -27,22 +27,22 @@
SURF 0x20
mat 1
refs 4
-0 0.948729932308 0.948479950428
-1 0.558269321918 0.948479950428
-2 0.558269321918 0.558019340038
-3 0.948729932308 0.558019280434
+0 0.943492412567 0.942461967468
+1 0.558069348335 0.942461848259
+2 0.558069348335 0.557038784027
+3 0.943492412567 0.557038784027
SURF 0x20
mat 1
refs 4
-7 0.948729932308 0.558019340038
-6 0.948729932308 0.948479950428
-5 0.558269321918 0.948479950428
-4 0.558269321918 0.558019280434
+7 0.943492531776 0.557038843632
+6 0.943492531776 0.942461967468
+5 0.558069348335 0.942461967468
+4 0.558069348335 0.557038784027
SURF 0x20
mat 1
refs 4
-11 0.948729932308 0.948479950428
-10 0.558269321918 0.948479950428
-9 0.558269321918 0.558019340038
-8 0.948729932308 0.558019280434
+11 0.943492531776 0.942461967468
+10 0.558069467545 0.942461967468
+9 0.558069348335 0.557038843632
+8 0.943492531776 0.557038784027
kids 0
Index: beacon.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/light/beacon.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beacon.xml 20 Dec 2008 14:20:11 -0000 1.1
+++ beacon.xml 21 Apr 2010 17:30:42 -0000 1.2
@@ -1,48 +1,52 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
<PropertyList>
- <path>RedLight.ac</path>
- <animation>
- <type>noshadow</type>
- <object-name>Light</object-name>
- </animation>
-
- <animation>
- <type>alpha-test</type>
- <alpha-factor>0.01</alpha-factor>
- </animation>
-
- <animation>
- <type>billboard</type>
- <object-name>Light</object-name>
- <spherical type="bool">true</spherical>
- </animation>
-
- <animation>
- <type>select</type>
- <object-name>Light</object-name>
- <condition>
- <property>/sim/model/lights/beacon/state</property>
- </condition>
- </animation>
-
- <animation>
- <type>dist-scale</type>
- <object-name>Light</object-name>
- <interpolation>
- <entry>
- <ind>0</ind>
- <dep>0.25</dep>
- </entry>
- <entry>
- <ind>20</ind>
- <dep>0.5</dep>
- </entry>
- <entry>
- <ind>1500</ind>
- <dep>5</dep>
- </entry>
- </interpolation>
- </animation>
+ <path>RedLight.ac</path>
+
+ <animation>
+ <type>noshadow</type>
+ <object-name>Light</object-name>
+ </animation>
+
+ <animation>
+ <type>alpha-test</type>
+ <alpha-factor>0.01</alpha-factor>
+ </animation>
+
+ <animation>
+ <type>billboard</type>
+ <object-name>Light</object-name>
+ <spherical type="bool">true</spherical>
+ </animation>
+
+ <animation>
+ <type>select</type>
+ <object-name>Light</object-name>
+ <condition>
+ <property>/sim/model/lights/beacon/state</property>
+ </condition>
+ </animation>
+
+ <animation>
+ <type>material</type>
+ <object-name>Light</object-name>
+ <emission>
+ <red> 1.0 </red>
+ <green> 1.0 </green>
+ <blue> 1.0 </blue>
+ <factor-prop>/systems/electrical/outputs/instrument-lights</factor-prop>
+ </emission>
+ </animation>
+
+ <animation>
+ <type>dist-scale</type>
+ <object-name>Light</object-name>
+ <interpolation>
+ <entry><ind> 0 </ind><dep> 0.25 </dep></entry>
+ <entry><ind> 20 </ind><dep> 0.50 </dep></entry>
+ <entry><ind> 1500 </ind><dep> 5.00 </dep></entry>
+ </interpolation>
+ </animation>
</PropertyList>
--- "Whitelight.xml" DELETED ---
------------------------------------------------------------------------------