CVS: data/Aircraft/DH-88/Models shadow.ac, NONE, 1.1 shadow.png, NONE, 1.1 shadow.xml, NONE, 1.1 dh88.ac, 1.7, 1.8 dh88.xml, 1.9, 1.10 glass_shader.png, 1.1, NONE

Emmanuel Baranger <[email protected]> Fri, 9 Apr 2010 18:20:24 -0500
Newsgroups gmane.games.flightgear.cvc
Message-ID <[email protected]>
Update of /var/cvs/FlightGear-0.9/data/Aircraft/DH-88/Models
In directory baron.flightgear.org:/tmp/cvs-serv25653/Models

Modified Files:
	dh88.ac dh88.xml 
Added Files:
	shadow.ac shadow.png shadow.xml 
Removed Files:
	glass_shader.png 
Log Message:
- little update on 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
4.364783 -1.200132 -6.686188
4.364783 -1.200132 6.686192
-4.396845 -1.200132 6.686188
-4.396842 -1.200132 -6.686192
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: dh88.ac
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/DH-88/Models/dh88.ac,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dh88.ac	23 Mar 2009 21:39:30 -0000	1.7
+++ dh88.ac	9 Apr 2010 23:08:20 -0000	1.8
@@ -1,14 +1,13 @@
 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 "Material" rgb 0.8 0.8 0.8 amb 0.5 0.5 0.5 emis 0 0 0 spec 1 1 1 shi 32 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.001" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0
 MATERIAL "rougetrans" rgb 1 0.5 0.5 amb 0 0 0 emis 0 0 0 spec 0 0 0 shi 64 trans 0.4
 MATERIAL "verttrans" rgb 0.5 1 0.5 amb 0 0 0 emis 0 0 0 spec 0 0 0 shi 64 trans 0.4
 MATERIAL "nospec" rgb 1 1 1 amb 0 0 0 emis 0 0 0 spec 0 0 0 shi 0 trans 0.5
 MATERIAL "transparent" rgb 1 1 1 amb 0 0 0 emis 0 0 0 spec 0 0 0 shi 64 trans 0.6
-MATERIAL "Material.001" rgb 0.8 0.8 0.8 amb 0.5 0.5 0.5 emis 0 0 0 spec 1 1 1 shi 32 trans 0
 OBJECT world
[...81153 lines suppressed...]
+mat 1
+refs 3
+433 0.0291756018996 0.179004758596
+432 0.0411667078733 0.216274738312
+434 0.0283153988421 0.179022461176
+SURF 0x10
+mat 1
+refs 3
+450 0.0291756018996 0.179004758596
+447 0.0283153988421 0.179022461176
+435 0.0411667078733 0.216274738312
+SURF 0x10
+mat 1
+refs 3
+445 0.0929291397333 0.184299126267
+443 0.0869500637054 0.216274738312
+440 0.0929291397333 0.183915197849
 kids 0
 OBJECT poly
 name "vitres"

Index: dh88.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/DH-88/Models/dh88.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dh88.xml	2 Mar 2009 16:46:14 -0000	1.9
+++ dh88.xml	9 Apr 2010 23:10:59 -0000	1.10
@@ -21,7 +21,6 @@
     <object-name>aileronG</object-name>
     <object-name>aileronD</object-name>
     <object-name>profondeur</object-name>
-    <object-name>derive</object-name>
     <object-name>direction</object-name>
     <object-name>roueG</object-name>
     <object-name>roueD</object-name>
@@ -43,6 +42,7 @@
     <object-name>echapp</object-name>
     <object-name>pito</object-name>
     <object-name>lamps</object-name>
+    <object-name>trous</object-name>
 
     <!-- Objets transparents -->
     <object-name>vitres</object-name>
@@ -69,17 +69,17 @@
     <object-name>lampD</object-name>
   </animation>
 
-  <animation>
-    <type>shader</type>
-    <shader>chrome</shader>
-    <texture>glass_shader.png</texture>
+  <animation>
+    <type>shader</type>
+    <shader>chrome</shader>
+    <texture>Aircraft/Generic/Effects/glass_shader.png</texture>
     <object-name>vitres</object-name>
     <object-name>nez</object-name>
     <object-name>lampR</object-name>
     <object-name>lampG</object-name>
     <object-name>lampD</object-name>
-  </animation>
-
+  </animation>
+
   <animation>
     <type>material</type>
     <object-name>fuselage</object-name>
@@ -88,7 +88,6 @@
     <object-name>aileronG</object-name>
     <object-name>aileronD</object-name>
     <object-name>profondeur</object-name>
-    <object-name>derive</object-name>
     <object-name>direction</object-name>
     <object-name>roueG</object-name>
     <object-name>roueD</object-name>
@@ -110,6 +109,8 @@
     <object-name>echapp</object-name>
     <object-name>pito</object-name>
     <object-name>lamps</object-name>
+    <object-name>trous</object-name>
+
     <property-base>sim/model/livery</property-base>
     <texture-prop>texture</texture-prop>
     <texture>texture.png</texture>
@@ -144,6 +145,23 @@
 -->
   </animation>
 
+  <!-- Une ombre pour OSG -->
+  <model>
+    <name>shadowOSG</name>
+    <path>Aircraft/DH-88/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>
+
   <!-- Immatriculation -->
   <model>
     <path>Aircraft/DH-88/Models/Immat/immat.xml</path>
@@ -612,5 +630,28 @@
     </offsets>
   </model>
 
+  <!-- Wing light cone -->
+  <model>
+    <name>Taxi-Light</name>
+    <path>Aircraft/DH-88/Models/lights/light-cone.xml</path>
+    <offsets>
+      <x-m>       -4.250 </x-m>
+      <y-m>        0.000 </y-m>
+      <z-m>        0.064 </z-m>
+      <pitch-deg> -7.500 </pitch-deg>
+    </offsets>
+  </model>
+
+  <animation>
+    <type>select</type>
+    <object-name>Taxi-Light</object-name>
+    <condition>
+      <equals>
+        <property>gear/gear[0]/position-norm</property>
+        <value> 1 </value>
+      </equals>
+    </condition>
+  </animation>
+
 </PropertyList>
 

--- "glass_shader.png" DELETED ---

------------------------------------------------------------------------------
Download Intel&#174; 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