CVS: data/Aircraft/F-106-dart/Models shadow.ac, NONE, 1.1 shadow.png, NONE, 1.1 shadow.xml, NONE, 1.1 f106.ac, 1.1, 1.2 f106.xml, 1.1, 1.2 glass_shader.png, 1.1, NONE
Emmanuel Baranger <[email protected]> Sat, 10 Apr 2010 18:02:29 -0500
| Newsgroups | gmane.games.flightgear.cvc |
|---|---|
| Message-ID | <[email protected]> |
Update of /var/cvs/FlightGear-0.9/data/Aircraft/F-106-dart/Models
In directory baron.flightgear.org:/tmp/cvs-serv29804/Models
Modified Files:
f106.ac f106.xml
Added Files:
shadow.ac shadow.png shadow.xml
Removed Files:
glass_shader.png
Log Message:
- update FDM (thanks to Melchior for the YASim_import script)
--- NEW FILE "shadow.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 "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
name "shadow"
data 6
shadow
texture "shadow.png"
texrep 1 1
crease 30.000000
numvert 4
10.801626 -2.900132 -5.805157
10.801626 -2.900132 5.805161
-10.780909 -2.900132 5.805157
-10.780905 -2.900132 -5.805161
numsurf 1
SURF 0x00
mat 1
refs 4
0 0.999999940395 0.999999642372
3 3.50186326159e-07 1.0
2 0.0 1.85901427585e-07
1 0.999999761581 0.0
kids 0
--- NEW BINARY FILE "shadow.png" ---
--- NEW FILE "shadow.xml" ---
<?xml version="1.0" encoding="UTF-8"?>
<PropertyList>
<path>shadow.ac</path>
<animation>
<!-- Objets opaques -->
<!-- Objets transparents -->
<object-name>shadow</object-name>
</animation>
<animation>
<type>noshadow</type>
<object-name>shadow</object-name>
</animation>
<!-- Une ombre pour OSG en attendant mieux ;) basé sur l'ombre du DC 3-->
<!-- pitch -->
<animation>
<type>rotate</type>
<object-name>shadow</object-name>
<property>/orientation/pitch-deg</property>
<factor>-1.0</factor>
<center>
<x-m>0</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</center>
<axis>
<x>0</x>
<y>1</y>
<z>0</z>
</axis>
</animation>
<!-- roll -->
<animation>
<type>rotate</type>
<object-name>shadow</object-name>
<property>/orientation/roll-deg</property>
<factor>1.0</factor>
<center>
<x-m>0</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</center>
<axis>
<x>1</x>
<y>0</y>
<z>0</z>
</axis>
</animation>
<!-- Translate to ground level -->
<animation>
<type>translate</type>
<object-name>shadow</object-name>
<property>/position/gear-agl-ft</property>
<factor>-0.3</factor>
<center>
<x-m>0</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</center>
<axis>
<x>0</x>
<y>0</y>
<z>1</z>
</axis>
</animation>
</PropertyList>
Index: f106.ac
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/F-106-dart/Models/f106.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- f106.ac 10 Jan 2009 17:01:54 -0000 1.1
+++ f106.ac 10 Apr 2010 23:02:25 -0000 1.2
@@ -1,19 +1,15 @@
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 "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 "DefaultWhite.004" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
-MATERIAL "DefaultWhite.005" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
-MATERIAL "DefaultWhite.006" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
-MATERIAL "DefaultWhite.010" 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.005" rgb 1 1 1 amb 0.2 0.2 0.2 emis 0 0 0 spec 0 0 0 shi 10 trans 0
-MATERIAL "DefaultWhite.002" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
+MATERIAL "DefaultWhite.011" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
+MATERIAL "DefaultWhite.013" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
[...59173 lines suppressed...]
OBJECT poly
name "voletD"
-data 6
-voletD
+data 10
+voletD.001
texture "texture.png"
texrep 1 1
crease 30.000000
@@ -84988,8 +84758,8 @@
kids 0
OBJECT poly
name "voletG"
-data 6
-voletG
+data 10
+voletG.001
texture "texture.png"
texrep 1 1
crease 30.000000
Index: f106.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/F-106-dart/Models/f106.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- f106.xml 10 Jan 2009 17:01:54 -0000 1.1
+++ f106.xml 10 Apr 2010 23:02:25 -0000 1.2
@@ -60,7 +60,7 @@
<animation>
<type>shader</type>
<shader>chrome</shader>
- <texture>glass_shader.png</texture>
+ <texture>Aircraft/Generic/Effects/glass_shader.png</texture>
<object-name>vitreA</object-name>
<object-name>vitreB</object-name>
</animation>
@@ -140,13 +140,90 @@
-->
</animation>
+ <!-- Les flammes -->
+ <model>
+ <path>Aircraft/F-106-dart/Models/effects/flammes/flammes.xml</path>
+ <offsets>
+ <x-m> 9.456 </x-m>
+ <y-m> 0.000 </y-m>
+ <z-m> -0.430 </z-m>
+ </offsets>
+ </model>
+
+ <!-- Particules OSG -->
+ <!-- Gauche -->
+ <model>
+ <path>Aircraft/F-106-dart/Models/effects/trail.xml</path>
+ <offsets>
+ <x-m> 9.456 </x-m>
+ <y-m> 0.000 </y-m>
+ <z-m> -0.430 </z-m>
+ <roll-deg> 0 </roll-deg>
+ <pitch-deg> 0 </pitch-deg>
+ <heading-deg> 0 </heading-deg>
+ </offsets>
+ </model>
+
+ <model>
+ <path>Aircraft/F-106-dart/Models/effects/smoke.xml</path>
+ <offsets>
+ <x-m> 9.456 </x-m>
+ <y-m> 0.000 </y-m>
+ <z-m> -0.430 </z-m>
+ <roll-deg> 0 </roll-deg>
+ <pitch-deg> 0 </pitch-deg>
+ <heading-deg> 0 </heading-deg>
+ </offsets>
+ </model>
+
+ <model>
+ <path>Aircraft/F-106-dart/Models/effects/tiptrail.xml</path>
+ <offsets>
+ <x-m> 7.557 </x-m>
+ <y-m> -5.802 </y-m>
+ <z-m> -1.441 </z-m>
+ <roll-deg> 0 </roll-deg>
+ <pitch-deg> 0 </pitch-deg>
+ <heading-deg> 0 </heading-deg>
+ </offsets>
+ </model>
+
+ <model>
+ <path>Aircraft/F-106-dart/Models/effects/tiptrail.xml</path>
+ <offsets>
+ <x-m> 7.557 </x-m>
+ <y-m> 5.802 </y-m>
+ <z-m> -1.441 </z-m>
+ <roll-deg> 0 </roll-deg>
+ <pitch-deg> 0 </pitch-deg>
+ <heading-deg> 0 </heading-deg>
+ </offsets>
+ </model>
+
+ <!-- Une ombre pour OSG -->
+ <model>
+ <name>shadowOSG</name>
+ <path>Aircraft/F-106-dart/Models/shadow.xml</path>
+ </model>
+
+ <animation>
+ <type>select</type>
+ <object-name>shadowOSG</object-name>
+ <condition>
+ <equals>
+ <property>sim[0]/rendering/shadows-ai</property>
+ <value>true</value>
+ </equals>
+ </condition>
+ </animation>
+
<!-- Interieur -->
<model>
<path>Aircraft/F-106-dart/Models/Interior/interior.xml</path>
<offsets>
- <x-m> 0.000 </x-m>
- <y-m> 0.000 </y-m>
- <z-m> 0.000 </z-m>
+ <x-m> 0 </x-m>
+ <y-m> 0 </y-m>
+ <z-m> 0 </z-m>
</offsets>
</model>
@@ -361,9 +438,9 @@
<z-m> -1.312 </z-m>
</center>
<axis>
- <x> 1.000 </x>
- <y> 0.000 </y>
- <z> 0.000 </z>
+ <x> 1 </x>
+ <y> 0 </y>
+ <z> 0 </z>
</axis>
</animation>
@@ -378,9 +455,9 @@
<z-m> -1.312 </z-m>
</center>
<axis>
- <x> 1.000 </x>
- <y> 0.000 </y>
- <z> 0.000 </z>
+ <x> 1 </x>
+ <y> 0 </y>
+ <z> 0 </z>
</axis>
</animation>
@@ -399,9 +476,9 @@
<z-m> -1.656 </z-m>
</center>
<axis>
- <x> 1.000 </x>
- <y> 0.000 </y>
- <z> 0.000 </z>
+ <x> 1 </x>
+ <y> 0 </y>
+ <z> 0 </z>
</axis>
</animation>
@@ -420,9 +497,9 @@
<z-m> -1.656 </z-m>
</center>
<axis>
- <x> 1.000 </x>
- <y> 0.000 </y>
- <z> 0.000 </z>
+ <x> 1 </x>
+ <y> 0 </y>
+ <z> 0 </z>
</axis>
</animation>
@@ -464,9 +541,9 @@
<z-m> -1.686 </z-m>
</center>
<axis>
- <x> 0.000 </x>
- <y> 1.000 </y>
- <z> 0.000 </z>
+ <x> 0 </x>
+ <y> 1 </y>
+ <z> 0 </z>
</axis>
</animation>
@@ -484,9 +561,9 @@
<z-m> -1.205 </z-m>
</center>
<axis>
- <x> 1.000 </x>
- <y> 0.000 </y>
- <z> 0.000 </z>
+ <x> 1 </x>
+ <y> 0 </y>
+ <z> 0 </z>
</axis>
</animation>
@@ -511,9 +588,9 @@
<z-m> -1.649 </z-m>
</center>
<axis>
- <x> 1.000 </x>
- <y> 0.000 </y>
- <z> 0.000 </z>
+ <x> 1 </x>
+ <y> 0 </y>
+ <z> 0 </z>
</axis>
</animation>
@@ -532,9 +609,9 @@
<z-m> -1.068 </z-m>
</center>
<axis>
- <x> 1.000 </x>
- <y> 0.000 </y>
- <z> 0.000 </z>
+ <x> 1 </x>
+ <y> 0 </y>
+ <z> 0 </z>
</axis>
</animation>
@@ -559,9 +636,9 @@
<z-m> -1.649 </z-m>
</center>
<axis>
- <x> 1.000 </x>
- <y> 0.000 </y>
- <z> 0.000 </z>
+ <x> 1 </x>
+ <y> 0 </y>
+ <z> 0 </z>
</axis>
</animation>
@@ -580,9 +657,9 @@
<z-m> -1.068 </z-m>
</center>
<axis>
- <x> 1.000 </x>
- <y> 0.000 </y>
- <z> 0.000 </z>
+ <x> 1 </x>
+ <y> 0 </y>
+ <z> 0 </z>
</axis>
</animation>
@@ -600,9 +677,9 @@
<z-m> -1.205 </z-m>
</center>
<axis>
- <x> 1.000 </x>
- <y> 0.000 </y>
- <z> 0.000 </z>
+ <x> 1 </x>
+ <y> 0 </y>
+ <z> 0 </z>
</axis>
</animation>
@@ -636,9 +713,9 @@
<entry><ind> 1.00 </ind><dep> 0.11 </dep></entry>
</interpolation>
<axis>
- <x> 0.0 </x>
- <y> 0.0 </y>
- <z> 1.0 </z>
+ <x> 0 </x>
+ <y> 0 </y>
+ <z> 1 </z>
</axis>
</animation>
@@ -657,9 +734,9 @@
<z-m> -2.196 </z-m>
</center>
<axis>
- <x> 0.0 </x>
- <y> 1.0 </y>
- <z> 0.0 </z>
+ <x> 0 </x>
+ <y> 1 </y>
+ <z> 0 </z>
</axis>
</animation>
@@ -678,9 +755,9 @@
<z-m> -2.588 </z-m>
</center>
<axis>
- <x> 0.0 </x>
- <y> 1.0 </y>
- <z> 0.0 </z>
+ <x> 0 </x>
+ <y> 1 </y>
+ <z> 0 </z>
</axis>
</animation>
@@ -694,9 +771,9 @@
<entry><ind> 1.00 </ind><dep> 0.29 </dep></entry>
</interpolation>
<axis>
- <x> 0.0 </x>
- <y> 0.0 </y>
- <z> 1.0 </z>
+ <x> 0 </x>
+ <y> 0 </y>
+ <z> 1 </z>
</axis>
</animation>
@@ -710,9 +787,9 @@
<entry><ind> 1.00 </ind><dep> 0.29 </dep></entry>
</interpolation>
<axis>
- <x> 0.0 </x>
- <y> 0.0 </y>
- <z> 1.0 </z>
+ <x> 0 </x>
+ <y> 0 </y>
+ <z> 1 </z>
</axis>
</animation>
@@ -728,9 +805,9 @@
<z-m> -2.198 </z-m>
</center>
<axis>
- <x> 0.000 </x>
- <y> 0.000 </y>
- <z> -1.000 </z>
+ <x> 0 </x>
+ <y> 0 </y>
+ <z> -1 </z>
</axis>
</animation>
@@ -746,9 +823,9 @@
<z-m> -2.840 </z-m>
</center>
<axis>
- <x> 0.000 </x>
- <y> -1.000 </y>
- <z> 0.000 </z>
+ <x> 0 </x>
+ <y> -1 </y>
+ <z> 0 </z>
</axis>
</animation>
@@ -763,9 +840,9 @@
<z-m> -2.697 </z-m>
</center>
<axis>
- <x> 0.000 </x>
- <y> -1.000 </y>
- <z> 0.000 </z>
+ <x> 0 </x>
+ <y> -1 </y>
+ <z> 0 </z>
</axis>
</animation>
@@ -780,9 +857,9 @@
<z-m> -2.697 </z-m>
</center>
<axis>
- <x> 0.000 </x>
- <y> -1.000 </y>
- <z> 0.000 </z>
+ <x> 0 </x>
+ <y> -1 </y>
+ <z> 0 </z>
</axis>
</animation>
@@ -804,10 +881,100 @@
<z-m> 0.129 </z-m>
</center>
<axis>
- <x> 0.000 </x>
- <y> 1.000 </y>
- <z> 0.000 </z>
+ <x> 0 </x>
+ <y> 1 </y>
+ <z> 0 </z>
</axis>
</animation>
+ <!-- Ajout des effets lumineux -->
+ <model>
+ <path>Aircraft/F-106-dart/Models/lights/beacon.xml</path>
+ <offsets>
+ <x-m> 1.714 </x-m>
+ <y-m> 0.000 </y-m>
+ <z-m> 0.191 </z-m>
+ </offsets>
+ </model>
+
+ <model>
+ <path>Aircraft/F-106-dart/Models/lights/beacon.xml</path>
+ <offsets>
+ <x-m> -2.509 </x-m>
+ <y-m> 0.000 </y-m>
+ <z-m> -1.824 </z-m>
+ </offsets>
+ </model>
+
+ <model>
+ <path>Aircraft/F-106-dart/Models/lights/RedLight.xml</path>
+ <offsets>
+ <x-m> 7.410 </x-m>
+ <y-m> -5.472 </y-m>
+ <z-m> -1.379 </z-m>
+ </offsets>
+ </model>
+
+ <model>
+ <path>Aircraft/F-106-dart/Models/lights/GreenLight.xml</path>
+ <offsets>
+ <x-m> 7.410 </x-m>
+ <y-m> 5.472 </y-m>
+ <z-m> -1.379 </z-m>
+ </offsets>
+ </model>
+
+ <model>
+ <path>Aircraft/F-106-dart/Models/lights/StrobeWhite.xml</path>
+ <offsets>
+ <x-m> 7.390 </x-m>
+ <y-m> -5.472 </y-m>
+ <z-m> -1.379 </z-m>
+ </offsets>
+ </model>
+
+ <model>
+ <path>Aircraft/F-106-dart/Models/lights/StrobeWhite.xml</path>
+ <offsets>
+ <x-m> 7.390 </x-m>
+ <y-m> 5.472 </y-m>
+ <z-m> -1.379 </z-m>
+ </offsets>
+ </model>
+
+ <!-- Gear light cone -->
+ <model>
+ <name>ConeLeft</name>
+ <path>Aircraft/F-106-dart/Models/lights/light-cone.xml</path>
+ <offsets>
+ <x-m> 3.262 </x-m>
+ <y-m> -2.115 </y-m>
+ <z-m> -1.597 </z-m>
+ <pitch-deg> -5 </pitch-deg>
+ </offsets>
+ </model>
+
+ <model>
+ <name>ConeRight</name>
+ <path>Aircraft/F-106-dart/Models/lights/light-cone.xml</path>
+ <offsets>
+ <x-m> 3.262 </x-m>
+ <y-m> 2.115 </y-m>
+ <z-m> -1.597 </z-m>
+ <pitch-deg> -5 </pitch-deg>
+ </offsets>
+ </model>
+
+ <animation>
+ <type>select</type>
+ <object-name>ConeLeft</object-name>
+ <object-name>ConeRight</object-name>
+ <condition>
+ <equals>
+ <property>gear/gear[0]/position-norm</property>
+ <value> 1 </value>
+ </equals>
+ </condition>
+ </animation>
+
</PropertyList>
--- "glass_shader.png" 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
_______________________________________________
Flightgear-cvslogs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/flightgear-cvslogs