Le 03/10/2012 22:05, Alexis Bory a écrit :
>
> Patch attached, Tests and comments welcome.
Self comment: this patch includes a change to the Hawkeye, grrr
use this one attached instead
Sorry for that
diff --git a/Nasal/view.nas b/Nasal/view.nas
index 6af58fa..09244dd 100644
--- a/Nasal/view.nas
+++ b/Nasal/view.nas
@@ -6,7 +6,7 @@
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 fovProp = nil;
var hasmember = func(class, member) {
if (contains(class, member))
@@ -235,6 +235,7 @@ var manager = {
me.current.handler.start();
if (hasmember(me.current.handler, "update"))
me._loop_(me.loopid += 1);
+ resetFOV();
},
reset : func {
if (hasmember(me.current.handler, "reset"))
@@ -638,7 +639,61 @@ var point = {
-var fovProp = nil;
+##
+# view.ScreenWidthCompens: optional FOV compensation for wider screens.
+# It keeps an equivalent of 55° FOV on a 4:3 zone centered on the screen
+# whichever is the screen width/height ratio. Works only if width >= height.
+#
+# status: 0=Init, 1=toggle option, 2=waiting for the window size to change.
+
+var defaultFov = nil;
+var oldW = 0;
+var oldH = 0;
+var fovStore = {};
+
+var screenWidthCompens = func(status) {
+ var opt = getprop("/sim/current-view/field-of-view-compensation");
+ if (status == 0) {
+ defaultFov = getprop("/sim/current-view/config/default-field-of-view-deg");
+ forindex (var i; views) {
+ var defaultFovNode = views[i].getNode("config/default-field-of-view-deg", 1);
+ fovStore[i] = defaultFovNode.getValue();
+ }
+ } elsif (status == 1) {
+ opt = ! opt;
+ setprop("/sim/current-view/field-of-view-compensation", opt);
+ if (! opt) {
+ forindex (var i; views) {
+ var defaultFovNode = views[i].getNode("config/default-field-of-view-deg", 1);
+ defaultFovNode.setValue(fovStore[i]);
+ }
+ var vn = getprop("/sim/current-view/view-number");
+ setprop("/sim/current-view/field-of-view", fovStore[vn]);
+ }
+ } elsif (status == 2 and ! opt) {
+ return;
+ }
+ var w = getprop("/sim/rendering/camera-group/camera/viewport/width");
+ var h = getprop("/sim/rendering/camera-group/camera/viewport/height");
+ if (! opt) {
+ setprop("/sim/current-view/config/default-field-of-view-deg", defaultFov);
+ return;
+ }
+ if ( w != oldW or h != oldH or status == 1) {
+ oldW = w;
+ oldH = h;
+ d = 1.28066 * h; # 1.28066 = 4/3 (width/height ratio) / 2 / tan(55°)
+ newFov = 2 * math.atan2( w / h * h / 2, d) * R2D;
+ setprop("/sim/current-view/config/default-field-of-view-deg", newFov);
+ forindex (var i; views) {
+ var defaultFovNode = views[i].getNode("config/default-field-of-view-deg", 1);
+ defaultFovNode.setValue(newFov);
+ }
+ fovProp.setValue(newFov);
+ }
+ settimer(func { screenWidthCompens(2); }, 1);
+}
+
_setlistener("/sim/signals/nasal-dir-initialized", func {
@@ -654,6 +709,7 @@ _setlistener("/sim/signals/nasal-dir-initialized", func {
manager.init();
manager.register("Fly-By View", fly_by_view_handler);
manager.register("Model View", model_view_handler);
+ screenWidthCompens(0);
});
diff --git a/gui/dialogs/view.xml b/gui/dialogs/view.xml
index 1bd235b..7ef301c 100644
--- a/gui/dialogs/view.xml
+++ b/gui/dialogs/view.xml
@@ -88,6 +88,25 @@
</group>
<hrule/>
+ <group>
+ <layout>hbox</layout>
+ <checkbox>
+ <property>sim/current-view/field-of-view-compensation</property>
+ <live>false</live>
+ <binding>
+ <command>nasal</command>
+ <script>view.screenWidthCompens(1)</script>
+ </binding>
+ </checkbox>
+ <text>
+ <label>Compensate Field of View for wider screens</label>
+ </text>
+ </group>
+
+
+
+
+ <hrule/>
<button>
<legend>Close</legend>
diff --git a/preferences.xml b/preferences.xml
index 80b324d..ef7d593 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -346,6 +346,7 @@ Started September 2000 by David Megginson, da...@megginson.com
<speed-up type="double">1.0</speed-up>
<current-view>
<field-of-view type="double">55.0</field-of-view>
+ <field-of-view-compensation type="bool" userarchive="y">false</field-of-view-compensation>
<aspect-ratio-multiplier type="double">1.0</aspect-ratio-multiplier>
<dynamic-view type="bool" userarchive="y">false</dynamic-view>
</current-view>
------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
