Description:
Misc foundational changes: UpdateTime and gdm fields.
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
| @@ -51,7 +51,7 | |||||
|
|
51 | "frameworks": { |
|
51 | "frameworks": { |
|
|
52 | "net45": { |
|
52 | "net45": { |
|
|
53 | "targetAlias": "net45", |
|
53 | "targetAlias": "net45", |
|
|
54 |
"runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.10 |
|
54 | "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.102/RuntimeIdentifierGraph.json" |
|
|
55 | } |
|
55 | } |
|
|
56 | } |
|
56 | } |
|
|
57 | } |
|
57 | } |
| @@ -65,7 +65,7 | |||||
|
|
65 | "frameworks": { |
|
65 | "frameworks": { |
|
|
66 | "net45": { |
|
66 | "net45": { |
|
|
67 | "targetAlias": "net45", |
|
67 | "targetAlias": "net45", |
|
|
68 |
"runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.10 |
|
68 | "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.102/RuntimeIdentifierGraph.json" |
|
|
69 | } |
|
69 | } |
|
|
70 | } |
|
70 | } |
|
|
71 | } |
|
71 | } |
| @@ -1,6 +1,6 | |||||
|
|
1 | { |
|
1 | { |
|
|
2 | "version": 2, |
|
2 | "version": 2, |
|
|
3 | "dgSpecHash": "sLS5t/lm8+OjmBMUSq4Oa+qj1nmlP4hv1nbhrDkCyh4cFv0feKffMuOUJCnVyo3CemM3wJ8x9kse/rI52oJ1pQ==", |
|
3 | "dgSpecHash": "QbljAP9YfnlfGt9DK+paIbf2KN67CHfFFP459FIA09f6Vs2u4/bm6jOZkhaagMtqNxlEucQ1En4ss24qjT71BA==", |
|
|
4 | "success": true, |
|
4 | "success": true, |
|
|
5 | "projectFilePath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj", |
|
5 | "projectFilePath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj", |
|
|
6 | "expectedPackageFiles": [], |
|
6 | "expectedPackageFiles": [], |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
| @@ -20,7 +20,7 | |||||
|
|
20 | public Vector2 mouseGrid; |
|
20 | public Vector2 mouseGrid; |
|
|
21 | public Boolean hasTree; |
|
21 | public Boolean hasTree; |
|
|
22 | public int tilesDrawn; |
|
22 | public int tilesDrawn; |
|
|
23 |
|
23 | internal object updateTime; | |
|
|
24 | } |
|
24 | } |
|
|
25 |
|
25 | ||
|
|
26 | public class DebugWindow |
|
26 | public class DebugWindow |
| @@ -39,6 +39,8 | |||||
|
|
39 | int frameCounter = 0; |
|
39 | int frameCounter = 0; |
|
|
40 | TimeSpan elapsedTime = TimeSpan.Zero; |
|
40 | TimeSpan elapsedTime = TimeSpan.Zero; |
|
|
41 | TimeSpan drawTime = TimeSpan.Zero; |
|
41 | TimeSpan drawTime = TimeSpan.Zero; |
|
|
|
42 | TimeSpan updateTime = TimeSpan.Zero; | ||
|
|
|
43 | |||
|
|
42 | Queue<float> past_fps = new Queue<float>(100); |
|
44 | Queue<float> past_fps = new Queue<float>(100); |
|
|
43 | int tilesDrawn = 0; |
|
45 | int tilesDrawn = 0; |
|
|
44 |
|
46 | ||
| @@ -77,6 +79,7 | |||||
|
|
77 | private Grammar grammar; |
|
79 | private Grammar grammar; |
|
|
78 | private string output; |
|
80 | private string output; |
|
|
79 | private bool showSecond = true; |
|
81 | private bool showSecond = true; |
|
|
|
82 | private GraphicsDeviceManager gdm; | ||
|
|
80 |
|
83 | ||
|
|
81 | private static void Main(string[] args) |
|
84 | private static void Main(string[] args) |
|
|
82 | { |
|
85 | { |
| @@ -97,7 +100,7 | |||||
|
|
97 | } |
|
100 | } |
|
|
98 | ; |
|
101 | ; |
|
|
99 | #endif |
|
102 | #endif |
|
|
100 |
|
|
103 | this.gdm = new GraphicsDeviceManager(this) |
|
|
101 | { |
|
104 | { |
|
|
102 |
|
105 | ||
|
|
103 | // Typically you would load a config here... |
|
106 | // Typically you would load a config here... |
| @@ -799,6 +802,7 | |||||
|
|
799 | pastFps = past_fps.ToArray(), |
|
802 | pastFps = past_fps.ToArray(), |
|
|
800 | cameraPosition = camera.position, |
|
803 | cameraPosition = camera.position, |
|
|
801 | drawTime = this.drawTime, |
|
804 | drawTime = this.drawTime, |
|
|
|
805 | updateTime = this.updateTime, | ||
|
|
802 | treeCount = this.simulation.map.tree_count, |
|
806 | treeCount = this.simulation.map.tree_count, |
|
|
803 | mouseGrid = this.mouseGrid, |
|
807 | mouseGrid = this.mouseGrid, |
|
|
804 | hasTree = has_tree, |
|
808 | hasTree = has_tree, |
| @@ -821,14 +825,17 | |||||
|
|
821 | additionalInfo.Add("Tracery Test", this.output); |
|
825 | additionalInfo.Add("Tracery Test", this.output); |
|
|
822 | debugWindow.Layout(debugInfo, additionalInfo, ref show_another_window); |
|
826 | debugWindow.Layout(debugInfo, additionalInfo, ref show_another_window); |
|
|
823 |
|
827 | ||
|
|
824 | //String[] messages = { "Message1", "Message2" }; |
|
828 | |
|
|
|
829 | debugWindow.ImGuiLayout(); | ||
|
|
825 |
|
830 | ||
|
|
826 | //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" }, |
|
831 | //String[] messages = { "Message1", "Message2" }; |
|
|
827 | // 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?" }, |
|
832 | |
|
|
828 | // new DialogOption{ response="Oh yeah, of course.", choice="..." }}; |
|
833 | //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" }, |
|
|
|
834 | // 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?" }, | ||
|
|
|
835 | // new DialogOption{ response="Oh yeah, of course.", choice="..." }}; | ||
|
|
829 |
|
836 | ||
|
|
830 |
|
837 | ||
|
|
831 |
|
|
838 | if (this.currentNode != null) |
|
|
832 | { |
|
839 | { |
|
|
833 | this.currentNode = DialogInterface.RenderDialog(ref this.showInitial, |
|
840 | this.currentNode = DialogInterface.RenderDialog(ref this.showInitial, |
|
|
834 | ref this.simulation.paused, debugWindow.monoFont, this.currentNode); |
|
841 | ref this.simulation.paused, debugWindow.monoFont, this.currentNode); |
You need to be logged in to leave comments.
Login now