Description:
Merge in toolbar.
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
|
1 | NO CONTENT: new file 100755, binary diff hidden |
@@ -0,0 +1,113 | |||
|
1 | using ImGuiNET; | |
|
2 | ||
|
3 | using Num = System.Numerics; | |
|
4 | ||
|
5 | namespace isometricparkfna.UI | |
|
6 | { | |
|
7 | ||
|
8 | public static class Menu | |
|
9 | { | |
|
10 | ||
|
11 | private static bool activeButton(string label, bool active, Num.Vector4 activeColor) { | |
|
12 | ||
|
13 | if (active) { | |
|
14 | ImGui.PushStyleColor(ImGuiCol.Button, activeColor); | |
|
15 | } | |
|
16 | ||
|
17 | var result = ImGui.Button(label); | |
|
18 | ||
|
19 | if (active) { | |
|
20 | ImGui.PopStyleColor(); | |
|
21 | } | |
|
22 | ||
|
23 | return result; | |
|
24 | } | |
|
25 | public static void Render(ImFontPtr font, int width, ref bool quit, ref bool paused, ref int rate, ref bool show_budget, ref bool show_forest, string header) | |
|
26 | { | |
|
27 | ImGui.PushFont(font); | |
|
28 | ||
|
29 | ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.None; | |
|
30 | ImGui.PushStyleVar(ImGuiStyleVar.FrameRounding, 0.0f); | |
|
31 | ImGui.PushStyleVar(ImGuiStyleVar.WindowRounding, 0.0f); | |
|
32 | ImGui.PushStyleVar(ImGuiStyleVar.FrameBorderSize, 1.0f); | |
|
33 | ImGui.PushStyleColor(ImGuiCol.WindowBg, new Num.Vector4(0.75f, 0.75f, 0.75f, 1f)); | |
|
34 | ImGui.PushStyleColor(ImGuiCol.MenuBarBg, new Num.Vector4(0.75f, 0.75f, 0.75f, 1f)); | |
|
35 | ImGui.PushStyleColor(ImGuiCol.PopupBg, new Num.Vector4(0.75f, 0.75f, 0.75f, 1f)); | |
|
36 | ||
|
37 | var title_bar = new Num.Vector4(0.65f, 0.65f, 0.65f, 1f); | |
|
38 | ImGui.PushStyleColor(ImGuiCol.TitleBg, title_bar); | |
|
39 | ImGui.PushStyleColor(ImGuiCol.TitleBgActive, title_bar); | |
|
40 | ImGui.PushStyleColor(ImGuiCol.TitleBgCollapsed, title_bar); | |
|
41 | ||
|
42 | ImGui.PushStyleColor(ImGuiCol.Border, new Num.Vector4(0f, 0f, 0f, 1f)); | |
|
43 | ImGui.PushStyleColor(ImGuiCol.BorderShadow, new Num.Vector4(0f, 0f, 0f, 0.5f)); | |
|
44 | ||
|
45 | ||
|
46 | ||
|
47 | ImGui.PushStyleColor(ImGuiCol.Button, new Num.Vector4(0.75f, 0.75f, 0.75f, 1f)); | |
|
48 | ImGui.PushStyleColor(ImGuiCol.Text, new Num.Vector4(0f, 0f, 0f, 1f)); | |
|
49 | ||
|
50 | if (ImGui.BeginMainMenuBar()) | |
|
51 | { | |
|
52 | ||
|
53 | ImGui.Text(header); | |
|
54 | ||
|
55 | ImGui.SetCursorPosX(width - 350); | |
|
56 | ||
|
57 | if (Menu.activeButton("$ Budget", show_budget, new Num.Vector4(0.060f, 0.590f, 0.980f, 1f))) | |
|
58 | { | |
|
59 | show_budget = !show_budget; | |
|
60 | ||
|
61 | } | |
|
62 | if (Menu.activeButton("\ue124 Forest", show_forest, new Num.Vector4(0.060f, 0.590f, 0.980f, 1f))) | |
|
63 | { | |
|
64 | show_forest = !show_forest; | |
|
65 | ||
|
66 | } | |
|
67 | ||
|
68 | ImGui.Text("|"); | |
|
69 | ||
|
70 | if (Menu.activeButton("\ue0ac Pause", paused, new Num.Vector4(0.060f, 0.590f, 0.980f, 1f))) | |
|
71 | { | |
|
72 | paused = !paused; | |
|
73 | } | |
|
74 | if (Menu.activeButton("1", (rate == 0), new Num.Vector4(0.060f, 0.590f, 0.980f, 1f))) | |
|
75 | { | |
|
76 | paused = false; | |
|
77 | rate = 0; | |
|
78 | } | |
|
79 | else if (Menu.activeButton("2", (rate == 1), new Num.Vector4(0.060f, 0.590f, 0.980f, 1f))) | |
|
80 | { | |
|
81 | paused = false; | |
|
82 | rate = 1; | |
|
83 | } | |
|
84 | else if (Menu.activeButton("3", (rate == 2), new Num.Vector4(0.060f, 0.590f, 0.980f, 1f))) | |
|
85 | { | |
|
86 | paused = false; | |
|
87 | rate = 2; | |
|
88 | } | |
|
89 | else if (Menu.activeButton("4", (rate == 3), new Num.Vector4(0.060f, 0.590f, 0.980f, 1f))) | |
|
90 | { | |
|
91 | paused = false; | |
|
92 | rate = 3; | |
|
93 | } | |
|
94 | #if DEBUG | |
|
95 | else if (Menu.activeButton("5", (rate == 4), new Num.Vector4(0.060f, 0.590f, 0.980f, 1f))) | |
|
96 | { | |
|
97 | paused = false; | |
|
98 | rate = 4; | |
|
99 | } | |
|
100 | #endif | |
|
101 | ||
|
102 | ||
|
103 | ImGui.EndMainMenuBar(); | |
|
104 | ||
|
105 | // ImGui.End(); | |
|
106 | ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.Left; | |
|
107 | ImGui.PopStyleVar(3); | |
|
108 | ImGui.PopStyleColor(9); | |
|
109 | ImGui.PopFont(); | |
|
110 | } | |
|
111 | } | |
|
112 | } | |
|
113 | } No newline at end of file |
|
1 | NO CONTENT: modified file, binary diff hidden |
|
1 | NO CONTENT: modified file, binary diff hidden |
|
1 | NO CONTENT: modified file, binary diff hidden |
|
1 | NO CONTENT: modified file, binary diff hidden |
|
1 | NO CONTENT: modified file, binary diff hidden |
|
1 | NO CONTENT: modified file, binary diff hidden |
|
1 | NO CONTENT: modified file, binary diff hidden |
|
1 | NO CONTENT: modified file, binary diff hidden |
|
1 | NO CONTENT: modified file, binary diff hidden |
|
1 | NO CONTENT: modified file, binary diff hidden |
|
1 | NO CONTENT: modified file, binary diff hidden |
|
1 | NO CONTENT: modified file, binary diff hidden |
@@ -5,6 +5,7 | |||
|
5 | 5 | }, |
|
6 | 6 | "projects": { |
|
7 | 7 | "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": { |
|
8 | "version": "1.0.0", | |
|
8 | 9 | "restore": { |
|
9 | 10 | "projectUniqueName": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj", |
|
10 | 11 | "projectName": "FNA", |
@@ -53,9 +54,7 | |||
|
53 | 54 | } |
|
54 | 55 | }, |
|
55 | 56 | "frameworks": { |
|
56 | "net45": { | |
|
57 | "runtimeIdentifierGraphPath": "/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json" | |
|
58 | } | |
|
57 | "net45": {} | |
|
59 | 58 | } |
|
60 | 59 | } |
|
61 | 60 | } |
@@ -7,7 +7,7 | |||
|
7 | 7 | <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/alys/.nuget/packages/</NuGetPackageRoot> |
|
8 | 8 | <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/alys/.nuget/packages/</NuGetPackageFolders> |
|
9 | 9 | <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle> |
|
10 |
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5. |
|
|
10 | <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.1.0</NuGetToolVersion> | |
|
11 | 11 | </PropertyGroup> |
|
12 | 12 | <PropertyGroup> |
|
13 | 13 | <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> |
This diff has been collapsed as it changes many lines, (591 lines changed) Show them Hide them | |||
@@ -2,57 +2,8 | |||
|
2 | 2 | "version": 3, |
|
3 | 3 | "targets": { |
|
4 | 4 | ".NETFramework,Version=v4.5": { |
|
5 | "Microsoft.NETFramework.ReferenceAssemblies/1.0.0": { | |
|
6 | "type": "package", | |
|
7 | "dependencies": { | |
|
8 | "Microsoft.NETFramework.ReferenceAssemblies.net45": "1.0.0" | |
|
9 | } | |
|
10 | }, | |
|
11 | "Microsoft.NETFramework.ReferenceAssemblies.net45/1.0.0": { | |
|
12 | "type": "package", | |
|
13 | "build": { | |
|
14 | "build/Microsoft.NETFramework.ReferenceAssemblies.net45.targets": {} | |
|
15 | } | |
|
16 | }, | |
|
17 | 5 | "FNA/1.0.0": { |
|
18 | 6 | "type": "project", |
|
19 | "framework": ".NETFramework,Version=v4.0", | |
|
20 | "compile": { | |
|
21 | "bin/placeholder/FNA.dll": {} | |
|
22 | }, | |
|
23 | "runtime": { | |
|
24 | "bin/placeholder/FNA.dll": {} | |
|
25 | } | |
|
26 | } | |
|
27 | }, | |
|
28 | ".NETStandard,Version=v2.0": { | |
|
29 | "Microsoft.NETCore.Platforms/1.1.0": { | |
|
30 | "type": "package", | |
|
31 | "compile": { | |
|
32 | "lib/netstandard1.0/_._": {} | |
|
33 | }, | |
|
34 | "runtime": { | |
|
35 | "lib/netstandard1.0/_._": {} | |
|
36 | } | |
|
37 | }, | |
|
38 | "NETStandard.Library/2.0.3": { | |
|
39 | "type": "package", | |
|
40 | "dependencies": { | |
|
41 | "Microsoft.NETCore.Platforms": "1.1.0" | |
|
42 | }, | |
|
43 | "compile": { | |
|
44 | "lib/netstandard1.0/_._": {} | |
|
45 | }, | |
|
46 | "runtime": { | |
|
47 | "lib/netstandard1.0/_._": {} | |
|
48 | }, | |
|
49 | "build": { | |
|
50 | "build/netstandard2.0/NETStandard.Library.targets": {} | |
|
51 | } | |
|
52 | }, | |
|
53 | "FNA/1.0.0": { | |
|
54 | "type": "project", | |
|
55 | "framework": ".NETStandard,Version=v2.0", | |
|
56 | 7 | "compile": { |
|
57 | 8 | "bin/placeholder/FNA.dll": {} |
|
58 | 9 | }, |
@@ -63,493 +14,15 | |||
|
63 | 14 | } |
|
64 | 15 | }, |
|
65 | 16 | "libraries": { |
|
66 | "Microsoft.NETCore.Platforms/1.1.0": { | |
|
67 | "sha512": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==", | |
|
68 | "type": "package", | |
|
69 | "path": "microsoft.netcore.platforms/1.1.0", | |
|
70 | "files": [ | |
|
71 | ".nupkg.metadata", | |
|
72 | ".signature.p7s", | |
|
73 | "ThirdPartyNotices.txt", | |
|
74 | "dotnet_library_license.txt", | |
|
75 | "lib/netstandard1.0/_._", | |
|
76 | "microsoft.netcore.platforms.1.1.0.nupkg.sha512", | |
|
77 | "microsoft.netcore.platforms.nuspec", | |
|
78 | "runtime.json" | |
|
79 | ] | |
|
80 | }, | |
|
81 | "Microsoft.NETFramework.ReferenceAssemblies/1.0.0": { | |
|
82 | "sha512": "7D2TMufjGiowmt0E941kVoTIS+GTNzaPopuzM1/1LSaJAdJdBrVP0SkZW7AgDd0a2U1DjsIeaKG1wxGVBNLDMw==", | |
|
83 | "type": "package", | |
|
84 | "path": "microsoft.netframework.referenceassemblies/1.0.0", | |
|
85 | "files": [ | |
|
86 | ".nupkg.metadata", | |
|
87 | ".signature.p7s", | |
|
88 | "microsoft.netframework.referenceassemblies.1.0.0.nupkg.sha512", | |
|
89 | "microsoft.netframework.referenceassemblies.nuspec" | |
|
90 | ] | |
|
91 | }, | |
|
92 | "Microsoft.NETFramework.ReferenceAssemblies.net45/1.0.0": { | |
|
93 | "sha512": "f7XMQsZFaoc3w8Vg3VQ3FHuU2C9vf0Ng5EAV4gzdNWDerPM/OmrzccLj15eI1wCLLXj4jk8+lKsbonzJeyXgQQ==", | |
|
94 | "type": "package", | |
|
95 | "path": "microsoft.netframework.referenceassemblies.net45/1.0.0", | |
|
96 | "files": [ | |
|
97 | ".nupkg.metadata", | |
|
98 | ".signature.p7s", | |
|
99 | "build/.NETFramework/v4.5/Accessibility.dll", | |
|
100 | "build/.NETFramework/v4.5/Accessibility.xml", | |
|
101 | "build/.NETFramework/v4.5/CustomMarshalers.dll", | |
|
102 | "build/.NETFramework/v4.5/CustomMarshalers.xml", | |
|
103 | "build/.NETFramework/v4.5/Facades/System.Collections.Concurrent.dll", | |
|
104 | "build/.NETFramework/v4.5/Facades/System.Collections.dll", | |
|
105 | "build/.NETFramework/v4.5/Facades/System.ComponentModel.Annotations.dll", | |
|
106 | "build/.NETFramework/v4.5/Facades/System.ComponentModel.EventBasedAsync.dll", | |
|
107 | "build/.NETFramework/v4.5/Facades/System.ComponentModel.dll", | |
|
108 | "build/.NETFramework/v4.5/Facades/System.Diagnostics.Contracts.dll", | |
|
109 | "build/.NETFramework/v4.5/Facades/System.Diagnostics.Debug.dll", | |
|
110 | "build/.NETFramework/v4.5/Facades/System.Diagnostics.Tools.dll", | |
|
111 | "build/.NETFramework/v4.5/Facades/System.Diagnostics.Tracing.dll", | |
|
112 | "build/.NETFramework/v4.5/Facades/System.Dynamic.Runtime.dll", | |
|
113 | "build/.NETFramework/v4.5/Facades/System.Globalization.dll", | |
|
114 | "build/.NETFramework/v4.5/Facades/System.IO.dll", | |
|
115 | "build/.NETFramework/v4.5/Facades/System.Linq.Expressions.dll", | |
|
116 | "build/.NETFramework/v4.5/Facades/System.Linq.Parallel.dll", | |
|
117 | "build/.NETFramework/v4.5/Facades/System.Linq.Queryable.dll", | |
|
118 | "build/.NETFramework/v4.5/Facades/System.Linq.dll", | |
|
119 | "build/.NETFramework/v4.5/Facades/System.Net.NetworkInformation.dll", | |
|
120 | "build/.NETFramework/v4.5/Facades/System.Net.Primitives.dll", | |
|
121 | "build/.NETFramework/v4.5/Facades/System.Net.Requests.dll", | |
|
122 | "build/.NETFramework/v4.5/Facades/System.ObjectModel.dll", | |
|
123 | "build/.NETFramework/v4.5/Facades/System.Reflection.Emit.ILGeneration.dll", | |
|
124 | "build/.NETFramework/v4.5/Facades/System.Reflection.Emit.Lightweight.dll", | |
|
125 | "build/.NETFramework/v4.5/Facades/System.Reflection.Emit.dll", | |
|
126 | "build/.NETFramework/v4.5/Facades/System.Reflection.Extensions.dll", | |
|
127 | "build/.NETFramework/v4.5/Facades/System.Reflection.Primitives.dll", | |
|
128 | "build/.NETFramework/v4.5/Facades/System.Reflection.dll", | |
|
129 | "build/.NETFramework/v4.5/Facades/System.Resources.ResourceManager.dll", | |
|
130 | "build/.NETFramework/v4.5/Facades/System.Runtime.Extensions.dll", | |
|
131 | "build/.NETFramework/v4.5/Facades/System.Runtime.InteropServices.WindowsRuntime.dll", | |
|
132 | "build/.NETFramework/v4.5/Facades/System.Runtime.InteropServices.dll", | |
|
133 | "build/.NETFramework/v4.5/Facades/System.Runtime.Numerics.dll", | |
|
134 | "build/.NETFramework/v4.5/Facades/System.Runtime.Serialization.Json.dll", | |
|
135 | "build/.NETFramework/v4.5/Facades/System.Runtime.Serialization.Primitives.dll", | |
|
136 | "build/.NETFramework/v4.5/Facades/System.Runtime.Serialization.Xml.dll", | |
|
137 | "build/.NETFramework/v4.5/Facades/System.Runtime.dll", | |
|
138 | "build/.NETFramework/v4.5/Facades/System.Security.Principal.dll", | |
|
139 | "build/.NETFramework/v4.5/Facades/System.ServiceModel.Duplex.dll", | |
|
140 | "build/.NETFramework/v4.5/Facades/System.ServiceModel.Http.dll", | |
|
141 | "build/.NETFramework/v4.5/Facades/System.ServiceModel.NetTcp.dll", | |
|
142 | "build/.NETFramework/v4.5/Facades/System.ServiceModel.Primitives.dll", | |
|
143 | "build/.NETFramework/v4.5/Facades/System.ServiceModel.Security.dll", | |
|
144 | "build/.NETFramework/v4.5/Facades/System.Text.Encoding.Extensions.dll", | |
|
145 | "build/.NETFramework/v4.5/Facades/System.Text.Encoding.dll", | |
|
146 | "build/.NETFramework/v4.5/Facades/System.Text.RegularExpressions.dll", | |
|
147 | "build/.NETFramework/v4.5/Facades/System.Threading.Tasks.Parallel.dll", | |
|
148 | "build/.NETFramework/v4.5/Facades/System.Threading.Tasks.dll", | |
|
149 | "build/.NETFramework/v4.5/Facades/System.Threading.dll", | |
|
150 | "build/.NETFramework/v4.5/Facades/System.Xml.ReaderWriter.dll", | |
|
151 | "build/.NETFramework/v4.5/Facades/System.Xml.XDocument.dll", | |
|
152 | "build/.NETFramework/v4.5/Facades/System.Xml.XmlSerializer.dll", | |
|
153 | "build/.NETFramework/v4.5/ISymWrapper.dll", | |
|
154 | "build/.NETFramework/v4.5/ISymWrapper.xml", | |
|
155 | "build/.NETFramework/v4.5/Microsoft.Activities.Build.dll", | |
|
156 | "build/.NETFramework/v4.5/Microsoft.Activities.Build.xml", | |
|
157 | "build/.NETFramework/v4.5/Microsoft.Build.Conversion.v4.0.dll", | |
|
158 | "build/.NETFramework/v4.5/Microsoft.Build.Conversion.v4.0.xml", | |
|
159 | "build/.NETFramework/v4.5/Microsoft.Build.Engine.dll", | |
|
160 | "build/.NETFramework/v4.5/Microsoft.Build.Engine.xml", | |
|
161 | "build/.NETFramework/v4.5/Microsoft.Build.Framework.dll", | |
|
162 | "build/.NETFramework/v4.5/Microsoft.Build.Framework.xml", | |
|
163 | "build/.NETFramework/v4.5/Microsoft.Build.Tasks.v4.0.dll", | |
|
164 | "build/.NETFramework/v4.5/Microsoft.Build.Tasks.v4.0.xml", | |
|
165 | "build/.NETFramework/v4.5/Microsoft.Build.Utilities.v4.0.dll", | |
|
166 | "build/.NETFramework/v4.5/Microsoft.Build.Utilities.v4.0.xml", | |
|
167 | "build/.NETFramework/v4.5/Microsoft.Build.dll", | |
|
168 | "build/.NETFramework/v4.5/Microsoft.Build.xml", | |
|
169 | "build/.NETFramework/v4.5/Microsoft.CSharp.dll", | |
|
170 | "build/.NETFramework/v4.5/Microsoft.CSharp.xml", | |
|
171 | "build/.NETFramework/v4.5/Microsoft.JScript.dll", | |
|
172 | "build/.NETFramework/v4.5/Microsoft.JScript.xml", | |
|
173 | "build/.NETFramework/v4.5/Microsoft.VisualBasic.Compatibility.Data.dll", | |
|
174 | "build/.NETFramework/v4.5/Microsoft.VisualBasic.Compatibility.Data.xml", | |
|
175 | "build/.NETFramework/v4.5/Microsoft.VisualBasic.Compatibility.dll", | |
|
176 | "build/.NETFramework/v4.5/Microsoft.VisualBasic.Compatibility.xml", | |
|
177 | "build/.NETFramework/v4.5/Microsoft.VisualBasic.dll", | |
|
178 | "build/.NETFramework/v4.5/Microsoft.VisualBasic.xml", | |
|
179 | "build/.NETFramework/v4.5/Microsoft.VisualC.STLCLR.dll", | |
|
180 | "build/.NETFramework/v4.5/Microsoft.VisualC.STLCLR.xml", | |
|
181 | "build/.NETFramework/v4.5/Microsoft.VisualC.dll", | |
|
182 | "build/.NETFramework/v4.5/Microsoft.VisualC.xml", | |
|
183 | "build/.NETFramework/v4.5/PermissionSets/FullTrust.xml", | |
|
184 | "build/.NETFramework/v4.5/PermissionSets/Internet.xml", | |
|
185 | "build/.NETFramework/v4.5/PermissionSets/LocalIntranet.xml", | |
|
186 | "build/.NETFramework/v4.5/PresentationBuildTasks.dll", | |
|
187 | "build/.NETFramework/v4.5/PresentationBuildTasks.xml", | |
|
188 | "build/.NETFramework/v4.5/PresentationCore.dll", | |
|
189 | "build/.NETFramework/v4.5/PresentationCore.xml", | |
|
190 | "build/.NETFramework/v4.5/PresentationFramework.Aero.dll", | |
|
191 | "build/.NETFramework/v4.5/PresentationFramework.Aero.xml", | |
|
192 | "build/.NETFramework/v4.5/PresentationFramework.Aero2.dll", | |
|
193 | "build/.NETFramework/v4.5/PresentationFramework.AeroLite.dll", | |
|
194 | "build/.NETFramework/v4.5/PresentationFramework.Classic.dll", | |
|
195 | "build/.NETFramework/v4.5/PresentationFramework.Classic.xml", | |
|
196 | "build/.NETFramework/v4.5/PresentationFramework.Luna.dll", | |
|
197 | "build/.NETFramework/v4.5/PresentationFramework.Luna.xml", | |
|
198 | "build/.NETFramework/v4.5/PresentationFramework.Royale.dll", | |
|
199 | "build/.NETFramework/v4.5/PresentationFramework.Royale.xml", | |
|
200 | "build/.NETFramework/v4.5/PresentationFramework.dll", | |
|
201 | "build/.NETFramework/v4.5/PresentationFramework.xml", | |
|
202 | "build/.NETFramework/v4.5/ReachFramework.dll", | |
|
203 | "build/.NETFramework/v4.5/ReachFramework.xml", | |
|
204 | "build/.NETFramework/v4.5/RedistList/FrameworkList.xml", | |
|
205 | "build/.NETFramework/v4.5/System.Activities.Core.Presentation.dll", | |
|
206 | "build/.NETFramework/v4.5/System.Activities.Core.Presentation.xml", | |
|
207 | "build/.NETFramework/v4.5/System.Activities.DurableInstancing.dll", | |
|
208 | "build/.NETFramework/v4.5/System.Activities.DurableInstancing.xml", | |
|
209 | "build/.NETFramework/v4.5/System.Activities.Presentation.dll", | |
|
210 | "build/.NETFramework/v4.5/System.Activities.Presentation.xml", | |
|
211 | "build/.NETFramework/v4.5/System.Activities.dll", | |
|
212 | "build/.NETFramework/v4.5/System.Activities.xml", | |
|
213 | "build/.NETFramework/v4.5/System.AddIn.Contract.dll", | |
|
214 | "build/.NETFramework/v4.5/System.AddIn.Contract.xml", | |
|
215 | "build/.NETFramework/v4.5/System.AddIn.dll", | |
|
216 | "build/.NETFramework/v4.5/System.AddIn.xml", | |
|
217 | "build/.NETFramework/v4.5/System.ComponentModel.Composition.Registration.dll", | |
|
218 | "build/.NETFramework/v4.5/System.ComponentModel.Composition.dll", | |
|
219 | "build/.NETFramework/v4.5/System.ComponentModel.Composition.xml", | |
|
220 | "build/.NETFramework/v4.5/System.ComponentModel.DataAnnotations.dll", | |
|
221 | "build/.NETFramework/v4.5/System.ComponentModel.DataAnnotations.xml", | |
|
222 | "build/.NETFramework/v4.5/System.Configuration.Install.dll", | |
|
223 | "build/.NETFramework/v4.5/System.Configuration.Install.xml", | |
|
224 | "build/.NETFramework/v4.5/System.Configuration.dll", | |
|
225 | "build/.NETFramework/v4.5/System.Configuration.xml", | |
|
226 | "build/.NETFramework/v4.5/System.Core.dll", | |
|
227 | "build/.NETFramework/v4.5/System.Core.xml", | |
|
228 | "build/.NETFramework/v4.5/System.Data.DataSetExtensions.dll", | |
|
229 | "build/.NETFramework/v4.5/System.Data.DataSetExtensions.xml", | |
|
230 | "build/.NETFramework/v4.5/System.Data.Entity.Design.dll", | |
|
231 | "build/.NETFramework/v4.5/System.Data.Entity.Design.xml", | |
|
232 | "build/.NETFramework/v4.5/System.Data.Entity.dll", | |
|
233 | "build/.NETFramework/v4.5/System.Data.Entity.xml", | |
|
234 | "build/.NETFramework/v4.5/System.Data.Linq.dll", | |
|
235 | "build/.NETFramework/v4.5/System.Data.Linq.xml", | |
|
236 | "build/.NETFramework/v4.5/System.Data.OracleClient.dll", | |
|
237 | "build/.NETFramework/v4.5/System.Data.OracleClient.xml", | |
|
238 | "build/.NETFramework/v4.5/System.Data.Services.Client.dll", | |
|
239 | "build/.NETFramework/v4.5/System.Data.Services.Client.xml", | |
|
240 | "build/.NETFramework/v4.5/System.Data.Services.Design.dll", | |
|
241 | "build/.NETFramework/v4.5/System.Data.Services.Design.xml", | |
|
242 | "build/.NETFramework/v4.5/System.Data.Services.dll", | |
|
243 | "build/.NETFramework/v4.5/System.Data.Services.xml", | |
|
244 | "build/.NETFramework/v4.5/System.Data.SqlXml.dll", | |
|
245 | "build/.NETFramework/v4.5/System.Data.SqlXml.xml", | |
|
246 | "build/.NETFramework/v4.5/System.Data.dll", | |
|
247 | "build/.NETFramework/v4.5/System.Data.xml", | |
|
248 | "build/.NETFramework/v4.5/System.Deployment.dll", | |
|
249 | "build/.NETFramework/v4.5/System.Deployment.xml", | |
|
250 | "build/.NETFramework/v4.5/System.Design.dll", | |
|
251 | "build/.NETFramework/v4.5/System.Design.xml", | |
|
252 | "build/.NETFramework/v4.5/System.Device.dll", | |
|
253 | "build/.NETFramework/v4.5/System.Device.xml", | |
|
254 | "build/.NETFramework/v4.5/System.DirectoryServices.AccountManagement.dll", | |
|
255 | "build/.NETFramework/v4.5/System.DirectoryServices.AccountManagement.xml", | |
|
256 | "build/.NETFramework/v4.5/System.DirectoryServices.Protocols.dll", | |
|
257 | "build/.NETFramework/v4.5/System.DirectoryServices.Protocols.xml", | |
|
258 | "build/.NETFramework/v4.5/System.DirectoryServices.dll", | |
|
259 | "build/.NETFramework/v4.5/System.DirectoryServices.xml", | |
|
260 | "build/.NETFramework/v4.5/System.Drawing.Design.dll", | |
|
261 | "build/.NETFramework/v4.5/System.Drawing.Design.xml", | |
|
262 | "build/.NETFramework/v4.5/System.Drawing.dll", | |
|
263 | "build/.NETFramework/v4.5/System.Drawing.xml", | |
|
264 | "build/.NETFramework/v4.5/System.EnterpriseServices.Thunk.dll", | |
|
265 | "build/.NETFramework/v4.5/System.EnterpriseServices.Wrapper.dll", | |
|
266 | "build/.NETFramework/v4.5/System.EnterpriseServices.dll", | |
|
267 | "build/.NETFramework/v4.5/System.EnterpriseServices.xml", | |
|
268 | "build/.NETFramework/v4.5/System.IO.Compression.FileSystem.dll", | |
|
269 | "build/.NETFramework/v4.5/System.IO.Compression.FileSystem.xml", | |
|
270 | "build/.NETFramework/v4.5/System.IO.Compression.dll", | |
|
271 | "build/.NETFramework/v4.5/System.IO.Compression.xml", | |
|
272 | "build/.NETFramework/v4.5/System.IO.Log.dll", | |
|
273 | "build/.NETFramework/v4.5/System.IO.Log.xml", | |
|
274 | "build/.NETFramework/v4.5/System.IdentityModel.Selectors.dll", | |
|
275 | "build/.NETFramework/v4.5/System.IdentityModel.Selectors.xml", | |
|
276 | "build/.NETFramework/v4.5/System.IdentityModel.Services.dll", | |
|
277 | "build/.NETFramework/v4.5/System.IdentityModel.Services.xml", | |
|
278 | "build/.NETFramework/v4.5/System.IdentityModel.dll", | |
|
279 | "build/.NETFramework/v4.5/System.IdentityModel.xml", | |
|
280 | "build/.NETFramework/v4.5/System.Management.Instrumentation.dll", | |
|
281 | "build/.NETFramework/v4.5/System.Management.Instrumentation.xml", | |
|
282 | "build/.NETFramework/v4.5/System.Management.dll", | |
|
283 | "build/.NETFramework/v4.5/System.Management.xml", | |
|
284 | "build/.NETFramework/v4.5/System.Messaging.dll", | |
|
285 | "build/.NETFramework/v4.5/System.Messaging.xml", | |
|
286 | "build/.NETFramework/v4.5/System.Net.Http.WebRequest.dll", | |
|
287 | "build/.NETFramework/v4.5/System.Net.Http.WebRequest.xml", | |
|
288 | "build/.NETFramework/v4.5/System.Net.Http.dll", | |
|
289 | "build/.NETFramework/v4.5/System.Net.Http.xml", | |
|
290 | "build/.NETFramework/v4.5/System.Net.dll", | |
|
291 | "build/.NETFramework/v4.5/System.Net.xml", | |
|
292 | "build/.NETFramework/v4.5/System.Numerics.dll", | |
|
293 | "build/.NETFramework/v4.5/System.Numerics.xml", | |
|
294 | "build/.NETFramework/v4.5/System.Printing.dll", | |
|
295 | "build/.NETFramework/v4.5/System.Printing.xml", | |
|
296 | "build/.NETFramework/v4.5/System.Reflection.Context.dll", | |
|
297 | "build/.NETFramework/v4.5/System.Reflection.Context.xml", | |
|
298 | "build/.NETFramework/v4.5/System.Runtime.Caching.dll", | |
|
299 | "build/.NETFramework/v4.5/System.Runtime.Caching.xml", | |
|
300 | "build/.NETFramework/v4.5/System.Runtime.DurableInstancing.dll", | |
|
301 | "build/.NETFramework/v4.5/System.Runtime.DurableInstancing.xml", | |
|
302 | "build/.NETFramework/v4.5/System.Runtime.Remoting.dll", | |
|
303 | "build/.NETFramework/v4.5/System.Runtime.Remoting.xml", | |
|
304 | "build/.NETFramework/v4.5/System.Runtime.Serialization.Formatters.Soap.dll", | |
|
305 | "build/.NETFramework/v4.5/System.Runtime.Serialization.Formatters.Soap.xml", | |
|
306 | "build/.NETFramework/v4.5/System.Runtime.Serialization.dll", | |
|
307 | "build/.NETFramework/v4.5/System.Runtime.Serialization.xml", | |
|
308 | "build/.NETFramework/v4.5/System.Security.dll", | |
|
309 | "build/.NETFramework/v4.5/System.Security.xml", | |
|
310 | "build/.NETFramework/v4.5/System.ServiceModel.Activation.dll", | |
|
311 | "build/.NETFramework/v4.5/System.ServiceModel.Activation.xml", | |
|
312 | "build/.NETFramework/v4.5/System.ServiceModel.Activities.dll", | |
|
313 | "build/.NETFramework/v4.5/System.ServiceModel.Activities.xml", | |
|
314 | "build/.NETFramework/v4.5/System.ServiceModel.Channels.dll", | |
|
315 | "build/.NETFramework/v4.5/System.ServiceModel.Channels.xml", | |
|
316 | "build/.NETFramework/v4.5/System.ServiceModel.Discovery.dll", | |
|
317 | "build/.NETFramework/v4.5/System.ServiceModel.Discovery.xml", | |
|
318 | "build/.NETFramework/v4.5/System.ServiceModel.Routing.dll", | |
|
319 | "build/.NETFramework/v4.5/System.ServiceModel.Routing.xml", | |
|
320 | "build/.NETFramework/v4.5/System.ServiceModel.Web.dll", | |
|
321 | "build/.NETFramework/v4.5/System.ServiceModel.Web.xml", | |
|
322 | "build/.NETFramework/v4.5/System.ServiceModel.dll", | |
|
323 | "build/.NETFramework/v4.5/System.ServiceModel.xml", | |
|
324 | "build/.NETFramework/v4.5/System.ServiceProcess.dll", | |
|
325 | "build/.NETFramework/v4.5/System.ServiceProcess.xml", | |
|
326 | "build/.NETFramework/v4.5/System.Speech.dll", | |
|
327 | "build/.NETFramework/v4.5/System.Speech.xml", | |
|
328 | "build/.NETFramework/v4.5/System.Threading.Tasks.Dataflow.xml", | |
|
329 | "build/.NETFramework/v4.5/System.Transactions.dll", | |
|
330 | "build/.NETFramework/v4.5/System.Transactions.xml", | |
|
331 | "build/.NETFramework/v4.5/System.Web.Abstractions.dll", | |
|
332 | "build/.NETFramework/v4.5/System.Web.ApplicationServices.dll", | |
|
333 | "build/.NETFramework/v4.5/System.Web.ApplicationServices.xml", | |
|
334 | "build/.NETFramework/v4.5/System.Web.DataVisualization.Design.dll", | |
|
335 | "build/.NETFramework/v4.5/System.Web.DataVisualization.dll", | |
|
336 | "build/.NETFramework/v4.5/System.Web.DataVisualization.xml", | |
|
337 | "build/.NETFramework/v4.5/System.Web.DynamicData.Design.dll", | |
|
338 | "build/.NETFramework/v4.5/System.Web.DynamicData.Design.xml", | |
|
339 | "build/.NETFramework/v4.5/System.Web.DynamicData.dll", | |
|
340 | "build/.NETFramework/v4.5/System.Web.DynamicData.xml", | |
|
341 | "build/.NETFramework/v4.5/System.Web.Entity.Design.dll", | |
|
342 | "build/.NETFramework/v4.5/System.Web.Entity.Design.xml", | |
|
343 | "build/.NETFramework/v4.5/System.Web.Entity.dll", | |
|
344 | "build/.NETFramework/v4.5/System.Web.Entity.xml", | |
|
345 | "build/.NETFramework/v4.5/System.Web.Extensions.Design.dll", | |
|
346 | "build/.NETFramework/v4.5/System.Web.Extensions.Design.xml", | |
|
347 | "build/.NETFramework/v4.5/System.Web.Extensions.dll", | |
|
348 | "build/.NETFramework/v4.5/System.Web.Extensions.xml", | |
|
349 | "build/.NETFramework/v4.5/System.Web.Mobile.dll", | |
|
350 | "build/.NETFramework/v4.5/System.Web.Mobile.xml", | |
|
351 | "build/.NETFramework/v4.5/System.Web.RegularExpressions.dll", | |
|
352 | "build/.NETFramework/v4.5/System.Web.RegularExpressions.xml", | |
|
353 | "build/.NETFramework/v4.5/System.Web.Routing.dll", | |
|
354 | "build/.NETFramework/v4.5/System.Web.Services.dll", | |
|
355 | "build/.NETFramework/v4.5/System.Web.Services.xml", | |
|
356 | "build/.NETFramework/v4.5/System.Web.dll", | |
|
357 | "build/.NETFramework/v4.5/System.Web.xml", | |
|
358 | "build/.NETFramework/v4.5/System.Windows.Controls.Ribbon.dll", | |
|
359 | "build/.NETFramework/v4.5/System.Windows.Controls.Ribbon.xml", | |
|
360 | "build/.NETFramework/v4.5/System.Windows.Forms.DataVisualization.Design.dll", | |
|
361 | "build/.NETFramework/v4.5/System.Windows.Forms.DataVisualization.dll", | |
|
362 | "build/.NETFramework/v4.5/System.Windows.Forms.DataVisualization.xml", | |
|
363 | "build/.NETFramework/v4.5/System.Windows.Forms.dll", | |
|
364 | "build/.NETFramework/v4.5/System.Windows.Forms.xml", | |
|
365 | "build/.NETFramework/v4.5/System.Windows.Input.Manipulations.dll", | |
|
366 | "build/.NETFramework/v4.5/System.Windows.Input.Manipulations.xml", | |
|
367 | "build/.NETFramework/v4.5/System.Windows.Presentation.dll", | |
|
368 | "build/.NETFramework/v4.5/System.Windows.Presentation.xml", | |
|
369 | "build/.NETFramework/v4.5/System.Windows.dll", | |
|
370 | "build/.NETFramework/v4.5/System.Workflow.Activities.dll", | |
|
371 | "build/.NETFramework/v4.5/System.Workflow.Activities.xml", | |
|
372 | "build/.NETFramework/v4.5/System.Workflow.ComponentModel.dll", | |
|
373 | "build/.NETFramework/v4.5/System.Workflow.ComponentModel.xml", | |
|
374 | "build/.NETFramework/v4.5/System.Workflow.Runtime.dll", | |
|
375 | "build/.NETFramework/v4.5/System.Workflow.Runtime.xml", | |
|
376 | "build/.NETFramework/v4.5/System.WorkflowServices.dll", | |
|
377 | "build/.NETFramework/v4.5/System.WorkflowServices.xml", | |
|
378 | "build/.NETFramework/v4.5/System.Xaml.dll", | |
|
379 | "build/.NETFramework/v4.5/System.Xaml.xml", | |
|
380 | "build/.NETFramework/v4.5/System.Xml.Linq.dll", | |
|
381 | "build/.NETFramework/v4.5/System.Xml.Linq.xml", | |
|
382 | "build/.NETFramework/v4.5/System.Xml.Serialization.dll", | |
|
383 | "build/.NETFramework/v4.5/System.Xml.dll", | |
|
384 | "build/.NETFramework/v4.5/System.Xml.xml", | |
|
385 | "build/.NETFramework/v4.5/System.dll", | |
|
386 | "build/.NETFramework/v4.5/System.xml", | |
|
387 | "build/.NETFramework/v4.5/UIAutomationClient.dll", | |
|
388 | "build/.NETFramework/v4.5/UIAutomationClient.xml", | |
|
389 | "build/.NETFramework/v4.5/UIAutomationClientsideProviders.dll", | |
|
390 | "build/.NETFramework/v4.5/UIAutomationClientsideProviders.xml", | |
|
391 | "build/.NETFramework/v4.5/UIAutomationProvider.dll", | |
|
392 | "build/.NETFramework/v4.5/UIAutomationProvider.xml", | |
|
393 | "build/.NETFramework/v4.5/UIAutomationTypes.dll", | |
|
394 | "build/.NETFramework/v4.5/UIAutomationTypes.xml", | |
|
395 | "build/.NETFramework/v4.5/WindowsBase.dll", | |
|
396 | "build/.NETFramework/v4.5/WindowsBase.xml", | |
|
397 | "build/.NETFramework/v4.5/WindowsFormsIntegration.dll", | |
|
398 | "build/.NETFramework/v4.5/WindowsFormsIntegration.xml", | |
|
399 | "build/.NETFramework/v4.5/XamlBuildTask.dll", | |
|
400 | "build/.NETFramework/v4.5/XamlBuildTask.xml", | |
|
401 | "build/.NETFramework/v4.5/mscorlib.dll", | |
|
402 | "build/.NETFramework/v4.5/mscorlib.xml", | |
|
403 | "build/.NETFramework/v4.5/sysglobl.dll", | |
|
404 | "build/.NETFramework/v4.5/sysglobl.xml", | |
|
405 | "build/Microsoft.NETFramework.ReferenceAssemblies.net45.targets", | |
|
406 | "microsoft.netframework.referenceassemblies.net45.1.0.0.nupkg.sha512", | |
|
407 | "microsoft.netframework.referenceassemblies.net45.nuspec" | |
|
408 | ] | |
|
409 | }, | |
|
410 | "NETStandard.Library/2.0.3": { | |
|
411 | "sha512": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", | |
|
412 | "type": "package", | |
|
413 | "path": "netstandard.library/2.0.3", | |
|
414 | "files": [ | |
|
415 | ".nupkg.metadata", | |
|
416 | ".signature.p7s", | |
|
417 | "LICENSE.TXT", | |
|
418 | "THIRD-PARTY-NOTICES.TXT", | |
|
419 | "build/netstandard2.0/NETStandard.Library.targets", | |
|
420 | "build/netstandard2.0/ref/Microsoft.Win32.Primitives.dll", | |
|
421 | "build/netstandard2.0/ref/System.AppContext.dll", | |
|
422 | "build/netstandard2.0/ref/System.Collections.Concurrent.dll", | |
|
423 | "build/netstandard2.0/ref/System.Collections.NonGeneric.dll", | |
|
424 | "build/netstandard2.0/ref/System.Collections.Specialized.dll", | |
|
425 | "build/netstandard2.0/ref/System.Collections.dll", | |
|
426 | "build/netstandard2.0/ref/System.ComponentModel.Composition.dll", | |
|
427 | "build/netstandard2.0/ref/System.ComponentModel.EventBasedAsync.dll", | |
|
428 | "build/netstandard2.0/ref/System.ComponentModel.Primitives.dll", | |
|
429 | "build/netstandard2.0/ref/System.ComponentModel.TypeConverter.dll", | |
|
430 | "build/netstandard2.0/ref/System.ComponentModel.dll", | |
|
431 | "build/netstandard2.0/ref/System.Console.dll", | |
|
432 | "build/netstandard2.0/ref/System.Core.dll", | |
|
433 | "build/netstandard2.0/ref/System.Data.Common.dll", | |
|
434 | "build/netstandard2.0/ref/System.Data.dll", | |
|
435 | "build/netstandard2.0/ref/System.Diagnostics.Contracts.dll", | |
|
436 | "build/netstandard2.0/ref/System.Diagnostics.Debug.dll", | |
|
437 | "build/netstandard2.0/ref/System.Diagnostics.FileVersionInfo.dll", | |
|
438 | "build/netstandard2.0/ref/System.Diagnostics.Process.dll", | |
|
439 | "build/netstandard2.0/ref/System.Diagnostics.StackTrace.dll", | |
|
440 | "build/netstandard2.0/ref/System.Diagnostics.TextWriterTraceListener.dll", | |
|
441 | "build/netstandard2.0/ref/System.Diagnostics.Tools.dll", | |
|
442 | "build/netstandard2.0/ref/System.Diagnostics.TraceSource.dll", | |
|
443 | "build/netstandard2.0/ref/System.Diagnostics.Tracing.dll", | |
|
444 | "build/netstandard2.0/ref/System.Drawing.Primitives.dll", | |
|
445 | "build/netstandard2.0/ref/System.Drawing.dll", | |
|
446 | "build/netstandard2.0/ref/System.Dynamic.Runtime.dll", | |
|
447 | "build/netstandard2.0/ref/System.Globalization.Calendars.dll", | |
|
448 | "build/netstandard2.0/ref/System.Globalization.Extensions.dll", | |
|
449 | "build/netstandard2.0/ref/System.Globalization.dll", | |
|
450 | "build/netstandard2.0/ref/System.IO.Compression.FileSystem.dll", | |
|
451 | "build/netstandard2.0/ref/System.IO.Compression.ZipFile.dll", | |
|
452 | "build/netstandard2.0/ref/System.IO.Compression.dll", | |
|
453 | "build/netstandard2.0/ref/System.IO.FileSystem.DriveInfo.dll", | |
|
454 | "build/netstandard2.0/ref/System.IO.FileSystem.Primitives.dll", | |
|
455 | "build/netstandard2.0/ref/System.IO.FileSystem.Watcher.dll", | |
|
456 | "build/netstandard2.0/ref/System.IO.FileSystem.dll", | |
|
457 | "build/netstandard2.0/ref/System.IO.IsolatedStorage.dll", | |
|
458 | "build/netstandard2.0/ref/System.IO.MemoryMappedFiles.dll", | |
|
459 | "build/netstandard2.0/ref/System.IO.Pipes.dll", | |
|
460 | "build/netstandard2.0/ref/System.IO.UnmanagedMemoryStream.dll", | |
|
461 | "build/netstandard2.0/ref/System.IO.dll", | |
|
462 | "build/netstandard2.0/ref/System.Linq.Expressions.dll", | |
|
463 | "build/netstandard2.0/ref/System.Linq.Parallel.dll", | |
|
464 | "build/netstandard2.0/ref/System.Linq.Queryable.dll", | |
|
465 | "build/netstandard2.0/ref/System.Linq.dll", | |
|
466 | "build/netstandard2.0/ref/System.Net.Http.dll", | |
|
467 | "build/netstandard2.0/ref/System.Net.NameResolution.dll", | |
|
468 | "build/netstandard2.0/ref/System.Net.NetworkInformation.dll", | |
|
469 | "build/netstandard2.0/ref/System.Net.Ping.dll", | |
|
470 | "build/netstandard2.0/ref/System.Net.Primitives.dll", | |
|
471 | "build/netstandard2.0/ref/System.Net.Requests.dll", | |
|
472 | "build/netstandard2.0/ref/System.Net.Security.dll", | |
|
473 | "build/netstandard2.0/ref/System.Net.Sockets.dll", | |
|
474 | "build/netstandard2.0/ref/System.Net.WebHeaderCollection.dll", | |
|
475 | "build/netstandard2.0/ref/System.Net.WebSockets.Client.dll", | |
|
476 | "build/netstandard2.0/ref/System.Net.WebSockets.dll", | |
|
477 | "build/netstandard2.0/ref/System.Net.dll", | |
|
478 | "build/netstandard2.0/ref/System.Numerics.dll", | |
|
479 | "build/netstandard2.0/ref/System.ObjectModel.dll", | |
|
480 | "build/netstandard2.0/ref/System.Reflection.Extensions.dll", | |
|
481 | "build/netstandard2.0/ref/System.Reflection.Primitives.dll", | |
|
482 | "build/netstandard2.0/ref/System.Reflection.dll", | |
|
483 | "build/netstandard2.0/ref/System.Resources.Reader.dll", | |
|
484 | "build/netstandard2.0/ref/System.Resources.ResourceManager.dll", | |
|
485 | "build/netstandard2.0/ref/System.Resources.Writer.dll", | |
|
486 | "build/netstandard2.0/ref/System.Runtime.CompilerServices.VisualC.dll", | |
|
487 | "build/netstandard2.0/ref/System.Runtime.Extensions.dll", | |
|
488 | "build/netstandard2.0/ref/System.Runtime.Handles.dll", | |
|
489 | "build/netstandard2.0/ref/System.Runtime.InteropServices.RuntimeInformation.dll", | |
|
490 | "build/netstandard2.0/ref/System.Runtime.InteropServices.dll", | |
|
491 | "build/netstandard2.0/ref/System.Runtime.Numerics.dll", | |
|
492 | "build/netstandard2.0/ref/System.Runtime.Serialization.Formatters.dll", | |
|
493 | "build/netstandard2.0/ref/System.Runtime.Serialization.Json.dll", | |
|
494 | "build/netstandard2.0/ref/System.Runtime.Serialization.Primitives.dll", | |
|
495 | "build/netstandard2.0/ref/System.Runtime.Serialization.Xml.dll", | |
|
496 | "build/netstandard2.0/ref/System.Runtime.Serialization.dll", | |
|
497 | "build/netstandard2.0/ref/System.Runtime.dll", | |
|
498 | "build/netstandard2.0/ref/System.Security.Claims.dll", | |
|
499 | "build/netstandard2.0/ref/System.Security.Cryptography.Algorithms.dll", | |
|
500 | "build/netstandard2.0/ref/System.Security.Cryptography.Csp.dll", | |
|
501 | "build/netstandard2.0/ref/System.Security.Cryptography.Encoding.dll", | |
|
502 | "build/netstandard2.0/ref/System.Security.Cryptography.Primitives.dll", | |
|
503 | "build/netstandard2.0/ref/System.Security.Cryptography.X509Certificates.dll", | |
|
504 | "build/netstandard2.0/ref/System.Security.Principal.dll", | |
|
505 | "build/netstandard2.0/ref/System.Security.SecureString.dll", | |
|
506 | "build/netstandard2.0/ref/System.ServiceModel.Web.dll", | |
|
507 | "build/netstandard2.0/ref/System.Text.Encoding.Extensions.dll", | |
|
508 | "build/netstandard2.0/ref/System.Text.Encoding.dll", | |
|
509 | "build/netstandard2.0/ref/System.Text.RegularExpressions.dll", | |
|
510 | "build/netstandard2.0/ref/System.Threading.Overlapped.dll", | |
|
511 | "build/netstandard2.0/ref/System.Threading.Tasks.Parallel.dll", | |
|
512 | "build/netstandard2.0/ref/System.Threading.Tasks.dll", | |
|
513 | "build/netstandard2.0/ref/System.Threading.Thread.dll", | |
|
514 | "build/netstandard2.0/ref/System.Threading.ThreadPool.dll", | |
|
515 | "build/netstandard2.0/ref/System.Threading.Timer.dll", | |
|
516 | "build/netstandard2.0/ref/System.Threading.dll", | |
|
517 | "build/netstandard2.0/ref/System.Transactions.dll", | |
|
518 | "build/netstandard2.0/ref/System.ValueTuple.dll", | |
|
519 | "build/netstandard2.0/ref/System.Web.dll", | |
|
520 | "build/netstandard2.0/ref/System.Windows.dll", | |
|
521 | "build/netstandard2.0/ref/System.Xml.Linq.dll", | |
|
522 | "build/netstandard2.0/ref/System.Xml.ReaderWriter.dll", | |
|
523 | "build/netstandard2.0/ref/System.Xml.Serialization.dll", | |
|
524 | "build/netstandard2.0/ref/System.Xml.XDocument.dll", | |
|
525 | "build/netstandard2.0/ref/System.Xml.XPath.XDocument.dll", | |
|
526 | "build/netstandard2.0/ref/System.Xml.XPath.dll", | |
|
527 | "build/netstandard2.0/ref/System.Xml.XmlDocument.dll", | |
|
528 | "build/netstandard2.0/ref/System.Xml.XmlSerializer.dll", | |
|
529 | "build/netstandard2.0/ref/System.Xml.dll", | |
|
530 | "build/netstandard2.0/ref/System.dll", | |
|
531 | "build/netstandard2.0/ref/mscorlib.dll", | |
|
532 | "build/netstandard2.0/ref/netstandard.dll", | |
|
533 | "build/netstandard2.0/ref/netstandard.xml", | |
|
534 | "lib/netstandard1.0/_._", | |
|
535 | "netstandard.library.2.0.3.nupkg.sha512", | |
|
536 | "netstandard.library.nuspec" | |
|
537 | ] | |
|
538 | }, | |
|
539 | 17 | "FNA/1.0.0": { |
|
540 | 18 | "type": "project", |
|
541 |
"path": "../../FNA/FNA. |
|
|
542 |
"msbuildProject": "../../FNA/FNA. |
|
|
19 | "path": "../../FNA/FNA.csproj", | |
|
20 | "msbuildProject": "../../FNA/FNA.csproj" | |
|
543 | 21 | } |
|
544 | 22 | }, |
|
545 | 23 | "projectFileDependencyGroups": { |
|
546 | 24 | ".NETFramework,Version=v4.5": [ |
|
547 |
"FNA >= 1.0.0" |
|
|
548 | "Microsoft.NETFramework.ReferenceAssemblies >= 1.0.0" | |
|
549 | ], | |
|
550 | ".NETStandard,Version=v2.0": [ | |
|
551 | "FNA >= 1.0.0", | |
|
552 | "NETStandard.Library >= 2.0.3" | |
|
25 | "FNA >= 1.0.0" | |
|
553 | 26 | ] |
|
554 | 27 | }, |
|
555 | 28 | "packageFolders": { |
@@ -558,37 +31,26 | |||
|
558 | 31 | "project": { |
|
559 | 32 | "version": "1.0.0", |
|
560 | 33 | "restore": { |
|
561 |
"projectUniqueName": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA. |
|
|
34 | "projectUniqueName": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj", | |
|
562 | 35 | "projectName": "SpriteFontPlus", |
|
563 |
"projectPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA. |
|
|
36 | "projectPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj", | |
|
564 | 37 | "packagesPath": "/Users/alys/.nuget/packages/", |
|
565 | 38 | "outputPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/", |
|
566 | 39 | "projectStyle": "PackageReference", |
|
567 | "crossTargeting": true, | |
|
568 | 40 | "configFilePaths": [ |
|
569 |
"/Users/alys/. |
|
|
41 | "/Users/alys/.config/NuGet/NuGet.Config" | |
|
570 | 42 | ], |
|
571 | 43 | "originalTargetFrameworks": [ |
|
572 |
"net45" |
|
|
573 | "netstandard2.0" | |
|
44 | "net45" | |
|
574 | 45 | ], |
|
575 | 46 | "sources": { |
|
576 | 47 | "https://api.nuget.org/v3/index.json": {} |
|
577 | 48 | }, |
|
578 | 49 | "frameworks": { |
|
579 | 50 | "net45": { |
|
580 | "targetAlias": "net45", | |
|
581 | 51 | "projectReferences": { |
|
582 |
"/Users/alys/repos/isometric-park-fna/FNA/FNA. |
|
|
583 |
"projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA. |
|
|
584 | } | |
|
585 | } | |
|
586 | }, | |
|
587 | "netstandard2.0": { | |
|
588 | "targetAlias": "netstandard2.0", | |
|
589 | "projectReferences": { | |
|
590 | "/Users/alys/repos/isometric-park-fna/FNA/FNA.Core.csproj": { | |
|
591 | "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.Core.csproj" | |
|
52 | "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": { | |
|
53 | "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj" | |
|
592 | 54 | } |
|
593 | 55 | } |
|
594 | 56 | } |
@@ -600,40 +62,7 | |||
|
600 | 62 | } |
|
601 | 63 | }, |
|
602 | 64 | "frameworks": { |
|
603 | "net45": { | |
|
604 | "targetAlias": "net45", | |
|
605 | "dependencies": { | |
|
606 | "Microsoft.NETFramework.ReferenceAssemblies": { | |
|
607 | "suppressParent": "All", | |
|
608 | "target": "Package", | |
|
609 | "version": "[1.0.0, )", | |
|
610 | "autoReferenced": true | |
|
611 | } | |
|
612 | }, | |
|
613 | "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.102/RuntimeIdentifierGraph.json" | |
|
614 | }, | |
|
615 | "netstandard2.0": { | |
|
616 | "targetAlias": "netstandard2.0", | |
|
617 | "dependencies": { | |
|
618 | "NETStandard.Library": { | |
|
619 | "suppressParent": "All", | |
|
620 | "target": "Package", | |
|
621 | "version": "[2.0.3, )", | |
|
622 | "autoReferenced": true | |
|
623 | } | |
|
624 | }, | |
|
625 | "imports": [ | |
|
626 | "net461", | |
|
627 | "net462", | |
|
628 | "net47", | |
|
629 | "net471", | |
|
630 | "net472", | |
|
631 | "net48" | |
|
632 | ], | |
|
633 | "assetTargetFallback": true, | |
|
634 | "warn": true, | |
|
635 | "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.102/RuntimeIdentifierGraph.json" | |
|
636 | } | |
|
65 | "net45": {} | |
|
637 | 66 | } |
|
638 | 67 | } |
|
639 | 68 | } No newline at end of file |
|
1 | NO CONTENT: modified file, binary diff hidden |
@@ -1,4 +1,4 | |||
|
1 | using System.Collections.Generic; | |
|
1 | using System.Collections.Generic; | |
|
2 | 2 | using Microsoft.Xna.Framework; |
|
3 | 3 | using Microsoft.Xna.Framework.Audio; |
|
4 | 4 | using Microsoft.Xna.Framework.Input; |
@@ -113,7 +113,7 | |||
|
113 | 113 | //gdm.SynchronizeWithVerticalRetrace = false; |
|
114 | 114 | IsFixedTimeStep = false; |
|
115 | 115 | |
|
116 | this.simulation = new Simulation(this.squaresAcross, this.squaresDown, 16.66667f*30); | |
|
116 | this.simulation = new Simulation(this.squaresAcross, this.squaresDown, new float[] {16.66667f*60, 16.66667f*30, 16.66667f*15, 16.66667f*7.5f, 16.66667f*1 }); | |
|
117 | 117 | |
|
118 | 118 | foreach (List<Cell> row in this.simulation.map.cells) |
|
119 | 119 | { |
@@ -293,185 +293,206 | |||
|
293 | 293 | #region input |
|
294 | 294 | #region camera_movement_keys |
|
295 | 295 | if (keyboardCur.IsKeyDown(Keys.Down)) |
|
296 | { | |
|
297 |
|
|
|
298 | } | |
|
299 |
|
|
|
300 | { | |
|
301 |
|
|
|
296 | { | |
|
297 | this.camera.Move(new Vector2(0, 2)); | |
|
298 | } | |
|
299 | else if (keyboardCur.IsKeyDown(Keys.Up)) | |
|
300 | { | |
|
301 | this.camera.Move(new Vector2(0, -2)); | |
|
302 | 302 | |
|
303 | } | |
|
304 |
|
|
|
305 | { | |
|
306 |
|
|
|
303 | } | |
|
304 | else if (keyboardCur.IsKeyDown(Keys.Left)) | |
|
305 | { | |
|
306 | this.camera.Move(new Vector2(-2, 0)); | |
|
307 | 307 | |
|
308 | } | |
|
309 |
|
|
|
310 | { | |
|
311 |
|
|
|
308 | } | |
|
309 | else if (keyboardCur.IsKeyDown(Keys.Right)) | |
|
310 | { | |
|
311 | this.camera.Move(new Vector2(2, 0)); | |
|
312 | 312 | |
|
313 | } | |
|
314 |
|
|
|
315 | { | |
|
316 |
|
|
|
317 | } | |
|
318 |
|
|
|
319 | { | |
|
320 | ||
|
321 | this.camera.ZoomIn(); | |
|
322 | } | |
|
323 | #endregion camera_movement_keys | |
|
313 | } | |
|
314 | else if (keyboardCur.IsKeyDown(Keys.Subtract) && keyboardPrev.IsKeyUp(Keys.Subtract)) | |
|
315 | { | |
|
316 | this.camera.ZoomOut(); | |
|
317 | } | |
|
318 | else if (keyboardCur.IsKeyDown(Keys.Add) && keyboardPrev.IsKeyUp(Keys.Add)) | |
|
319 | { | |
|
324 | 320 | |
|
325 | #region misc_keys | |
|
326 | if (keyboardCur.IsKeyDown(Keys.Q) && keyboardPrev.IsKeyUp(Keys.Q)) | |
|
327 | { | |
|
328 | System.Console.WriteLine("Quitting"); | |
|
329 | Environment.Exit(0); | |
|
330 | } | |
|
331 | if (keyboardCur.IsKeyDown(Keys.OemBackslash) && keyboardPrev.IsKeyUp(Keys.OemBackslash)) | |
|
332 | { | |
|
333 | this.show_another_window = !this.show_another_window; | |
|
321 | this.camera.ZoomIn(); | |
|
322 | } | |
|
323 | #endregion camera_movement_keys | |
|
334 | 324 | |
|
335 | } | |
|
336 | ||
|
337 | if (keyboardCur.IsKeyDown(Keys.G) && keyboardPrev.IsKeyUp(Keys.G)) | |
|
325 | #region misc_keys | |
|
326 | if (keyboardCur.IsKeyDown(Keys.Q) && keyboardPrev.IsKeyUp(Keys.Q)) | |
|
327 | { | |
|
328 | System.Console.WriteLine("Quitting"); | |
|
329 | Environment.Exit(0); | |
|
330 | } | |
|
331 | if (keyboardCur.IsKeyDown(Keys.OemBackslash) && keyboardPrev.IsKeyUp(Keys.OemBackslash)) | |
|
338 | 332 | { |
|
339 | this.showGrid = !this.showGrid; | |
|
333 | this.show_another_window = !this.show_another_window; | |
|
340 | 334 | |
|
341 | } | |
|
342 | if (keyboardCur.IsKeyDown(Keys.B) && keyboardPrev.IsKeyUp(Keys.B)) | |
|
343 | { | |
|
344 | this.showBudget = !this.showBudget; | |
|
335 | } | |
|
345 | 336 | |
|
346 | } | |
|
347 | if (keyboardCur.IsKeyDown(Keys.F) && keyboardPrev.IsKeyUp(Keys.F)) | |
|
348 | { | |
|
349 | this.showForest = !this.showForest; | |
|
337 | if (keyboardCur.IsKeyDown(Keys.G) && keyboardPrev.IsKeyUp(Keys.G)) | |
|
338 | { | |
|
339 | this.showGrid = !this.showGrid; | |
|
350 | 340 | |
|
351 | } | |
|
352 |
|
|
|
353 | { | |
|
354 | this.camera.Jump(Vector2.Zero); | |
|
341 | } | |
|
342 | if (keyboardCur.IsKeyDown(Keys.B) && keyboardPrev.IsKeyUp(Keys.B)) | |
|
343 | { | |
|
344 | this.showBudget = !this.showBudget; | |
|
355 | 345 | |
|
356 | } | |
|
357 |
|
|
|
358 | { | |
|
359 | sound.Play(volume, pitch, pan); | |
|
360 | } | |
|
361 | #endregion misc_keys | |
|
362 | ||
|
363 | ||
|
364 | #region gamerate_keys | |
|
365 | if (keyboardCur.IsKeyDown(Keys.D0) && keyboardPrev.IsKeyUp(Keys.D0) ) | |
|
366 | { | |
|
367 | this.simulation.paused = !this.simulation.paused; | |
|
346 | } | |
|
347 | if (keyboardCur.IsKeyDown(Keys.F) && keyboardPrev.IsKeyUp(Keys.F)) | |
|
348 | { | |
|
349 | this.showForest = !this.showForest; | |
|
368 | 350 | |
|
369 | } | |
|
370 | #endregion gamerate_keys | |
|
371 | ||
|
372 | ||
|
373 | ||
|
351 | } | |
|
352 | if (keyboardCur.IsKeyDown(Keys.C) && keyboardPrev.IsKeyUp(Keys.C)) | |
|
353 | { | |
|
354 | this.camera.Jump(Vector2.Zero); | |
|
374 | 355 | |
|
375 | //if (keyboardCur.IsKeyDown(Keys.P) && keyboardPrev.IsKeyUp(Keys.P)) | |
|
376 | // { | |
|
377 | // this.player_state = !this.player_state; | |
|
378 | // } | |
|
379 | ||
|
380 | //if (player_state ) | |
|
381 | //{ | |
|
382 | // MediaPlayer.Play(music); | |
|
383 | //} | |
|
356 | } | |
|
357 | if (keyboardCur.IsKeyDown(Keys.OemBackslash) && keyboardPrev.IsKeyUp(Keys.OemBackslash) && keyboardCur.IsKeyDown(Keys.LeftShift)) | |
|
358 | { | |
|
359 | sound.Play(volume, pitch, pan); | |
|
360 | } | |
|
361 | #endregion misc_keys | |
|
384 | 362 | |
|
385 | 363 | |
|
386 | MouseState mouseCur = Mouse.GetState(); | |
|
387 | this.original_point = Vector2.Transform(new Vector2(mouseCur.X, mouseCur.Y), Matrix.Invert(camera.get_transformation(GraphicsDevice))); | |
|
364 | #region gamerate_keys | |
|
365 | if (keyboardCur.IsKeyDown(Keys.P) && keyboardPrev.IsKeyUp(Keys.P) ) | |
|
366 | { | |
|
367 | this.simulation.paused = !this.simulation.paused; | |
|
388 | 368 | |
|
389 | if (MathUtils.Between(mouseCur.X, 0, 50)) | |
|
390 | { | |
|
391 | this.camera.Move(new Vector2(-4, 0)); | |
|
392 | } | |
|
393 | else if (MathUtils.Between(mouseCur.X, (FNAGame.width - 50), FNAGame.width)) | |
|
394 | { | |
|
395 | this.camera.Move(new Vector2(4, 0)); | |
|
396 | } | |
|
369 | } | |
|
370 | if (keyboardCur.IsKeyDown(Keys.D0) && keyboardPrev.IsKeyUp(Keys.D0) ) | |
|
371 | { | |
|
372 | this.simulation.paused = !this.simulation.paused; | |
|
397 | 373 | |
|
398 | if (MathUtils.Between(mouseCur.Y, 0, 50)) | |
|
399 | { | |
|
400 | this.camera.Move(new Vector2(0, -4)); | |
|
401 | } | |
|
402 | else if (MathUtils.Between(mouseCur.Y, (FNAGame.height - 50), FNAGame.height)) | |
|
403 | { | |
|
404 | this.camera.Move(new Vector2(0, 4)); | |
|
405 | } | |
|
406 | ||
|
407 | if (mouseCur.RightButton == ButtonState.Pressed) | |
|
408 | { | |
|
409 | Vector2 cameraMiddle = this.camera.position + new Vector2(FNAGame.width / 2, FNAGame.height / 2); | |
|
410 | Vector2 delta = this.camera.position - this.original_point; | |
|
411 | this.camera.Jump(this.original_point); | |
|
412 | } | |
|
413 | ||
|
414 | #endregion input | |
|
415 | ||
|
416 | ||
|
417 | ||
|
418 | this.simulation.update(gameTime.ElapsedGameTime); | |
|
419 | ||
|
420 | if (this.showBudget) | |
|
421 | { | |
|
422 | this.showBudget = this.budgetWindow.update(mouseCur, this.simulation.latestBudget, this.simulation.previousBudget); | |
|
423 | } | |
|
374 | } | |
|
375 | if (keyboardCur.IsKeyDown(Keys.D1) && keyboardPrev.IsKeyUp(Keys.D1) ) | |
|
376 | { | |
|
377 | this.simulation.paused = false; | |
|
378 | this.simulation.setRate(0); | |
|
379 | } | |
|
380 | if (keyboardCur.IsKeyDown(Keys.D2) && keyboardPrev.IsKeyUp(Keys.D2) ) | |
|
381 | { | |
|
382 | this.simulation.paused = false; | |
|
383 | this.simulation.setRate(1); | |
|
384 | } | |
|
385 | if (keyboardCur.IsKeyDown(Keys.D3) && keyboardPrev.IsKeyUp(Keys.D3) ) | |
|
386 | { | |
|
387 | this.simulation.paused = false; | |
|
388 | this.simulation.setRate(2); | |
|
389 | } | |
|
390 | if (keyboardCur.IsKeyDown(Keys.D4) && keyboardPrev.IsKeyUp(Keys.D4) ) | |
|
391 | { | |
|
392 | this.simulation.paused = false; | |
|
393 | this.simulation.setRate(3); | |
|
394 | } | |
|
395 | #if DEBUG | |
|
396 | if (keyboardCur.IsKeyDown(Keys.D5) && keyboardPrev.IsKeyUp(Keys.D5) ) | |
|
397 | { | |
|
398 | this.simulation.paused = false; | |
|
399 | this.simulation.setRate(4); | |
|
400 | } | |
|
401 | #endif | |
|
402 | #endregion gamerate_keys | |
|
424 | 403 | |
|
425 | 404 | |
|
426 | if (!this.showInitial && this.remainingDialog.Count > 0) | |
|
427 | { | |
|
428 | this.currentNode = this.remainingDialog.Dequeue(); | |
|
429 | this.showInitial = true; | |
|
430 | } | |
|
405 | MouseState mouseCur = Mouse.GetState(); | |
|
406 | this.original_point = Vector2.Transform(new Vector2(mouseCur.X, mouseCur.Y), Matrix.Invert(camera.get_transformation(GraphicsDevice))); | |
|
407 | ||
|
408 | int menuBarHeight = 20; | |
|
431 | 409 | |
|
432 | this.original_point = Vector2.Transform(new Vector2(mouseCur.X, mouseCur.Y), Matrix.Invert(camera.get_transformation(GraphicsDevice))); | |
|
410 | if (MathUtils.Between(mouseCur.X, 0, 50)) | |
|
411 | { | |
|
412 | this.camera.Move(new Vector2(-4, 0)); | |
|
413 | } | |
|
414 | else if (MathUtils.Between(mouseCur.X, (FNAGame.width - 50), FNAGame.width)) | |
|
415 | { | |
|
416 | this.camera.Move(new Vector2(4, 0)); | |
|
417 | } | |
|
433 | 418 | |
|
434 | //int gridx = (int)((this.original_point.X-baseOffsetX) / Tile.TileStepX); | |
|
435 | /* int gridx = (int)(this.original_point.Y / Tile.TileHeight + this.original_point.X / Tile.TileWidth); */ | |
|
436 | //int gridy = (int)((this.original_point.Y-baseOffsetY) / (Tile.TileStepY*2)); | |
|
437 | /* int gridy = (int)(this.original_point.Y / Tile.TileHeight - this.original_point.X / Tile.TileWidth); */ | |
|
438 | ||
|
439 | //this.mouseGrid = new Vector2(gridx, gridy); | |
|
440 | this.mouseGrid = this.calculateMousegrid(this.original_point); | |
|
419 | if (MathUtils.Between(mouseCur.Y, menuBarHeight, 50 + menuBarHeight)) | |
|
420 | { | |
|
421 | this.camera.Move(new Vector2(0, -4)); | |
|
422 | } | |
|
423 | else if (MathUtils.Between(mouseCur.Y, (FNAGame.height - 50 -menuBarHeight), FNAGame.height-menuBarHeight)) | |
|
424 | { | |
|
425 | this.camera.Move(new Vector2(0, 4)); | |
|
426 | } | |
|
441 | 427 | |
|
442 | elapsedTime += gameTime.ElapsedGameTime; | |
|
443 | ||
|
444 | if (elapsedTime > TimeSpan.FromSeconds(1)) | |
|
428 | if (mouseCur.RightButton == ButtonState.Pressed) | |
|
445 | 429 | { |
|
446 | elapsedTime -= TimeSpan.FromSeconds(1); | |
|
447 | frameRate = frameCounter; | |
|
448 | frameCounter = 0; | |
|
430 | Vector2 cameraMiddle = this.camera.position + new Vector2(FNAGame.width / 2, FNAGame.height / 2); | |
|
431 | Vector2 delta = this.camera.position - this.original_point; | |
|
432 | this.camera.Jump(this.original_point); | |
|
449 | 433 | } |
|
450 | 434 | |
|
451 | this.keyboardPrev = keyboardCur; | |
|
435 | #endregion input | |
|
436 | ||
|
437 | ||
|
438 | ||
|
439 | this.simulation.update(gameTime.ElapsedGameTime); | |
|
440 | ||
|
441 | if (this.showBudget) | |
|
442 | { | |
|
443 | this.showBudget = this.budgetWindow.update(mouseCur, this.simulation.latestBudget, this.simulation.previousBudget); | |
|
444 | } | |
|
445 | ||
|
452 | 446 | |
|
453 | stopWatch.Stop(); | |
|
454 | this.updateTime = stopWatch.Elapsed; | |
|
447 | if (!this.showInitial && this.remainingDialog.Count > 0) | |
|
448 | { | |
|
449 | this.currentNode = this.remainingDialog.Dequeue(); | |
|
450 | this.showInitial = true; | |
|
451 | } | |
|
452 | ||
|
453 | this.original_point = Vector2.Transform(new Vector2(mouseCur.X, mouseCur.Y), Matrix.Invert(camera.get_transformation(GraphicsDevice))); | |
|
455 | 454 | |
|
456 | base.Update(gameTime); | |
|
455 | //int gridx = (int)((this.original_point.X-baseOffsetX) / Tile.TileStepX); | |
|
456 | /* int gridx = (int)(this.original_point.Y / Tile.TileHeight + this.original_point.X / Tile.TileWidth); */ | |
|
457 | //int gridy = (int)((this.original_point.Y-baseOffsetY) / (Tile.TileStepY*2)); | |
|
458 | /* int gridy = (int)(this.original_point.Y / Tile.TileHeight - this.original_point.X / Tile.TileWidth); */ | |
|
457 | 459 | |
|
458 | } | |
|
460 | //this.mouseGrid = new Vector2(gridx, gridy); | |
|
461 | this.mouseGrid = this.calculateMousegrid(this.original_point); | |
|
462 | ||
|
463 | elapsedTime += gameTime.ElapsedGameTime; | |
|
459 | 464 | |
|
460 | protected float calculateDepth() { | |
|
461 | return ((this.squaresAcross + 1) + ((this.squaresDown + 1) * Tile.TileWidth)) * 10; | |
|
462 | } | |
|
465 | if (elapsedTime > TimeSpan.FromSeconds(1)) | |
|
466 | { | |
|
467 | elapsedTime -= TimeSpan.FromSeconds(1); | |
|
468 | frameRate = frameCounter; | |
|
469 | frameCounter = 0; | |
|
470 | } | |
|
471 | ||
|
472 | this.keyboardPrev = keyboardCur; | |
|
473 | ||
|
474 | stopWatch.Stop(); | |
|
475 | this.updateTime = stopWatch.Elapsed; | |
|
476 | ||
|
477 | base.Update(gameTime); | |
|
478 | ||
|
479 | } | |
|
463 | 480 | |
|
464 | protected Boolean cull(int gridX, int gridY) | |
|
465 | { | |
|
466 | int screenX = (gridX - gridY) * Tile.TileSpriteWidth / 2; | |
|
467 | int screenY = (gridX + gridY) * Tile.TileSpriteHeight / 2; | |
|
481 | protected float calculateDepth() { | |
|
482 | return ((this.squaresAcross + 1) + ((this.squaresDown + 1) * Tile.TileWidth)) * 10; | |
|
483 | } | |
|
468 | 484 | |
|
469 | Vector2 original = Vector2.Transform(new Vector2(screenX, screenY), camera.get_transformation(GraphicsDevice)); | |
|
485 | protected Boolean cull(int gridX, int gridY) | |
|
486 | { | |
|
487 | int screenX = (gridX - gridY) * Tile.TileSpriteWidth / 2; | |
|
488 | int screenY = (gridX + gridY) * Tile.TileSpriteHeight / 2; | |
|
470 | 489 | |
|
471 | return (!FNAGame.enableCulling || | |
|
472 | (MathUtils.Between(original.X, -Tile.TileSpriteWidth, FNAGame.width) | |
|
473 | && MathUtils.Between(original.Y, -Tile.TileSpriteHeight, FNAGame.height))); | |
|
474 | } | |
|
490 | Vector2 original = Vector2.Transform(new Vector2(screenX, screenY), camera.get_transformation(GraphicsDevice)); | |
|
491 | ||
|
492 | return (!FNAGame.enableCulling || | |
|
493 | (MathUtils.Between(original.X, -Tile.TileSpriteWidth, FNAGame.width) | |
|
494 | && MathUtils.Between(original.Y, -Tile.TileSpriteHeight, FNAGame.height))); | |
|
495 | } | |
|
475 | 496 | |
|
476 | 497 | //Convenience method I'm not super sure about anymore. |
|
477 | 498 | protected void drawTileAt(int x, int y, int tileIndex, int height) |
@@ -746,15 +767,19 | |||
|
746 | 767 | if (MathUtils.Between(this.mouseGrid.X, 0, this.squaresAcross) && MathUtils.Between(this.mouseGrid.Y, 0, this.squaresAcross)) |
|
747 | 768 | { |
|
748 | 769 | has_tree = this.simulation.map.cells[(int)this.mouseGrid.X][(int)this.mouseGrid.Y].hasTree; |
|
749 | //batch.DrawString(font, has_tree.ToString(), new Vector2(500, 33), Color.Black, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.5f); | |
|
750 | //batch.DrawString(font, has_tree.ToString(), new Vector2(499, 32), Color.White, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.49f); | |
|
751 | 770 | } |
|
752 | 771 | //*/ |
|
753 | 772 | |
|
773 | String status_left = ""; | |
|
774 | if (MathUtils.Between(this.mouseGrid.X, -1, this.simulation.map.MapWidth) && MathUtils.Between(this.mouseGrid.Y, -1, this.simulation.map.MapHeight)) | |
|
775 | { | |
|
776 | status_left = String.Format("{0:},{1:} {2}", this.mouseGrid.X, this.mouseGrid.Y, this.simulation.map.cells[(int)this.mouseGrid.X][(int)this.mouseGrid.Y].status); | |
|
777 | } | |
|
754 | 778 | |
|
755 | 779 | String header_left = String.Format("${0:}|{1:} \ue124", this.simulation.money, this.simulation.map.tree_count); |
|
756 | 780 | String header_middle = String.Format("{0:MMMMM yyyy} ({1:})", this.simulation.DateTime, this.simulation.Season); |
|
757 |
String header_right = String.Format(" |
|
|
781 | // String header_right = String.Format("Press H for help."); | |
|
782 | String header_right = ""; | |
|
758 | 783 | |
|
759 | 784 | this.Window.Title = String.Format("Isometric Park [{0:}]", header_middle); |
|
760 | 785 | Vector2 middle_dimensions = monoFont.MeasureString(header_middle); |
@@ -762,13 +787,16 | |||
|
762 | 787 | |
|
763 | 788 | float middle_start = (int)((FNAGame.width / 2) - (middle_dimensions.X / 2)); |
|
764 | 789 | float right_start = (int)(FNAGame.width - right_dimensions.X - 10.0f); |
|
765 | ||
|
766 | FilledRectangle.drawFilledRectangle(batch, new Rectangle(0, 0, width, (int)middle_dimensions.Y), Color.White, 0.51f); | |
|
790 | float top = (float)Math.Round(FNAGame.height - middle_dimensions.Y); // Rounding so the int and float versions are closer. | |
|
767 | 791 | |
|
768 | 792 | |
|
793 | FilledRectangle.drawFilledRectangle(batch, new Rectangle(0, (int)top, width, (int)middle_dimensions.Y), Color.White, 0.51f); | |
|
794 | ||
|
795 | ||
|
796 | batch.DrawString(monoFont, status_left, new Vector2(1, top), Color.Black, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.5f); | |
|
769 | 797 | batch.DrawString(monoFont, header_left, new Vector2(1, 1), Color.Black, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.5f); |
|
770 | 798 | batch.DrawString(monoFont, header_middle, new Vector2(middle_start, 1), Color.Black, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.5f); |
|
771 | batch.DrawString(monoFont, header_right, new Vector2(right_start, 1), Color.Black, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.5f); | |
|
799 | // batch.DrawString(monoFont, header_right, new Vector2(right_start, 1), Color.Black, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.5f); | |
|
772 | 800 | #endregion draw_header |
|
773 | 801 | |
|
774 | 802 | |
@@ -844,6 +872,14 | |||
|
844 | 872 | ForestWindow.Render(ref this.showForest, debugWindow.monoFont, this.simulation); |
|
845 | 873 | } |
|
846 | 874 | |
|
875 | bool quit = false; | |
|
876 | Menu.Render(debugWindow.monoFont, FNAGame.width, ref quit, ref this.simulation.paused, ref this.simulation.currentRate, | |
|
877 | ref this.showBudget, ref this.showForest, header_left); | |
|
878 | ||
|
879 | if (quit) { | |
|
880 | System.Environment.Exit(0); | |
|
881 | } | |
|
882 | ||
|
847 | 883 | |
|
848 | 884 | _imGuiRenderer.AfterLayout(); |
|
849 | 885 |
@@ -109,7 +109,7 | |||
|
109 | 109 | } |
|
110 | 110 | } |
|
111 | 111 | |
|
112 | public float millisecondsPerAdvance { get; private set; } | |
|
112 | public float[] millisecondsPerAdvance { get; private set; } | |
|
113 | 113 | public String Season { get |
|
114 | 114 | { |
|
115 | 115 | if (MathUtils.Between(this.DateTime.Month, 3, 5)) |
@@ -136,6 +136,7 | |||
|
136 | 136 | public int ticksPerAdvance; |
|
137 | 137 | private float lastAdvance; |
|
138 | 138 | public bool paused; |
|
139 | public int currentRate; | |
|
139 | 140 | |
|
140 | 141 | private Random random; |
|
141 | 142 | |
@@ -194,7 +195,7 | |||
|
194 | 195 | |
|
195 | 196 | |
|
196 | 197 | |
|
197 | public Simulation(int width, int height, float millisecondsPerAdvance) | |
|
198 | public Simulation(int width, int height, float[] millisecondsPerAdvance) | |
|
198 | 199 | { |
|
199 | 200 | this.random = new Random(); |
|
200 | 201 | |
@@ -296,13 +297,21 | |||
|
296 | 297 | return budget; |
|
297 | 298 | } |
|
298 | 299 | |
|
300 | public void setRate(int newRate) { | |
|
301 | if ((newRate >= 0) && (newRate <= this.millisecondsPerAdvance.Length)) { | |
|
302 | this.currentRate = newRate; | |
|
303 | } | |
|
304 | } | |
|
305 | ||
|
299 | 306 | public void update(TimeSpan deltaTime) |
|
300 | 307 | { |
|
301 | 308 | if (!this.paused) |
|
302 | 309 | { |
|
303 | 310 | this.Elapsed += deltaTime.Milliseconds; |
|
304 | 311 | |
|
305 | int advancesToSimulate = (int)((this.Elapsed - this.lastAdvance) / this.millisecondsPerAdvance); | |
|
312 | float millisecondsPerAdvance = this.millisecondsPerAdvance[this.currentRate]; | |
|
313 | ||
|
314 | int advancesToSimulate = (int)((this.Elapsed - this.lastAdvance) / millisecondsPerAdvance); | |
|
306 | 315 | |
|
307 | 316 | for (int i = 0; i < advancesToSimulate; i++) |
|
308 | 317 | { |
@@ -315,7 +324,7 | |||
|
315 | 324 | //it's t=125, we have 2.5 steps to simulate. However, we only want to simulate |
|
316 | 325 | //whole steps for simplicity's sake, so that means we'll simulate 2. But that means we've only simulated |
|
317 | 326 | //through t=120, so that's what we want to track in lastAdvance. |
|
318 |
this.lastAdvance += advancesToSimulate * |
|
|
327 | this.lastAdvance += advancesToSimulate * millisecondsPerAdvance; | |
|
319 | 328 | } |
|
320 | 329 | |
|
321 | 330 | /* |
@@ -1,4 +1,4 | |||
|
1 | using System; | |
|
1 | using System; | |
|
2 | 2 | using System.Collections.Generic; |
|
3 | 3 | using ImGuiNET; |
|
4 | 4 | using ImGuiNET.SampleProgram.XNA; |
@@ -141,10 +141,9 | |||
|
141 | 141 | |
|
142 | 142 | ImGui.Text(string.Format("Application average {0:F3} ms/frame ({1:F1} FPS", 1000f / ImGui.GetIO().Framerate, ImGui.GetIO().Framerate)); |
|
143 | 143 | |
|
144 | ||
|
145 | ||
|
144 | ||
|
146 | 145 | |
|
147 | if (ImGui.Button("Test Window")) | |
|
146 | if (ImGui.Button("Test Window")) | |
|
148 | 147 | { |
|
149 | 148 | this.show_test_window = !this.show_test_window; |
|
150 | 149 | } |
You need to be logged in to leave comments.
Login now