CVS: data/Aircraft/Lockheed-NF104A/Models nf104a.ac, 1.2, 1.3 nf104a.xml, 1.4, 1.5

Emmanuel Baranger <[email protected]> Fri, 2 Apr 2010 17:51:58 -0500
Newsgroups gmane.games.flightgear.cvc
Message-ID <[email protected]>
Update of /var/cvs/FlightGear-0.9/data/Aircraft/Lockheed-NF104A/Models
In directory baron.flightgear.org:/tmp/cvs-serv5663/Models

Modified Files:
	nf104a.ac nf104a.xml 
Log Message:
- new update for new effects

Index: nf104a.ac
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lockheed-NF104A/Models/nf104a.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nf104a.ac	28 Mar 2010 12:12:08 -0000	1.2
+++ nf104a.ac	2 Apr 2010 22:49:15 -0000	1.3
@@ -1,10 +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" 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 "ac3dmat1.001" rgb 1 1 1 amb 0.2 0.2 0.2 emis 0 0 0 spec 0.2 0.2 0.2 shi 128 trans 0
+MATERIAL "ac3dmat14.001" rgb 0.8 0.8 0.8 amb 0.8 0.8 0.8 emis 0 0 0 spec 0.8 0.8 0.8 shi 128 trans 0
+MATERIAL "ac3dmat1.002" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 128 trans 0
 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.5
 OBJECT world
-kids 36
+kids 46
[...11633 lines suppressed...]
+mat 5
 refs 4
 74 0.900245368481 0.574562370777
 76 0.843548715115 0.700283586979
 87 0.86613792181 0.736468791962
 81 0.930969357491 0.670720219612
 SURF 0x10
-mat 3
+mat 5
 refs 4
 88 0.965484678745 0.600780248642
 79 0.963858366013 0.421605139971
 74 0.900245368481 0.574562370777
 81 0.930969357491 0.670720219612
 SURF 0x10
-mat 3
+mat 5
 refs 4
 84 1.0 0.530840396881
 80 0.994626700878 0.32022228837

Index: nf104a.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Lockheed-NF104A/Models/nf104a.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nf104a.xml	2 Apr 2010 15:35:37 -0000	1.4
+++ nf104a.xml	2 Apr 2010 22:49:35 -0000	1.5
@@ -27,6 +27,8 @@
     <object-name>voletG</object-name>
     <object-name>voletD</object-name>
     <object-name>derive</object-name>
+    <object-name>profondeurG</object-name>
+    <object-name>profondeurD</object-name>
     <object-name>entreeair</object-name>
     <object-name>aerofreinG</object-name>
     <object-name>aerofreinD</object-name>
@@ -36,8 +38,23 @@
     <object-name>articuleB</object-name>
     <object-name>lampeA</object-name>
     <object-name>roueA</object-name>
+     
+    <object-name>axeG</object-name>
+    <object-name>axeGH</object-name>
+    <object-name>axeGbar</object-name>
+    <object-name>axeGpiston</object-name>
+    <object-name>roueG</object-name>
+    <object-name>lampeG</object-name>
     <object-name>roueG</object-name>
+
+    <object-name>axeD</object-name>
+    <object-name>axeDH</object-name>
+    <object-name>axeDbar</object-name>
+    <object-name>axeDpiston</object-name>
     <object-name>roueD</object-name>
+    <object-name>lampeD</object-name>
+    <object-name>roueD</object-name>
+
     <object-name>sortie</object-name>
     <object-name>fusee</object-name>
     <object-name>profondeur</object-name>
@@ -48,13 +65,39 @@
     <object-name>vitres</object-name>
     <object-name>canopytrans</object-name>
     <object-name>lampeATR</object-name>
+    <object-name>lampeTRG</object-name>
+    <object-name>lampeTRD</object-name>
   </animation>
 
-	<effect>
-		<inherits-from>Aircraft/Lockheed-NF104A/Models/Effects/F104reflect</inherits-from>
+  <effect>
+    <inherits-from>Aircraft/Lockheed-NF104A/Models/Effects/F104reflect</inherits-from>
     <object-name>vitres</object-name>
     <object-name>canopytrans</object-name>
     <object-name>lampeATR</object-name>
+    <object-name>lampeTRG</object-name>
+    <object-name>lampeTRD</object-name>
+  </effect>
+
+  <effect>
+    <inherits-from>Aircraft/Lockheed-NF104A/Models/Effects/F104reflect</inherits-from>
+    <object-name>fuselage</object-name>
+    <object-name>porteG</object-name>
+    <object-name>porteD</object-name>
+    <object-name>porteAG</object-name>
+    <object-name>porteAD</object-name>
+    <object-name>canopy</object-name>
+    <object-name>ailes</object-name>
+    <object-name>aileronG</object-name>
+    <object-name>aileronD</object-name>
+    <object-name>voletG</object-name>
+    <object-name>voletD</object-name>
+    <object-name>derive</object-name>
+    <object-name>profondeurG</object-name>
+    <object-name>profondeurD</object-name>
+    <object-name>entreeair</object-name>
+    <object-name>aerofreinG</object-name>
+    <object-name>aerofreinD</object-name>
+    <object-name>direction</object-name>
   </effect>
 
   <animation>
@@ -62,6 +105,8 @@
     <object-name>vitres</object-name>
     <object-name>canopytrans</object-name>
     <object-name>lampeATR</object-name>
+    <object-name>lampeTRG</object-name>
+    <object-name>lampeTRD</object-name>
   </animation>
 
   <animation>
@@ -78,6 +123,8 @@
     <object-name>voletG</object-name>
     <object-name>voletD</object-name>
     <object-name>derive</object-name>
+    <object-name>profondeurG</object-name>
+    <object-name>profondeurD</object-name>
     <object-name>entreeair</object-name>
     <object-name>aerofreinG</object-name>
     <object-name>aerofreinD</object-name>
@@ -87,8 +134,23 @@
     <object-name>articuleB</object-name>
     <object-name>lampeA</object-name>
     <object-name>roueA</object-name>
+     
+    <object-name>axeG</object-name>
+    <object-name>axeGH</object-name>
+    <object-name>axeGbar</object-name>
+    <object-name>axeGpiston</object-name>
     <object-name>roueG</object-name>
+    <object-name>lampeG</object-name>
+    <object-name>roueG</object-name>
+
+    <object-name>axeD</object-name>
+    <object-name>axeDH</object-name>
+    <object-name>axeDbar</object-name>
+    <object-name>axeDpiston</object-name>
+    <object-name>roueD</object-name>
+    <object-name>lampeD</object-name>
     <object-name>roueD</object-name>
+
     <object-name>sortie</object-name>
     <object-name>fusee</object-name>
     <object-name>profondeur</object-name>
@@ -127,31 +189,7 @@
       <shininess-prop>shininess</shininess-prop>
     </shininess>
 -->
-  </animation> 
-  
-  <effect>
-    <inherits-from>Aircraft/Lockheed-NF104A/Models/Effects/F104reflect</inherits-from>
-    <object-name>fuselage</object-name>
-    <object-name>porteG</object-name>
-    <object-name>porteD</object-name>
-    <object-name>porteAG</object-name>
-    <object-name>porteAD</object-name>
-    <object-name>canopy</object-name>
-    <object-name>ailes</object-name>
-    <object-name>aileronG</object-name>
-    <object-name>aileronD</object-name>
-    <object-name>voletG</object-name>
-    <object-name>voletD</object-name>
-    <object-name>derive</object-name>
-    <object-name>entreeair</object-name>
-    <object-name>aerofreinG</object-name>
-    <object-name>aerofreinD</object-name>
-    <object-name>lampeA</object-name>
-    <object-name>sortie</object-name>
-    <object-name>fusee</object-name>
-    <object-name>profondeur</object-name>
-    <object-name>direction</object-name>
-  </effect>
+  </animation>
 
   <!-- Interieur -->
   <model>
@@ -180,6 +218,28 @@
     </condition>
   </animation>
 
+  <!-- Flamme -->
+  <model>
+    <path>Aircraft/Lockheed-NF104A/Models/Effects/flammes/flammesG.xml</path>
+    <offsets>
+      <x-m>  5.888 </x-m>
+      <y-m>  0.000 </y-m>
+      <z-m> -0.490 </z-m>
+      <roll-deg>     0 </roll-deg>
+      <pitch-deg>   -4 </pitch-deg>
+      <heading-deg>  0 </heading-deg>
+    </offsets>
+  </model>
+
+  <model>
+    <path>Aircraft/Lockheed-NF104A/Models/Effects/trail/trail.xml</path>
+    <offsets>
+      <x-m>  5.888 </x-m>
+      <y-m>  0.000 </y-m>
+      <z-m> -0.490 </z-m>
+    </offsets>
+  </model>
+
   <!-- Ailerons -->
   <animation>
     <type>rotate</type>
@@ -296,7 +356,7 @@
       <z2-m> 0.405 </z2-m>
     </axis>
   </animation>
-  
+
   <!-- Aerofreins -->
   <animation>
     <type>rotate</type>
@@ -354,6 +414,64 @@
     </axis>
   </animation>
 
+  <animation>
+    <name>RoueGauche</name>
+    <object-name>axeG</object-name>
+    <object-name>axeGpiston</object-name>
+    <object-name>axeGbar</object-name>
+    <object-name>roueG</object-name>
+  </animation>
+
+  <animation>
+    <type>rotate</type>
+    <object-name>RoueGauche</object-name>
+    <property>/gear/gear[1]/compression-norm</property>
+    <interpolation>
+      <entry><ind> 0.0 </ind><dep>   5 </dep></entry>
+      <entry><ind> 0.1 </ind><dep>   0 </dep></entry>
+      <entry><ind> 1.0 </ind><dep> -10 </dep></entry>
+    </interpolation>
+    <center>
+      <x-m>  1.753 </x-m>
+      <y-m> -0.320 </y-m>
+      <z-m> -1.235 </z-m>
+    </center>
+    <axis>
+      <x> 1 </x>
+      <y> 0 </y>
+      <z> 0 </z>
+    </axis>
+  </animation>
+
+  <animation>
+    <name>RoueDroite</name>
+    <object-name>axeD</object-name>
+    <object-name>axeDpiston</object-name>
+    <object-name>axeDbar</object-name>
+    <object-name>roueD</object-name>
+  </animation>
+
+  <animation>
+    <type>rotate</type>
+    <object-name>RoueDroite</object-name>
+    <property>/gear/gear[2]/compression-norm</property>
+    <interpolation>
+      <entry><ind> 0.0 </ind><dep>   5 </dep></entry>
+      <entry><ind> 0.1 </ind><dep>   0 </dep></entry>
+      <entry><ind> 1.0 </ind><dep> -10 </dep></entry>
+    </interpolation>
+    <center>
+      <x-m>  1.753 </x-m>
+      <y-m>  0.320 </y-m>
+      <z-m> -1.235 </z-m>
+    </center>
+    <axis>
+      <x> -1 </x>
+      <y>  0 </y>
+      <z>  0 </z>
+    </axis>
+  </animation>
+
   <!-- Rentre des roues -->
   <animation>
     <name>TrainAvant</name>
@@ -389,7 +507,12 @@
   <animation>
     <name>TrainGauche</name>
     <object-name>axeG</object-name>
+    <object-name>axeGH</object-name>
+    <object-name>axeGbar</object-name>
+    <object-name>axeGpiston</object-name>
     <object-name>roueG</object-name>
+    <object-name>lampeG</object-name>
+    <object-name>lampeTRG</object-name>
   </animation>
 
   <animation>
@@ -436,7 +559,12 @@
   <animation>
     <name>TrainDroit</name>
     <object-name>axeD</object-name>
+    <object-name>axeDH</object-name>
+    <object-name>axeDbar</object-name>
+    <object-name>axeDpiston</object-name>
     <object-name>roueD</object-name>
+    <object-name>lampeD</object-name>
+    <object-name>lampeTRD</object-name>
   </animation>
 
   <animation>


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