From d80e08992ea99bca47f8a28a876a69bb4e93f987 Mon Sep 17 00:00:00 2001 From: Torsten Dreyer Date: Sat, 25 Sep 2010 15:12:34 +0200 Subject: [PATCH 1/6] add "local weather config" to the menubar --- gui/menubar.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gui/menubar.xml b/gui/menubar.xml index 0429ac003..e7ad39d78 100644 --- a/gui/menubar.xml +++ b/gui/menubar.xml @@ -347,6 +347,14 @@ + + + + dialog-show + local_weather_config + + + From 29820a9584acd618a70e585e0583d66906bd02e8 Mon Sep 17 00:00:00 2001 From: Durk Talsma Date: Sat, 25 Sep 2010 15:30:53 +0200 Subject: [PATCH 2/6] Make GUI input for the transition effect persistent across sessions. --- preferences.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/preferences.xml b/preferences.xml index 1a06bef7e..bf2b8e90a 100644 --- a/preferences.xml +++ b/preferences.xml @@ -148,6 +148,7 @@ Started September 2000 by David Megginson, david@megginson.com 0 0 + 0 0 0 0 From 5d2845a5404cee2283096f4f131130721bcb4ba7 Mon Sep 17 00:00:00 2001 From: Stuart Buchanan Date: Sat, 25 Sep 2010 22:28:56 +0100 Subject: [PATCH 3/6] Minor change to urban shader to mak building sides vertical. --- Shaders/urban.frag | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Shaders/urban.frag b/Shaders/urban.frag index 1638f94da..7e207cf44 100644 --- a/Shaders/urban.frag +++ b/Shaders/urban.frag @@ -1,6 +1,6 @@ // -*- mode: C; -*- // Licence: GPL v2 -// Author: Frederic Bouvier. +// Author: Frederic Bouvier. // Adapted from the paper by F. Policarpo et al. : Real-time Relief Mapping on Arbitrary Polygonal Surfaces #version 120 @@ -34,7 +34,7 @@ float ray_intersect(sampler2D reliefMap, vec2 dp, vec2 ds) for(int i = 0; i < linear_search_steps - 1; ++i) { depth += size; - float t = texture2D(reliefMap, dp + ds * depth).a; + float t = step(0.95, texture2D(reliefMap, dp + ds * depth).a); if(best_depth > 0.996) if(depth >= t) best_depth = depth; @@ -46,7 +46,7 @@ float ray_intersect(sampler2D reliefMap, vec2 dp, vec2 ds) for(int i = 0; i < binary_search_steps; ++i) { size *= 0.5; - float t = texture2D(reliefMap, dp + ds * depth).a; + float t = step(0.95, texture2D(reliefMap, dp + ds * depth).a); if(depth >= t) { best_depth = depth; @@ -129,7 +129,7 @@ void main (void) finalColor = mix(finalColor, clamp(n+nvL[2]*4.1+vec4(0.1, 0.1, nvL[2]*2.2, 1.0), 0.7, 1.0), step(0.8,Nz)*(1.0-emis)*smoothstep(snowlevel+300.0, snowlevel+360.0, (rawpos.z)+nvL[1]*3000.0)); finalColor *= ambient_light; - + if (gl_Fog.density == 1.0) fogFactor=1.0; From 5edf6cae9b533f32a55a1d51333d974dcd9509e9 Mon Sep 17 00:00:00 2001 From: Torsten Dreyer Date: Sun, 26 Sep 2010 17:07:24 +0200 Subject: [PATCH 4/6] reflect recent weather changes in startup.nas --- Nasal/startup.nas | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Nasal/startup.nas b/Nasal/startup.nas index 3d7cff973..dddf1524f 100644 --- a/Nasal/startup.nas +++ b/Nasal/startup.nas @@ -1,6 +1,8 @@ var set_runway_from_metar_wind = func { - if (!getprop("/environment/params/real-world-weather-fetch")) + if (!getprop("/environment/realwx/enabled")) return printlog("info", "metar-rwy: no live weather"); + if (!getprop("/environment/metar/valid")) + return printlog("info", "metar-rwy: no valid metar"); if (!getprop("/sim/startup/options/airport")) return printlog("info", "metar-rwy: no airport requested"); if (getprop("/sim/startup/options/runway")) From 7ee83e19df1029638fef6c636fcd5875652fddfe Mon Sep 17 00:00:00 2001 From: Stuart Buchanan Date: Mon, 27 Sep 2010 21:13:30 +0100 Subject: [PATCH 5/6] Modify chat key handler, so excessive backspaces doesn't enable the autopilot. --- Nasal/multiplayer.nas | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Nasal/multiplayer.nas b/Nasal/multiplayer.nas index 9bf4d351f..f2843b0c6 100644 --- a/Nasal/multiplayer.nas +++ b/Nasal/multiplayer.nas @@ -125,8 +125,10 @@ var handle_key = func(key) { input = substr(input, 0, size(input) - 1); gui.popupTip(input, 1000000); - return 1; } + + # Always handle key so excessive backspacing doesn't toggle the heading autopilot + return 1; } elsif (key == 27) { From 351114b9997f25ac5b37a8de9adb16d4f963fd0c Mon Sep 17 00:00:00 2001 From: Torsten Dreyer Date: Tue, 28 Sep 2010 08:58:02 +0200 Subject: [PATCH 6/6] Fix line endings --- Nasal/view.nas | 1326 ++++++++++++++++++++++++------------------------ 1 file changed, 663 insertions(+), 663 deletions(-) diff --git a/Nasal/view.nas b/Nasal/view.nas index 30b4f25a8..3642ac2e3 100644 --- a/Nasal/view.nas +++ b/Nasal/view.nas @@ -1,663 +1,663 @@ -## -## view.nas -## -## Nasal code for implementing view-specific functionality. - -var index = nil; # current view index -var views = nil; # list of all view branches (/sim/view[n]) as props.Node -var current = nil; # current view branch (e.g. /sim/view[1]) as props.Node - - -var hasmember = func(class, member) { - if (contains(class, member)) - return 1; - if (!contains(class, "parents")) - return 0; - if (typeof(class.parents) != "vector") - return 0; - foreach (var parent; class.parents) - if (hasmember(parent, member)) - return 1; - return 0; -} - - -# Dynamically calculate limits so that it takes STEPS iterations to -# traverse the whole range, the maximum FOV is fixed at 120 degrees, -# and the minimum corresponds to normal maximum human visual acuity -# (~1 arc minute of resolution, although apparently people vary widely -# in this ability). Quick derivation of the math: -# -# mul^steps = max/min -# steps * ln(mul) = ln(max/min) -# mul = exp(ln(max/min) / steps) -var STEPS = 40; -var ACUITY = 1/60; # Maximum angle subtended by one pixel (== 1 arc minute) -var max = var min = var mul = 0; -var calcMul = func { - max = 120; # Fixed at 120 degrees - min = getprop("/sim/startup/xsize") * ACUITY; - mul = math.exp(math.ln(max/min) / STEPS); -} - -## -# Handler. Increase FOV by one step -# -var increase = func { - calcMul(); - var val = fovProp.getValue() * mul; - if(val == max) { return; } - if(val > max) { val = max } - fovProp.setDoubleValue(val); - var popup=getprop("/sim/view-name-popup"); - if(popup == 1 or popup==nil) gui.popupTip(sprintf("FOV: %.1f", val)); -} - -## -# Handler. Decrease FOV by one step -# -var decrease = func { - calcMul(); - var val = fovProp.getValue() / mul; - fovProp.setDoubleValue(val); - var popup=getprop("/sim/view-name-popup"); - if(popup == 1 or popup==nil) gui.popupTip(sprintf("FOV: %.1f%s", val, val < min ? " (overzoom)" : "")); -} - -## -# Handler. Reset FOV to default. -# -var resetFOV = func { - setprop("/sim/current-view/field-of-view", - getprop("/sim/current-view/config/default-field-of-view-deg")); -} - -var resetViewPos = func { - var v = current.getNode("config"); - setprop("/sim/current-view/x-offset-m", v.getNode("x-offset-m", 1).getValue() or 0); - setprop("/sim/current-view/y-offset-m", v.getNode("y-offset-m", 1).getValue() or 0); - setprop("/sim/current-view/z-offset-m", v.getNode("z-offset-m", 1).getValue() or 0); -} - -var resetViewDir = func { - setprop("/sim/current-view/goal-heading-offset-deg", - getprop("/sim/current-view/config/heading-offset-deg")); - setprop("/sim/current-view/goal-pitch-offset-deg", - getprop("/sim/current-view/config/pitch-offset-deg")); - setprop("/sim/current-view/goal-roll-offset-deg", - getprop("/sim/current-view/config/roll-offset-deg")); -} - -## -# Handler. Step to the next (force=1) or next enabled view. -# -var stepView = func(step, force = 0) { - step = step > 0 ? 1 : -1; - var n = index; - for (var i = 0; i < size(views); i += 1) { - n += step; - if (n < 0) - n = size(views) - 1; - elsif (n >= size(views)) - n = 0; - if (force or (var e = views[n].getNode("enabled")) == nil or e.getBoolValue()) - break; - } - setprop("/sim/current-view/view-number", n); - - # And pop up a nice reminder - var popup=getprop("/sim/view-name-popup"); - if(popup == 1 or popup==nil) gui.popupTip(views[n].getNode("name").getValue()); -} - -## -# Get view index by name. -# -var indexof = func(name) { - forindex (var i; views) - if (views[i].getNode("name", 1).getValue() == name) - return i; - return nil; -} - -## -# Standard view "slew" rate, in degrees/sec. -# -var VIEW_PAN_RATE = 60; - -## -# Pans the view horizontally. The argument specifies a relative rate -# (or number of "steps" -- same thing) to the standard rate. -# -var panViewDir = func(step) { - if (getprop("/sim/freeze/master")) - var prop = "/sim/current-view/heading-offset-deg"; - else - var prop = "/sim/current-view/goal-heading-offset-deg"; - - controls.slewProp(prop, step * VIEW_PAN_RATE); -} - -## -# Pans the view vertically. The argument specifies a relative rate -# (or number of "steps" -- same thing) to the standard rate. -# -var panViewPitch = func(step) { - if (getprop("/sim/freeze/master")) - var prop = "/sim/current-view/pitch-offset-deg"; - else - var prop = "/sim/current-view/goal-pitch-offset-deg"; - - controls.slewProp(prop, step * VIEW_PAN_RATE); -} - - -## -# Reset view to default using current view manager (see default_handler). -# -var resetView = func { - manager.reset(); -} - - -## -# Default view handler used by view.manager. -# -var default_handler = { - reset : func { - resetViewDir(); - resetFOV(); - }, -}; - - -## -# View manager. Administrates optional Nasal view handlers. -# Usage: view.manager.register(, ); -# -# view-id: the view's name (e.g. "Chase View") or index number -# view-handler: a hash with any combination of the functions listed in the -# following example, or none at all. Only define the interface -# functions that you really need! The hash may contain local -# variables and other, non-interface functions. -# -# Example: -# -# var some_view_handler = { -# init : func {}, # called only once at startup -# start : func {}, # called when view is switched to our view -# stop : func {}, # called when view is switched away from our view -# reset : func {}, # called with view.resetView() -# update : func { 0 }, # called iteratively if defined. Must return -# }; # interval in seconds until next invocation -# # Don't define it if you don't need it! -# -# view.manager.register("Some View", some_view_handler); -# -# -var manager = { - current : { node: nil, handler: default_handler }, - init : func { - me.views = {}; - me.loopid = 0; - var viewnodes = props.globals.getNode("sim").getChildren("view"); - forindex (var i; viewnodes) - me.views[i] = { node: viewnodes[i], handler: default_handler }; - setlistener("/sim/current-view/view-number", func(n) { - manager.set_view(n.getValue()); - }, 1); - }, - register : func(which, handler = nil) { - if (num(which) == nil) - which = indexof(which); - if (handler == nil) - handler = default_handler; - me.views[which]["handler"] = handler; - if (hasmember(handler, "init")) - handler.init(me.views[which].node); - me.set_view(); - }, - set_view : func(which = nil) { - if (which == nil) - which = index; - elsif (num(which) == nil) - which = indexof(which); - - me.loopid += 1; - if (hasmember(me.current.handler, "stop")) - me.current.handler.stop(); - - me.current = me.views[which]; - - if (hasmember(me.current.handler, "start")) - me.current.handler.start(); - if (hasmember(me.current.handler, "update")) - me._loop_(me.loopid += 1); - }, - reset : func { - if (hasmember(me.current.handler, "reset")) - me.current.handler.reset(); - else - default_handler.reset(); - }, - _loop_ : func(id) { - id == me.loopid or return; - settimer(func { me._loop_(id) }, me.current.handler.update() or 0); - }, -}; - - -var fly_by_view_handler = { - init : func { - me.latN = props.globals.getNode("/sim/viewer/latitude-deg", 1); - me.lonN = props.globals.getNode("/sim/viewer/longitude-deg", 1); - me.altN = props.globals.getNode("/sim/viewer/altitude-ft", 1); - me.hdgN = props.globals.getNode("/orientation/heading-deg", 1); - - setlistener("/sim/signals/reinit", func(n) { n.getValue() or me.reset() }); - setlistener("/sim/crashed", func(n) { n.getValue() and me.reset() }); - setlistener("/sim/freeze/replay-state", func { - settimer(func { me.reset() }, 1); # time for replay to catch up - }); - me.reset(); - }, - start : func { - me.reset(); - }, - reset: func { - me.chase = -getprop("/sim/chase-distance-m"); - me.course = me.hdgN.getValue(); - me.last = geo.aircraft_position(); - me.setpos(1); - me.dist = 20; - }, - setpos : func(force = 0) { - var pos = geo.aircraft_position(); - - # check if the aircraft has moved enough - var dist = me.last.distance_to(pos); - if (dist < 1.7 * me.chase and !force) - return 1.13; - - # "predict" and remember next aircraft position - var course = me.hdgN.getValue(); - var delta_alt = (pos.alt() - me.last.alt()) * 0.5; - pos.apply_course_distance(course, dist * 0.8); - pos.set_alt(pos.alt() + delta_alt); - me.last.set(pos); - - # apply random deviation - var radius = me.chase * (0.5 * rand() + 0.7); - var agl = getprop("/position/altitude-agl-ft") * FT2M; - if (agl > me.chase) - var angle = rand() * 2 * math.pi; - else - var angle = ((2 * rand() - 1) * 0.15 + 0.5) * (rand() < 0.5 ? -math.pi : math.pi); - - var dev_alt = math.cos(angle) * radius; - var dev_side = math.sin(angle) * radius; - pos.apply_course_distance(course + 90, dev_side); - - # and make sure it's not under ground - var lat = pos.lat(); - var lon = pos.lon(); - var alt = pos.alt(); - var elev = geo.elevation(lat, lon); - if (elev != nil) { - elev += 2; # min elevation - if (alt + dev_alt < elev and dev_alt < 0) - dev_alt = -dev_alt; - if (alt + dev_alt < elev) - alt = elev; - else - alt += dev_alt; - } - - # set new view point - me.latN.setValue(lat); - me.lonN.setValue(lon); - me.altN.setValue(alt * M2FT); - return 7.3; - }, - update : func { - return me.setpos(); - }, -}; - - -var model_view_handler = { - init: func(node) { - me.viewN = node; - me.current = nil; - me.legendN = props.globals.initNode("/sim/current-view/model-view", ""); - me.dialog = props.Node.new({ "dialog-name": "model-view" }); - }, - start: func { - me.listener = setlistener("/sim/signals/multiplayer-updated", func me._update_(), 1); - me.reset(); - fgcommand("dialog-show", me.dialog); - }, - stop: func { - fgcommand("dialog-close", me.dialog); - removelistener(me.listener); - }, - reset: func { - me.select(0); - }, - find: func(callsign) { - forindex (var i; me.list) - if (me.list[i].callsign == callsign) - return i; - return nil; - }, - select: func(which) { - if (num(which) == nil) - which = me.find(which) or 0; # turn callsign into index - - me.setup(me.list[which]); - }, - next: func(step) { - var i = me.find(me.current); - i = i == nil ? 0 : math.mod(i + step, size(me.list)); - me.setup(me.list[i]); - }, - _update_: func { - var self = { callsign: getprop("/sim/multiplay/callsign"), model:, - node: props.globals, root: '/' }; - me.list = [self] ~ multiplayer.model.list; - if (!me.find(me.current)) - me.select(0); - }, - setup: func(data) { - if (data.root == '/') { - var zoffset = getprop("/sim/chase-distance-m"); - var ident = '[' ~ data.callsign ~ ']'; - } else { - var zoffset = 70; - var ident = '"' ~ data.callsign ~ '" (' ~ data.model ~ ')'; - } - - me.current = data.callsign; - me.legendN.setValue(ident); - setprop("/sim/current-view/z-offset-m", zoffset); - - me.viewN.getNode("config").setValues({ - "eye-lat-deg-path": data.root ~ "/position/latitude-deg", - "eye-lon-deg-path": data.root ~ "/position/longitude-deg", - "eye-alt-ft-path": data.root ~ "/position/altitude-ft", - "eye-heading-deg-path": data.root ~ "/orientation/heading-deg", - "target-lat-deg-path": data.root ~ "/position/latitude-deg", - "target-lon-deg-path": data.root ~ "/position/longitude-deg", - "target-alt-ft-path": data.root ~ "/position/altitude-ft", - "target-heading-deg-path": data.root ~ "/orientation/heading-deg", - "target-pitch-deg-path": data.root ~ "/orientation/pitch-deg", - "target-roll-deg-path": data.root ~ "/orientation/roll-deg", - }); - }, -}; - - -var pilot_view_limiter = { - new : func { - return { parents: [pilot_view_limiter] }; - }, - init : func { - me.hdgN = props.globals.getNode("/sim/current-view/heading-offset-deg"); - me.xoffsetN = props.globals.getNode("/sim/current-view/x-offset-m"); - me.xoffset_lowpass = aircraft.lowpass.new(0.1); - me.last_offset = 0; - }, - start : func { - var limits = current.getNode("config/limits", 1); - me.left = { - heading_max : abs(limits.getNode("left/heading-max-deg", 1).getValue() or 1000), - threshold : abs(limits.getNode("left/x-offset-threshold-deg", 1).getValue() or 0), - xoffset_max : abs(limits.getNode("left/x-offset-max-m", 1).getValue() or 0), - }; - me.right = { - heading_max : -abs(limits.getNode("right/heading-max-deg", 1).getValue() or 1000), - threshold : -abs(limits.getNode("right/x-offset-threshold-deg", 1).getValue() or 0), - xoffset_max : -abs(limits.getNode("right/x-offset-max-m", 1).getValue() or 0), - }; - me.left.scale = me.left.xoffset_max / (me.left.heading_max - me.left.threshold); - me.right.scale = me.right.xoffset_max / (me.right.heading_max - me.right.threshold); - me.last_hdg = normdeg(me.hdgN.getValue()); - me.enable_xoffset = me.right.xoffset_max > 0.001 or me.left.xoffset_max > 0.001; - }, - update : func { - if (getprop("/devices/status/keyboard/ctrl")) - return; - - var hdg = normdeg(me.hdgN.getValue()); - if (abs(me.last_hdg - hdg) > 180) # avoid wrap-around skips - me.hdgN.setDoubleValue(hdg = me.last_hdg); - elsif (hdg > me.left.heading_max) - me.hdgN.setDoubleValue(hdg = me.left.heading_max); - elsif (hdg < me.right.heading_max) - me.hdgN.setDoubleValue(hdg = me.right.heading_max); - me.last_hdg = hdg; - - # translate view on X axis to look far right or far left - if (me.enable_xoffset) { - var offset = 0; - if (hdg > me.left.threshold) - offset = (me.left.threshold - hdg) * me.left.scale; - elsif (hdg < me.right.threshold) - offset = (me.right.threshold - hdg) * me.right.scale; - - var new_offset = me.xoffset_lowpass.filter(offset); - me.xoffsetN.setDoubleValue(me.xoffsetN.getValue() - me.last_offset + new_offset); - me.last_offset = new_offset; - } - return 0; - }, -}; - - -var panViewDir = func(step) { # FIXME overrides panViewDir function from above; needs better integration - if (getprop("/sim/freeze/master")) - var prop = "/sim/current-view/heading-offset-deg"; - else - var prop = "/sim/current-view/goal-heading-offset-deg"; - var viewVal = getprop(prop); - var delta = step * VIEW_PAN_RATE * getprop("/sim/time/delta-realtime-sec"); - var viewValSlew = normdeg(viewVal + delta); - var headingMax = abs(current.getNode("config/limits/left/heading-max-deg", 1).getValue() or 1000); - var headingMin = -abs(current.getNode("config/limits/right/heading-max-deg", 1).getValue() or 1000); - if (viewValSlew > headingMax) - viewValSlew = headingMax; - elsif (viewValSlew < headingMin) - viewValSlew = headingMin; - setprop(prop, viewValSlew); -} - - -#------------------------------------------------------------------------------ -# -# Saves/restores/moves the view point (position, orientation, field-of-view). -# Moves are interpolated with sinusoidal characteristic. There's only one -# instance of this class, available as "view.point". -# -# Usage: -# view.point.save(); ... save current view and return reference to -# saved values in the form of a props.Node -# -# view.point.restore(); ... restore saved view parameters -# -# view.point.move( [,