Merge pull request #1 from thekovic/fps

Fix FPS regression in Visual Mode

.gitignore

@@ -8,3 +8,4 @@ Source/Plugins/ImageDrawingExample/obj
 Build/*.exe
 Build/*.pdb
 Build/Plugins
+Build/Builder.xml

Source/Core/Config/ProgramConfiguration.cs

@@ -93,6 +93,7 @@ public class ProgramConfiguration
         private bool toolbargeometry;
         private bool toolbartesting;
         private bool toolbarfile;
+        private bool showfps;
 
         // These are not stored in the configuration, only used at runtime
         private string defaulttexture;
@@ -155,6 +156,7 @@ public class ProgramConfiguration
         public bool ToolbarGeometry { get { return toolbargeometry; } internal set { toolbargeometry = value; } }
         public bool ToolbarTesting { get { return toolbartesting; } internal set { toolbartesting = value; } }
         public bool ToolbarFile { get { return toolbarfile; } internal set { toolbarfile = value; } }
+        public bool ShowFPS { get { return showfps; } internal set { showfps = value; } }
 
         public string DefaultTexture { get { return defaulttexture; } set { defaulttexture = value; } }
         public string DefaultFloorTexture { get { return defaultfloortexture; } set { defaultfloortexture = value; } }
@@ -234,6 +236,7 @@ internal bool Load(string cfgfilepathname, string defaultfilepathname)
                 toolbargeometry = cfg.ReadSetting("toolbargeometry", true);
                 toolbartesting = cfg.ReadSetting("toolbartesting", true);
                 toolbarfile = cfg.ReadSetting("toolbarfile", true);
+                showfps = cfg.ReadSetting("showfps", false);
 
                 // Success
                 return true;
@@ -295,6 +298,7 @@ internal void Save(string filepathname)
             cfg.WriteSetting("toolbargeometry", toolbargeometry);
             cfg.WriteSetting("toolbartesting", toolbartesting);
             cfg.WriteSetting("toolbarfile", toolbarfile);
+            cfg.WriteSetting("showfps", showfps);
 
             // Save settings configuration
             General.WriteLogLine("Saving program configuration...");

Source/Core/Rendering/Renderer3D.cs

@@ -104,6 +104,11 @@ internal sealed class Renderer3D : Renderer, IRenderer3D
         // Things to be rendered, sorted by distance from camera
         private BinaryHeap<VisualThing> thingsbydistance;
 
+        // FPS-related
+        private int fps = 0;
+        private System.Diagnostics.Stopwatch fpsWatch;
+        private TextLabel fpsLabel;
+
         #endregion
 
         #region ================== Properties
@@ -135,6 +140,12 @@ internal Renderer3D(D3DDevice graphics) : base(graphics)
             frustum = new ProjectedFrustum2D(new Vector2D(), 0.0f, 0.0f, PROJ_NEAR_PLANE,
                 General.Settings.ViewDistance, Angle2D.DegToRad((float)General.Settings.VisualFOV));
 
+            fpsLabel = new TextLabel(7);
+            fpsLabel.AlignX = TextAlignmentX.Left;
+            fpsLabel.AlignY = TextAlignmentY.Top;
+            fpsLabel.Text = "(FPS unavailable)";
+            fpsWatch = new System.Diagnostics.Stopwatch();
+
             // We have no destructor
             GC.SuppressFinalize(this);
         }
@@ -422,6 +433,11 @@ public void ApplyMatrices2D()
         // This starts rendering
         public bool Start()
         {
+            if (General.Settings.ShowFPS && !fpsWatch.IsRunning)
+            {
+                fpsWatch.Start();
+            }
+
             // Create texture
             if (General.Map.Data.ThingBox.Texture == null)
                 General.Map.Data.ThingBox.CreateTexture();
@@ -549,6 +565,18 @@ public void FinishGeometry()
             // Done
             graphics.Shaders.World3D.End();
             geometry = null;
+
+            if (General.Settings.ShowFPS)
+            {
+                fps++;
+                if (fpsWatch.ElapsedMilliseconds > 1000)
+                {
+                    fpsLabel.Text = string.Format("{0} FPS", fps);
+                    fps = 0;
+                    fpsWatch.Reset();
+                    fpsWatch.Start();
+                }
+            }
         }
 
         // villsa 9/15/11
@@ -989,6 +1017,11 @@ public void RenderCrosshair()
             graphics.Device.DrawUserPrimitives<FlatVertex>(PrimitiveType.TriangleStrip, 0, 2, crosshairverts);
             graphics.Shaders.Display2D.EndPass();
             graphics.Shaders.Display2D.End();
+
+            if (General.Settings.ShowFPS)
+            {
+                General.Map.Renderer2D.RenderText(fpsLabel);
+            }
         }
 
         // This switches fog on and off
@@ -997,7 +1030,7 @@ public void SetFogMode(bool usefog)
             graphics.Device.SetRenderState(RenderState.FogEnable, usefog);
         }
 
-        // This siwtches crosshair busy icon on and off
+        // This switches crosshair busy icon on and off
         public void SetCrosshairBusy(bool busy)
         {
             crosshairbusy = busy;

Source/Core/Windows/MainForm.cs

@@ -908,10 +908,6 @@ public void RedrawDisplay()
         {
             if ((General.Map != null) && (General.Editing.Mode != null))
             {
-                foreach (Sector s in General.Map.Map.Sectors)
-                    s.UpdateNeeded = true;
-
-                General.Map.Map.Update();
                 General.Editing.Mode.OnRedrawDisplay();
             }
             else
@@ -2004,6 +2000,11 @@ public void ToggleFullBrightness()
             General.Interface.DisplayStatus(StatusType.Action, "Full Brightness is now " + (Renderer.FullBrightness ? "ON" : "OFF"));
 
             // Redraw display to show changes
+            foreach (Sector s in General.Map.Map.Sectors)
+            {
+                s.UpdateNeeded = true;
+            }
+            General.Map.Map.Update();
             General.Interface.RedrawDisplay();
         }