Menu
▾
▴
flightgear-cvslogs — CVS commit log distribution
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(24) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
| 2006 |
Jan
(353) |
Feb
(445) |
Mar
(417) |
Apr
(227) |
May
(230) |
Jun
(327) |
Jul
(267) |
Aug
(336) |
Sep
(78) |
Oct
(215) |
Nov
(275) |
Dec
(411) |
| 2007 |
Jan
(570) |
Feb
(322) |
Mar
(425) |
Apr
(316) |
May
(536) |
Jun
(1280) |
Jul
(475) |
Aug
(235) |
Sep
(207) |
Oct
(478) |
Nov
(751) |
Dec
(1020) |
| 2008 |
Jan
(352) |
Feb
(607) |
Mar
(488) |
Apr
(406) |
May
(276) |
Jun
(295) |
Jul
(924) |
Aug
(1415) |
Sep
(481) |
Oct
(1169) |
Nov
(692) |
Dec
(889) |
| 2009 |
Jan
(521) |
Feb
(612) |
Mar
(1014) |
Apr
(855) |
May
(854) |
Jun
(620) |
Jul
(558) |
Aug
(260) |
Sep
(487) |
Oct
(823) |
Nov
(471) |
Dec
(464) |
| 2010 |
Jan
(761) |
Feb
(453) |
Mar
(783) |
Apr
(328) |
May
(42) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Durk T. <du...@ba...> - 2010-04-25 08:34:21
|
Update of /var/cvs/FlightGear-0.9/source/src/AIModel In directory baron.flightgear.org:/tmp/cvs-serv18630/src/AIModel Modified Files: AIAircraft.cxx AIAircraft.hxx Log Message: Expanded ATC communication between AI aircraft and Airport ground control. Index: AIAircraft.cxx =================================================================== RCS file: /var/cvs/FlightGear-0.9/source/src/AIModel/AIAircraft.cxx,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- AIAircraft.cxx 19 Feb 2010 00:31:38 -0000 1.91 +++ AIAircraft.cxx 25 Apr 2010 08:32:53 -0000 1.92 @@ -80,6 +80,7 @@ headingError = 0; holdPos = false; + needsTaxiClearance = false; _performance = 0; //TODO initialize to JET_TRANSPORT from PerformanceDB dt = 0; @@ -663,9 +664,8 @@ //cerr << trafficRef->getCallSign() << " has passed waypoint " << prev->name << " at speed " << speed << endl; if (prev->name == "PushBackPoint") { dep->getDynamics()->releaseParking(fp->getGate()); - time_t holdUntil = now + 120; - fp->setTime(holdUntil); - //cerr << _getCallsign() << "Holding at pushback point" << endl; + AccelTo(0.0); + setTaxiClearanceRequest(true); } // This is the last taxi waypoint, and marks the the end of the flight plan Index: AIAircraft.hxx =================================================================== RCS file: /var/cvs/FlightGear-0.9/source/src/AIModel/AIAircraft.hxx,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- AIAircraft.hxx 19 Feb 2010 00:31:38 -0000 1.42 +++ AIAircraft.hxx 25 Apr 2010 08:33:08 -0000 1.43 @@ -70,6 +70,8 @@ void announcePositionToController(); //TODO have to be public? void processATC(FGATCInstruction instruction); + void setTaxiClearanceRequest(bool arg) { needsTaxiClearance = arg; }; + bool getTaxiClearanceRequest() { return needsTaxiClearance; }; FGAISchedule * getTrafficRef() { return trafficRef; }; virtual const char* getTypeString(void) const { return "aircraft"; } @@ -150,6 +152,7 @@ const char * _getTransponderCode() const; bool reachedWaypoint; + bool needsTaxiClearance; time_t timeElapsed; PerformanceData* _performance; // the performance data for this aircraft |
|
From: Durk T. <du...@ba...> - 2010-04-25 08:34:21
|
Update of /var/cvs/FlightGear-0.9/source/src/ATC In directory baron.flightgear.org:/tmp/cvs-serv18630/src/ATC Modified Files: trafficcontrol.cxx trafficcontrol.hxx Log Message: Expanded ATC communication between AI aircraft and Airport ground control. Index: trafficcontrol.cxx =================================================================== RCS file: /var/cvs/FlightGear-0.9/source/src/ATC/trafficcontrol.cxx,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- trafficcontrol.cxx 21 Feb 2010 14:15:18 -0000 1.14 +++ trafficcontrol.cxx 25 Apr 2010 08:33:20 -0000 1.15 @@ -340,11 +340,27 @@ alt = 0; } + bool FGATCInstruction::hasInstruction() { return (holdPattern || holdPosition || changeSpeed || changeHeading || changeAltitude || resolveCircularWait); } +/*************************************************************************** + * FGATCController + * + **************************************************************************/ + + + + +FGATCController::FGATCController() +{ + dt_count = 0; + available = true; + lastTransmission = 0; +} + string FGATCController::getGateName(FGAIAircraft *ref) { return ref->atGate(); @@ -370,6 +386,7 @@ //double commFreqD; sender = rec->getAircraft()->getTrafficRef()->getCallSign(); + //cerr << "transmitting for: " << sender << "Leg = " << rec->getLeg() << endl; switch (rec->getLeg()) { case 2: case 3: @@ -449,6 +466,12 @@ taxiFreqStr = formatATCFrequency3_2(taxiFreq); text = receiver + ". Switching to " + taxiFreqStr + ". " + sender; break; + case MSG_INITIATE_CONTACT: + text = receiver + ". With you. " + sender; + break; + case MSG_ACKNOWLEDGE_INITIATE_CONTACT: + text = receiver + ". Roger. " + sender; + break; case MSG_REQUEST_PUSHBACK_CLEARANCE: text = receiver + ". Request push-back. " + sender; break; @@ -457,9 +480,30 @@ break; case MSG_HOLD_PUSHBACK_CLEARANCE: text = receiver + ". Standby. " + sender; - break; - default: - text = sender + ". Transmitting unknown Message"; + break; + case MSG_REQUEST_TAXI_CLEARANCE: + text = receiver + ". Ready to Taxi. " + sender; + break; + case MSG_ISSUE_TAXI_CLEARANCE: + text = receiver + ". Cleared to taxi. " + sender; + break; + case MSG_ACKNOWLEDGE_TAXI_CLEARANCE: + text = receiver + ". Cleared to taxi. " + sender; + break; + case MSG_HOLD_POSITION: + text = receiver + ". Hold Position. " + sender; + break; + case MSG_ACKNOWLEDGE_HOLD_POSITION: + text = receiver + ". Holding Position. " + sender; + break; + case MSG_RESUME_TAXI: + text = receiver + ". Resume Taxiing. " + sender; + break; + case MSG_ACKNOWLEDGE_RESUME_TAXI: + text = receiver + ". Continuing Taxi. " + sender; + break; + default: + text = text + sender + ". Transmitting unknown Message"; break; } double onBoardRadioFreq0 = fgGetDouble("/instrumentation/comm[0]/frequencies/selected-mhz"); @@ -691,8 +735,6 @@ FGStartupController::FGStartupController() : FGATCController() { - available = false; - lastTransmission = 0; } void FGStartupController::announcePosition(int id, FGAIFlightPlan *intendedRoute, int currentPosition, @@ -874,7 +916,7 @@ available = false; } } - // Note: The next two stages are only necessesary when Startup control is + // Note: The next four stages are only necessesary when Startup control is // on a different frequency, compared to ground control if ((state == 4) && available){ if (now > startTime+130) { @@ -885,20 +927,36 @@ available = false; } } + if ((state == 5) && available){ + if (now > startTime+140) { + transmit(&(*i), MSG_INITIATE_CONTACT, ATC_AIR_TO_GROUND); + i->updateState(); + lastTransmission = now; + available = false; + } + } + if ((state == 6) && available){ + if (now > startTime+150) { + transmit(&(*i), MSG_ACKNOWLEDGE_INITIATE_CONTACT, ATC_GROUND_TO_AIR); + i->updateState(); + lastTransmission = now; + available = false; + } + } // TODO: Switch to APRON control and request pushback Clearance. // Get Push back clearance - if ((state == 5) && available){ - if (now > startTime+160) { + if ((state == 7) && available){ + if (now > startTime+180) { transmit(&(*i), MSG_REQUEST_PUSHBACK_CLEARANCE, ATC_AIR_TO_GROUND); i->updateState(); lastTransmission = now; available = false; } } - if ((state == 6) && available){ - if (now > startTime+180) { + if ((state == 8) && available){ + if (now > startTime+200) { if (i->pushBackAllowed()) { i->allowRepeatedTransmissions(); transmit(&(*i), MSG_PERMIT_PUSHBACK_CLEARANCE, ATC_GROUND_TO_AIR); @@ -911,7 +969,7 @@ available = false; } } - if ((state == 6) && available){ + if ((state == 9) && available){ i->setHoldPosition(false); } } Index: trafficcontrol.hxx =================================================================== RCS file: /var/cvs/FlightGear-0.9/source/src/ATC/trafficcontrol.hxx,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- trafficcontrol.hxx 21 Feb 2010 14:15:18 -0000 1.8 +++ trafficcontrol.hxx 25 Apr 2010 08:33:26 -0000 1.9 @@ -129,6 +129,7 @@ void setLeg(int lg) { leg = lg;}; int getId() { return id;}; int getState() { return state;}; + int setState(int s) { state = s;} FGATCInstruction getInstruction() { return instruction;}; bool hasInstruction() { return instruction.hasInstruction(); }; void setPositionAndHeading(double lat, double lon, double hdg, double spd, double alt); @@ -210,7 +211,10 @@ *************************************************************************************/ class FGATCController { -private: +protected: + bool available; + time_t lastTransmission; + double dt_count; @@ -220,18 +224,27 @@ public: typedef enum { MSG_ANNOUNCE_ENGINE_START, - MSG_REQUEST_ENGINE_START, + MSG_REQUEST_ENGINE_START, MSG_PERMIT_ENGINE_START, MSG_DENY_ENGINE_START, MSG_ACKNOWLEDGE_ENGINE_START, MSG_REQUEST_PUSHBACK_CLEARANCE, - MSG_PERMIT_PUSHBACK_CLEARANCE, + MSG_PERMIT_PUSHBACK_CLEARANCE, MSG_HOLD_PUSHBACK_CLEARANCE, - MSG_ACKNOWLEDGE_SWITCH_GROUND_FREQUENCY } AtcMsgId; + MSG_ACKNOWLEDGE_SWITCH_GROUND_FREQUENCY, + MSG_INITIATE_CONTACT, + MSG_ACKNOWLEDGE_INITIATE_CONTACT, + MSG_REQUEST_TAXI_CLEARANCE, + MSG_ISSUE_TAXI_CLEARANCE, + MSG_ACKNOWLEDGE_TAXI_CLEARANCE, + MSG_HOLD_POSITION, + MSG_ACKNOWLEDGE_HOLD_POSITION, + MSG_RESUME_TAXI, + MSG_ACKNOWLEDGE_RESUME_TAXI } AtcMsgId; typedef enum { ATC_AIR_TO_GROUND, ATC_GROUND_TO_AIR } AtcMsgDir; - FGATCController() { dt_count = 0;}; + FGATCController(); virtual ~FGATCController() {}; virtual void announcePosition(int id, FGAIFlightPlan *intendedRoute, int currentRoute, double lat, double lon, @@ -284,8 +297,6 @@ { private: TrafficVector activeTraffic; - bool available; - time_t lastTransmission; //ActiveRunwayVec activeRunways; public: |
|
From: Emmanuel B. <he...@ba...> - 2010-04-25 07:00:28
|
Update of /var/cvs/FlightGear-0.9/data/Aircraft/Piper-PA-32/Models/Liveries In directory baron.flightgear.org:/tmp/cvs-serv14627/Models/Liveries Modified Files: kaerick-family.png Log Message: - little update Index: kaerick-family.png =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Piper-PA-32/Models/Liveries/kaerick-family.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 Binary files /tmp/cvslhZ1VA and /tmp/cvsyJB3b1 differ |
|
From: Emmanuel B. <he...@ba...> - 2010-04-25 07:00:28
|
Update of /var/cvs/FlightGear-0.9/data/Aircraft/Piper-PA-32/Models/Interior In directory baron.flightgear.org:/tmp/cvs-serv14627/Models/Interior Modified Files: colors.png interior.ac interior.xml Log Message: - little update Index: colors.png =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Piper-PA-32/Models/Interior/colors.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 Binary files /tmp/cvsJXJ0Xt and /tmp/cvs7alWvT differ Index: interior.ac =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Piper-PA-32/Models/Interior/interior.ac,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- interior.ac 19 Apr 2010 21:54:44 -0000 1.1 +++ interior.ac 25 Apr 2010 07:00:17 -0000 1.2 @@ -1,3327 +1,3323 @@ 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 "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 "transparent" rgb 0.5 0.6 0.7 amb 0 0 0 emis 0 0 0 spec 1 1 1 shi 64 trans 0.7 OBJECT world -kids 3 +kids 6 OBJECT poly name "interieur" -data 9 [...8659 lines suppressed...] -184 0.960217118263 0.266948968172 -191 0.0229417979717 0.122113570571 -190 0.0823831111193 0.0307362992316 -185 0.888565838337 0.147399023175 +22 0.960217118263 0.266948968172 +29 0.0229417979717 0.122113570571 +28 0.0823831111193 0.0307362992316 +23 0.888565838337 0.147399023175 SURF 0x10 mat 2 refs 4 -190 0.0823831111193 0.0307362992316 -193 0.136625289917 0.0 -192 0.835211455822 0.105673678219 -185 0.888565838337 0.147399023175 +28 0.0823831111193 0.0307362992316 +31 0.136625289917 0.0 +30 0.835211455822 0.105673678219 +23 0.888565838337 0.147399023175 kids 0 Index: interior.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Piper-PA-32/Models/Interior/interior.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- interior.xml 19 Apr 2010 21:54:44 -0000 1.1 +++ interior.xml 25 Apr 2010 07:00:17 -0000 1.2 @@ -8,14 +8,18 @@ <!-- Objets opaques --> <object-name>interieur</object-name> <object-name>inttour</object-name> + <object-name>inttourD</object-name> + <object-name>intporteD</object-name> <!-- Objets transparents --> <object-name>intvitres</object-name> + <object-name>intvitreD</object-name> </animation> <animation> <type>noshadow</type> <object-name>intvitres</object-name> + <object-name>intvitreD</object-name> </animation> <animation> @@ -48,5 +52,30 @@ </offsets> </model> + <!-- Porte --> + <animation> + <name>IntPorteGauche</name> + <object-name>inttourD</object-name> + <object-name>intporteD</object-name> + <object-name>intvitreD</object-name> + </animation> + + <animation> + <type>rotate</type> + <object-name>IntPorteGauche</object-name> + <property>instrumentation/doors/crew/position-norm</property> + <factor> 60 </factor> + <center> + <x-m> -1.672 </x-m> + <y-m> 0.654 </y-m> + <z-m> -0.424 </z-m> + </center> + <axis> + <x> 0 </x> + <y> 0 </y> + <z> 1 </z> + </axis> + </animation> + </PropertyList> |
|
From: Emmanuel B. <he...@ba...> - 2010-04-25 07:00:28
|
Update of /var/cvs/FlightGear-0.9/data/Aircraft/Piper-PA-32/Nasal In directory baron.flightgear.org:/tmp/cvs-serv14627/Nasal Modified Files: doors.nas pa32-keyboard.xml Log Message: - little update Index: doors.nas =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Piper-PA-32/Nasal/doors.nas,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- doors.nas 19 Apr 2010 21:54:45 -0000 1.1 +++ doors.nas 25 Apr 2010 07:00:18 -0000 1.2 @@ -7,6 +7,7 @@ Doors.new = func { obj = { parents : [Doors], crew : aircraft.door.new("instrumentation/doors/crew", 8.0), + passenger : aircraft.door.new("instrumentation/doors/passenger", 10.0) }; return obj; }; @@ -15,9 +16,15 @@ me.crew.toggle(); } +Doors.passengerexport = func { + me.passenger.toggle(); +} + + # ============== # Initialization # ============== # objects must be here, otherwise local to init() doorsystem = Doors.new(); + Index: pa32-keyboard.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Piper-PA-32/Nasal/pa32-keyboard.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pa32-keyboard.xml 19 Apr 2010 21:54:45 -0000 1.1 +++ pa32-keyboard.xml 25 Apr 2010 07:00:18 -0000 1.2 @@ -7,7 +7,7 @@ <desc>Canopy</desc> <binding> <command>nasal</command> - <script>pa18.doorsystem.crewexport();</script> + <script>pa32.doorsystem.crewexport();</script> </binding> </key> |
|
From: Emmanuel B. <he...@ba...> - 2010-04-25 03:02:04
|
Update of /var/cvs/FlightGear-0.9/data/Aircraft/Piper-PA-32 In directory baron.flightgear.org:/tmp/cvs-serv25231 Modified Files: pa32-splash.png thumbnail.jpg Log Message: - little update |
|
From: Frederic B. <fr...@ba...> - 2010-04-24 16:47:14
|
Update of /var/cvs/FlightGear-0.9/data/Shaders In directory baron.flightgear.org:/tmp/cvs-serv9009 Modified Files: terrain-default.frag Log Message: Fix line endings Index: terrain-default.frag =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Shaders/terrain-default.frag,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- terrain-default.frag 31 Jan 2010 10:40:59 -0000 1.1 +++ terrain-default.frag 24 Apr 2010 16:47:01 -0000 1.2 @@ -1,58 +1,57 @@ -// -*-C++-*- - -varying vec4 diffuse, constantColor; -varying vec3 normal, lightDir, halfVector; -varying float fogCoord, alpha; - -uniform sampler2D texture; -uniform sampler3D noise; - -float luminance(vec3 color) -{ - return dot(vec3(0.212671, 0.715160, 0.072169), color); -} - -void main() -{ - vec3 n, halfV; - float NdotL, NdotHV, fogFactor; - vec4 color = constantColor; - vec4 texel; - vec4 fragColor; - vec4 specular = vec4(0.0); - - n = normalize(normal); - if (!gl_FrontFacing) - n = -n; - NdotL = max(dot(n, lightDir), 0.0); - if (NdotL > 0.0) { - color += diffuse * NdotL; - halfV = normalize(halfVector); - NdotHV = max(dot(n, halfV), 0.0); - if (gl_FrontMaterial.shininess > 0.0) - specular.rgb = (gl_FrontMaterial.specular.rgb - * gl_LightSource[0].specular.rgb - * pow(NdotHV, gl_FrontMaterial.shininess)); - } - color.a = alpha; - - - // This shouldn't be necessary, but our lighting becomes very - // saturated. Clamping the color before modulating by the texture - // is closer to what the OpenGL fixed function pipeline does. - color = clamp(color, 0.0, 1.0); - texel = texture2D(texture, gl_TexCoord[0].st); - fragColor = color * texel + specular; - - // Store pixel's luminance in the alpha value - if(alpha > 0.95) { - float lum = 1.0 - (luminance(fragColor.rgb) * 3.0); - float tex_lum = luminance(texel.rgb); - fragColor.a = tex_lum * clamp(lum, 0.01, 1.0); - } - - fogFactor = exp(-gl_Fog.density * gl_Fog.density * fogCoord * fogCoord); - gl_FragColor = mix(gl_Fog.color, fragColor, fogFactor); - -} - +// -*-C++-*- + +varying vec4 diffuse, constantColor; +varying vec3 normal, lightDir, halfVector; +varying float fogCoord, alpha; + +uniform sampler2D texture; +uniform sampler3D noise; + +float luminance(vec3 color) +{ + return dot(vec3(0.212671, 0.715160, 0.072169), color); +} + +void main() +{ + vec3 n, halfV; + float NdotL, NdotHV, fogFactor; + vec4 color = constantColor; + vec4 texel; + vec4 fragColor; + vec4 specular = vec4(0.0); + + n = normalize(normal); + if (!gl_FrontFacing) + n = -n; + NdotL = max(dot(n, lightDir), 0.0); + if (NdotL > 0.0) { + color += diffuse * NdotL; + halfV = normalize(halfVector); + NdotHV = max(dot(n, halfV), 0.0); + if (gl_FrontMaterial.shininess > 0.0) + specular.rgb = (gl_FrontMaterial.specular.rgb + * gl_LightSource[0].specular.rgb + * pow(NdotHV, gl_FrontMaterial.shininess)); + } + color.a = alpha; + + + // This shouldn't be necessary, but our lighting becomes very + // saturated. Clamping the color before modulating by the texture + // is closer to what the OpenGL fixed function pipeline does. + color = clamp(color, 0.0, 1.0); + texel = texture2D(texture, gl_TexCoord[0].st); + fragColor = color * texel + specular; + + // Store pixel's luminance in the alpha value + if(alpha > 0.95) { + float lum = 1.0 - (luminance(fragColor.rgb) * 3.0); + float tex_lum = luminance(texel.rgb); + fragColor.a = tex_lum * clamp(lum, 0.01, 1.0); + } + + fogFactor = exp(-gl_Fog.density * gl_Fog.density * fogCoord * fogCoord); + gl_FragColor = mix(gl_Fog.color, fragColor, fogFactor); + +} |
|
From: Stuart B. <st...@ba...> - 2010-04-23 20:56:02
|
Update of /var/cvs/FlightGear-0.9/data/Aircraft/c172p/Models In directory baron.flightgear.org:/tmp/cvs-serv12876/Models Modified Files: c172p.xml Log Message: Labeling of instruments using OSGText. Activated with panel hotspots. Index: c172p.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/c172p/Models/c172p.xml,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- c172p.xml 7 Apr 2010 23:07:47 -0000 1.41 +++ c172p.xml 23 Apr 2010 20:53:34 -0000 1.42 @@ -363,6 +363,798 @@ </offsets> </model> +<text> + <name>Registration</name> + <type type="string">text-value</type> + <property type="string">/sim/multiplay/callsign</property> + <format type="string">%s</format> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.5</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>0.25</y-m> + <z-m>0.01</z-m> + </offsets> +</text> + + +<!-- Labels activated by hotspots --> +<text> + <name>LabelASI</name> + <type type="string">literal</type> + <text type="string">Airspeed Indicator</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>-0.311</y-m> + <z-m>0.068</z-m> + </offsets> +</text> + +<text> + <name>LabelAI</name> + <type type="string">literal</type> + <text type="string">Attitude Indicator</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>-0.222</y-m> + <z-m>0.069</z-m> + </offsets> +</text> + +<text> + <name>LabelMagCompass</name> + <type type="string">literal</type> + <text type="string">Magnetic Compass</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.3</x-m> + <y-m>0.00</y-m> + <z-m>0.18</z-m> + </offsets> +</text> + +<text> + <name>LabelAltimeter</name> + <type type="string">literal</type> + <text type="string">Altimeter (ft)</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>-0.133</y-m> + <z-m>0.069</z-m> + </offsets> +</text> + +<text> + <name>LabelBatteryGauge</name> + <type type="string">literal</type> + <text type="string">Battery Gauge</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>-0.410</y-m> + <z-m>-0.171</z-m> + </offsets> +</text> + +<text> + <name>LabelAutopilot</name> + <type type="string">literal</type> + <text type="string">Autopilot</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.15</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>0.116</y-m> + <z-m>-0.085</z-m> + </offsets> +</text> + +<text> + <name>LabelDME</name> + <type type="string">literal</type> + <text type="string">DME</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>0.116</y-m> + <z-m>-0.142</z-m> + </offsets> +</text> + +<text> + <name>LabelTurn</name> + <type type="string">literal</type> + <text type="string">Turn & Bank</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>-0.311</y-m> + <z-m>-0.037</z-m> + </offsets> +</text> + +<text> + <name>LabelVSI</name> + <type type="string">literal</type> + <text type="string">Vertical Speed Indicator</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>-0.131</y-m> + <z-m>-0.036</z-m> + </offsets> +</text> + +<text> + <name>LabelRPM</name> + <type type="string">literal</type> + <text type="string">Tachometer</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>-0.311</y-m> + <z-m>-0.142</z-m> + </offsets> +</text> + +<text> + <name>LabelHI</name> + <type type="string">literal</type> + <text type="string">Heading Indicator</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>-0.222</y-m> + <z-m>-0.036</z-m> + </offsets> +</text> + +<text> + <name>LabelVOR1</name> + <type type="string">literal</type> + <text type="string">NAV 1 display</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>-0.041</y-m> + <z-m>0.069</z-m> + </offsets> +</text> + +<text> + <name>LabelVOR2</name> + <type type="string">literal</type> + <text type="string">NAV 2 display</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>-0.041</y-m> + <z-m>-0.036</z-m> + </offsets> +</text> + +<text> + <name>LabelADF</name> + <type type="string">literal</type> + <text type="string">ADF display</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.15</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>-0.041</y-m> + <z-m>-0.141</z-m> + </offsets> +</text> + +<text> + <name>LabelRadio1</name> + <type type="string">literal</type> + <text type="string">NAV/COM 1</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>0.113</y-m> + <z-m>0.025</z-m> + </offsets> +</text> + +<text> + <name>LabelRadio2</name> + <type type="string">literal</type> + <text type="string">NAV/COM 2</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>0.113</y-m> + <z-m>-0.02</z-m> + </offsets> +</text> + +<text> + <name>LabelKMA</name> + <type type="string">literal</type> + <text type="string">Audio Panel</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.15</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>0.113</y-m> + <z-m>0.100</z-m> + </offsets> +</text> + +<text> + <name>LabelKR87</name> + <type type="string">literal</type> + <text type="string">ADF Receiver</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.15</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>0.113</y-m> + <z-m>0.061</z-m> + </offsets> +</text> + +<text> + <name>LabelClock</name> + <type type="string">literal</type> + <text type="string">Clock</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>-0.389</y-m> + <z-m>0.049</z-m> + </offsets> +</text> + +<text> + <name>LabelVac</name> + <type type="string">literal</type> + <text type="string">Vacuum Gauge</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>-0.432</y-m> + <z-m>0.0228</z-m> + </offsets> +</text> + +<text> + <name>LabelFuel</name> + <type type="string">literal</type> + <text type="string">Fuel Gauge</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>-0.405</y-m> + <z-m>-0.013</z-m> + </offsets> +</text> + +<text> + <name>LabelOil</name> + <type type="string">literal</type> + <text type="string">Oil Gauge</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>-0.405</y-m> + <z-m>-0.060</z-m> + </offsets> +</text> + +<text> + <name>LabelMags</name> + <type type="string">literal</type> + <text type="string">Magneto & Starter</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>-0.414</y-m> + <z-m>-0.250</z-m> + </offsets> +</text> + +<text> + <name>LabelLights</name> + <type type="string">literal</type> + <text type="string">Panel Lights</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>-0.035</y-m> + <z-m>-0.273</z-m> + </offsets> +</text> + +<text> + <name>LabelFlaps</name> + <type type="string">literal</type> + <text type="string">Flaps</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>0.19</y-m> + <z-m>-0.25</z-m> + </offsets> +</text> + +<text> + <name>LabelParkingBrake</name> + <type type="string">literal</type> + <text type="string">Parking Brake</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.15</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>-0.20</y-m> + <z-m>-0.29</z-m> + </offsets> +</text> + +<text> + <name>LabelCarbHeat</name> + <type type="string">literal</type> + <text type="string">Carburetor Heat</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.15</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>-0.08</y-m> + <z-m>-0.19</z-m> + </offsets> +</text> + +<text> + <name>LabelThrottle</name> + <type type="string">literal</type> + <text type="string">Throttle</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m>-0.02</y-m> + <z-m>-0.18</z-m> + </offsets> +</text> + +<text> + <name>LabelMixture</name> + <type type="string">literal</type> + <text type="string">Mixture</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.34</x-m> + <y-m> 0.07</y-m> + <z-m>-0.18</z-m> + </offsets> +</text> + +<text> + <name>LabelTrim</name> + <type type="string">literal</type> + <text type="string">Elevator Trim</text> + <draw-text type="bool">true</draw-text> + <font>Helvetica.txf</font> + <character-size type="double">0.012</character-size> + <character-aspect-ratio type="double">1.0</character-aspect-ratio> + <axis-alignment>yz-plane</axis-alignment> + <max-height>0.2</max-height> + <max-width>0.07</max-width> + <font-resolution> + <width type="int">32</width> + <height type="int">32</height> + </font-resolution> + <alignment>center-center</alignment> + <offsets> + <x-m>-0.24</x-m> + <y-m>-0.10</y-m> + <z-m>-0.38</z-m> + </offsets> +</text> + +<animation> + <type>material</type> + <object-name>LabelASI</object-name> + <object-name>LabelAI</object-name> + <object-name>LabelMagCompass</object-name> + <object-name>LabelAltimeter</object-name> + <object-name>LabelBatteryGauge</object-name> + <object-name>LabelAutopilot</object-name> + <object-name>LabelDME</object-name> + <object-name>LabelTurn</object-name> + <object-name>LabelVSI</object-name> + <object-name>LabelRPM</object-name> + <object-name>LabelHI</object-name> + <object-name>LabelVOR1</object-name> + <object-name>LabelVOR2</object-name> + <object-name>LabelADF</object-name> + <object-name>LabelRadio1</object-name> + <object-name>LabelRadio2</object-name> + <object-name>LabelKMA</object-name> + <object-name>LabelKR87</object-name> + <object-name>LabelClock</object-name> + <object-name>LabelVac</object-name> + <object-name>LabelFuel</object-name> + <object-name>LabelOil</object-name> + <object-name>LabelMags</object-name> + <object-name>LabelLights</object-name> + <object-name>LabelFlaps</object-name> + <object-name>LabelParkingBrake</object-name> + <object-name>LabelCarbHeat</object-name> + <object-name>LabelThrottle</object-name> + <object-name>LabelMixture</object-name> + <object-name>LabelTrim</object-name> + <emission> + <red>1.0</red> + <green>0.8</green> + <blue>0.0</blue> + </emission> +</animation> + +<animation> + <type>select</type> + <object-name>LabelASI</object-name> + <object-name>LabelAI</object-name> + <object-name>LabelMagCompass</object-name> + <object-name>LabelAltimeter</object-name> + <object-name>LabelBatteryGauge</object-name> + <object-name>LabelAutopilot</object-name> + <object-name>LabelDME</object-name> + <object-name>LabelTurn</object-name> + <object-name>LabelVSI</object-name> + <object-name>LabelRPM</object-name> + <object-name>LabelHI</object-name> + <object-name>LabelVOR1</object-name> + <object-name>LabelVOR2</object-name> + <object-name>LabelADF</object-name> + <object-name>LabelRadio1</object-name> + <object-name>LabelRadio2</object-name> + <object-name>LabelKMA</object-name> + <object-name>LabelKR87</object-name> + <object-name>LabelClock</object-name> + <object-name>LabelVac</object-name> + <object-name>LabelFuel</object-name> + <object-name>LabelOil</object-name> + <object-name>LabelMags</object-name> + <object-name>LabelLights</object-name> + <object-name>LabelFlaps</object-name> + <object-name>LabelParkingBrake</object-name> + <object-name>LabelCarbHeat</object-name> + <object-name>LabelThrottle</object-name> + <object-name>LabelMixture</object-name> + <object-name>LabelTrim</object-name> + <object-name>LabelPanelLight</object-name> + <condition> + <property>/sim/panel-hotspots</property> + </condition> +</animation> <!-- Controls --> <animation> |
|
From: Stuart B. <st...@ba...> - 2010-04-23 20:56:00
|
Update of /var/cvs/FlightGear-0.9/data/Aircraft/c172p/Models/Yoke In directory baron.flightgear.org:/tmp/cvs-serv12876/Models/Yoke Modified Files: yoke.xml Log Message: Labeling of instruments using OSGText. Activated with panel hotspots. Index: yoke.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/c172p/Models/Yoke/yoke.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- yoke.xml 25 Nov 2009 20:58:13 -0000 1.1 +++ yoke.xml 23 Apr 2010 20:53:48 -0000 1.2 @@ -34,9 +34,14 @@ <type>select</type> <object-name>Yoke</object-name> <condition> - <not> - <property>sim/model/hide-yoke</property> - </not> + <and> + <not> + <property>sim/model/hide-yoke</property> + </not> + <not> + <property>/sim/panel-hotspots</property> + </not> + </and> </condition> </animation> |
|
From: Stuart B. <st...@ba...> - 2010-04-23 20:55:56
|
Update of /var/cvs/FlightGear-0.9/data/Aircraft/c172p In directory baron.flightgear.org:/tmp/cvs-serv12876 Modified Files: c172-help.xml Log Message: Labeling of instruments using OSGText. Activated with panel hotspots. Index: c172-help.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/c172p/c172-help.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- c172-help.xml 22 Nov 2009 23:03:07 -0000 1.1 +++ c172-help.xml 23 Apr 2010 20:52:32 -0000 1.2 @@ -1,5 +1,9 @@ <PropertyList> <title>Cessna 172P</title> + <key> + <name>Ctrl-c</name> + <desc>Panel hotspots and labels</desc> + </key> <line/> <line>_________Engine Start Checklist_________</line> <line>Mixture: Rich</line> |
|
From: Emmanuel B. <he...@ba...> - 2010-04-23 20:55:33
|
Update of /var/cvs/FlightGear-0.9/data/Aircraft/Piper-PA-32/Models/Liveries In directory baron.flightgear.org:/tmp/cvs-serv10609/Models/Liveries Modified Files: Readme.txt Added Files: kaerick-family.png kaerick-family.xml Log Message: - add new liverie by Kaerick --- NEW BINARY FILE "kaerick-family.png" --- --- NEW FILE "kaerick-family.xml" --- <?xml version="1.0" encoding="UTF-8"?> <PropertyList> <sim> <model> <livery> <name type="string">Kaerick family</name> <texture>Liveries/kaerick-family.png</texture> <diffuse> <red> 1.0 </red> <green> 1.0 </green> <blue> 1.0 </blue> </diffuse> <ambient> <red> 1.0 </red> <green> 1.0 </green> <blue> 1.0 </blue> </ambient> <specular> <red> 1.0 </red> <green> 1.0 </green> <blue> 1.0 </blue> </specular> <emission> <red> 0.0 </red> <green> 0.0 </green> <blue> 0.0 </blue> </emission> <!-- <transparency> <alpha> 0.0 </alpha> </transparency> <shininess>10</shininess> --> </livery> </model> </sim> </PropertyList> Index: Readme.txt =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Piper-PA-32/Models/Liveries/Readme.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Readme.txt 19 Apr 2010 21:54:44 -0000 1.1 +++ Readme.txt 23 Apr 2010 20:33:51 -0000 1.2 @@ -2,3 +2,9 @@ These liveries were made by : Emmanuel BARANGER 2010 +kaerick-family + +These liveries were made by : Kaerick 2010 + +Thanks ti him + |
|
From: Emmanuel B. <he...@ba...> - 2010-04-23 20:53:41
|
Update of /var/cvs/FlightGear-0.9/data/Aircraft/Piper-PA-32/Models/Pilot In directory baron.flightgear.org:/tmp/cvs-serv10609/Models/Pilot Modified Files: Read-Me.txt general_pilot.png Log Message: - add new liverie by Kaerick Index: Read-Me.txt =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Piper-PA-32/Models/Pilot/Read-Me.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Read-Me.txt 19 Apr 2010 21:54:45 -0000 1.1 +++ Read-Me.txt 23 Apr 2010 20:39:15 -0000 1.2 @@ -22,3 +22,4 @@ BARANGER Emmanuel http://helijah.free.fr +New texture (Breizh) by Kaerick Index: general_pilot.png =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Piper-PA-32/Models/Pilot/general_pilot.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 Binary files /tmp/cvsUd44Yf and /tmp/cvsu9iwPr differ |
|
From: Tim M. <ti...@ba...> - 2010-04-22 14:56:47
|
Update of /var/cvs/FlightGear-0.9/data/Shaders In directory baron.flightgear.org:/tmp/cvs-serv2733/Shaders Modified Files: landmass-g.vert landmass.geom Log Message: Rewrote landmass geometry shader I did several optimizations, including reducing to a bare minimum shader computations and producing the geometry as one tristrip with degenerate triangles. The result was an increase from 14 fps to 51 fps (NVidia 8600M, ufo, ksfo). Author: Tim Moore <ti...@re...> Index: landmass-g.vert =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Shaders/landmass-g.vert,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- landmass-g.vert 29 Mar 2010 06:13:43 -0000 1.1 +++ landmass-g.vert 22 Apr 2010 14:56:35 -0000 1.2 @@ -1,19 +1,55 @@ +#version 120 + +// "landmass" effect with forest construction using a geometry +// shader. The landmass effect includes a bumpmap effect as well as +// variation by altitude. +// +// The fragment shader needs position and normals in model and eye +// coordinates. This vertex shader calculates the positions and +// normals of the forest polygons so the geometry shader can do as +// little as possible. + +// Input for the geometry shader. "raw" means terrain model +// coordinates; that's a tile-local coordinate system, with z as local +// up. "ec" means eye coordinates. + +// model position of original terrain poly; the bottom of the forest. varying vec4 rawposIn; +// model forest top +varying vec4 rawTopIn; +// model normal varying vec3 NormalIn; +varying vec4 ecPosIn; +varying vec4 ecTopIn; +varying vec3 ecNormalIn; +// eye spacce tangent and binormal varying vec3 VTangentIn; varying vec3 VBinormalIn; +// screen-space position of top +varying vec4 positionTopIn; +// constant color component +varying vec4 constantColorIn; attribute vec3 tangent; attribute vec3 binormal; +uniform float canopy_height; + void main(void) { - rawposIn = gl_Vertex; + rawposIn = gl_Vertex; + ecPosIn = gl_ModelViewMatrix * gl_Vertex; NormalIn = normalize(gl_Normal); + rawTopIn = rawposIn + vec4(0.0, 0.0, canopy_height, 0.0); + ecTopIn = gl_ModelViewMatrix * rawTopIn; + ecNormalIn = gl_NormalMatrix * NormalIn; VTangentIn = gl_NormalMatrix * tangent; VBinormalIn = gl_NormalMatrix * binormal; gl_FrontColor = gl_Color; gl_Position = ftransform(); + positionTopIn = gl_ModelViewProjectionMatrix * rawTopIn; gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0; + constantColorIn = gl_FrontMaterial.emission + + gl_Color * (gl_LightModel.ambient + gl_LightSource[0].ambient); } Index: landmass.geom =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Shaders/landmass.geom,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- landmass.geom 11 Apr 2010 08:36:39 -0000 1.3 +++ landmass.geom 22 Apr 2010 14:56:35 -0000 1.4 @@ -1,82 +1,116 @@ #version 120 #extension GL_EXT_geometry_shader4 : enable +// Geometry shader that creates a prism from a terrain triangle, +// resulting in a forest effect. +// +// A geometry shader should do as little computation as possible. + +// See landmass-g.vert for a description of the inputs. varying in vec4 rawposIn[]; varying in vec3 NormalIn[]; +varying in vec4 rawTopIn[]; +varying in vec4 ecPosIn[]; +varying in vec4 ecTopIn[]; +varying in vec3 ecNormalIn[]; varying in vec3 VTangentIn[]; varying in vec3 VBinormalIn[]; +varying in vec4 positionTopIn[]; +varying in vec4 constantColorIn[]; + +uniform float canopy_height; +// model position varying out vec4 rawpos; +// eye position varying out vec4 ecPosition; +// eye space surface matrix varying out vec3 VNormal; varying out vec3 VTangent; varying out vec3 VBinormal; +// model normal varying out vec3 Normal; varying out vec4 constantColor; varying out float bump; -uniform float canopy_height; - -void createVertex(int i, int j, float offset, float s) +// Emit one vertex of the forest geometry. +// parameters: +// i - index into original terrain triangle +void doVertex(in int i, in vec4 pos, in vec4 ecpos, in vec4 screenpos, + in vec3 rawNormal, in vec3 normal, in float s) { - rawpos = rawposIn[i] + offset * vec4(NormalIn[i], 0.0); - ecPosition = gl_ModelViewMatrix * rawpos; - if ( s == 0.0 ) - { - vec4 v; - if (j < i) - { - v = rawposIn[j] - rawposIn[i]; - Normal = normalize(cross( NormalIn[i], v.xyz )); - } - else - { - v = rawposIn[i] - rawposIn[j]; - Normal = normalize(cross( NormalIn[j], v.xyz )); - } - } - else - { - Normal = NormalIn[i]; - } - VNormal = normalize(gl_NormalMatrix * Normal); - VTangent = VTangentIn[i]; + rawpos = pos; + ecPosition = ecpos; + Normal = rawNormal; + VNormal = normal; + VTangent = VTangentIn[i]; VBinormal = VBinormalIn[i]; bump = s; gl_FrontColor = gl_FrontColorIn[i]; - constantColor = gl_FrontMaterial.emission - + gl_FrontColorIn[i] * (gl_LightModel.ambient + gl_LightSource[0].ambient); - gl_Position = gl_ProjectionMatrix * ecPosition; + constantColor = constantColorIn[i]; + gl_Position = screenpos; gl_TexCoord[0] = gl_TexCoordIn[i][0]; EmitVertex(); } +vec3 rawSideNormal[3]; +vec3 sideNormal[3]; + +// Emit a vertex for a forest side triangle +void doSideVertex(in int vertIdx, in int sideIdx, vec4 pos, in vec4 ecpos, + in vec4 screenpos) +{ + doVertex(vertIdx, pos, ecpos, screenpos, rawSideNormal[sideIdx], + sideNormal[sideIdx], 0.0); +} + void main(void) { - if (canopy_height > 0.01) { - createVertex(0, 1, canopy_height, 0.0); - createVertex(0, 1, 0.0, 0.0); - createVertex(1, 0, canopy_height, 0.0); - createVertex(1, 0, 0.0, 0.0); - EndPrimitive(); - createVertex(1, 2, canopy_height, 0.0); - createVertex(1, 2, 0.0, 0.0); - createVertex(2, 1, canopy_height, 0.0); - createVertex(2, 1, 0.0, 0.0); - EndPrimitive(); - createVertex(2, 0, canopy_height, 0.0); - createVertex(2, 0, 0.0, 0.0); - createVertex(0, 2, canopy_height, 0.0); - createVertex(0, 2, 0.0, 0.0); - EndPrimitive(); - createVertex(0, 1, 0.0, 0.0); - createVertex(1, 2, 0.0, 0.0); - createVertex(2, 0, 0.0, 0.0); - EndPrimitive(); - } - createVertex(0, 1, canopy_height, 1.0); - createVertex(1, 2, canopy_height, 1.0); - createVertex(2, 0, canopy_height, 1.0); - EndPrimitive(); + rawSideNormal[0] = normalize(cross((rawposIn[1] - rawposIn[0]).xyz, + NormalIn[0])); + rawSideNormal[1] = normalize(cross((rawposIn[2] - rawposIn[1]).xyz, + NormalIn[1])); + rawSideNormal[2] = normalize(cross((rawposIn[0] - rawposIn[2]).xyz, + NormalIn[2])); + for (int i = 0; i < 3; ++i) + sideNormal[i] = gl_NormalMatrix * rawSideNormal[i]; + if (canopy_height > 0.01) { + // Sides + doSideVertex(0, 0, rawTopIn[0], ecTopIn[0], positionTopIn[0]); + doSideVertex(0, 0, rawposIn[0], ecPosIn[0], gl_PositionIn[0]); + doSideVertex(1, 0, rawTopIn[1], ecTopIn[1], positionTopIn[1]); + doSideVertex(1, 0, rawposIn[1], ecPosIn[1], gl_PositionIn[1]); + + doSideVertex(2, 1, rawTopIn[2], ecTopIn[2], positionTopIn[2]); + doSideVertex(2, 1, rawposIn[2], ecPosIn[2], gl_PositionIn[2]); + + doSideVertex(0, 2, rawTopIn[0], ecTopIn[0], positionTopIn[0]); + doSideVertex(0, 2, rawposIn[0], ecPosIn[0], gl_PositionIn[0]); + // Degenerate triangles; avoids EndPrimitive() + doSideVertex(0, 2, rawposIn[0], ecPosIn[0], gl_PositionIn[0]); + doVertex(0, rawTopIn[0], ecTopIn[0], positionTopIn[0], NormalIn[0], + ecNormalIn[0], 1.0); + // Top + } + doVertex(0, rawTopIn[0], ecTopIn[0], positionTopIn[0], NormalIn[0], + ecNormalIn[0], 1.0); + doVertex(1, rawTopIn[1], ecTopIn[1], positionTopIn[1], NormalIn[1], + ecNormalIn[1], 1.0); + doVertex(2, rawTopIn[2], ecTopIn[2], positionTopIn[2], NormalIn[2], + ecNormalIn[2], 1.0); + // Don't render "bottom" triangle for now; it's hidden. +#if 0 + // degenerate + doVertex(2, rawTopIn[2], ecTopIn[2], positionTopIn[2], NormalIn[2], + ecNormalIn[2], 1.0); + // bottom + doVertex(0, rawposIn[0], ecPosIn[0], gl_PositionIn[0], NormalIn[0], + ecNormalIn[0], 1.0); + doVertex(1, rawposIn[1], ecPosIn[1], gl_PositionIn[1], NormalIn[1], + ecNormalIn[1], 1.0); + doVertex(2, rawposIn[2], ecPosIn[2], gl_PositionIn[2], NormalIn[2], + ecNormalIn[2], 1.0); +#endif + EndPrimitive(); } |
|
From: Tim M. <ti...@ba...> - 2010-04-22 14:56:44
|
Update of /var/cvs/FlightGear-0.9/data/Effects In directory baron.flightgear.org:/tmp/cvs-serv2733/Effects Modified Files: landmass.eff Log Message: Rewrote landmass geometry shader I did several optimizations, including reducing to a bare minimum shader computations and producing the geometry as one tristrip with degenerate triangles. The result was an increase from 14 fps to 51 fps (NVidia 8600M, ufo, ksfo). Author: Tim Moore <ti...@re...> Index: landmass.eff =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Effects/landmass.eff,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- landmass.eff 11 Apr 2010 06:09:07 -0000 1.10 +++ landmass.eff 22 Apr 2010 14:56:34 -0000 1.11 @@ -87,7 +87,7 @@ <vertex-shader>Shaders/landmass-g.vert</vertex-shader> <geometry-shader>Shaders/landmass.geom</geometry-shader> <fragment-shader>Shaders/landmass.frag</fragment-shader> - <geometry-vertices-out type="int">20</geometry-vertices-out> + <geometry-vertices-out type="int">18</geometry-vertices-out> <geometry-input-type>triangles</geometry-input-type> <geometry-output-type>triangle-strip</geometry-output-type> <attribute> |
|
From: Emmanuel B. <he...@ba...> - 2010-04-21 20:48:29
|
Update of /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models In directory baron.flightgear.org:/tmp/cvs-serv29031/Models Modified Files: c-2a.ac c-2a.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) - Add Nav light and light Cone - Add shadow --- 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 8.68004 -1.886655 -12.314798 8.68004 -1.886655 12.314804 -8.638659 -1.886655 12.314802 -8.638655 -1.886655 -12.314802 numsurf 1 SURF 0x00 mat 1 refs 4 0 0.999999880791 3.23365071608e-07 3 3.63304479833e-07 0.0 2 0.0 0.999999880791 1 0.999999761581 1.0 kids 0 --- NEW BINARY FILE "shadow.png" --- --- NEW FILE "shadow.xml" --- <?xml version="1.0"?> <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 </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 </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: c-2a.ac =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/c-2a.ac,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- c-2a.ac 13 Jan 2009 14:15:35 -0000 1.6 +++ c-2a.ac 21 Apr 2010 17:06:31 -0000 1.7 @@ -4,7 +4,7 @@ MATERIAL "DefaultWhite.003" rgb 1 1 1 amb 0.5 0.5 0.5 emis 0 0 0 spec 0.5 0.5 0.5 shi 32 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 "gloss" rgb 0.2 0.2 0.2 amb 0 0 0 emis 0 0 0 spec 0.110345 0.014746 0.014746 shi 14 trans 0.6 -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 "DefaultWhite.004" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0 MATERIAL "red" rgb 0.93051 0.059393 0.059393 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 50 trans 0.52902 MATERIAL "green" rgb 0.062908 0.744836 0.142794 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 50 trans 0.52902 MATERIAL "transp" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 50 trans 0.52902 @@ -26,35 +26,35 @@ texrep 1 1 crease 30.000000 [...85306 lines suppressed...] -770 0.0661768466234 0.0779509097338 +842 0.00864500459284 0.952717006207 +846 0.00667745899409 0.952957928181 +847 0.00667745899409 0.962201178074 +843 0.00864500459284 0.962091088295 +SURF 0x10 +mat 1 +refs 3 +856 0.101368971169 0.943531930447 +858 0.104096829891 0.937880635262 +855 0.101368971169 0.937696874142 +SURF 0x10 +mat 1 +refs 3 +859 0.104096829891 0.937479794025 +858 0.104096829891 0.937880635262 +857 0.118737071753 0.940716922283 kids 0 OBJECT poly name "vitres" Index: c-2a.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/c-2a.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- c-2a.xml 13 Jan 2009 14:15:36 -0000 1.6 +++ c-2a.xml 21 Apr 2010 17:08:05 -0000 1.7 @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <PropertyList> @@ -63,6 +63,7 @@ <object-name>axeDB</object-name> <object-name>articuleDH</object-name> <object-name>articuleDB</object-name> + <object-name>trous</object-name> <!-- Transparence --> <object-name>vitres</object-name> @@ -72,13 +73,13 @@ <object-name>lampeA</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> - </animation> - + </animation> + <animation> <type>noshadow</type> <object-name>vitres</object-name> @@ -133,6 +134,7 @@ <object-name>air2</object-name> <object-name>antennes</object-name> <object-name>lampeA1</object-name> + <object-name>trous</object-name> <property-base>sim/model/livery</property-base> <texture-prop>texture</texture-prop> @@ -168,16 +170,33 @@ --> </animation> + <!-- Une ombre pour OSG --> + <model> + <name>shadowOSG</name> + <path>Aircraft/C-2A/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> + <!-- Interieur --> <model> <path>Aircraft/C-2A/Models/Interior/interior.xml</path> <offsets> - <x-m> 0.0 </x-m> - <y-m> 0.0 </y-m> - <z-m> 0.0 </z-m> - <roll-deg> 0.0 </roll-deg> - <pitch-deg> 0.0 </pitch-deg> - <heading-deg> 0.0 </heading-deg> + <x-m> 0 </x-m> + <y-m> 0 </y-m> + <z-m> 0 </z-m> + <roll-deg> 0 </roll-deg> + <pitch-deg> 0 </pitch-deg> + <heading-deg> 0 </heading-deg> </offsets> </model> @@ -185,12 +204,12 @@ <model> <path>Aircraft/C-2A/Models/Immat/immat.xml</path> <offsets> - <x-m> 0.0 </x-m> - <y-m> 0.0 </y-m> - <z-m> 0.0 </z-m> - <roll-deg> 0.0 </roll-deg> - <pitch-deg> 0.0 </pitch-deg> - <heading-deg> 0.0 </heading-deg> + <x-m> 0 </x-m> + <y-m> 0 </y-m> + <z-m> 0 </z-m> + <roll-deg> 0 </roll-deg> + <pitch-deg> 0 </pitch-deg> + <heading-deg> 0 </heading-deg> </offsets> </model> @@ -275,7 +294,7 @@ <type>rotate</type> <object-name>AileGauche</object-name> <property>surface-positions/wing-fold-pos-norm</property> - <factor>115</factor> + <factor> 115 </factor> <axis> <x1-m> -0.607 </x1-m> <y1-m> -3.881 </y1-m> @@ -290,7 +309,7 @@ <type>rotate</type> <object-name>AileDroite</object-name> <property>surface-positions/wing-fold-pos-norm</property> - <factor>-115</factor> + <factor> -115 </factor> <axis> <x1-m> -0.607 </x1-m> <y1-m> 3.881 </y1-m> @@ -306,7 +325,7 @@ <type>rotate</type> <object-name>aileronG</object-name> <property>surface-positions/left-aileron-pos-norm</property> - <factor>-25.0</factor> + <factor> -25 </factor> <axis> <x1-m> 0.209 </x1-m> <y1-m> -6.962 </y1-m> @@ -321,7 +340,7 @@ <type>rotate</type> <object-name>aileronD</object-name> <property>surface-positions/right-aileron-pos-norm</property> - <factor>-25.0</factor> + <factor> -25 </factor> <axis> <x1-m> 0.087 </x1-m> <y1-m> 11.849 </y1-m> @@ -337,7 +356,7 @@ <type>rotate</type> <object-name>voletG1</object-name> <property>surface-positions/flap-pos-norm</property> - <factor>-35.0</factor> + <factor> -35 </factor> <axis> <x1-m> 0.186 </x1-m> <y1-m> -3.976 </y1-m> @@ -352,7 +371,7 @@ <type>rotate</type> <object-name>voletD1</object-name> <property>surface-positions/flap-pos-norm</property> - <factor>-35.0</factor> + <factor> -35 </factor> <axis> <x1-m> -0.045 </x1-m> <y1-m> 6.947 </y1-m> @@ -367,7 +386,7 @@ <type>rotate</type> <object-name>voletG2</object-name> <property>surface-positions/flap-pos-norm</property> - <factor>-35.0</factor> + <factor> -35 </factor> <axis> <x1-m> 0.342 </x1-m> <y1-m> -1.093 </y1-m> @@ -382,7 +401,7 @@ <type>rotate</type> <object-name>voletD2</object-name> <property>surface-positions/flap-pos-norm</property> - <factor>-35.0</factor> + <factor> -35 </factor> <axis> <x1-m> 0.186 </x1-m> <y1-m> 3.976 </y1-m> @@ -398,16 +417,16 @@ <type>rotate</type> <object-name>profondeur</object-name> <property>surface-positions/elevator-pos-norm</property> - <factor>25.0</factor> + <factor> 25 </factor> <center> <x-m> 7.912 </x-m> <y-m> 0.000 </y-m> <z-m> 0.849 </z-m> </center> <axis> - <x> 0.00 </x> - <y> 1.00 </y> - <z> 0.00 </z> + <x> 0 </x> + <y> 1 </y> + <z> 0 </z> </axis> </animation> @@ -416,16 +435,16 @@ <type>rotate</type> <object-name>directionG</object-name> <property>surface-positions/rudder-pos-norm</property> - <factor>25.0</factor> + <factor> 25 </factor> <center> <x-m> 7.829 </x-m> <y-m> -3.919 </y-m> <z-m> 0.543 </z-m> </center> <axis> - <x> 0.00 </x> - <y> 0.00 </y> - <z> -1.00 </z> + <x> 0 </x> + <y> 0 </y> + <z> -1 </z> </axis> </animation> @@ -433,16 +452,16 @@ <type>rotate</type> <object-name>directionD</object-name> <property>surface-positions/rudder-pos-norm</property> - <factor>25.0</factor> + <factor> 25 </factor> <center> <x-m> 7.829 </x-m> <y-m> 3.919 </y-m> <z-m> 0.543 </z-m> </center> <axis> - <x> 0.00 </x> - <y> 0.00 </y> - <z> -1.00 </z> + <x> 0 </x> + <y> 0 </y> + <z> -1 </z> </axis> </animation> @@ -452,18 +471,9 @@ <object-name>porteA</object-name> <property>gear/gear[0]/position-norm</property> <interpolation> - <entry> - <ind> 0.0 </ind> - <dep> 0.0 </dep> - </entry> - <entry> - <ind> 0.2 </ind> - <dep> 135.0 </dep> - </entry> - <entry> - <ind> 1.0 </ind> - <dep> 135.0 </dep> - </entry> + <entry><ind> 0.0 </ind><dep> 0 </dep></entry> + <entry><ind> 0.2 </ind><dep> 135 </dep></entry> + <entry><ind> 1.0 </ind><dep> 135 </dep></entry> </interpolation> <center> <x-m> -7.825 </x-m> @@ -471,29 +481,23 @@ <z-m> -1.521 </z-m> </center> <axis> - <x> 0.00 </x> - <y> 1.00 </y> - <z> 0.00 </z> + <x> 0 </x> + <y> 1 </y> + <z> 0 </z> </axis> </animation> + <x-m> -0.832 </x-m> + <y-m> -12.178 </y-m> + <z-m> 0.614 </z-m> <animation> <type>rotate</type> <object-name>porteG</object-name> <property>gear/gear[0]/position-norm</property> <interpolation> - <entry> - <ind> 0.0 </ind> - <dep> 0.0 </dep> - </entry> - <entry> - <ind> 0.2 </ind> - <dep> -160.0 </dep> - </entry> - <entry> - <ind> 1.0 </ind> - <dep> -160.0 </dep> - </entry> + <entry><ind> 0.0 </ind><dep> 0 </dep></entry> + <entry><ind> 0.2 </ind><dep> -160 </dep></entry> + <entry><ind> 1.0 </ind><dep> -160 </dep></entry> </interpolation> <axis> <x1-m> -7.096 </x1-m> @@ -510,18 +514,9 @@ <object-name>porteD</object-name> <property>gear/gear[0]/position-norm</property> <interpolation> - <entry> - <ind> 0.0 </ind> - <dep> 0.0 </dep> - </entry> - <entry> - <ind> 0.2 </ind> - <dep> 160.0 </dep> - </entry> - <entry> - <ind> 1.0 </ind> - <dep> 160.0 </dep> - </entry> + <entry><ind> 0.0 </ind><dep> 0 </dep></entry> + <entry><ind> 0.2 </ind><dep> 160 </dep></entry> + <entry><ind> 1.0 </ind><dep> 160 </dep></entry> </interpolation> <axis> <x1-m> -7.096 </x1-m> @@ -538,18 +533,9 @@ <object-name>porteGAG</object-name> <property>gear/gear[1]/position-norm</property> <interpolation> - <entry> - <ind> 0.0 </ind> - <dep> 0.0 </dep> - </entry> - <entry> - <ind> 0.2 </ind> - <dep> -50.0 </dep> - </entry> - <entry> - <ind> 1.0 </ind> - <dep> -50.0 </dep> - </entry> + <entry><ind> 0.0 </ind><dep> 0 </dep></entry> + <entry><ind> 0.2 </ind><dep> -50 </dep></entry> + <entry><ind> 1.0 </ind><dep> -50 </dep></entry> </interpolation> <axis> <x1-m> -2.247 </x1-m> @@ -566,18 +552,9 @@ <object-name>porteGAD</object-name> <property>gear/gear[1]/position-norm</property> <interpolation> - <entry> - <ind> 0.0 </ind> - <dep> 0.0 </dep> - </entry> - <entry> - <ind> 0.2 </ind> - <dep> 50.0 </dep> - </entry> - <entry> - <ind> 1.0 </ind> - <dep> 50.0 </dep> - </entry> + <entry><ind> 0.0 </ind><dep> 0 </dep></entry> + <entry><ind> 0.2 </ind><dep> 50 </dep></entry> + <entry><ind> 1.0 </ind><dep> 50 </dep></entry> </interpolation> <axis> <x1-m> -2.247 </x1-m> @@ -594,18 +571,9 @@ <object-name>porteGBG</object-name> <property>gear/gear[1]/position-norm</property> <interpolation> - <entry> - <ind> 0.0 </ind> - <dep> 0.0 </dep> - </entry> - <entry> - <ind> 0.2 </ind> - <dep> -35.0 </dep> - </entry> - <entry> - <ind> 1.0 </ind> - <dep> -35.0 </dep> - </entry> + <entry><ind> 0.0 </ind><dep> 0 </dep></entry> + <entry><ind> 0.2 </ind><dep> -35 </dep></entry> + <entry><ind> 1.0 </ind><dep> -35 </dep></entry> </interpolation> <axis> <x1-m> -1.217 </x1-m> @@ -622,18 +590,9 @@ <object-name>porteGBD</object-name> <property>gear/gear[1]/position-norm</property> <interpolation> - <entry> - <ind> 0.0 </ind> - <dep> 0.0 </dep> - </entry> - <entry> - <ind> 0.2 </ind> - <dep> 35.0 </dep> - </entry> - <entry> - <ind> 1.0 </ind> - <dep> 35.0 </dep> - </entry> + <entry><ind> 0.0 </ind><dep> 0 </dep></entry> + <entry><ind> 0.2 </ind><dep> 35 </dep></entry> + <entry><ind> 1.0 </ind><dep> 35 </dep></entry> </interpolation> <axis> <x1-m> -1.217 </x1-m> @@ -650,18 +609,9 @@ <object-name>porteDAD</object-name> <property>gear/gear[2]/position-norm</property> <interpolation> - <entry> - <ind> 0.0 </ind> - <dep> 0.0 </dep> - </entry> - <entry> - <ind> 0.2 </ind> - <dep> 50.0 </dep> - </entry> - <entry> - <ind> 1.0 </ind> - <dep> 50.0 </dep> - </entry> + <entry><ind> 0.0 </ind><dep> 0 </dep></entry> + <entry><ind> 0.2 </ind><dep> 50 </dep></entry> + <entry><ind> 1.0 </ind><dep> 50 </dep></entry> </interpolation> <axis> <x1-m> -2.247 </x1-m> @@ -678,18 +628,9 @@ <object-name>porteDAG</object-name> <property>gear/gear[2]/position-norm</property> <interpolation> - <entry> - <ind> 0.0 </ind> - <dep> 0.0 </dep> - </entry> - <entry> - <ind> 0.2 </ind> - <dep> -50.0 </dep> - </entry> - <entry> - <ind> 1.0 </ind> - <dep> -50.0 </dep> - </entry> + <entry><ind> 0.0 </ind><dep> 0 </dep></entry> + <entry><ind> 0.2 </ind><dep> -50 </dep></entry> + <entry><ind> 1.0 </ind><dep> -50 </dep></entry> </interpolation> <axis> <x1-m> -2.247 </x1-m> @@ -706,18 +647,9 @@ <object-name>porteDBD</object-name> <property>gear/gear[2]/position-norm</property> <interpolation> - <entry> - <ind> 0.0 </ind> - <dep> 0.0 </dep> - </entry> - <entry> - <ind> 0.2 </ind> - <dep> 35.0 </dep> - </entry> - <entry> - <ind> 1.0 </ind> - <dep> 35.0 </dep> - </entry> + <entry><ind> 0.0 </ind><dep> 0 </dep></entry> + <entry><ind> 0.2 </ind><dep> 35 </dep></entry> + <entry><ind> 1.0 </ind><dep> 35 </dep></entry> </interpolation> <axis> <x1-m> -1.217 </x1-m> @@ -734,18 +666,9 @@ <object-name>porteDBG</object-name> <property>gear/gear[2]/position-norm</property> <interpolation> - <entry> - <ind> 0.0 </ind> - <dep> 0.0 </dep> - </entry> - <entry> - <ind> 0.2 </ind> - <dep> -35.0 </dep> - </entry> - <entry> - <ind> 1.0 </ind> - <dep> -35.0 </dep> - </entry> + <entry><ind> 0.0 </ind><dep> 0 </dep></entry> + <entry><ind> 0.2 </ind><dep> -35 </dep></entry> + <entry><ind> 1.0 </ind><dep> -35 </dep></entry> </interpolation> <axis> <x1-m> -1.217 </x1-m> @@ -787,14 +710,8 @@ <object-name>TrainAvant</object-name> <property>gear/gear[0]/position-norm</property> <interpolation> - <entry> - <ind> 0.0 </ind> - <dep> -75.0 </dep> - </entry> - <entry> - <ind> 1.0</ind> - <dep> 0.0</dep> - </entry> + <entry><ind> 0 </ind><dep> -75 </dep></entry> + <entry><ind> 1 </ind><dep> 0 </dep></entry> </interpolation> <center> <x-m> -7.533 </x-m> @@ -802,9 +719,9 @@ <z-m> -1.224 </z-m> </center> <axis> - <x> 0.0 </x> - <y> 1.0 </y> - <z> 0.0 </z> + <x> 0 </x> + <y> 1 </y> + <z> 0 </z> </axis> </animation> @@ -813,14 +730,8 @@ <object-name>TrainGauche</object-name> <property>gear/gear[1]/position-norm</property> <interpolation> - <entry> - <ind> 0.0 </ind> - <dep> 75.0 </dep> - </entry> - <entry> - <ind> 1.0</ind> - <dep> 0.0</dep> - </entry> + <entry><ind> 0 </ind><dep> 75 </dep></entry> + <entry><ind> 1 </ind><dep> 0 </dep></entry> </interpolation> <center> <x-m> -0.550 </x-m> @@ -828,9 +739,9 @@ <z-m> -0.486 </z-m> </center> <axis> - <x> 0.0 </x> - <y> 1.0 </y> - <z> 0.0 </z> + <x> 0 </x> + <y> 1 </y> + <z> 0 </z> </axis> </animation> @@ -839,14 +750,8 @@ <object-name>TrainDroit</object-name> <property>gear/gear[2]/position-norm</property> <interpolation> - <entry> - <ind> 0.0 </ind> - <dep> 75.0 </dep> - </entry> - <entry> - <ind> 1.0</ind> - <dep> 0.0</dep> - </entry> + <entry><ind> 0 </ind><dep> 75 </dep></entry> + <entry><ind> 1 </ind><dep> 0 </dep></entry> </interpolation> <center> <x-m> -0.550 </x-m> @@ -854,9 +759,9 @@ <z-m> -0.486 </z-m> </center> <axis> - <x> 0.0 </x> - <y> 1.0 </y> - <z> 0.0 </z> + <x> 0 </x> + <y> 1 </y> + <z> 0 </z> </axis> </animation> @@ -865,16 +770,16 @@ <type>rotate</type> <object-name>roueA</object-name> <property>controls/flight/rudder</property> - <factor> 40.0 </factor> + <factor> 40 </factor> <center> <x-m> -7.533 </x-m> <y-m> 0.000 </y-m> <z-m> -2.107 </z-m> </center> <axis> - <x> 0.000 </x> - <y> 0.000 </y> - <z> -1.000 </z> + <x> 0 </x> + <y> 0 </y> + <z> -1 </z> </axis> </animation> @@ -912,9 +817,9 @@ <entry><ind> 1.00 </ind><dep> 0.11 </dep></entry> </interpolation> <axis> - <x> 0.0 </x> - <y> 0.0 </y> - <z> 1.0 </z> + <x> 0 </x> + <y> 0 </y> + <z> 1 </z> </axis> </animation> @@ -933,9 +838,9 @@ <z-m> -2.196 </z-m> </center> <axis> - <x> 0.0 </x> - <y> 1.0 </y> - <z> 0.0 </z> + <x> 0 </x> + <y> 1 </y> + <z> 0 </z> </axis> </animation> @@ -954,9 +859,9 @@ <z-m> -2.588 </z-m> </center> <axis> - <x> 0.0 </x> - <y> 1.0 </y> - <z> 0.0 </z> + <x> 0 </x> + <y> 1 </y> + <z> 0 </z> </axis> </animation> --> @@ -970,9 +875,9 @@ <entry><ind> 1.00 </ind><dep> 0.28 </dep></entry> </interpolation> <axis> - <x> 0.0 </x> - <y> 0.0 </y> - <z> 1.0 </z> + <x> 0 </x> + <y> 0 </y> + <z> 1 </z> </axis> </animation> @@ -991,9 +896,9 @@ <z-m> -1.671 </z-m> </center> <axis> - <x> 0.0 </x> - <y> 1.0 </y> - <z> 0.0 </z> + <x> 0 </x> + <y> 1 </y> + <z> 0 </z> </axis> </animation> @@ -1012,9 +917,9 @@ <z-m> -1.894 </z-m> </center> <axis> - <x> 0.0 </x> - <y> 1.0 </y> - <z> 0.0 </z> + <x> 0 </x> + <y> 1 </y> + <z> 0 </z> </axis> </animation> @@ -1028,9 +933,9 @@ <entry><ind> 1.00 </ind><dep> 0.28 </dep></entry> </interpolation> <axis> - <x> 0.0 </x> - <y> 0.0 </y> - <z> 1.0 </z> + <x> 0 </x> + <y> 0 </y> + <z> 1 </z> </axis> </animation> @@ -1049,9 +954,9 @@ <z-m> -1.671 </z-m> </center> <axis> - <x> 0.0 </x> - <y> 1.0 </y> - <z> 0.0 </z> + <x> 0 </x> + <y> 1 </y> + <z> 0 </z> </axis> </animation> @@ -1070,9 +975,9 @@ <z-m> -1.894 </z-m> </center> <axis> - <x> 0.0 </x> - <y> 1.0 </y> - <z> 0.0 </z> + <x> 0 </x> + <y> 1 </y> + <z> 0 </z> </axis> </animation> @@ -1088,9 +993,9 @@ <z-m> -2.107 </z-m> </center> <axis> - <x> 0.000 </x> - <y> -1.000 </y> - <z> 0.000 </z> + <x> 0 </x> + <y> -1 </y> + <z> 0 </z> </axis> </animation> @@ -1105,9 +1010,9 @@ <z-m> -1.903 </z-m> </center> <axis> - <x> 0.000 </x> - <y> -1.000 </y> - <z> 0.000 </z> + <x> 0 </x> + <y> -1 </y> + <z> 0 </z> </axis> </animation> @@ -1122,9 +1027,9 @@ <z-m> -1.903 </z-m> </center> <axis> - <x> 0.000 </x> - <y> -1.000 </y> - <z> 0.000 </z> + <x> 0 </x> + <y> -1 </y> + <z> 0 </z> </axis> </animation> @@ -1140,9 +1045,9 @@ <z-m> -1.406 </z-m> </center> <axis> - <x> 1.000 </x> - <y> 0.000 </y> - <z> 0.000 </z> + <x> 1 </x> + <y> 0 </y> + <z> 0 </z> </axis> </animation> @@ -1151,10 +1056,10 @@ <type>rotate</type> <object-name>crosse</object-name> <property>gear/tailhook/position-norm</property> - <factor>40</factor> + <factor> 40 </factor> <center> <x-m> 3.282 </x-m> - <y-m> 0.00 </y-m> + <y-m> 0.000 </y-m> <z-m> -1.789 </z-m> </center> <axis> @@ -1169,7 +1074,7 @@ <type>rotate</type> <object-name>baie1</object-name> <property>instrumentation/doors/passenger/position-norm</property> - <factor>40</factor> + <factor> 40 </factor> <center> <x-m> 5.245 </x-m> <y-m> 0.000 </y-m> @@ -1186,7 +1091,7 @@ <type>rotate</type> <object-name>baie2</object-name> <property>instrumentation/doors/passenger/position-norm</property> - <factor>30</factor> + <factor> 30 </factor> <center> <x-m> 8.315 </x-m> <y-m> 0.000 </y-m> @@ -1199,5 +1104,74 @@ </axis> </animation> + <!-- Effets lumineux --> + <model> + <path>Aircraft/C-2A/Models/light/beacon.xml</path> + <offsets> + <x-m> 7.175 </x-m> + <y-m> 3.910 </y-m> + <z-m> 1.892 </z-m> + </offsets> + </model> + + <model> + <path>Aircraft/C-2A/Models/light/RedLight.xml</path> + <offsets> + <x-m> -0.832 </x-m> + <y-m> -12.178 </y-m> + <z-m> 0.614 </z-m> + </offsets> + </model> + + <model> + <path>Aircraft/C-2A/Models/light/GreenLight.xml</path> + <offsets> + <x-m> -0.832 </x-m> + <y-m> 12.178 </y-m> + <z-m> 0.614 </z-m> + </offsets> + </model> + + <model> + <path>Aircraft/C-2A/Models/light/StrobeWhite.xml</path> + <offsets> + <x-m> -0.812 </x-m> + <y-m> -12.178 </y-m> + <z-m> 0.614 </z-m> + </offsets> + </model> + + <model> + <path>Aircraft/C-2A/Models/light/StrobeWhite.xml</path> + <offsets> + <x-m> -0.812 </x-m> + <y-m> 12.178 </y-m> + <z-m> 0.614 </z-m> + </offsets> + </model> + + <!-- Gear light cone --> + <model> + <name>LightCone</name> + <path>Aircraft/C-2A/Models/light/light-cone.xml</path> + <offsets> + <x-m> -7.611 </x-m> + <y-m> 0.000 </y-m> + <z-m> -1.700 </z-m> + <pitch-deg> -7.500 </pitch-deg> + </offsets> + </model> + + <animation> + <type>select</type> + <object-name>LightCone</object-name> + <condition> + <equals> + <property>gear/gear[0]/position-norm</property> + <value> 1 </value> + </equals> + </condition> + </animation> + </PropertyList> --- "glass_shader.png" DELETED --- |
|
From: Emmanuel B. <he...@ba...> - 2010-04-21 20:48:29
|
Update of /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/light In directory baron.flightgear.org:/tmp/cvs-serv29031/Models/light Modified Files: GreenLight.ac GreenLight.xml RedLight.ac RedLight.xml WhiteLight.ac beacon.xml Added Files: StrobeGreen.xml StrobeRed.xml StrobeRed2.xml StrobeWhite.xml WhiteLight.xml light-cone.ac light-cone.xml light-gradient-lamp.png Removed Files: Whitelight.xml Log Message: - little update on FDM (thanks to Melchior for the YASim_import script) - Add Nav light and light Cone - Add shadow --- NEW FILE "StrobeGreen.xml" --- <?xml version="1.0" encoding="UTF-8"?> <PropertyList> <path>GreenLight.ac</path> <animation> <type>noshadow</type> <object-name>Light</object-name> </animation> <animation> <type>alpha-test</type> <alpha-factor>0.01</alpha-factor> </animation> <animation> <type>billboard</type> <object-name>Light</object-name> <spherical type="bool">true</spherical> </animation> <animation> <type>select</type> <object-name>Light</object-name> <condition> <property>/sim/model/lights/sbc1/state</property> </condition> </animation> <animation> <type>dist-scale</type> <object-name>Light</object-name> <interpolation> <entry> <ind>0</ind> <dep>0.25</dep> </entry> <entry> <ind>20</ind> <dep>0.5</dep> </entry> <entry> <ind>1500</ind> <dep>5</dep> </entry> </interpolation> </animation> </PropertyList> --- NEW FILE "StrobeRed.xml" --- <?xml version="1.0" encoding="UTF-8"?> <PropertyList> <path>RedLight.ac</path> <animation> <type>noshadow</type> <object-name>Light</object-name> </animation> <animation> <type>alpha-test</type> <alpha-factor>0.01</alpha-factor> </animation> <animation> <type>billboard</type> <object-name>Light</object-name> <spherical type="bool">true</spherical> </animation> <animation> <type>select</type> <object-name>Light</object-name> <condition> <property>/sim/model/lights/sbc2/state</property> </condition> </animation> <animation> <type>dist-scale</type> <object-name>Light</object-name> <interpolation> <entry> <ind>0</ind> <dep>0.25</dep> </entry> <entry> <ind>20</ind> <dep>0.5</dep> </entry> <entry> <ind>1500</ind> <dep>5</dep> </entry> </interpolation> </animation> </PropertyList> --- NEW FILE "StrobeRed2.xml" --- <?xml version="1.0" encoding="UTF-8"?> <PropertyList> <path>RedLight.ac</path> <animation> <type>noshadow</type> <object-name>Light</object-name> </animation> <animation> <type>alpha-test</type> <alpha-factor>0.01</alpha-factor> </animation> <animation> <type>billboard</type> <object-name>Light</object-name> <spherical type="bool">true</spherical> </animation> <animation> <type>select</type> <object-name>Light</object-name> <condition> <property>/sim/model/lights/beacon/state</property> </condition> </animation> <animation> <type>dist-scale</type> <object-name>Light</object-name> <interpolation> <entry> <ind>0</ind> <dep>0.25</dep> </entry> <entry> <ind>20</ind> <dep>0.5</dep> </entry> <entry> <ind>1500</ind> <dep>5</dep> </entry> </interpolation> </animation> </PropertyList> --- NEW FILE "StrobeWhite.xml" --- <?xml version="1.0" encoding="UTF-8"?> <PropertyList> <path>WhiteLight.ac</path> <animation> <type>noshadow</type> <object-name>Light</object-name> </animation> <animation> <type>alpha-test</type> <alpha-factor>0.01</alpha-factor> </animation> <animation> <type>billboard</type> <object-name>Light</object-name> <spherical type="bool">true</spherical> </animation> <animation> <type>select</type> <object-name>Light</object-name> <condition> <property>/sim/model/lights/sbc1/state</property> </condition> </animation> <animation> <type>material</type> <object-name>Light</object-name> <emission> <red> 1.0 </red> <green> 1.0 </green> <blue> 1.0 </blue> <factor-prop>/systems/electrical/outputs/instrument-lights</factor-prop> </emission> </animation> <animation> <type>dist-scale</type> <object-name>Light</object-name> <interpolation> <entry><ind> 0 </ind><dep> 0.25 </dep></entry> <entry><ind> 20 </ind><dep> 0.50 </dep></entry> <entry><ind> 1500 </ind><dep> 5.00 </dep></entry> </interpolation> </animation> </PropertyList> --- NEW FILE "WhiteLight.xml" --- <?xml version="1.0" encoding="UTF-8"?> <PropertyList> <path>WhiteLight.ac</path> <animation> <type>noshadow</type> <object-name>Light</object-name> </animation> <animation> <type>alpha-test</type> <alpha-factor>0.01</alpha-factor> </animation> <animation> <type>billboard</type> <object-name>Light</object-name> <spherical type="bool">true</spherical> </animation> <animation> <type>material</type> <object-name>Light</object-name> <emission> <red> 1.0 </red> <green> 1.0 </green> <blue> 1.0 </blue> <factor-prop>/systems/electrical/outputs/instrument-lights</factor-prop> </emission> </animation> <animation> <type>dist-scale</type> <object-name>Light</object-name> <interpolation> <entry><ind> 0 </ind><dep> 0.25 </dep></entry> <entry><ind> 20 </ind><dep> 0.50 </dep></entry> <entry><ind> 1500 </ind><dep> 5.00 </dep></entry> </interpolation> </animation> </PropertyList> --- NEW FILE "light-cone.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 "lightcone" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 1 0.969 0.847 shi 64 trans 0.808 MATERIAL "lightcone2" rgb 0 0 0 amb 0 0 0 emis 1 1 1 spec 0 0 0 shi 60 trans 0.804 MATERIAL "light" rgb 0.2 0.2 0.2 amb 0.2 0.2 0.2 emis 1 1 1 spec 0 0 0 shi 128 trans 0 OBJECT world kids 3 OBJECT poly name "Cone" data 4 Cone crease 45.000000 numvert 193 -24.8113 0 0 -19.96805 6e-06 4.08375 -19.96805 -0.796695 4.0053 -19.96805 -1.562775 3.772915 -19.96805 -2.268801 3.395515 -19.96805 -2.88764 2.88765 [...3229 lines suppressed...] 32 0.5 0.527458012104 SURF 0x10 mat 3 refs 3 29 0.915733993053 0.245857998729 30 0.961937010288 0.333485990763 32 0.5 0.527458012104 SURF 0x10 mat 3 refs 3 30 0.961937010288 0.333485990763 31 0.990395009518 0.428577005863 32 0.5 0.527458012104 SURF 0x10 mat 3 refs 3 31 0.990395009518 0.428577005863 0 1.0 0.527458012104 32 0.5 0.527458012104 kids 0 --- NEW FILE "light-cone.xml" --- <?xml version="1.0" encoding="UTF-8"?> <PropertyList> <path>light-cone.ac</path> <effect> <inherits-from>Effects/light-cone</inherits-from> <object-name>Cone</object-name> </effect> </PropertyList> --- NEW BINARY FILE "light-gradient-lamp.png" --- Index: GreenLight.ac =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/light/GreenLight.ac,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- GreenLight.ac 20 Dec 2008 14:20:07 -0000 1.1 +++ GreenLight.ac 21 Apr 2010 17:22:25 -0000 1.2 @@ -1,6 +1,6 @@ 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 "ac3dmat1" rgb 1 1 1 amb 0.2 0.2 0.2 emis 1 1 1 spec 0 0 0 shi 10 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 Index: GreenLight.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/light/GreenLight.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- GreenLight.xml 20 Dec 2008 14:20:08 -0000 1.1 +++ GreenLight.xml 21 Apr 2010 17:23:20 -0000 1.2 @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <PropertyList> @@ -21,29 +21,23 @@ </animation> <animation> - <type>select</type> + <type>material</type> <object-name>Light</object-name> - <condition> - <property>/sim/model/lights/sbc1/state</property> - </condition> + <emission> + <red> 1.0 </red> + <green> 1.0 </green> + <blue> 1.0 </blue> + <factor-prop>/systems/electrical/outputs/instrument-lights</factor-prop> + </emission> </animation> <animation> <type>dist-scale</type> <object-name>Light</object-name> <interpolation> - <entry> - <ind>0</ind> - <dep>0.25</dep> - </entry> - <entry> - <ind>20</ind> - <dep>0.5</dep> - </entry> - <entry> - <ind>1500</ind> - <dep>5</dep> - </entry> + <entry><ind> 0 </ind><dep> 0.25 </dep></entry> + <entry><ind> 20 </ind><dep> 0.50 </dep></entry> + <entry><ind> 1500 </ind><dep> 5.00 </dep></entry> </interpolation> </animation> Index: RedLight.ac =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/light/RedLight.ac,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- RedLight.ac 20 Dec 2008 14:20:08 -0000 1.1 +++ RedLight.ac 21 Apr 2010 17:23:48 -0000 1.2 @@ -1,6 +1,6 @@ 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 "ac3dmat1" rgb 1 1 1 amb 0.2 0.2 0.2 emis 1 1 1 spec 0 0 0 shi 10 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 @@ -27,22 +27,22 @@ SURF 0x20 mat 1 refs 4 -0 0.442211866379 0.43821194768 -1 0.0567888170481 0.438211858273 -2 0.0567888170481 0.0527888052166 -3 0.442211866379 0.0527887605131 +0 0.448961138725 0.442461937666 +1 0.0635380744934 0.442461848259 +2 0.0635380744934 0.0570387989283 +3 0.448961138725 0.0570387542248 SURF 0x20 mat 1 refs 4 -7 0.442211985588 0.0527888350189 -6 0.442211985588 0.43821194768 -5 0.0567888170481 0.43821194768 -4 0.0567888170481 0.0527887605131 +7 0.448961257935 0.0570388287306 +6 0.448961257935 0.442461937666 +5 0.0635380744934 0.442461937666 +4 0.0635380744934 0.0570387542248 SURF 0x20 mat 1 refs 4 -11 0.442211985588 0.43821194768 -10 0.0567889362574 0.43821194768 -9 0.0567888170481 0.0527888350189 -8 0.442211985588 0.0527887605131 +11 0.448961257935 0.442461937666 +10 0.0635381937027 0.442461937666 +9 0.0635380744934 0.0570388287306 +8 0.448961257935 0.0570387542248 kids 0 Index: RedLight.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/light/RedLight.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- RedLight.xml 20 Dec 2008 14:20:09 -0000 1.1 +++ RedLight.xml 21 Apr 2010 17:24:45 -0000 1.2 @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <PropertyList> @@ -21,29 +21,23 @@ </animation> <animation> - <type>select</type> + <type>material</type> <object-name>Light</object-name> - <condition> - <property>/sim/model/lights/sbc1/state</property> - </condition> + <emission> + <red> 1.0 </red> + <green> 1.0 </green> + <blue> 1.0 </blue> + <factor-prop>/systems/electrical/outputs/instrument-lights</factor-prop> + </emission> </animation> <animation> <type>dist-scale</type> <object-name>Light</object-name> <interpolation> - <entry> - <ind>0</ind> - <dep>0.25</dep> - </entry> - <entry> - <ind>20</ind> - <dep>0.5</dep> - </entry> - <entry> - <ind>1500</ind> - <dep>5</dep> - </entry> + <entry><ind> 0 </ind><dep> 0.25 </dep></entry> + <entry><ind> 20 </ind><dep> 0.50 </dep></entry> + <entry><ind> 1500 </ind><dep> 5.00 </dep></entry> </interpolation> </animation> Index: WhiteLight.ac =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/light/WhiteLight.ac,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- WhiteLight.ac 20 Dec 2008 14:20:10 -0000 1.1 +++ WhiteLight.ac 21 Apr 2010 17:28:24 -0000 1.2 @@ -1,6 +1,6 @@ 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 "ac3dmat1" rgb 1 1 1 amb 0.2 0.2 0.2 emis 1 1 1 spec 0 0 0 shi 10 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 @@ -27,22 +27,22 @@ SURF 0x20 mat 1 refs 4 -0 0.948729932308 0.948479950428 -1 0.558269321918 0.948479950428 -2 0.558269321918 0.558019340038 -3 0.948729932308 0.558019280434 +0 0.943492412567 0.942461967468 +1 0.558069348335 0.942461848259 +2 0.558069348335 0.557038784027 +3 0.943492412567 0.557038784027 SURF 0x20 mat 1 refs 4 -7 0.948729932308 0.558019340038 -6 0.948729932308 0.948479950428 -5 0.558269321918 0.948479950428 -4 0.558269321918 0.558019280434 +7 0.943492531776 0.557038843632 +6 0.943492531776 0.942461967468 +5 0.558069348335 0.942461967468 +4 0.558069348335 0.557038784027 SURF 0x20 mat 1 refs 4 -11 0.948729932308 0.948479950428 -10 0.558269321918 0.948479950428 -9 0.558269321918 0.558019340038 -8 0.948729932308 0.558019280434 +11 0.943492531776 0.942461967468 +10 0.558069467545 0.942461967468 +9 0.558069348335 0.557038843632 +8 0.943492531776 0.557038784027 kids 0 Index: beacon.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/light/beacon.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- beacon.xml 20 Dec 2008 14:20:11 -0000 1.1 +++ beacon.xml 21 Apr 2010 17:30:42 -0000 1.2 @@ -1,48 +1,52 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> + <PropertyList> - <path>RedLight.ac</path> - <animation> - <type>noshadow</type> - <object-name>Light</object-name> - </animation> - - <animation> - <type>alpha-test</type> - <alpha-factor>0.01</alpha-factor> - </animation> - - <animation> - <type>billboard</type> - <object-name>Light</object-name> - <spherical type="bool">true</spherical> - </animation> - - <animation> - <type>select</type> - <object-name>Light</object-name> - <condition> - <property>/sim/model/lights/beacon/state</property> - </condition> - </animation> - - <animation> - <type>dist-scale</type> - <object-name>Light</object-name> - <interpolation> - <entry> - <ind>0</ind> - <dep>0.25</dep> - </entry> - <entry> - <ind>20</ind> - <dep>0.5</dep> - </entry> - <entry> - <ind>1500</ind> - <dep>5</dep> - </entry> - </interpolation> - </animation> + <path>RedLight.ac</path> + + <animation> + <type>noshadow</type> + <object-name>Light</object-name> + </animation> + + <animation> + <type>alpha-test</type> + <alpha-factor>0.01</alpha-factor> + </animation> + + <animation> + <type>billboard</type> + <object-name>Light</object-name> + <spherical type="bool">true</spherical> + </animation> + + <animation> + <type>select</type> + <object-name>Light</object-name> + <condition> + <property>/sim/model/lights/beacon/state</property> + </condition> + </animation> + + <animation> + <type>material</type> + <object-name>Light</object-name> + <emission> + <red> 1.0 </red> + <green> 1.0 </green> + <blue> 1.0 </blue> + <factor-prop>/systems/electrical/outputs/instrument-lights</factor-prop> + </emission> + </animation> + + <animation> + <type>dist-scale</type> + <object-name>Light</object-name> + <interpolation> + <entry><ind> 0 </ind><dep> 0.25 </dep></entry> + <entry><ind> 20 </ind><dep> 0.50 </dep></entry> + <entry><ind> 1500 </ind><dep> 5.00 </dep></entry> + </interpolation> + </animation> </PropertyList> --- "Whitelight.xml" DELETED --- |
|
From: Emmanuel B. <he...@ba...> - 2010-04-21 20:48:19
|
Update of /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/Interior/Panel In directory baron.flightgear.org:/tmp/cvs-serv29031/Models/Interior/Panel Modified Files: panel.xml Log Message: - little update on FDM (thanks to Melchior for the YASim_import script) - Add Nav light and light Cone - Add shadow Index: panel.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/Interior/Panel/panel.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- panel.xml 19 Dec 2008 09:52:16 -0000 1.2 +++ panel.xml 21 Apr 2010 17:17:27 -0000 1.3 @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <PropertyList> @@ -20,9 +20,9 @@ <x-m> -0.112 </x-m> <y-m> -0.406 </y-m> <z-m> -0.192 </z-m> - <roll-deg> 0.000 </roll-deg> - <pitch-deg> -13.000 </pitch-deg> - <heading-deg> 0.000 </heading-deg> + <roll-deg> 0 </roll-deg> + <pitch-deg> -13 </pitch-deg> + <heading-deg> 0 </heading-deg> </offsets> </model> @@ -32,9 +32,9 @@ <x-m> -0.112 </x-m> <y-m> 0.406 </y-m> <z-m> -0.192 </z-m> - <roll-deg> 0.000 </roll-deg> - <pitch-deg> -13.000 </pitch-deg> - <heading-deg> 0.000 </heading-deg> + <roll-deg> 0 </roll-deg> + <pitch-deg> -13 </pitch-deg> + <heading-deg> 0 </heading-deg> </offsets> </model> @@ -45,9 +45,9 @@ <x-m> -0.088 </x-m> <y-m> -0.494 </y-m> <z-m> -0.286 </z-m> - <roll-deg> 0.000 </roll-deg> - <pitch-deg> -13.000 </pitch-deg> - <heading-deg> 0.000 </heading-deg> + <roll-deg> 0 </roll-deg> + <pitch-deg> -13 </pitch-deg> + <heading-deg> 0 </heading-deg> </offsets> </model> @@ -57,9 +57,9 @@ <x-m> -0.088 </x-m> <y-m> 0.315 </y-m> <z-m> -0.286 </z-m> - <roll-deg> 0.000 </roll-deg> - <pitch-deg> -13.000 </pitch-deg> - <heading-deg> 0.000 </heading-deg> + <roll-deg> 0 </roll-deg> + <pitch-deg> -13 </pitch-deg> + <heading-deg> 0 </heading-deg> </offsets> </model> @@ -70,9 +70,9 @@ <x-m> -0.074 </x-m> <y-m> -0.247 </y-m> <z-m> -0.350 </z-m> - <roll-deg> 0.000 </roll-deg> - <pitch-deg> -13.000 </pitch-deg> - <heading-deg> 0.000 </heading-deg> + <roll-deg> 0 </roll-deg> + <pitch-deg> -13 </pitch-deg> + <heading-deg> 0 </heading-deg> </offsets> </model> @@ -82,9 +82,9 @@ <x-m> -0.087 </x-m> <y-m> -0.247 </y-m> <z-m> -0.293 </z-m> - <roll-deg> 0.000 </roll-deg> - <pitch-deg> -13.000 </pitch-deg> - <heading-deg> 0.000 </heading-deg> + <roll-deg> 0 </roll-deg> + <pitch-deg> -13 </pitch-deg> + <heading-deg> 0 </heading-deg> </offsets> </model> @@ -94,9 +94,9 @@ <x-m> -0.102 </x-m> <y-m> -0.247 </y-m> <z-m> -0.237 </z-m> - <roll-deg> 0.000 </roll-deg> - <pitch-deg> -13.000 </pitch-deg> - <heading-deg> 0.000 </heading-deg> + <roll-deg> 0 </roll-deg> + <pitch-deg> -13 </pitch-deg> + <heading-deg> 0 </heading-deg> </offsets> </model> @@ -106,9 +106,9 @@ <x-m> -0.116 </x-m> <y-m> -0.247 </y-m> <z-m> -0.180 </z-m> - <roll-deg> 0.000 </roll-deg> - <pitch-deg> -13.000 </pitch-deg> - <heading-deg> 0.000 </heading-deg> + <roll-deg> 0 </roll-deg> + <pitch-deg> -13 </pitch-deg> + <heading-deg> 0 </heading-deg> </offsets> </model> @@ -118,9 +118,9 @@ <x-m> -0.129 </x-m> <y-m> -0.247 </y-m> <z-m> -0.123 </z-m> - <roll-deg> 0.000 </roll-deg> - <pitch-deg> -13.000 </pitch-deg> - <heading-deg> 0.000 </heading-deg> + <roll-deg> 0 </roll-deg> + <pitch-deg> -13 </pitch-deg> + <heading-deg> 0 </heading-deg> </offsets> </model> @@ -130,9 +130,9 @@ <x-m> -0.141 </x-m> <y-m> -0.247 </y-m> <z-m> -0.067 </z-m> - <roll-deg> 0.000 </roll-deg> - <pitch-deg> -13.000 </pitch-deg> - <heading-deg> 0.000 </heading-deg> + <roll-deg> 0 </roll-deg> + <pitch-deg> -13 </pitch-deg> + <heading-deg> 0 </heading-deg> </offsets> </model> @@ -142,9 +142,9 @@ <x-m> -0.074 </x-m> <y-m> -0.193 </y-m> <z-m> -0.350 </z-m> - <roll-deg> 0.000 </roll-deg> - <pitch-deg> -13.000 </pitch-deg> - <heading-deg> 0.000 </heading-deg> + <roll-deg> 0 </roll-deg> + <pitch-deg> -13 </pitch-deg> + <heading-deg> 0 </heading-deg> </offsets> </model> @@ -154,9 +154,9 @@ <x-m> -0.087 </x-m> <y-m> -0.193 </y-m> <z-m> -0.293 </z-m> - <roll-deg> 0.000 </roll-deg> - <pitch-deg> -13.000 </pitch-deg> - <heading-deg> 0.000 </heading-deg> + <roll-deg> 0 </roll-deg> + <pitch-deg> -13 </pitch-deg> + <heading-deg> 0 </heading-deg> </offsets> </model> @@ -166,9 +166,9 @@ <x-m> -0.102 </x-m> <y-m> -0.193 </y-m> <z-m> -0.237 </z-m> - <roll-deg> 0.000 </roll-deg> - <pitch-deg> -13.000 </pitch-deg> - <heading-deg> 0.000 </heading-deg> + <roll-deg> 0 </roll-deg> + <pitch-deg> -13 </pitch-deg> + <heading-deg> 0 </heading-deg> </offsets> </model> @@ -178,9 +178,9 @@ <x-m> -0.116 </x-m> <y-m> -0.193 </y-m> <z-m> -0.180 </z-m> - <roll-deg> 0.000 </roll-deg> - <pitch-deg> -13.000 </pitch-deg> - <heading-deg> 0.000 </heading-deg> + <roll-deg> 0 </roll-deg> + <pitch-deg> -13 </pitch-deg> + <heading-deg> 0 </heading-deg> </offsets> </model> @@ -190,9 +190,9 @@ <x-m> -0.129 </x-m> <y-m> -0.193 </y-m> <z-m> -0.123 </z-m> - <roll-deg> 0.000 </roll-deg> - <pitch-deg> -13.000 </pitch-deg> - <heading-deg> 0.000 </heading-deg> + <roll-deg> 0 </roll-deg> + <pitch-deg> -13 </pitch-deg> + <heading-deg> 0 </heading-deg> </offsets> </model> @@ -202,9 +202,9 @@ <x-m> -0.141 </x-m> <y-m> -0.193 </y-m> <z-m> -0.067 </z-m> - <roll-deg> 0.000 </roll-deg> - <pitch-deg> -13.000 </pitch-deg> - <heading-deg> 0.000 </heading-deg> + <roll-deg> 0 </roll-deg> + <pitch-deg> -13 </pitch-deg> + <heading-deg> 0 </heading-deg> </offsets> </model> |
|
From: Emmanuel B. <he...@ba...> - 2010-04-21 20:48:17
|
Update of /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/Interior/Panel/Instruments/ai In directory baron.flightgear.org:/tmp/cvs-serv29031/Models/Interior/Panel/Instruments/ai Modified Files: ai.ac ai.xml Log Message: - little update on FDM (thanks to Melchior for the YASim_import script) - Add Nav light and light Cone - Add shadow Index: ai.ac =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/Interior/Panel/Instruments/ai/ai.ac,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ai.ac 19 Dec 2008 09:52:16 -0000 1.2 +++ ai.ac 21 Apr 2010 17:18:23 -0000 1.3 @@ -1,15 +1,9 @@ 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 "illumball.rgb" rgb 0.941176 0.937255 0.921569 amb 0.5 0.5 0.5 emis 0 0 0 spec 1 1 1 shi 32 trans 0 -MATERIAL "ac3dmat13" rgb 0.529412 0.529412 0.529412 amb 0.5 0.5 0.5 emis 0 0 0 spec 1 1 1 shi 32 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 "illum" rgb 0.941176 0.937255 0.921569 amb 0.5 0.5 0.5 emis 0 0 0 spec 1 1 1 shi 32 trans 0 -MATERIAL "ac3dmat1" rgb 1 1 1 amb 0.2 0.2 0.2 emis 0 0 0 spec 0 0 0 shi 10 trans 0 -MATERIAL "transparent.001" rgb 0.547091 0.565624 0.595981 amb 0 0 0 emis 0 0 0 spec 1 1 1 shi 64 trans 0.5 -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 "Nonevisse.rgb" 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 [...27492 lines suppressed...] +mat 2 refs 4 246 0.476345300674 0.471176743507 234 0.454886108637 0.445028543472 235 0.479356467724 0.43194898963 247 0.489175677299 0.464318841696 SURF 0x10 -mat 6 +mat 2 refs 4 244 0.462892830372 0.503653645515 231 0.429229319096 0.506969153881 232 0.431949049234 0.479356139898 245 0.464318841696 0.489175528288 SURF 0x10 -mat 6 +mat 2 refs 4 225 0.533520758152 0.562714874744 226 0.520641505718 0.568049609661 Index: ai.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/Interior/Panel/Instruments/ai/ai.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ai.xml 18 Dec 2008 20:49:53 -0000 1.1 +++ ai.xml 21 Apr 2010 17:19:40 -0000 1.2 @@ -1,17 +1,13 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Attitude/Turn Indicator --> - <PropertyList> <path>ai.ac</path> <animation> <object-name>contour</object-name> - <object-name>visse1</object-name> - <object-name>visse2</object-name> - <object-name>visse3</object-name> - <object-name>visse4</object-name> + <object-name>visses</object-name> <object-name>AttitudeBall</object-name> <object-name>barre</object-name> <object-name>barre1</object-name> @@ -29,13 +25,13 @@ <object-name>vitre</object-name> </animation> - <animation> - <type>shader</type> - <shader>chrome</shader> - <texture>shader.png</texture> + <animation> + <type>shader</type> + <shader>chrome</shader> + <texture>shader.png</texture> <object-name>vitre</object-name> - </animation> - + </animation> + <animation> <type>material</type> <object-name>AttitudeBall</object-name> @@ -43,10 +39,10 @@ <object-name>BallTurn</object-name> <object-name>FaceTurn</object-name> <emission> - <red> 0.6 </red> - <green> 0.3 </green> - <blue> 0.3 </blue> - <factor-prop>controls/lighting/instruments-norm</factor-prop> + <red> 0.030 </red> + <green> 0.015 </green> + <blue> 0.005 </blue> + <factor-prop>systems/electrical/outputs/instrument-lights</factor-prop> </emission> </animation> @@ -106,14 +102,8 @@ <object-name>BallTurn</object-name> <property>/instrumentation/slip-skid-ball/indicated-slip-skid</property> <interpolation> - <entry> - <ind> -1.1 </ind> - <dep> -22.0 </dep> - </entry> - <entry> - <ind> 1.1 </ind> - <dep> 22.0 </dep> - </entry> + <entry><ind> -1.1 </ind><dep> -22 </dep></entry> + <entry><ind> 1.1 </ind><dep> 22 </dep></entry> </interpolation> <center> <x-m> 0.001 </x-m> |
|
From: Emmanuel B. <he...@ba...> - 2010-04-21 20:48:15
|
Update of /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/Interior/Panel/Instruments/alt In directory baron.flightgear.org:/tmp/cvs-serv29031/Models/Interior/Panel/Instruments/alt Modified Files: alt.xml Log Message: - little update on FDM (thanks to Melchior for the YASim_import script) - Add Nav light and light Cone - Add shadow Index: alt.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/Interior/Panel/Instruments/alt/alt.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- alt.xml 18 Dec 2008 20:49:56 -0000 1.1 +++ alt.xml 21 Apr 2010 17:20:40 -0000 1.2 @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <PropertyList> @@ -7,10 +7,7 @@ <animation> <object-name>contour</object-name> <object-name>Face</object-name> - <object-name>visse1</object-name> - <object-name>visse2</object-name> - <object-name>visse3</object-name> - <object-name>visse4</object-name> + <object-name>visses</object-name> <object-name>disk</object-name> <object-name>inhg</object-name> <object-name>Needle100</object-name> @@ -26,13 +23,13 @@ <object-name>vitre</object-name> </animation> - <animation> - <type>shader</type> - <shader>chrome</shader> - <texture>shader.png</texture> + <animation> + <type>shader</type> + <shader>chrome</shader> + <texture>shader.png</texture> <object-name>vitre</object-name> - </animation> - + </animation> + <animation> <type>material</type> <object-name>Face</object-name> @@ -41,10 +38,10 @@ <object-name>Needle1000</object-name> <object-name>Needle100</object-name> <emission> - <red> 1.0 </red> - <green> 0.2 </green> - <blue> 0.0 </blue> - <factor-prop>/sim/model//material/instruments/factor</factor-prop> + <red> 0.030 </red> + <green> 0.015 </green> + <blue> 0.005 </blue> + <factor-prop>systems/electrical/outputs/instrument-lights</factor-prop> </emission> </animation> @@ -65,9 +62,9 @@ <property>/instrumentation/altimeter/indicated-altitude-ft</property> <factor>0.36</factor> <axis> - <x>-1</x> - <y>0</y> - <z>0</z> + <x> -1 </x> + <y> 0 </y> + <z> 0 </z> </axis> </animation> @@ -77,9 +74,9 @@ <property>/instrumentation/altimeter/indicated-altitude-ft</property> <factor>0.036</factor> <axis> - <x>-1</x> - <y>0</y> - <z>0</z> + <x> -1 </x> + <y> 0 </y> + <z> 0 </z> </axis> </animation> @@ -89,9 +86,9 @@ <property>/instrumentation/altimeter/indicated-altitude-ft</property> <factor>0.0036</factor> <axis> - <x>-1</x> - <y>0</y> - <z>0</z> + <x> -1 </x> + <y> 0 </y> + <z> 0 </z> </axis> </animation> @@ -112,13 +109,13 @@ <entry><ind> 31.40 </ind><dep> 350.00 </dep></entry> </interpolation> <center> - <x>0.25</x> - <y>0.25</y> + <x> 0.25 </x> + <y> 0.25 </y> </center> <axis> - <x>0</x> - <y>0</y> - <z>-1</z> + <x> 0 </x> + <y> 0 </y> + <z> -1 </z> </axis> </animation> @@ -134,10 +131,10 @@ <binding> <command>property-adjust</command> <property>/instrumentation/altimeter/setting-inhg</property> - <step>-0.01</step> - <min>26.0</min> - <max>33.0</max> - <wrap>false</wrap> + <step> -0.01 </step> + <min> 26.00 </min> + <max> 33.00 </max> + <wrap> false </wrap> </binding> </action> <action> @@ -147,10 +144,10 @@ <binding> <command>property-adjust</command> <property>/instrumentation/altimeter/setting-inhg</property> - <step>-0.1</step> - <min>26.0</min> - <max>33.0</max> - <wrap>false</wrap> + <step> -0.1 </step> + <min> 26.0 </min> + <max> 33.0 </max> + <wrap> false </wrap> </binding> </action> </animation> @@ -179,10 +176,10 @@ <binding> <command>property-adjust</command> <property>/instrumentation/altimeter/setting-inhg</property> - <step>0.1</step> - <min>26.0</min> - <max>33.0</max> - <wrap>false</wrap> + <step> 0.1 </step> + <min> 26.0 </min> + <max> 33.0 </max> + <wrap> false </wrap> </binding> </action> </animation> |
|
From: Emmanuel B. <he...@ba...> - 2010-04-21 20:48:15
|
Update of /var/cvs/FlightGear-0.9/data/Aircraft/C-2A In directory baron.flightgear.org:/tmp/cvs-serv29031 Modified Files: c-2a-base.xml c-2a-set.xml c-2a-splash.png c-2a-yasim-cnf.xml c-2a-yasim.xml Log Message: - little update on FDM (thanks to Melchior for the YASim_import script) - Add Nav light and light Cone - Add shadow Index: c-2a-base.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/c-2a-base.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- c-2a-base.xml 20 Dec 2008 01:21:51 -0000 1.4 +++ c-2a-base.xml 21 Apr 2010 17:02:17 -0000 1.5 @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <PropertyList> Index: c-2a-set.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/c-2a-set.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- c-2a-set.xml 18 Dec 2008 20:49:41 -0000 1.1 +++ c-2a-set.xml 21 Apr 2010 17:03:42 -0000 1.2 @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- <PropertyList include="c-2a-jsbsim-cnf.xml"> --> <PropertyList include="c-2a-yasim-cnf.xml"> Index: c-2a-splash.png =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/c-2a-splash.png,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 Binary files /tmp/cvsRfDV3g and /tmp/cvsGt3FlR differ Index: c-2a-yasim-cnf.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/c-2a-yasim-cnf.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- c-2a-yasim-cnf.xml 18 Dec 2008 20:49:41 -0000 1.1 +++ c-2a-yasim-cnf.xml 21 Apr 2010 17:05:24 -0000 1.2 @@ -1,9 +1,10 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> + <!-- -************************************************************************ -GRUMMAN C 2A -December 2008 BARANGER Emmanuel -************************************************************************ + ************************************************************************ + GRUMMAN C 2A + December 2008 BARANGER Emmanuel + ************************************************************************ --> <PropertyList include="c-2a-base.xml"> Index: c-2a-yasim.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/c-2a-yasim.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- c-2a-yasim.xml 20 Dec 2008 14:19:56 -0000 1.4 +++ c-2a-yasim.xml 21 Apr 2010 17:05:49 -0000 1.5 @@ -1,3 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> + <!-- GRUMMAN C 2A : 2008 BARANGER Emmanuel wingspan : 24.69 m @@ -33,22 +35,24 @@ <control-setting axis="/controls/gear/gear-down" value="0"/> </cruise> - <cockpit x="9.267" y="-0.570" z=".154"/> + <cockpit x="6.700" y="-0.570" z="0.154"/> <!-- Fuselage --> - <fuselage ax="8.641" ay="0" az="-0.425" bx="-8.651" by="0" bz="0.510" width="3" taper="0.5" midpoint="0.5"/> + <fuselage ax="8.641" ay="0" az="-0.850" bx="-3.769" by="0" bz="-0.737" width="2.4" taper="1" midpoint="0"/> + <fuselage ax="-3.769" ay="0" az="-0.737" bx="-8.716" by="0" bz="0.510" width="2.4" taper="1" midpoint="0"/> <!-- Ailes --> <wing x="0.625" y="0.549" z="0.131" chord="3.747" - length="11.565" + length="11.8" taper="0.38" - sweep="0" - dihedral="2" - camber="0.0-"> + sweep="1.5" + dihedral="2.5" + camber="0.05"> <stall aoa="18" width="6" peak="1.5"/> - <flap0 start="0" end=".6" lift="1.4" drag="1.9"/> - <flap1 start=".6" end=".95" lift="1.4" drag="1.2"/> + <flap0 start="0.00" end="0.54" lift="1.4" drag="1.9"/> + <flap1 start="0.54" end="0.95" lift="1.4" drag="1.2"/> + <control-input axis="/controls/flight/flaps" control="FLAP0"/> <control-input axis="/controls/flight/aileron" control="FLAP1" split="true"/> <control-input axis="/controls/flight/aileron-trim" control="FLAP1" split="true"/> @@ -64,7 +68,8 @@ <hstab x="-7.220" y="0.0" z="0.866" chord="2.357" length="3.923" - taper="0.75"> + taper="0.75" + sweep="4"> <stall aoa="18" width="4" peak="1.5"/> <flap0 start="0" end="0.95" lift="1.5" drag="1.4"/> <control-input axis="/controls/flight/elevator" control="FLAP0"/> @@ -73,6 +78,20 @@ <control-output control="FLAP0" prop="/surface-positions/elevator-pos-norm"/> </hstab> + <vstab x="-7.110" y="1.919" z="0.890" + chord="1.535" + length="1.450" + taper="0.6" + sweep="12"> + </vstab> + + <vstab x="-7.110" y="-1.919" z="0.890" + chord="1.535" + length="1.450" + taper="0.6" + sweep="12"> + </vstab> + <!-- Direction gauche --> <vstab x="-7.566" y="3.925" z="-0.848" chord="1.830" @@ -102,14 +121,11 @@ <!-- Moteur gauche - Rayon * Rayon * Mass(kg) 2.43*2.43 * 487.15 - moment d'après la doc : ________________________ = __________________ = 958.85 - 3 3 --> <propeller x="2.743" y="3.169" z="-0.422" mass="2994" moment="958.85" - radius="2.43" + radius="1.837" cruise-speed="245" cruise-rpm="920" cruise-power="1800" @@ -135,7 +151,7 @@ <propeller x="2.743" y="-3.169" z="-0.422" mass="2994" moment="958.85" - radius="2.43" + radius="1.837" cruise-speed="245" cruise-rpm="920" cruise-power="1800" @@ -215,7 +231,7 @@ <control-speed control="LEXTEND" transition-time="1"/> </launchbar> - <!-- CG Théorique : x=0.625 y=0.0 z=-0.131" --> + <!-- CG Theorique : x=0.625 y=0.0 z=-0.131" --> <ballast x="5.0" y="0.0" z="0.0" mass="6000"/> </airplane> |
|
From: Torsten D. <to...@ba...> - 2010-04-21 20:05:44
|
Update of /var/cvs/FlightGear-0.9/data/Aircraft/SenecaII/Models In directory baron.flightgear.org:/tmp/cvs-serv6225 Modified Files: SenecaII.ac Log Message: rhinoplasty Index: SenecaII.ac =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/SenecaII/Models/SenecaII.ac,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- SenecaII.ac 5 Dec 2009 15:42:56 -0000 1.8 +++ SenecaII.ac 21 Apr 2010 20:04:56 -0000 1.9 @@ -66700,17143 +66700,17343 @@ 129 0.03125 0 97 0.03125 1 kids 0 +OBJECT group +name "PowerQuadrant" +loc 0.0925736 0.0191578 0.00210953 +kids 10 OBJECT poly -name "Fuselage" -loc -0.109639 1.3121 1.19209e-07 -texture "d-gear.png" [...33452 lines suppressed...] +176 0.926958 0.460823 +SURF 0x10 +mat 13 +refs 3 +173 0.896103 0.479625 +172 0.896103 0.477281 +176 0.926958 0.460823 +SURF 0x10 +mat 13 +refs 3 +174 0.896103 0.481426 +173 0.896103 0.479625 +176 0.926958 0.460823 +SURF 0x10 +mat 13 +refs 3 +175 0.896103 0.48288 +174 0.896103 0.481426 +176 0.926958 0.460823 kids 0 |
|
From: Emmanuel B. <he...@ba...> - 2010-04-21 18:04:18
|
Update of /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/Interior In directory baron.flightgear.org:/tmp/cvs-serv29031/Models/Interior Modified Files: interior.ac interior.xml Removed Files: shader.png Log Message: - little update on FDM (thanks to Melchior for the YASim_import script) - Add Nav light and light Cone - Add shadow Index: interior.ac =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/Interior/interior.ac,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- interior.ac 20 Dec 2008 14:20:05 -0000 1.2 +++ interior.ac 21 Apr 2010 17:13:58 -0000 1.3 @@ -1,7 +1,6 @@ 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 "NoName" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 50 trans 0 -MATERIAL "NoName.002" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 50 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 "transp" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 50 trans 0.52902 OBJECT world kids 5 @@ -2400,3511 +2399,3511 @@ -6.102261 -1.729469 -0.807153 numsurf 1147 [...6053 lines suppressed...] +mat 1 refs 4 1 0.185994982719 0.833111107349 45 0.185994982719 0.836057960987 65 0.204026758671 0.836059987545 21 0.204026758671 0.833111345768 SURF 0x10 -mat 2 +mat 1 refs 4 0 0.17439609766 0.833111345768 44 0.17439609766 0.836059987545 45 0.185994982719 0.836057960987 1 0.185994982719 0.833111107349 SURF 0x10 -mat 2 +mat 1 refs 4 0 0.17439609766 0.833111345768 10 0.166984379292 0.833111345768 Index: interior.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/Interior/interior.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- interior.xml 21 Dec 2008 13:33:11 -0000 1.3 +++ interior.xml 21 Apr 2010 17:14:17 -0000 1.4 @@ -20,13 +20,13 @@ <object-name>intvitres</object-name> </animation> - <animation> - <type>shader</type> - <shader>chrome</shader> - <texture>shader.png</texture> + <animation> + <type>shader</type> + <shader>chrome</shader> + <texture>Aircraft/Generic/Effects/glass_shader.png</texture> <object-name>intvitres</object-name> - </animation> - + </animation> + <!-- Pilote --> <model> <path>Aircraft/C-2A/Models/Pilot/pilot.xml</path> --- "shader.png" DELETED --- |
|
From: Emmanuel B. <he...@ba...> - 2010-04-21 17:57:04
|
Update of /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/Interior/Panel/Instruments/empty In directory baron.flightgear.org:/tmp/cvs-serv29031/Models/Interior/Panel/Instruments/empty Modified Files: empty.xml Log Message: - little update on FDM (thanks to Melchior for the YASim_import script) - Add Nav light and light Cone - Add shadow Index: empty.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/C-2A/Models/Interior/Panel/Instruments/empty/empty.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- empty.xml 19 Dec 2008 09:52:17 -0000 1.1 +++ empty.xml 21 Apr 2010 17:21:31 -0000 1.2 @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <PropertyList> @@ -7,10 +7,7 @@ <animation> <object-name>contour</object-name> <object-name>Face</object-name> - <object-name>visse1</object-name> - <object-name>visse2</object-name> - <object-name>visse3</object-name> - <object-name>visse4</object-name> + <object-name>visses</object-name> <object-name>sur</object-name> <object-name>vitre</object-name> @@ -21,21 +18,21 @@ <object-name>vitre</object-name> </animation> - <animation> - <type>shader</type> - <shader>chrome</shader> - <texture>shader.png</texture> + <animation> + <type>shader</type> + <shader>chrome</shader> + <texture>shader.png</texture> <object-name>vitre</object-name> - </animation> - + </animation> + <animation> <type>material</type> <object-name>Face</object-name> <emission> - <red> 1.0 </red> - <green> 0.2 </green> - <blue> 0.0 </blue> - <factor-prop>/sim/model//material/instruments/factor</factor-prop> + <red> 0.030 </red> + <green> 0.015 </green> + <blue> 0.005 </blue> + <factor-prop>systems/electrical/outputs/instrument-lights</factor-prop> </emission> </animation> |
|
From: James T. <jm...@ba...> - 2010-04-21 16:18:44
|
Update of /var/cvs/FlightGear-0.9/source/src/GUI In directory baron.flightgear.org:/tmp/cvs-serv26213/src/GUI Modified Files: MapWidget.cxx Log Message: MapWidget: fix a crash on uninitialized. Index: MapWidget.cxx =================================================================== RCS file: /var/cvs/FlightGear-0.9/source/src/GUI/MapWidget.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MapWidget.cxx 27 Mar 2010 16:58:00 -0000 1.1 +++ MapWidget.cxx 21 Apr 2010 16:18:31 -0000 1.2 @@ -532,18 +532,18 @@ double julianDate = globals->get_time_params()->getJD(); _magVar->update(_projectionCenter, julianDate); - SGGeod topLeft = unproject(SGVec2d(_width/2, _height/2)); - // compute draw range, including a fudge factor for ILSs and other 'long' - // symbols - _drawRangeNm = SGGeodesy::distanceNm(_projectionCenter, topLeft) + 10.0; - bool aircraftUp = _root->getBoolValue("aircraft-heading-up"); if (aircraftUp) { _upHeading = fgGetDouble("/orientation/heading-deg"); } else { _upHeading = 0.0; } - + + SGGeod topLeft = unproject(SGVec2d(_width/2, _height/2)); + // compute draw range, including a fudge factor for ILSs and other 'long' + // symbols + _drawRangeNm = SGGeodesy::distanceNm(_projectionCenter, topLeft) + 10.0; + // drawing operations GLint sx = (int) abox.min[0], sy = (int) abox.min[1]; |
|
From: Emmanuel B. <he...@ba...> - 2010-04-19 21:54:54
|
Update of /var/cvs/FlightGear-0.9/data/Aircraft/Piper-PA-32/Models/Interior/Panel/Instruments/ai In directory baron.flightgear.org:/tmp/cvs-serv31301/Models/Interior/Panel/Instruments/ai Added Files: ai.ac ai.png ai.xml glass.png Log Message: - new plane --- NEW FILE "ai.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 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 "transparent" rgb 0.547091 0.565624 0.595981 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 64 trans 0.7 OBJECT world kids 8 OBJECT poly name "aircraft" data 8 aircraft texture "ai.png" texrep 1 1 crease 30.000000 numvert 116 0.001854 -0.002487 -0.000397 0.001854 -0.007211 -0.000397 0.001854 -0.007211 0.000399 0.001854 -0.002487 0.000399 [...6426 lines suppressed...] refs 4 206 0.691397368908 0.947724878788 205 0.674232006073 0.890837192535 203 0.752928614616 0.833070993423 204 0.777850270271 0.884284496307 SURF 0x10 mat 3 refs 4 207 0.588898539543 0.926364541054 205 0.674232006073 0.890837192535 206 0.691397368908 0.947724878788 208 0.597614467144 0.98682141304 SURF 0x10 mat 3 refs 4 210 0.500086665154 1.0 209 0.500086665154 0.938426554203 207 0.588898539543 0.926364541054 208 0.597614467144 0.98682141304 kids 0 --- NEW BINARY FILE "ai.png" --- --- NEW FILE "ai.xml" --- <?xml version="1.0" encoding="UTF-8"?> <PropertyList> <path>ai.ac</path> <animation> <object-name>fond</object-name> <object-name>face</object-name> <object-name>background</object-name> <object-name>scale</object-name> <object-name>float</object-name> <object-name>aircraft</object-name> <object-name>bouton</object-name> <object-name>vitre</object-name> </animation> <animation> <type>noshadow</type> <object-name>vitre</object-name> </animation> <animation> <type>shader</type> <shader>chrome</shader> <texture>glass.png</texture> <object-name>vitre</object-name> </animation> <animation> <type>material</type> <object-name>background</object-name> <object-name>scale</object-name> <object-name>float</object-name> <object-name>aircraft</object-name> <emission> <red> 1.0 </red> <green> 0.2 </green> <blue> 0.0 </blue> <factor-prop>systems/electrical/outputs/instrument-lights</factor-prop> <factor-prop>/sim/model//material/instruments/factor</factor-prop> </emission> </animation> <animation> <type>rotate</type> <object-name>background</object-name> <object-name>scale</object-name> <object-name>float</object-name> <property>/orientation/roll-deg</property> <factor>1.0</factor> <axis> <x>1.0</x> </axis> </animation> <animation> <type>translate</type> <object-name>float</object-name> <property>/orientation/pitch-deg</property> <factor>-0.0002</factor> <min-m>-0.1</min-m> <max-m>0.1</max-m> <axis> <z>1.0</z> </axis> </animation> </PropertyList> --- NEW BINARY FILE "glass.png" --- |
2 messages has been excluded from this view by a project administrator.
