CVS: data/Aircraft/Lionceau/Models shadow.png, NONE, 1.1 lionceau.ac, 1.18, 1.19 lionceau.xml, 1.19, 1.20 prop.png, 1.2, 1.3 shadow.ac, 1.5, 1.6 texture.png, 1.7, 1.8 texture.xcf.gz, 1.5, 1.6 glass_shader.png, 1.1, NONE

Emmanuel Baranger <[email protected]> Sun, 4 Apr 2010 06:55:44 -0500
Newsgroups gmane.games.flightgear.cvc
Message-ID <[email protected]>
Update of /var/cvs/FlightGear-0.9/data/Aircraft/Lionceau/Models
In directory baron.flightgear.org:/tmp/cvs-serv23715/Models

Modified Files:
	lionceau.ac lionceau.xml prop.png shadow.ac texture.png 
	texture.xcf.gz 
Added Files:
	shadow.png 
Removed Files:
	glass_shader.png 
Log Message:
- little update on FDM 

--- NEW BINARY FILE "shadow.png" ---

Index: lionceau.ac
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lionceau/Models/lionceau.ac,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lionceau.ac	1 Apr 2009 16:25:27 -0000	1.18
+++ lionceau.ac	4 Apr 2010 11:55:39 -0000	1.19
@@ -1,14 +1,12 @@
 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.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 "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.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 "transparentvert" rgb 0 1 0 amb 0 0 0 emis 0 0 0 spec 1 1 1 shi 64 trans 0.7
 MATERIAL "transparentrouge" rgb 1 0 0 amb 0 0 0 emis 0 0 0 spec 1 1 1 shi 64 trans 0.7
-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 0.547091 0.565624 0.595981 amb 0 0 0 emis 0 0 0 spec 1 1 1 shi 64 trans 0.7
-MATERIAL "inttransparent" rgb 0.28 0.28 0.28 amb 0 0 0 emis 0 0 0 spec 1 1 1 shi 64 trans 0.9
 OBJECT world
[...76193 lines suppressed...]
+mat 1
 refs 4
 57 0.555544912815 0.102343946695
 52 0.822497606277 0.118345156312
 43 0.822497606277 0.117730915546
 46 0.555544912815 0.101680122316
 SURF 0x10
-mat 2
+mat 1
 refs 4
 47 0.434690535069 0.0780837163329
 46 0.434690535069 0.101680122316
 43 0.167737856507 0.117730915546
 44 0.167737841606 0.0983548164368
 SURF 0x10
-mat 2
+mat 1
 refs 4
 47 0.555544912815 0.0780837163329
 44 0.822497606277 0.0983548164368

Index: lionceau.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lionceau/Models/lionceau.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- lionceau.xml	23 May 2009 10:26:28 -0000	1.19
+++ lionceau.xml	4 Apr 2010 11:55:40 -0000	1.20
@@ -70,6 +70,7 @@
     <object-name>cableB</object-name>
     <object-name>plaque</object-name>
     <object-name>lampes</object-name>
+    <object-name>trous</object-name>
 
     <!-- Objets transparents -->
     <object-name>verriere</object-name>
@@ -80,14 +81,14 @@
     <object-name>lampeD</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>verriere</object-name>
     <object-name>verriere2</object-name>
-  </animation>
-
+  </animation>
+
   <animation>
     <type>noshadow</type>
     <object-name>verriere</object-name>
@@ -132,6 +133,7 @@
     <object-name>machoireD</object-name>
     <object-name>cacheH</object-name>
     <object-name>cacheB</object-name>
+    <object-name>trous</object-name>
 
     <property-base>sim/model/livery</property-base>
     <texture-prop>texture</texture-prop>
@@ -249,7 +251,7 @@
   <animation>
     <type>rotate</type>
     <object-name>ProfondeurTrim</object-name>
-    <property>/controls/flight/elevator</property>
+    <property>surface-positions/elevator-pos-norm</property>
     <factor>11</factor>
     <center>
       <x-m> 3.108 </x-m>
@@ -289,7 +291,7 @@
   <animation>
     <type>rotate</type>
     <object-name>direction</object-name>
-    <property>/controls/flight/rudder</property>
+    <property>surface-positions/rudder-pos-norm</property>
     <factor>20</factor>
     <axis>
       <x1-m>  2.774 </x1-m>
@@ -565,9 +567,19 @@
     </axis>
   </animation>
 
-  <!-- Lumière rouge -->
+  <!-- Ajout des effets lumineux -->
   <model>
-    <name>LeftLight</name>
+    <name>Beacon</name>
+    <path>Aircraft/Lionceau/Models/lights/beacon.xml</path>
+    <offsets>
+      <x-m>  2.657 </x-m>
+      <y-m>  0.000 </y-m>
+      <z-m>  1.180 </z-m>
+    </offsets>
+  </model>
+
+  <model>
+    <name>Red</name>
     <path>Aircraft/Lionceau/Models/lights/RedLight.xml</path>
     <offsets>
       <x-m> -0.857 </x-m>
@@ -576,9 +588,8 @@
     </offsets>
   </model>
 
-  <!-- Lumière verte -->
   <model>
-    <name>RightLight</name>
+    <name>Green</name>
     <path>Aircraft/Lionceau/Models/lights/GreenLight.xml</path>
     <offsets>
       <x-m> -0.857 </x-m>
@@ -587,5 +598,40 @@
     </offsets>
   </model>
 
+  <model>
+    <name>LeftWhite</name>
+    <path>Aircraft/Lionceau/Models/lights/StrobeWhite.xml</path>
+    <offsets>
+      <x-m> -0.837 </x-m>
+      <y-m> -4.311 </y-m>
+      <z-m> -0.311 </z-m>
+    </offsets>
+  </model>
+
+  <model>
+    <name>RightWhite</name>
+    <path>Aircraft/Lionceau/Models/lights/StrobeWhite.xml</path>
+    <offsets>
+      <x-m> -0.837 </x-m>
+      <y-m>  4.311 </y-m>
+      <z-m> -0.311 </z-m>
+    </offsets>
+  </model>
+
+  <animation>
+    <type>select</type>
+    <object-name>Beacon</object-name>
+    <object-name>Red</object-name>
+    <object-name>Green</object-name>
+    <object-name>LeftWhite</object-name>
+    <object-name>RightWhite</object-name>
+    <condition>
+      <equals>
+        <property>controls/switches/lights</property>
+        <value>true</value>
+      </equals>
+    </condition>
+  </animation>
+
 </PropertyList>
 

Index: prop.png
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lionceau/Models/prop.png,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
Binary files /tmp/cvsniE0hD and /tmp/cvsOBPvUA differ

Index: shadow.ac
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lionceau/Models/shadow.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- shadow.ac	24 Dec 2009 19:23:03 -0000	1.5
+++ shadow.ac	4 Apr 2010 11:55:40 -0000	1.6
@@ -7,7 +7,7 @@
 name "shadow"
 data 6
 shadow
-texture "prop.png"
+texture "shadow.png"
 texrep 1 1
 crease 30.000000
 numvert 4
@@ -19,8 +19,8 @@
 SURF 0x00
 mat 1
 refs 4
-0 0.999929606915 0.998243153095
-3 0.500029265881 0.998243153095
-2 0.500029325485 0.501586735249
-1 0.999929606915 0.501586735249
+0 0.999999940395 0.999999582767
+3 2.8823663456e-07 1.0
+2 0.0 2.21848978299e-07
+1 0.999999821186 0.0
 kids 0

Index: texture.png
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lionceau/Models/texture.png,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
Binary files /tmp/cvsdeSCDG and /tmp/cvsy9EVjE differ

Index: texture.xcf.gz
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lionceau/Models/texture.xcf.gz,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
Binary files /tmp/cvs2F1MnF and /tmp/cvsaGE5eD differ

--- "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