CVS: data/Aircraft/f-14b/Models/Cockpit an-arc-182v.ac, 1.2, 1.3 an-arc-182v.xml, 1.3, 1.4 cockpit.xml, 1.24, 1.25 detail-inside-back.ac, 1.9, 1.10 rio-ecm-display.ac, 1.1, 1.2

Alexis Bory <[email protected]> Mon, 12 Apr 2010 15:31:03 -0500
Newsgroups	gmane.games.flightgear.cvc
Message-ID	<[email protected]>
Update of /var/cvs/FlightGear-0.9/data/Aircraft/f-14b/Models/Cockpit
In directory baron.flightgear.org:/tmp/cvs-serv1934

Modified Files:
	an-arc-182v.ac an-arc-182v.xml cockpit.xml 
	detail-inside-back.ac rio-ecm-display.ac 
Log Message:
- Add armament panel, move a bit other instruments.


Index: an-arc-182v.ac
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/f-14b/Models/Cockpit/an-arc-182v.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- an-arc-182v.ac	19 Mar 2009 19:28:49 -0000	1.2
+++ an-arc-182v.ac	12 Apr 2010 20:30:39 -0000	1.3
@@ -7,8 +7,8 @@
 kids 1
 OBJECT group
 name "an-arc-182v"
-loc -0.0933585 0.0430478 -0.0539779
-kids 14
+loc -0.0570182 0.0306512 -0.0539779
+kids 13
 OBJECT group
 name "switches-and-knobs"
 loc -0.337893 0.433678 -0.446023
@@ -19,128 +19,128 @@
[...7118 lines suppressed...]
-0.060329 0.0222842 0.00623135
-0.07236 0.0223866 0.00623135
-0.060329 0.0222842 -0.00157359
 0.07236 0.0223866 -0.00157359
+0.060329 0.0222842 -0.00157359
+0.07236 0.0223866 0.00623135
+0.060329 0.0222842 0.00623135
 numsurf 1
 SURF 0x10
 mat 2
 refs 4
-1 0.0690576 0.804858
-3 0.950223 0.804858
-2 0.950223 0.897372
-0 0.0690576 0.897372
+2 0.0690576 0.804858
+0 0.950223 0.804858
+1 0.950223 0.897372
+3 0.0690576 0.897372
 kids 0

Index: an-arc-182v.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/f-14b/Models/Cockpit/an-arc-182v.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- an-arc-182v.xml	17 Dec 2008 17:10:48 -0000	1.3
+++ an-arc-182v.xml	12 Apr 2010 20:30:45 -0000	1.4
@@ -4,7 +4,7 @@
 <PropertyList>
 	<path>an-arc-182v.ac</path>
 
-	<animation>
+	<!--<animation>
 		<type>select</type>
 		<object-name>an-arc-182v</object-name>
 		<condition>
@@ -13,7 +13,7 @@
 				<value>RIO View</value>
 			</equals>
 		</condition>
-	</animation>
+	</animation>-->
 
 	<!-- Frequency Digital Display, ta-ta-ta da... -->
 	<animation>
@@ -256,8 +256,8 @@
 		<property>sim/model/f-14b/instrumentation/an-arc-182v/function</property>
 		<factor>30</factor>
 		<center>
-			<x-m>-0.0222</x-m>
-			<y-m>-0.0492</y-m>
+			<x-m>0.0142</x-m>
+			<y-m>-0.0491</y-m>
 			<z-m>0.0</z-m>
 		</center>
 		<axis>
@@ -317,8 +317,8 @@
 		<property>sim/model/f-14b/instrumentation/an-arc-182v/mode</property>
 		<factor>30</factor>
 		<center>
-			<x-m>-0.0228</x-m>
-			<y-m>0.0516</y-m>
+			<x-m>0.0135</x-m>
+			<y-m>0.0515</y-m>
 			<z-m>0.0</z-m>
 		</center>
 		<axis>
@@ -356,7 +356,7 @@
 		<property>sim/model/f-14b/instrumentation/an-arc-182v/volume</property>
 		<factor>225</factor>
 		<center>
-			<x-m>-0.0505</x-m>
+			<x-m>-0.0142</x-m>
 			<y-m>-0.0608</y-m>
 			<z-m>0.0</z-m>
 		</center>
@@ -367,6 +367,7 @@
 		</axis>
 	</animation>
 	<animation>
+		<name>toto</name>
 		<type>pick</type>
 		<visible>true</visible>
 		<object-name>hotspot-volume</object-name>

Index: cockpit.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/f-14b/Models/Cockpit/cockpit.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- cockpit.xml	23 Jan 2010 17:50:49 -0000	1.24
+++ cockpit.xml	12 Apr 2010 20:30:51 -0000	1.25
@@ -480,12 +480,23 @@
 
 	<!-- Left Console -->
 	<model>
+		<path>Aircraft/f-14b/Models/Cockpit/armament-panel.xml</path>
+		<offsets>
+			<x-m>-4.0827</x-m>
+			<y-m>-0.4453</y-m>
+			<z-m>-0.1820</z-m>
+			<pitch-deg>-18.5</pitch-deg>
+			<heading-deg>11.5</heading-deg>
+			<roll-deg>-3.5</roll-deg>
+		</offsets>
+	</model>
+	<model>
 		<path>Aircraft/f-14b/Models/Cockpit/an-arc-182v.xml</path>
 		<offsets>
 			<x-m>-3.7609</x-m>
-			<y-m>-0.3850</y-m>
-			<z-m>-0.3340</z-m>
-			<roll-deg>-23.8</roll-deg>
+			<y-m>-0.3852</y-m>
+			<z-m>-0.3213</z-m>
+			<roll-deg>-17</roll-deg>
 		</offsets>
 	</model>
 
@@ -564,9 +575,9 @@
 		<path>Aircraft/f-14b/Models/Cockpit/rio-ecm-display.xml</path>
 		<offsets>
 			<x-m>-4.0150</x-m>
-			<y-m>0.3918</y-m>
-			<z-m>-0.3390</z-m>
-			<roll-deg>23.2</roll-deg>
+			<y-m>0.3888</y-m>
+			<z-m>-0.3191</z-m>
+			<roll-deg>17</roll-deg>
 		</offsets>
 	</model>
 	

Index: detail-inside-back.ac
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/f-14b/Models/Cockpit/detail-inside-back.ac,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- detail-inside-back.ac	18 Jan 2010 23:31:24 -0000	1.9
+++ detail-inside-back.ac	12 Apr 2010 20:30:54 -0000	1.10
@@ -3,810 +3,572 @@
 MATERIAL "ac3dmat14" rgb 0.8 0.8 0.8  amb 0.8 0.8 0.8  emis 0 0 0  spec 0.2 0.2 0.2  shi 128  trans 0
 MATERIAL "ac3dmat13" rgb 0.533333 0.533333 0.533333  amb 0.533333 0.533333 0.533333  emis 0 0 0  spec 0.2 0.2 0.2  shi 128  trans 0
 OBJECT world
-kids 1
+kids 2
 OBJECT group
 name "detail-inside-back"
 loc -4.04816 -0.206898 -0.0674277
-kids 8
+kids 6
+OBJECT group
[...4009 lines suppressed...]
-91 0.519531 0.0351562
-90 0.519531 0.0378482
-47 0.472656 0.0378482
-SURF 0x10
+25 0.45125 0.683799
+55 0.45125 0.683799
+56 0.447504 0.675363
+24 0.447504 0.675363
+SURF 0x0
 mat 0
 refs 4
-68 0.472656 0.0351562
-69 0.519531 0.0351562
-91 0.519531 0.0351562
-46 0.472656 0.0351562
+24 0.447504 0.675363
+56 0.447504 0.675363
+57 0.358085 0.588386
+23 0.358085 0.588386
 kids 0

Index: rio-ecm-display.ac
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/f-14b/Models/Cockpit/rio-ecm-display.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rio-ecm-display.ac	15 Oct 2009 20:40:18 -0000	1.1
+++ rio-ecm-display.ac	12 Apr 2010 20:30:58 -0000	1.2
@@ -10,7 +10,7 @@
 kids 3
 OBJECT poly
 name "mount"
-loc 0.0599693 -0.00536775 0.0389816
+loc 0.0599693 -0.0205568 0.0389816
 texture "rio-ecm-display.png"
 crease 180.000000
 numvert 96
@@ -754,7 +754,7 @@
 kids 0
 OBJECT poly
 name "mode-toggle"
-loc -0.06377 -0.00147083 -0.0567209
+loc -0.06377 -0.0166599 -0.0567209
 crease 45.000000
 numvert 4
 0.0661481 -1.86265e-09 0.0325983
@@ -776,7 +776,7 @@
 kids 4
 OBJECT poly
 name "data-adf-switch"
-loc 0.0280207 0.00041382 -0.0350854
+loc 0.0280207 -0.0147752 -0.0350854
 texture "an-arc-182v.png"
 crease 45.000000
 numvert 17
@@ -905,7 +905,7 @@
 kids 0
 OBJECT poly
 name "mode-switch"
-loc -0.00675775 -0.00124147 -0.0339605
+loc -0.0067577 -0.0164305 -0.0339605
 texture "an-arc-182v.png"
 crease 45.000000
 numvert 17
@@ -1034,7 +1034,7 @@
 kids 0
 OBJECT poly
 name "ecm-oride-switch"
-loc -0.0107474 0.000413822 0.0111856
+loc -0.0107474 -0.0147752 0.0111856
 texture "an-arc-182v.png"
 crease 45.000000
 numvert 17
@@ -1163,7 +1163,7 @@
 kids 0
 OBJECT poly
 name "ecm-corr-switch"
-loc -0.0105155 0.000413822 0.0564693
+loc -0.0105155 -0.0147752 0.0564693
 texture "an-arc-182v.png"
 crease 45.000000
 numvert 17


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