CVS: data/Aircraft/Skyvan/Models/light StrobeWhite.xml, NONE, 1.1 WhiteLight.xml, NONE, 1.1 flash.ac, NONE, 1.1 flash.xml, 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]>
| Newsgroups | gmane.games.flightgear.cvc |
|---|---|
| Message-ID | <[email protected]> |
Update of /var/cvs/FlightGear-0.9/data/Aircraft/Skyvan/Models/light
In directory baron.flightgear.org:/tmp/cvs-serv3355/Models/light
Modified Files:
GreenLight.ac GreenLight.xml RedLight.ac RedLight.xml
WhiteLight.ac beacon.xml
Added Files:
StrobeWhite.xml WhiteLight.xml flash.ac flash.xml
Removed Files:
Whitelight.xml
Log Message:
- new splash screen by Michat. Thanks to him
- update on FDM (thanks to Melchior for the YASim_import script)
--- 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 "flash.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 "lit" rgb 1 0.97912 0.97912 amb 0 0 0 emis 1 1 1 spec 0 0 0 shi 49 trans 0
OBJECT world
kids 1
OBJECT poly
name "flash"
data 5
flash
texture "lights.png"
texrep 1 1
crease 30.000000
numvert 4
0 0.6 0.6
0 -0.6 0.6
0 -0.6 -0.6
0 0.6 -0.599999
numsurf 1
SURF 0x00
mat 1
refs 4
0 0.52999997139 0.97000002861
3 0.97000002861 0.97000002861
2 0.97000002861 0.52999997139
1 0.52999997139 0.52999997139
kids 0
--- NEW FILE "flash.xml" ---
<?xml version="1.0" encoding="UTF-8"?>
<PropertyList>
<path>flash.ac</path>
<animation>
<!-- Objets opaques -->
<!-- Objets transparents -->
<object-name>flash</object-name>
</animation>
<animation>
<type>noshadow</type>
<object-name>flash</object-name>
</animation>
<!--
<animation>
<type>select</type>
<object-name>lumiereG</object-name>
<object-name>lumiereD</object-name>
<condition>
<not-equals>
<property>systems/electrical/outputs/landing-lights</property>
<value>0</value>
</not-equals>
</condition>
</animation>
-->
<animation>
<type>flash</type>
<object-name>flash</object-name>
<center>
<x-m> 0.000 </x-m>
<y-m> 0.000 </y-m>
<z-m> 0.000 </z-m>
</center>
<axis>
<x> -1 </x>
<y> 0 </y>
<z> 0 </z>
</axis>
<power>2</power>
<factor>2</factor>
<offset>0</offset>
<two-sides type="bool">false</two-sides>
<min>0.5</min>
<max>2</max>
</animation>
</PropertyList>
Index: GreenLight.ac
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Skyvan/Models/light/GreenLight.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GreenLight.ac 12 Jan 2009 15:37:35 -0000 1.1
+++ GreenLight.ac 31 Mar 2010 17:49:37 -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/Skyvan/Models/light/GreenLight.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GreenLight.xml 12 Jan 2009 15:37:35 -0000 1.1
+++ GreenLight.xml 31 Mar 2010 17:49:37 -0000 1.2
@@ -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/Skyvan/Models/light/RedLight.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RedLight.ac 12 Jan 2009 15:37:36 -0000 1.1
+++ RedLight.ac 31 Mar 2010 17:49:38 -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/Skyvan/Models/light/RedLight.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RedLight.xml 12 Jan 2009 15:37:37 -0000 1.1
+++ RedLight.xml 31 Mar 2010 17:49:38 -0000 1.2
@@ -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/Skyvan/Models/light/WhiteLight.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WhiteLight.ac 12 Jan 2009 15:37:37 -0000 1.1
+++ WhiteLight.ac 31 Mar 2010 17:49:39 -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/Skyvan/Models/light/beacon.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beacon.xml 12 Jan 2009 15:37:37 -0000 1.1
+++ beacon.xml 31 Mar 2010 17:49:41 -0000 1.2
@@ -1,48 +1,52 @@
<?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 ---
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev