diff --git a/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache b/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache index e4dfd2c966682d9662faf1c0854b1e6ae7f5f7b0..743c6d6e54f8ef664f3a7669a6e1f2d6df812d03 GIT binary patch literal 27126 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 F|1Vx;CWHV0 diff --git a/isometric-park-fna/Content/.DS_Store b/isometric-park-fna/Content/.DS_Store index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..b53d332a12844391beebbe9032a54757b53e20ed GIT binary patch literal 8196 zc%1E-UrZcD9LImZgTn3tWvL3wrF`uCQ@$_j;DHIeDFo1FTOduJ4cQyko3hGyWiyQ zyF0(%?A*+Jb~dvI0N9(6TLEeSfCJY_8EhzyeQuC1F9B(N00qqWoSBMiMttLIdGh4R zlP6D}Zn4lcZj{|-So zL&r_G)W=mNJvyh#*6eA?Oengn>NDe6)l}n}GNMaK#g9Mp{3_XASs_-7wH#^SCNgpL zY(}-_ol>Drtmny9Zc3)jo-$$lI3`fWBxZ3Q7jO|T;?wvHK8r8o8~6^c;Jf%9et;jk zKg*Y+b#Ohb_{jz|vU}1uz7dUq{wm?bt)cPTau>lns&>{l>^%@Va`b_=N$Gaa_pvD6OHK<7{3?>1u6tjkr4)2oReX&N<~90|G^w zcTSobY0O6>_GN{Zz#*Q3ON!i9+JwU#MU-rFqa8vQPa!77ZnRrC#!*&Di5u+^BD{S& z5x6Pn-h>tShywRDT&I}*0>4qv{-%(Xq93a%WV^5q>v1o|>;N`n3*Jjn>!PqlC~C*? z1P{P*+^oYeQo diff --git a/isometric-park-fna/DebugWindow.cs b/isometric-park-fna/DebugWindow.cs --- a/isometric-park-fna/DebugWindow.cs +++ b/isometric-park-fna/DebugWindow.cs @@ -20,7 +20,7 @@ public Vector2 mouseGrid; public Boolean hasTree; public int tilesDrawn; - + internal object updateTime; } public class DebugWindow diff --git a/isometric-park-fna/FNAGame.cs b/isometric-park-fna/FNAGame.cs --- a/isometric-park-fna/FNAGame.cs +++ b/isometric-park-fna/FNAGame.cs @@ -39,6 +39,8 @@ int frameCounter = 0; TimeSpan elapsedTime = TimeSpan.Zero; TimeSpan drawTime = TimeSpan.Zero; + TimeSpan updateTime = TimeSpan.Zero; + Queue past_fps = new Queue(100); int tilesDrawn = 0; @@ -77,6 +79,7 @@ private Grammar grammar; private string output; private bool showSecond = true; + private GraphicsDeviceManager gdm; private static void Main(string[] args) { @@ -97,7 +100,7 @@ } ; #endif - GraphicsDeviceManager gdm = new GraphicsDeviceManager(this) + this.gdm = new GraphicsDeviceManager(this) { // Typically you would load a config here... @@ -799,6 +802,7 @@ pastFps = past_fps.ToArray(), cameraPosition = camera.position, drawTime = this.drawTime, + updateTime = this.updateTime, treeCount = this.simulation.map.tree_count, mouseGrid = this.mouseGrid, hasTree = has_tree, @@ -821,14 +825,17 @@ additionalInfo.Add("Tracery Test", this.output); debugWindow.Layout(debugInfo, additionalInfo, ref show_another_window); - //String[] messages = { "Message1", "Message2" }; + + debugWindow.ImGuiLayout(); - //DialogOption[] dialog = { new DialogOption{ response="Welcome to your new park, director! You can use the mouse or arrow keys to move around, and the plus and minus keys to zoom in and out.", choice="Okay" }, - // new DialogOption{ response="Make sure that you keep visitors happy and the budget in the black! You're currently getting an annual grant out of my budget—it'd sure be nice if you park were self-sufficient so we could drop that expense!", choice="And I need to keep the forest healthy, too, right?" }, - // new DialogOption{ response="Oh yeah, of course.", choice="..." }}; + //String[] messages = { "Message1", "Message2" }; + + //DialogOption[] dialog = { new DialogOption{ response="Welcome to your new park, director! You can use the mouse or arrow keys to move around, and the plus and minus keys to zoom in and out.", choice="Okay" }, + // new DialogOption{ response="Make sure that you keep visitors happy and the budget in the black! You're currently getting an annual grant out of my budget—it'd sure be nice if you park were self-sufficient so we could drop that expense!", choice="And I need to keep the forest healthy, too, right?" }, + // new DialogOption{ response="Oh yeah, of course.", choice="..." }}; - if (this.currentNode != null) + if (this.currentNode != null) { this.currentNode = DialogInterface.RenderDialog(ref this.showInitial, ref this.simulation.paused, debugWindow.monoFont, this.currentNode);