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

List:       bzflag-commits
Subject:    SF.net SVN: bzflag: [16455] branches/v2_0branch/bzflag/src/bzflag
From:       JeffM2501 () users ! sourceforge ! net
Date:       2008-01-07 22:55:38
Message-ID: E1JC0sc-0007VQ-Jt () sc8-pr-svn2 ! sourceforge ! net
[Download RAW message or body]

Revision: 16455
          http://bzflag.svn.sourceforge.net/bzflag/?rev=16455&view=rev
Author:   JeffM2501
Date:     2008-01-07 14:55:37 -0800 (Mon, 07 Jan 2008)

Log Message:
-----------
use the config var "defaultFOV" instead of a hardcoded 60 deg, so that widescreen \
users can configure the view to a more natural view.

Modified Paths:
--------------
    branches/v2_0branch/bzflag/src/bzflag/clientCommands.cxx
    branches/v2_0branch/bzflag/src/bzflag/defaultBZDB.cxx
    branches/v2_0branch/bzflag/src/bzflag/playing.cxx

Modified: branches/v2_0branch/bzflag/src/bzflag/clientCommands.cxx
===================================================================
--- branches/v2_0branch/bzflag/src/bzflag/clientCommands.cxx	2008-01-07 08:45:45 UTC \
                (rev 16454)
+++ branches/v2_0branch/bzflag/src/bzflag/clientCommands.cxx	2008-01-07 22:55:37 UTC \
(rev 16455) @@ -515,11 +515,12 @@
     return "usage: viewZoom {in|out|toggle}";
 
   float fov = BZDB.eval("displayFOV");
+  float defFov = BZDB.eval("defaultFOV");
 
   if (args[0] == "out") {
     fov += 1.0f;
-    if (fov > 60.0f)
-      fov = 60.0f;
+    if (fov > defFov)
+      fov = defFov;
     BZDB.setFloat("displayFOV", fov);
   } else if (args[0] == "in") {
     fov -= 1.0f;
@@ -528,20 +529,20 @@
     BZDB.setFloat("displayFOV", fov);
   } else if (args[0] == "toggle") {
     if (fov < 15.5f) {
-      fov = 60.0f;
+      fov = defFov;
     } else {
       fov = 15.0f;
     }
     BZDB.setFloat("displayFOV", fov);
     // also toggle the observer fov
-    if (ROAM.getZoom() != 60.0f) {
-      ROAM.setZoom(60.0f);
+    if (ROAM.getZoom() != defFov) {
+      ROAM.setZoom(defFov);
     } else {
       ROAM.setZoom(15.0f);
     }
   } else if (args[0] == "reset") {
-    fov = 60.0f;
-    ROAM.setZoom(60.0f);
+    fov = defFov;
+    ROAM.setZoom(defFov);
     BZDB.setFloat("displayFOV", fov);
   } else {
     return "usage: viewZoom {in|out|toggle|reset}";

Modified: branches/v2_0branch/bzflag/src/bzflag/defaultBZDB.cxx
===================================================================
--- branches/v2_0branch/bzflag/src/bzflag/defaultBZDB.cxx	2008-01-07 08:45:45 UTC \
                (rev 16454)
+++ branches/v2_0branch/bzflag/src/bzflag/defaultBZDB.cxx	2008-01-07 22:55:37 UTC \
(rev 16455) @@ -62,6 +62,7 @@
   { "displayReloadTimer",	"1",			true,	StateDatabase::ReadWrite,	NULL },
   { "displayRadar",		"1",			false,	StateDatabase::ReadWrite,	NULL },
   { "displayRadarRange",	"0.5",			false,	StateDatabase::ReadWrite,	NULL },
+  { "defaultFOV",		"60.0",			false,  StateDatabase::ReadWrite,	NULL },
   { "displayFOV",		"60.0",			false,  StateDatabase::ReadWrite,	NULL },
   { "roamZoomMax",		"120",			false,	StateDatabase::ReadWrite,	NULL },
   { "roamZoomMin",		"15",			false,	StateDatabase::ReadWrite,	NULL },

Modified: branches/v2_0branch/bzflag/src/bzflag/playing.cxx
===================================================================
--- branches/v2_0branch/bzflag/src/bzflag/playing.cxx	2008-01-07 08:45:45 UTC (rev \
                16454)
+++ branches/v2_0branch/bzflag/src/bzflag/playing.cxx	2008-01-07 22:55:37 UTC (rev \
16455) @@ -5044,7 +5044,7 @@
       myTankPos = defaultPos;
       myTankDir = defaultDir;
       muzzleHeight = BZDB.eval(StateDatabase::BZDB_MUZZLEHEIGHT);
-      fov = 60.0f;
+      fov = BZDB.eval("defaultFOV");
     } else {
       myTankPos = myTank->getPosition();
       myTankDir = myTank->getForward();


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
BZFlag-commits mailing list
BZFlag-commits@lists.SourceForge.net
https://lists.SourceForge.net/lists/listinfo/bzflag-commits
irc: #BZFlag @ irc.freenode.net


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