[prev in list] [next in list] [prev in thread] [next in thread] 

List:       flightgear-cvs
Subject:    [Flightgear-cvslogs] CVS: data/Aircraft/bo105/Models bo105.xml, 1.60,
From:       Melchior Franz <mfranz () flightgear ! org>
Date:       2007-11-29 16:57:47
Message-ID: E1Ixmhv-0007HH-00 () baron ! me ! umn ! edu
[Download RAW message or body]

Update of /var/cvs/FlightGear-0.9/data/Aircraft/bo105/Models
In directory baron:/tmp/cvs-serv27894/Models

Modified Files:
	bo105.xml bo105.ac bo105.nas 
Log Message:
new main rotor. For now the metal parts are uni-color (should be more shiny
on civilian, and some parts darker on military variants). Control rods,
mixing levers, swash plate aren't animated (yet?), but the vibration
absorber pendulums are. More to come ...


Index: bo105.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/bo105/Models/bo105.xml,v
retrieving revision 1.60
retrieving revision 1.61
diff -C 2 -r1.60 -r1.61
*** bo105.xml	30 Sep 2007 19:05:46 -0000	1.60
--- bo105.xml	29 Nov 2007 16:57:02 -0000	1.61
***************
*** 7,13 ****
  	<nasal>
  		<load>
  			var variant = cmdarg().getNode("sim/model/variant");
! 			if (variant == nil or (variant = variant.getValue()) == nil)
! 				variant = 2;
  
  			var dir = getprop("/sim/fg-root") ~ "/Aircraft/bo105/Models/Variants";
--- 7,19 ----
  	<nasal>
  		<load>
+ 			print("LOAD ", cmdarg().getPath());
+ 
  			var variant = cmdarg().getNode("sim/model/variant");
! 			if (variant == nil or (variant = variant.getValue()) == nil) {
! 				variant = int(rand() * 5);
! 				print("RANDOM=", variant);
! 			} else {
! 				print("VARIANT=", variant);
! 			}
  
  			var dir = getprop("/sim/fg-root") ~ "/Aircraft/bo105/Models/Variants";
***************
*** 37,40 ****
--- 43,48 ----
  			}
  		</load>
+ 
+ 		<unload>print("UNLOAD ", cmdarg().getPath())</unload>
  	</nasal>
  
***************
*** 80,84 ****
  		<object-name>tailrotor_blade1</object-name>
  		<object-name>tailrotor_blade2</object-name>
! 		<property>sim/model/bo105/tail-angle</property>
  		<center>
  			<x-m>2.134</x-m>
--- 88,92 ----
  		<object-name>tailrotor_blade1</object-name>
  		<object-name>tailrotor_blade2</object-name>
! 		<property>sim/model/bo105/tail-angle-deg</property>
  		<center>
  			<x-m>2.134</x-m>
***************
*** 96,100 ****
  		<type>rotate</type>
  		<object-name>rotor_disc_T</object-name>
! 		<property>sim/model/bo105/tail-angle</property>
  		<center>
  			<x-m>2.134</x-m>
--- 104,108 ----
  		<type>rotate</type>
  		<object-name>rotor_disc_T</object-name>
! 		<property>sim/model/bo105/tail-angle-deg</property>
  		<center>
  			<x-m>2.134</x-m>
***************
*** 375,383 ****
  	<animation>
  		<type>rotate</type>
! 		<object-name>rotorhead</object-name>
! 		<object-name>bladelever1</object-name>
! 		<object-name>bladelever2</object-name>
! 		<object-name>bladelever3</object-name>
! 		<object-name>bladelever4</object-name>
  		<offset-deg>-3</offset-deg>
  		<axis>
--- 383,399 ----
  	<animation>
  		<type>rotate</type>
! 		<object-name>star_hub</object-name>
! 		<object-name>star_cap1</object-name>
! 		<object-name>star_cap2</object-name>
! 		<object-name>star_cap3</object-name>
! 		<object-name>star_cap4</object-name>
! 		<object-name>pitch_link1</object-name>
! 		<object-name>pitch_link2</object-name>
! 		<object-name>pitch_link3</object-name>
! 		<object-name>pitch_link3</object-name>
! 		<object-name>eye</object-name>
! 		<object-name>rotoraxis</object-name>
! 		<object-name>swashplate_rotor</object-name>
! 		<object-name>swashplate_cap</object-name>
  		<offset-deg>-3</offset-deg>
  		<axis>
***************
*** 395,398 ****
--- 411,426 ----
  	<animation>
  		<type>rotate</type>
+ 		<object-name>blade_mounting_fork1</object-name>
+ 		<object-name>blade_mounting_fork2</object-name>
+ 		<object-name>blade_mounting_fork3</object-name>
+ 		<object-name>blade_mounting_fork4</object-name>
+ 		<object-name>pitch_horn1</object-name>
+ 		<object-name>pitch_horn2</object-name>
+ 		<object-name>pitch_horn3</object-name>
+ 		<object-name>pitch_horn4</object-name>
+ 		<object-name>blade_fitting1</object-name>
+ 		<object-name>blade_fitting2</object-name>
+ 		<object-name>blade_fitting3</object-name>
+ 		<object-name>blade_fitting4</object-name>
  		<object-name>blade1</object-name>
  		<object-name>blade1a</object-name>
***************
*** 419,422 ****
--- 447,458 ----
  		<object-name>blade4d</object-name>
  		<object-name>blade4e</object-name>
+ 		<object-name>absorber1</object-name>
+ 		<object-name>absorber2</object-name>
+ 		<object-name>absorber3</object-name>
+ 		<object-name>absorber4</object-name>
+ 		<object-name>pendulum1</object-name>
+ 		<object-name>pendulum2</object-name>
+ 		<object-name>pendulum3</object-name>
+ 		<object-name>pendulum4</object-name>
  		<offset-deg>-3</offset-deg>
  		<axis>
***************
*** 436,444 ****
  	<animation>
  		<type>rotate</type>
! 		<object-name>rotorhead</object-name>
! 		<object-name>bladelever1</object-name>
! 		<object-name>bladelever2</object-name>
! 		<object-name>bladelever3</object-name>
! 		<object-name>bladelever4</object-name>
  		<property>rotors/main/blade[0]/position-deg</property>
  		<axis>
--- 472,488 ----
  	<animation>
  		<type>rotate</type>
! 		<object-name>star_hub</object-name>
! 		<object-name>star_cap1</object-name>
! 		<object-name>star_cap2</object-name>
! 		<object-name>star_cap3</object-name>
! 		<object-name>star_cap4</object-name>
! 		<object-name>eye</object-name>
! 		<object-name>rotoraxis</object-name>
! 		<object-name>swashplate_rotor</object-name>
! 		<object-name>swashplate_cap</object-name>
! 		<object-name>pitch_link1</object-name>
! 		<object-name>pitch_link2</object-name>
! 		<object-name>pitch_link3</object-name>
! 		<object-name>pitch_link4</object-name>
  		<property>rotors/main/blade[0]/position-deg</property>
  		<axis>
***************
*** 513,531 ****
  	<!-- main rotor blades -->
  
- 	<animation>
- 		<type>material</type>
- 		<object-name>blade1</object-name>
- 		<global type="bool">true</global>
- 		<transparency>
- 			<alpha-prop>rotors/main/rpm</alpha-prop>
- 			<factor>-0.0045</factor>
- 			<offset>1</offset>
- 		</transparency>
- 	</animation>
- 
  	<!-- blade 1 -->
  
  	<animation>
  		<type>rotate</type>
  		<object-name>blade1</object-name>
  		<object-name>blade1a</object-name>
--- 557,567 ----
  	<!-- main rotor blades -->
  
  	<!-- blade 1 -->
  
  	<animation>
  		<type>rotate</type>
+ 		<object-name>blade_mounting_fork1</object-name>
+ 		<object-name>pitch_horn1</object-name>
+ 		<object-name>blade_fitting1</object-name>
  		<object-name>blade1</object-name>
  		<object-name>blade1a</object-name>
***************
*** 534,537 ****
--- 570,575 ----
  		<object-name>blade1d</object-name>
  		<object-name>blade1e</object-name>
+ 		<object-name>absorber1</object-name>
+ 		<object-name>pendulum1</object-name>
  		<property>rotors/main/blade[0]/position-deg</property>
  		<offset-deg>0</offset-deg>
***************
*** 545,548 ****
--- 583,589 ----
  	<animation>
  		<type>rotate</type>
+ 		<object-name>blade_mounting_fork1</object-name>
+ 		<object-name>pitch_horn1</object-name>
+ 		<object-name>blade_fitting1</object-name>
  		<object-name>blade1</object-name>
  		<object-name>blade1a</object-name>
***************
*** 551,559 ****
  		<object-name>blade1d</object-name>
  		<object-name>blade1e</object-name>
  		<property>rotors/main/blade[0]/incidence-deg</property>
  		<center>
! 			<x-m>0.4</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.7</z-m>
  		</center>
  		<axis>
--- 592,602 ----
  		<object-name>blade1d</object-name>
  		<object-name>blade1e</object-name>
+ 		<object-name>absorber1</object-name>
+ 		<object-name>pendulum1</object-name>
  		<property>rotors/main/blade[0]/incidence-deg</property>
  		<center>
! 			<x-m>0</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.814282</z-m>
  		</center>
  		<axis>
***************
*** 574,580 ****
  		<factor alias="../../params/flapA/factor"/>
  		<center>
! 			<x-m>0.57097</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.90708</z-m>
  		</center>
  		<axis>
--- 617,623 ----
  		<factor alias="../../params/flapA/factor"/>
  		<center>
! 			<x-m>1.007322</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.83294</z-m>
  		</center>
  		<axis>
***************
*** 594,600 ****
  		<factor alias="../../params/flapB/factor"/>
  		<center>
! 			<x-m>1.42027</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.90708</z-m>
  		</center>
  		<axis>
--- 637,643 ----
  		<factor alias="../../params/flapB/factor"/>
  		<center>
! 			<x-m>1.807322</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.83294</z-m>
  		</center>
  		<axis>
***************
*** 613,619 ****
  		<factor alias="../../params/flapC/factor"/>
  		<center>
! 			<x-m>2.4008</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.90708</z-m>
  		</center>
  		<axis>
--- 656,662 ----
  		<factor alias="../../params/flapC/factor"/>
  		<center>
! 			<x-m>2.607322</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.83294</z-m>
  		</center>
  		<axis>
***************
*** 631,637 ****
  		<factor alias="../../params/flapD/factor"/>
  		<center>
! 			<x-m>3.2008</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.90708</z-m>
  		</center>
  		<axis>
--- 674,680 ----
  		<factor alias="../../params/flapD/factor"/>
  		<center>
! 			<x-m>3.307322</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.83294</z-m>
  		</center>
  		<axis>
***************
*** 648,654 ****
  		<factor alias="../../params/flapE/factor"/>
  		<center>
! 			<x-m>4.0512</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.90708</z-m>
  		</center>
  		<axis>
--- 691,713 ----
  		<factor alias="../../params/flapE/factor"/>
  		<center>
! 			<x-m>4.007321</x-m>
! 			<y-m>0</y-m>
! 			<z-m>1.83294</z-m>
! 		</center>
! 		<axis>
! 			<x>0</x>
! 			<y>-1</y>
! 			<z>0</z>
! 		</axis>
! 	</animation>
! 
! 	<animation>
! 		<type>rotate</type>
! 		<object-name>pendulum1</object-name>
! 		<property>sim/model/bo105/absorber-angle-deg</property>
! 		<center>
! 			<x-m>0.745474</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.846635</z-m>
  		</center>
  		<axis>
***************
*** 663,666 ****
--- 722,728 ----
  	<animation>
  		<type>rotate</type>
+ 		<object-name>blade_mounting_fork2</object-name>
+ 		<object-name>pitch_horn2</object-name>
+ 		<object-name>blade_fitting2</object-name>
  		<object-name>blade2</object-name>
  		<object-name>blade2a</object-name>
***************
*** 669,672 ****
--- 731,736 ----
  		<object-name>blade2d</object-name>
  		<object-name>blade2e</object-name>
+ 		<object-name>absorber2</object-name>
+ 		<object-name>pendulum2</object-name>
  		<property>rotors/main/blade[1]/position-deg</property>
  		<offset-deg>90</offset-deg>
***************
*** 680,683 ****
--- 744,750 ----
  	<animation>
  		<type>rotate</type>
+ 		<object-name>blade_mounting_fork2</object-name>
+ 		<object-name>pitch_horn2</object-name>
+ 		<object-name>blade_fitting2</object-name>
  		<object-name>blade2</object-name>
  		<object-name>blade2a</object-name>
***************
*** 686,694 ****
  		<object-name>blade2d</object-name>
  		<object-name>blade2e</object-name>
  		<property>rotors/main/blade[1]/incidence-deg</property>
  		<center>
  			<x-m>0</x-m>
! 			<y-m>0.04</y-m>
! 			<z-m>1.7</z-m>
  		</center>
  		<axis>
--- 753,763 ----
  		<object-name>blade2d</object-name>
  		<object-name>blade2e</object-name>
+ 		<object-name>absorber2</object-name>
+ 		<object-name>pendulum2</object-name>
  		<property>rotors/main/blade[1]/incidence-deg</property>
  		<center>
  			<x-m>0</x-m>
! 			<y-m>0</y-m>
! 			<z-m>1.814282</z-m>
  		</center>
  		<axis>
***************
*** 710,715 ****
  		<center>
  			<x-m>0</x-m>
! 			<y-m>-0.57097</y-m>
! 			<z-m>1.90708</z-m>
  		</center>
  		<axis>
--- 779,784 ----
  		<center>
  			<x-m>0</x-m>
! 			<y-m>-1.007322</y-m>
! 			<z-m>1.83294</z-m>
  		</center>
  		<axis>
***************
*** 730,735 ****
  		<center>
  			<x-m>0</x-m>
! 			<y-m>-1.42027</y-m>
! 			<z-m>1.90708</z-m>
  		</center>
  		<axis>
--- 799,804 ----
  		<center>
  			<x-m>0</x-m>
! 			<y-m>-1.807322</y-m>
! 			<z-m>1.83294</z-m>
  		</center>
  		<axis>
***************
*** 749,754 ****
  		<center>
  			<x-m>0</x-m>
! 			<y-m>-2.4008</y-m>
! 			<z-m>1.90708</z-m>
  		</center>
  		<axis>
--- 818,823 ----
  		<center>
  			<x-m>0</x-m>
! 			<y-m>-2.607322</y-m>
! 			<z-m>1.83294</z-m>
  		</center>
  		<axis>
***************
*** 767,772 ****
  		<center>
  			<x-m>0</x-m>
! 			<y-m>-3.2008</y-m>
! 			<z-m>1.90708</z-m>
  		</center>
  		<axis>
--- 836,841 ----
  		<center>
  			<x-m>0</x-m>
! 			<y-m>-3.307322</y-m>
! 			<z-m>1.83294</z-m>
  		</center>
  		<axis>
***************
*** 784,789 ****
  		<center>
  			<x-m>0</x-m>
! 			<y-m>-4.0512</y-m>
! 			<z-m>1.90708</z-m>
  		</center>
  		<axis>
--- 853,874 ----
  		<center>
  			<x-m>0</x-m>
! 			<y-m>-4.007321</y-m>
! 			<z-m>1.83294</z-m>
! 		</center>
! 		<axis>
! 			<x>-1</x>
! 			<y>0</y>
! 			<z>0</z>
! 		</axis>
! 	</animation>
! 
! 	<animation>
! 		<type>rotate</type>
! 		<object-name>pendulum2</object-name>
! 		<property>sim/model/bo105/absorber-angle-deg</property>
! 		<center>
! 			<x-m>0</x-m>
! 			<y-m>-0.745474</y-m>
! 			<z-m>1.846635</z-m>
  		</center>
  		<axis>
***************
*** 798,801 ****
--- 883,889 ----
  	<animation>
  		<type>rotate</type>
+ 		<object-name>blade_mounting_fork3</object-name>
+ 		<object-name>pitch_horn3</object-name>
+ 		<object-name>blade_fitting3</object-name>
  		<object-name>blade3</object-name>
  		<object-name>blade3a</object-name>
***************
*** 804,807 ****
--- 892,897 ----
  		<object-name>blade3d</object-name>
  		<object-name>blade3e</object-name>
+ 		<object-name>absorber3</object-name>
+ 		<object-name>pendulum3</object-name>
  		<property>rotors/main/blade[2]/position-deg</property>
  		<offset-deg>180</offset-deg>
***************
*** 815,818 ****
--- 905,911 ----
  	<animation>
  		<type>rotate</type>
+ 		<object-name>blade_mounting_fork3</object-name>
+ 		<object-name>pitch_horn3</object-name>
+ 		<object-name>blade_fitting3</object-name>
  		<object-name>blade3</object-name>
  		<object-name>blade3a</object-name>
***************
*** 821,829 ****
  		<object-name>blade3d</object-name>
  		<object-name>blade3e</object-name>
  		<property>rotors/main/blade[2]/incidence-deg</property>
  		<center>
! 			<x-m>-0.4</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.7</z-m>
  		</center>
  		<axis>
--- 914,924 ----
  		<object-name>blade3d</object-name>
  		<object-name>blade3e</object-name>
+ 		<object-name>absorber3</object-name>
+ 		<object-name>pendulum3</object-name>
  		<property>rotors/main/blade[2]/incidence-deg</property>
  		<center>
! 			<x-m>0</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.814282</z-m>
  		</center>
  		<axis>
***************
*** 844,850 ****
  		<factor alias="../../params/flapA/factor"/>
  		<center>
! 			<x-m>-0.57097</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.90708</z-m>
  		</center>
  		<axis>
--- 939,945 ----
  		<factor alias="../../params/flapA/factor"/>
  		<center>
! 			<x-m>-1.007322</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.83294</z-m>
  		</center>
  		<axis>
***************
*** 864,870 ****
  		<factor alias="../../params/flapB/factor"/>
  		<center>
! 			<x-m>-1.42027</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.90708</z-m>
  		</center>
  		<axis>
--- 959,965 ----
  		<factor alias="../../params/flapB/factor"/>
  		<center>
! 			<x-m>-1.807322</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.83294</z-m>
  		</center>
  		<axis>
***************
*** 883,889 ****
  		<factor alias="../../params/flapC/factor"/>
  		<center>
! 			<x-m>-2.4008</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.90708</z-m>
  		</center>
  		<axis>
--- 978,984 ----
  		<factor alias="../../params/flapC/factor"/>
  		<center>
! 			<x-m>-2.607322</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.83294</z-m>
  		</center>
  		<axis>
***************
*** 901,907 ****
  		<factor alias="../../params/flapD/factor"/>
  		<center>
! 			<x-m>-3.2008</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.90708</z-m>
  		</center>
  		<axis>
--- 996,1002 ----
  		<factor alias="../../params/flapD/factor"/>
  		<center>
! 			<x-m>-3.307322</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.83294</z-m>
  		</center>
  		<axis>
***************
*** 918,924 ****
  		<factor alias="../../params/flapE/factor"/>
  		<center>
! 			<x-m>-4.0512</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.90708</z-m>
  		</center>
  		<axis>
--- 1013,1035 ----
  		<factor alias="../../params/flapE/factor"/>
  		<center>
! 			<x-m>-4.007321</x-m>
! 			<y-m>0</y-m>
! 			<z-m>1.83294</z-m>
! 		</center>
! 		<axis>
! 			<x>0</x>
! 			<y>1</y>
! 			<z>0</z>
! 		</axis>
! 	</animation>
! 
! 	<animation>
! 		<type>rotate</type>
! 		<object-name>pendulum3</object-name>
! 		<property>sim/model/bo105/absorber-angle-deg</property>
! 		<center>
! 			<x-m>-0.745474</x-m>
  			<y-m>0</y-m>
! 			<z-m>1.846635</z-m>
  		</center>
  		<axis>
***************
*** 933,936 ****
--- 1044,1050 ----
  	<animation>
  		<type>rotate</type>
+ 		<object-name>blade_mounting_fork4</object-name>
+ 		<object-name>pitch_horn4</object-name>
+ 		<object-name>blade_fitting4</object-name>
  		<object-name>blade4</object-name>
  		<object-name>blade4a</object-name>
***************
*** 939,942 ****
--- 1053,1058 ----
  		<object-name>blade4d</object-name>
  		<object-name>blade4e</object-name>
+ 		<object-name>absorber4</object-name>
+ 		<object-name>pendulum4</object-name>
  		<property>rotors/main/blade[3]/position-deg</property>
  		<offset-deg>270</offset-deg>
***************
*** 950,953 ****
--- 1066,1072 ----
  	<animation>
  		<type>rotate</type>
+ 		<object-name>blade_mounting_fork4</object-name>
+ 		<object-name>pitch_horn4</object-name>
+ 		<object-name>blade_fitting4</object-name>
  		<object-name>blade4</object-name>
  		<object-name>blade4a</object-name>
***************
*** 956,964 ****
  		<object-name>blade4d</object-name>
  		<object-name>blade4e</object-name>
  		<property>rotors/main/blade[3]/incidence-deg</property>
  		<center>
  			<x-m>0</x-m>
! 			<y-m>-0.04</y-m>
! 			<z-m>1.7</z-m>
  		</center>
  		<axis>
--- 1075,1085 ----
  		<object-name>blade4d</object-name>
  		<object-name>blade4e</object-name>
+ 		<object-name>absorber4</object-name>
+ 		<object-name>pendulum4</object-name>
  		<property>rotors/main/blade[3]/incidence-deg</property>
  		<center>
  			<x-m>0</x-m>
! 			<y-m>0</y-m>
! 			<z-m>1.814282</z-m>
  		</center>
  		<axis>
***************
*** 980,985 ****
  		<center>
  			<x-m>0</x-m>
! 			<y-m>0.57097</y-m>
! 			<z-m>1.90708</z-m>
  		</center>
  		<axis>
--- 1101,1106 ----
  		<center>
  			<x-m>0</x-m>
! 			<y-m>1.007322</y-m>
! 			<z-m>1.83294</z-m>
  		</center>
  		<axis>
***************
*** 1000,1005 ****
  		<center>
  			<x-m>0</x-m>
! 			<y-m>1.42027</y-m>
! 			<z-m>1.90708</z-m>
  		</center>
  		<axis>
--- 1121,1126 ----
  		<center>
  			<x-m>0</x-m>
! 			<y-m>1.807322</y-m>
! 			<z-m>1.83294</z-m>
  		</center>
  		<axis>
***************
*** 1019,1024 ****
  		<center>
  			<x-m>0</x-m>
! 			<y-m>2.4008</y-m>
! 			<z-m>1.90708</z-m>
  		</center>
  		<axis>
--- 1140,1145 ----
  		<center>
  			<x-m>0</x-m>
! 			<y-m>2.607322</y-m>
! 			<z-m>1.83294</z-m>
  		</center>
  		<axis>
***************
*** 1037,1042 ****
  		<center>
  			<x-m>0</x-m>
! 			<y-m>3.2008</y-m>
! 			<z-m>1.90708</z-m>
  		</center>
  		<axis>
--- 1158,1163 ----
  		<center>
  			<x-m>0</x-m>
! 			<y-m>3.307322</y-m>
! 			<z-m>1.83294</z-m>
  		</center>
  		<axis>
***************
*** 1054,1059 ****
  		<center>
  			<x-m>0</x-m>
! 			<y-m>4.0512</y-m>
! 			<z-m>1.90708</z-m>
  		</center>
  		<axis>
--- 1175,1196 ----
  		<center>
  			<x-m>0</x-m>
! 			<y-m>4.007321</y-m>
! 			<z-m>1.83294</z-m>
! 		</center>
! 		<axis>
! 			<x>1</x>
! 			<y>0</y>
! 			<z>0</z>
! 		</axis>
! 	</animation>
! 
! 	<animation>
! 		<type>rotate</type>
! 		<object-name>pendulum4</object-name>
! 		<property>sim/model/bo105/absorber-angle-deg</property>
! 		<center>
! 			<x-m>0</x-m>
! 			<y-m>0.745474</y-m>
! 			<z-m>1.846635</z-m>
  		</center>
  		<axis>
***************
*** 1064,1067 ****
--- 1201,1228 ----
  	</animation>
  
+ <!--== rotor material ==-->
+ 
+ 	<animation>
+ 		<type>material</type>
+ 		<object-name>blade1</object-name>
+ 		<global type="bool">true</global>
+ 		<transparency>
+ 			<alpha-prop>rotors/main/rpm</alpha-prop>
+ 			<factor>-0.0045</factor>
+ 			<offset>1</offset>
+ 		</transparency>
+ 	</animation>
+ 
+ 	<animation>
+ 		<type>material</type>
+ 		<object-name>blade_fitting1</object-name>
+ 		<global type="bool">true</global>
+ 		<transparency>
+ 			<alpha-prop>rotors/main/rpm</alpha-prop>
+ 			<factor>-0.0045</factor>
+ 			<offset>1</offset>
+ 		</transparency>
+ 	</animation>
+ 
  <!--== doors ==-->
  

Index: bo105.ac
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/bo105/Models/bo105.ac,v
retrieving revision 1.32
retrieving revision 1.33
diff -C 2 -r1.32 -r1.33
*** bo105.ac	25 Jul 2007 22:04:37 -0000	1.32
--- bo105.ac	29 Nov 2007 16:57:02 -0000	1.33
***************
*** 2,9 ****
--- 2,11 ----
  MATERIAL "black" rgb 0.150446 0.150446 0.150446  amb 0 0 0  emis 0 0 0  spec 1 1 1  \
shi 72  trans 0  MATERIAL "aluminum" rgb 0.706 0.705719 0.705719  amb 1 1 1  emis 0 0 \
0  spec 0.780472 0.780472 0.780472  shi 72  trans 0 + MATERIAL "mil_metal_fade" rgb \
0.5 0.5 0.45  amb 0.5 0.5 0.45  emis 0 0 0  spec 0.8 0.8 0.8  shi 72  trans 0  \
MATERIAL "red_light_on" rgb 1 0 0  amb 1 1 0  emis 1 1 0  spec 0 0 0  shi 0  trans 0  \
MATERIAL "red_light_off" rgb 0.6 0 0  amb 0 0 0  emis 0 0 0  spec 0.2 0.2 0.2  shi 72 \
trans 0.235839  MATERIAL "grey" rgb 0.395669 0.420446 0.397719  amb 0.39643 0.39643 \
0.408819  emis 0 0 0  spec 0 0 0  shi 72  trans 0  MATERIAL "main_rotor" rgb 0.2 0.2 \
0.2  amb 0.2 0.2 0.2  emis 0 0 0  spec 0.1 0.1 0.1  shi 72  trans 0 + MATERIAL \
"mil_metal_nofade" rgb 0.5 0.5 0.5  amb 0.5 0.5 0.5  emis 0 0 0  spec 0.8 0.8 0.8  \
shi 72  trans 0  MATERIAL "flightsuit" rgb 0.35 0.36 0.31  amb 0.35 0.36 0.31  emis 0 \
0 0  spec 0 0 0  shi 0  trans 0 [...155974 lines suppressed...]
! refs 4
! 6 0 0
! 18 0 0
! 37 0 0
! 39 0 0
  SURF 0x10
! mat 7
! refs 4
! 7 0 0
! 6 0 0
! 39 0 0
! 38 0 0
  SURF 0x10
! mat 7
! refs 4
! 38 0 0
! 39 0 0
! 37 0 0
! 36 0 0
  kids 0

Index: bo105.nas
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/bo105/Models/bo105.nas,v
retrieving revision 1.98
retrieving revision 1.99
diff -C 2 -r1.98 -r1.99
*** bo105.nas	15 Oct 2007 18:50:41 -0000	1.98
--- bo105.nas	29 Nov 2007 16:57:05 -0000	1.99
***************
*** 15,22 ****
  
  
- # delete obsolete entry in autosave.xml
- props.globals.getNode("/sim/model/bo105/variant", 1).setAttribute("userarchive", \
                0);
- 
- 
  # config file entries ===============================================
  aircraft.data.add("/sim/model/bo105/variant");
--- 15,18 ----
***************
*** 148,151 ****
--- 144,154 ----
  
  
+ # blade vibration absorber pendulum
+ var pendulum = props.globals.getNode("/sim/model/bo105/absorber-angle-deg", 1);
+ var update_absorber = func {
+ 	pendulum.setDoubleValue(90 * clamp(abs(rotor_rpm.getValue()) / 90));
+ }
+ 
+ 
  
  # sound =============================================================
***************
*** 225,229 ****
  	if (arg[0]) {
  		# crash
! 		setprop("sim/model/bo105/tail-angle", 35);
  		setprop("sim/model/bo105/shadow", 0);
  		setprop("sim/model/bo105/doors/door[0]/position-norm", 0.2);
--- 228,232 ----
  	if (arg[0]) {
  		# crash
! 		setprop("sim/model/bo105/tail-angle-deg", 35);
  		setprop("sim/model/bo105/shadow", 0);
  		setprop("sim/model/bo105/doors/door[0]/position-norm", 0.2);
***************
*** 254,258 ****
  	} else {
  		# uncrash (for replay)
! 		setprop("sim/model/bo105/tail-angle", 0);
  		setprop("sim/model/bo105/shadow", 1);
  		doors.reset();
--- 257,261 ----
  	} else {
  		# uncrash (for replay)
! 		setprop("sim/model/bo105/tail-angle-deg", 0);
  		setprop("sim/model/bo105/shadow", 1);
  		doors.reset();
***************
*** 769,773 ****
  
  # main() ============================================================
! var delta_time = props.globals.getNode("/sim/time/delta-realtime-sec", 1);
  var adf_rotation = props.globals.getNode("/instrumentation/adf/rotation-deg", 1);
  var hi_heading = props.globals.getNode("/instrumentation/heading-indicator/indicated-heading-deg", \
                1);
--- 772,776 ----
  
  # main() ============================================================
! var delta_time = props.globals.getNode("/sim/time/delta-sec", 1);
  var adf_rotation = props.globals.getNode("/instrumentation/adf/rotation-deg", 1);
  var hi_heading = props.globals.getNode("/instrumentation/heading-indicator/indicated-heading-deg", \
                1);
***************
*** 780,783 ****
--- 783,787 ----
  	update_stall(dt);
  	update_slide();
+ 	update_absorber();
  	settimer(main_loop, 0);
  }


-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell.  From the desktop to the data center, Linux is going
mainstream.  Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Flightgear-cvslogs mailing list
Flightgear-cvslogs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-cvslogs


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic