diff -Nru fgfs-base-2.11.0+201306080800~gita7e94ce/Aircraft/777/777-set-common.xml fgfs-base-2.11.0+201306130800~git5839904/Aircraft/777/777-set-common.xml --- fgfs-base-2.11.0+201306080800~gita7e94ce/Aircraft/777/777-set-common.xml 2013-06-04 01:06:22.000000000 +0000 +++ fgfs-base-2.11.0+201306130800~git5839904/Aircraft/777/777-set-common.xml 2013-06-13 13:07:21.000000000 +0000 @@ -9,7 +9,7 @@ 4 4 - 20130603 + 20130612 yasim 0.1 diff -Nru fgfs-base-2.11.0+201306080800~gita7e94ce/Aircraft/777/Nasal/AFDS.nas fgfs-base-2.11.0+201306130800~git5839904/Aircraft/777/Nasal/AFDS.nas --- fgfs-base-2.11.0+201306080800~gita7e94ce/Aircraft/777/Nasal/AFDS.nas 2013-06-04 01:06:22.000000000 +0000 +++ fgfs-base-2.11.0+201306130800~git5839904/Aircraft/777/Nasal/AFDS.nas 2013-06-13 13:07:21.000000000 +0000 @@ -228,6 +228,11 @@ me.target_alt.setValue(me.alt_setting.getValue()); } me.autothrottle_mode.setValue(5); # A/T SPD + setprop("/autopilot/locks/pitch-lock", 1); + settimer(func + { + setprop("autopilot/locks/pitch-lock", 0); + }, 5); } if(btn==4) { @@ -319,6 +324,11 @@ setprop("autopilot/internal/current-pitch-deg", getprop("orientation/pitch-deg")); var alt = me.alt_setting.getValue(); me.target_alt.setValue(alt); + setprop("/autopilot/locks/pitch-lock", 1); + settimer(func + { + setprop("autopilot/locks/pitch-lock", 0); + }, 5); } me.vertical_mode.setValue(btn); } @@ -690,6 +700,14 @@ { setprop("autopilot/settings/autopilot-transition", 0); }, 10); + if(me.AP_annun.getValue() != "LAND 3") + { + setprop("/autopilot/locks/pitch-lock", 1); + settimer(func + { + setprop("autopilot/locks/pitch-lock", 0); + }, 5); + } } me.AP_annun.setValue(msg); var tmp = abs(me.vs_setting.getValue()); @@ -1035,7 +1053,7 @@ { if(me.mach_setting.getValue() == 0.780) { - if(getprop("/instrumentation/airspeed-indicator/indicated-mach") < 0.785) + if(getprop("/instrumentation/airspeed-indicator/indicated-mach") < 0.795) { me.vnav_path_mode.setValue(1); # VNAV PTH DESCEND VS me.target_alt.setValue(me.intervention_alt); @@ -1053,7 +1071,7 @@ } else { - if(getprop("/instrumentation/airspeed-indicator/indicated-speed-kt") < 285) + if(getprop("/instrumentation/airspeed-indicator/indicated-speed-kt") < 295) { me.vnav_path_mode.setValue(1); # VNAV PTH DESCEND VS me.target_alt.setValue(me.intervention_alt); @@ -1281,13 +1299,11 @@ { me.rollout_armed.setValue(1); # ROLLOUT me.flare_armed.setValue(1); # FLARE - setprop("autopilot/settings/flare-speed-fps", 0); + setprop("autopilot/settings/flare-speed-fps", 5); } } elsif(idx == 7) # FLARE { - var f_angle = 0.00; - me.flare_constant_setting.setValue(f_angle); if(me.autothrottle_mode.getValue()) { if(getprop("position/gear-agl-ft") < 25) diff -Nru fgfs-base-2.11.0+201306080800~gita7e94ce/Aircraft/777/Systems/777-autopilot.xml fgfs-base-2.11.0+201306130800~git5839904/Aircraft/777/Systems/777-autopilot.xml --- fgfs-base-2.11.0+201306080800~gita7e94ce/Aircraft/777/Systems/777-autopilot.xml 2013-06-04 01:06:22.000000000 +0000 +++ fgfs-base-2.11.0+201306130800~git5839904/Aircraft/777/Systems/777-autopilot.xml 2013-06-13 13:07:21.000000000 +0000 @@ -1026,7 +1026,7 @@ - 0 + -3.0 /autopilot/internal/target-pitch-deg @@ -1111,7 +1111,21 @@ - + + AP:Pitch sample and hold + false + + + autopilot/locks/pitch-lock + + + gain + 1.0 + /orientation/pitch-deg + /autopilot/internal/target-pitch-deg + + + Elevator Control false @@ -1131,10 +1145,10 @@ 2.0 0.0 - -0.8 + -1.0 - 0.8 + 1.0 diff -Nru fgfs-base-2.11.0+201306080800~gita7e94ce/Shaders/3dcloud-lightfield.vert fgfs-base-2.11.0+201306130800~git5839904/Shaders/3dcloud-lightfield.vert --- fgfs-base-2.11.0+201306080800~gita7e94ce/Shaders/3dcloud-lightfield.vert 2013-04-28 16:14:56.000000000 +0000 +++ fgfs-base-2.11.0+201306130800~git5839904/Shaders/3dcloud-lightfield.vert 2013-06-13 13:07:21.000000000 +0000 @@ -94,7 +94,7 @@ float fogCoord = length(vec3(gl_ModelViewMatrix * vec4(gl_Color.x, gl_Color.y, gl_Color.z, 1.0))); float center_dist = length(vec3(gl_ModelViewMatrix * vec4(0.0,0.0,0.0,1.0))); - if ((fogCoord > detail_range) && (fogCoord > center_dist)) { + if ((fogCoord > detail_range) && (fogCoord > center_dist) && (shade_factor < 0.7)) { // More than detail_range away, so discard all sprites on opposite side of // cloud center by shifting them beyond the view fustrum gl_Position = vec4(0.0,0.0,10.0,1.0); @@ -176,7 +176,7 @@ //gl_FrontColor.a = 1.0; //light_diffuse+ gl_FrontLightModelProduct.sceneColor;// * shade ;//+ gl_FrontLightModelProduct.sceneColor; - if ((fogCoord > (0.9 * detail_range)) && (fogCoord > center_dist)) { + if ((fogCoord > (0.9 * detail_range)) && (fogCoord > center_dist) && (shade_factor < 0.7)) { // cloudlet is almost at the detail range, so fade it out. gl_FrontColor.a = 1.0 - smoothstep(0.9 * detail_range, detail_range, fogCoord); } else { diff -Nru fgfs-base-2.11.0+201306080800~gita7e94ce/Shaders/3dcloud.vert fgfs-base-2.11.0+201306130800~git5839904/Shaders/3dcloud.vert --- fgfs-base-2.11.0+201306080800~gita7e94ce/Shaders/3dcloud.vert 2013-04-28 16:14:56.000000000 +0000 +++ fgfs-base-2.11.0+201306130800~git5839904/Shaders/3dcloud.vert 2013-06-13 13:07:21.000000000 +0000 @@ -44,7 +44,7 @@ float fogCoord = length(vec3(gl_ModelViewMatrix * vec4(gl_Color.x, gl_Color.y, gl_Color.z, 1.0))); float center_dist = length(vec3(gl_ModelViewMatrix * vec4(0.0,0.0,0.0,1.0))); - if ((fogCoord > detail_range) && (fogCoord > center_dist)) { + if ((fogCoord > detail_range) && (fogCoord > center_dist) && (shade_factor < 0.7)) { // More than detail_range away, so discard all sprites on opposite side of // cloud center by shifting them beyond the view fustrum gl_Position = vec4(0.0,0.0,10.0,1.0); @@ -72,7 +72,7 @@ gl_Position = gl_ModelViewProjectionMatrix * gl_Position; gl_FrontColor = gl_LightSource[0].diffuse * shade + gl_FrontLightModelProduct.sceneColor; - if ((fogCoord > (0.9 * detail_range)) && (fogCoord > center_dist)) { + if ((fogCoord > (0.9 * detail_range)) && (fogCoord > center_dist) && (shade_factor < 0.7)) { // cloudlet is almost at the detail range, so fade it out. gl_FrontColor.a = 1.0 - smoothstep(0.9 * detail_range, detail_range, fogCoord); } else { diff -Nru fgfs-base-2.11.0+201306080800~gita7e94ce/debian/changelog fgfs-base-2.11.0+201306130800~git5839904/debian/changelog --- fgfs-base-2.11.0+201306080800~gita7e94ce/debian/changelog 2013-06-08 13:05:53.000000000 +0000 +++ fgfs-base-2.11.0+201306130800~git5839904/debian/changelog 2013-06-13 13:07:32.000000000 +0000 @@ -1,3 +1,15 @@ +fgfs-base (2.11.0+201306130800~git5839904-0ubuntu0ppa1) raring; urgency=low + + [ Hyde Yamakawa ] + * 777:Improve stablity when AP engage and Autoland flare + + [ Thorsten Renk ] + * Tweak to prevent the cloud LOD system from dropping sprites in very faint clouds which have just few sprites to begin with and appear unrealistic when these are dropped + + [ Saikrishna Arcot ] + + -- Saikrishna Arcot Thu, 13 Jun 2013 08:07:32 -0500 + fgfs-base (2.11.0+201306080800~gita7e94ce-0ubuntu0ppa1) raring; urgency=low [ Gijs de Rooy ]