Description:
Update ForestWindow to hook into Encompass.
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
@@ -815,7 +815,7 | |||||
|
815 |
|
815 | ||
|
816 | if (this.showForest) |
|
816 | if (this.showForest) |
|
817 | { |
|
817 | { |
|
818 |
ForestWindow.Render( |
|
818 | ForestWindow.Render(this.showForest, debugWindow.monoFont, this.simulation, this.imGuiWindowBridgeEngine); |
|
819 | } |
|
819 | } |
|
820 |
|
820 | ||
|
821 | if (this.showNews) |
|
821 | if (this.showNews) |
@@ -2,13 +2,17 | |||||
|
2 |
|
2 | ||
|
3 | using Num = System.Numerics; |
|
3 | using Num = System.Numerics; |
|
4 |
|
4 | ||
|
|
5 | using isometricparkfna.Messages; | ||
|
|
6 | using isometricparkfna.Engines; | ||
|
|
7 | |||
|
5 | namespace isometricparkfna.UI |
|
8 | namespace isometricparkfna.UI |
|
6 | { |
|
9 | { |
|
7 |
|
10 | ||
|
8 | public static class ForestWindow |
|
11 | public static class ForestWindow |
|
9 | { |
|
12 | { |
|
10 |
public static void Render( |
|
13 | public static void Render(bool show, ImFontPtr font, Simulation sim, ImGuiWindowBridgeEngine engine) |
|
11 | { |
|
14 | { |
|
|
15 | bool newShow = show; | ||
|
12 | if (show) |
|
16 | if (show) |
|
13 | { |
|
17 | { |
|
14 | ImGui.PushFont(font); |
|
18 | ImGui.PushFont(font); |
@@ -58,6 +62,10 | |||||
|
58 | ImGui.PopStyleColor(8); |
|
62 | ImGui.PopStyleColor(8); |
|
59 | ImGui.PopFont(); |
|
63 | ImGui.PopFont(); |
|
60 | } |
|
64 | } |
|
|
65 | if (show != newShow) | ||
|
|
66 | { | ||
|
|
67 | engine.messages.Add(new ToggleWindowMessage {Window = Window.Forest }); | ||
|
|
68 | } | ||
|
61 | } |
|
69 | } |
|
62 | } |
|
70 | } |
|
63 | } No newline at end of file |
|
71 | } |
@@ -148,7 +148,6 | |||||
|
148 | if (show != newShow) |
|
148 | if (show != newShow) |
|
149 | { |
|
149 | { |
|
150 | engine.messages.Add(new ToggleWindowMessage {Window = Window.News }); |
|
150 | engine.messages.Add(new ToggleWindowMessage {Window = Window.News }); |
|
151 | // SendMessage(new ToggleWindowMessage {Window = Window.News }); |
|
||
|
152 | } |
|
151 | } |
|
153 | } |
|
152 | } |
|
154 | } |
|
153 | } |
You need to be logged in to leave comments.
Login now