Changeset 1910

Timestamp:

11/20/09 15:30:51 (3 months ago)

Author:

borrillis

Message:

- TechDemo?

Added some error checking in case Overlays weren't loaded.

Location:

trunk/Projects/AxiomDemos/Source/Demos

Files:

• Axiom.Demos.csproj (modified) (1 diff)
• TechDemo.cs (modified) (7 diffs)

trunk/Projects/AxiomDemos/Source/Demos/Axiom.Demos.csproj

@@ -44 +44 @@
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x86\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

trunk/Projects/AxiomDemos/Source/Demos/TechDemo.cs

@@ -35 +35 @@
         public ConfigureInput SetupInput;
 
-        public TechDemo() { SetupInput += new ConfigureInput( _setupInput ); }
+        public TechDemo() { SetupInput = new ConfigureInput( _setupInput ); }
 
         #region Protected Fields
@@ -246 +246 @@
             ir.Initialize( window, true, true, false, false );
 #endif
+
 #if ( SIS )
             SharpInputSystem.ParameterList pl = new SharpInputSystem.ParameterList();
@@ -589 +590 @@
                 toggleDelay = .3f;
             }
-#endif
 #if DEBUG
                         if ( !input.IsMousePressed( MouseButtons.Left ) )
@@ -605 +605 @@
                         }
 #endif
+#endif
+
 #if ( SIS )
             // TODO: Move this into an event queueing mechanism that is processed every frame
@@ -783 +785 @@
             }
 
-            OverlayElement element = OverlayManager.Instance.Elements.GetElement( "Core/DebugText" );
-            element.Text = debugText;
+            if ( debugText != String.Empty )
+            {
+                OverlayElement element = OverlayManager.Instance.Elements.GetElement( "Core/DebugText" );
+                element.Text = debugText;
+            }
         }
 
@@ -795 +800 @@
             // TODO: Replace with CEGUI
             OverlayElement element = OverlayManager.Instance.Elements.GetElement( "Core/CurrFps" );
+            if ( element != null )
             element.Text = string.Format( "Current FPS: {0:#.00}", Root.Instance.CurrentFPS );
 
             element = OverlayManager.Instance.Elements.GetElement( "Core/BestFps" );
-            element.Text = string.Format( "Best FPS: {0:#.00}", Root.Instance.BestFPS );
+            if ( element != null )
+                element.Text = string.Format( "Best FPS: {0:#.00}", Root.Instance.BestFPS );
 
             element = OverlayManager.Instance.Elements.GetElement( "Core/WorstFps" );
-            element.Text = string.Format( "Worst FPS: {0:#.00}", Root.Instance.WorstFPS );
+            if ( element != null )
+                element.Text = string.Format( "Worst FPS: {0:#.00}", Root.Instance.WorstFPS );
 
             //element = OverlayManager.Instance.Elements.GetElement( "Core/AverageFps" );
@@ -810 +818 @@
             average = sum / elapsedFrames;
             elapsedFrames++;
-            element.Text = string.Format( "Average FPS: {0:#.00} in {1:#.0}s", average, ( DateTime.Now - averageStart ).TotalSeconds );
+            if ( element != null )
+                element.Text = string.Format( "Average FPS: {0:#.00} in {1:#.0}s", average, ( DateTime.Now - averageStart ).TotalSeconds );
                         
             element = OverlayManager.Instance.Elements.GetElement( "Core/NumTris" );
-            element.Text = string.Format( "Triangle Count: {0}", scene.TargetRenderSystem.FacesRendered );
+            if ( element != null )
+                element.Text = string.Format( "Triangle Count: {0}", scene.TargetRenderSystem.FacesRendered );
 
             element = OverlayManager.Instance.Elements.GetElement("Core/NumBatches");
-            element.Text = string.Format("Batch Count: {0}", scene.TargetRenderSystem.BatchesRendered);
+            if ( element != null )
+                element.Text = string.Format( "Batch Count: {0}", scene.TargetRenderSystem.BatchesRendered );
         }