alysbrooks-public/games/isometric-park-fna Commit - r413:1338aca1d507

r413:1338aca1d507 - Sat, 21 Aug 2021 08:52:41

isometric-park-fna/UI/Widgets.cs ¶ created 644 +61 0

@@ -0,0 +1,61
	1	using System; //FYI, this is where IntPtr comes from
	2
	3	using ImGuiNET;
	4	using Num = System.Numerics;
	5
	6	namespace isometricparkfna.UI
	7	{
	8
	9	public static class Widgets
	10	{
	11	//Relatively thin wrappers over common ImGui idioms
	12	#region basic_elements
	13	public static void Tooltip(string text, Num.Vector2 relative_position)
	14	{
	15	if (ImGui.IsItemHovered())
	16	{
	17	var rect = ImGui.GetItemRectMax();
	18	ImGui.SetNextWindowPos(rect + relative_position );
	19	ImGui.BeginTooltip();
	20	ImGui.Text(text);
	21	ImGui.EndTooltip();
	22	}
	23	}
	24
	25	public static void Tooltip(string text)
	26	{
	27	Widgets.Tooltip(text, new Num.Vector2(15, 0));
	28	}
	29
	30	public static void Indicator(string text, Num.Vector4 color)
	31	{
	32	var dimensions = ImGui.CalcTextSize(text);
	33
	34	ImGui.PushStyleColor(ImGuiCol.Text, color);
	35	//Found through trial and error:
	36	ImGui.SetCursorPosX(ImGui.GetCursorPosX() -(dimensions.X + 10));
	37	ImGui.Text(text);
	38	ImGui.PopStyleColor();
	39	}
	40
	41	public static void MapImage(ImGuiImageMap map, Num.Vector2 size, int image_index)
	42	{
	43	ImGui.Image(map.ImGuiTexture, size, map.GetSourceUVStart(image_index), map.GetSourceUVEnd(image_index), Num.Vector4.One, Num.Vector4.Zero); // Here, the previously loaded texture is used
	44
	45	}
	46	#endregion
	47
	48	//Widgets that are made up of the components defined above
	49	#region composite_widgets
	50
	51	public static void MapImageTooltip(ImGuiImageMap map, Num.Vector2 size, int image_index, string tooltip)
	52	{
	53	ImGui.Image(map.ImGuiTexture, size, map.GetSourceUVStart(image_index), map.GetSourceUVEnd(image_index), Num.Vector4.One, Num.Vector4.Zero); // Here, the previously loaded texture is used
	54
	55	Widgets.Tooltip(tooltip, Num.Vector2.Zero);
	56
	57	}
	58
	59	#endregion
	60	}
	61	}

isometric-park-fna/Utils/Fact.cs ¶ created 644 +20 0

@@ -0,0 +1,20
	1
	2	using System;
	3	namespace isometricparkfna.Utils
	4	{
	5	public struct Fact<T>
	6	{
	7	public T Value;
	8
	9	public bool Known {get;}
	10	public bool Aware {get;}
	11
	12	public Fact(T value)
	13	{
	14	this.Value = value;
	15	this.Known = true;
	16	this.Aware = true;
	17	}
	18
	19	}
	20	}

SpriteFontPlus/src/obj/Debug/net45/.NETFramework,Version=v4.5.AssemblyAttributes.cs ¶ +3 -3

@@ -1,4 +1,4
1	// <autogenerated />	1	// <autogenerated />
2	using System;	2	using System;
3	using System.Reflection;	3	using System.Reflection;
4	[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")]	4	[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")]

SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csproj.CoreCompileInputs.cache ¶ +1 -1

	@@ -1,1 +1,1
	1	7bbcd971441293d3543e03c61356b4763d0b75e2		1	e3914796b5fae6ebfb8f4168aa490143cbdf1c22

SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csproj.FileListAbsolute.txt ¶ +1 -45

@@ -1,48 +1,4
1	/Users/alys/repos/fna-tutorial/SpriteFontPlus/src/bin/FNA/Debug/net45/FNA.dll.config
2	/Users/alys/repos/fna-tutorial/SpriteFontPlus/src/bin/FNA/Debug/net45/SpriteFontPlus.dll
3	/Users/alys/repos/fna-tutorial/SpriteFontPlus/src/bin/FNA/Debug/net45/SpriteFontPlus.pdb
4	/Users/alys/repos/fna-tutorial/SpriteFontPlus/src/bin/FNA/Debug/net45/FNA.dll
5	/Users/alys/repos/fna-tutorial/SpriteFontPlus/src/bin/FNA/Debug/net45/FNA.pdb
6	/Users/alys/repos/fna-tutorial/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache
7	/Users/alys/repos/fna-tutorial/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.AssemblyInfoInputs.cache
8	/Users/alys/repos/fna-tutorial/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.AssemblyInfo.cs
9	/Users/alys/repos/fna-tutorial/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csproj.CoreCompileInputs.cache
10	/Users/alys/repos/fna-tutorial/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csproj.CopyComplete
11	/Users/alys/repos/fna-tutorial/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.dll
12	/Users/alys/repos/fna-tutorial/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.pdb
13	/Users/alys/repos/fna-pong/SpriteFontPlus/src/bin/FNA/Debug/net45/FNA.dll.config
14	/Users/alys/repos/fna-pong/SpriteFontPlus/src/bin/FNA/Debug/net45/SpriteFontPlus.dll
15	/Users/alys/repos/fna-pong/SpriteFontPlus/src/bin/FNA/Debug/net45/SpriteFontPlus.pdb
16	/Users/alys/repos/fna-pong/SpriteFontPlus/src/bin/FNA/Debug/net45/FNA.dll
17	/Users/alys/repos/fna-pong/SpriteFontPlus/src/bin/FNA/Debug/net45/FNA.pdb
18	/Users/alys/repos/fna-pong/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache
19	/Users/alys/repos/fna-pong/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.AssemblyInfoInputs.cache
20	/Users/alys/repos/fna-pong/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.AssemblyInfo.cs
21	/Users/alys/repos/fna-pong/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csproj.CoreCompileInputs.cache
22	/Users/alys/repos/fna-pong/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csproj.CopyComplete
23	/Users/alys/repos/fna-pong/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.dll
24	/Users/alys/repos/fna-pong/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.pdb
25	/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/bin/FNA/Debug/net45/FNA.dll.config
26	/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/bin/FNA/Debug/net45/SpriteFontPlus.dll
27	/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/bin/FNA/Debug/net45/SpriteFontPlus.pdb
28	/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/bin/FNA/Debug/net45/FNA.dll
29	/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/bin/FNA/Debug/net45/FNA.pdb
30	/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache	1	/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache
31	/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csproj.CoreCompileInputs.cache
32	/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.AssemblyInfoInputs.cache	2	/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.AssemblyInfoInputs.cache
33	/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.AssemblyInfo.cs	3	/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.AssemblyInfo.cs
34	/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csproj.Co~~pyComplet~~e	4	/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csproj.CoreCompileInputs.cache
35	/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.dll
36	/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.pdb
37	/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/bin/FNA/Debug/net45/FNA.dll.config
38	/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/bin/FNA/Debug/net45/SpriteFontPlus.dll
39	/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/bin/FNA/Debug/net45/SpriteFontPlus.pdb
40	/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/bin/FNA/Debug/net45/FNA.dll
41	/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/bin/FNA/Debug/net45/FNA.pdb
42	/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache
43	/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.AssemblyInfoInputs.cache
44	/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.AssemblyInfo.cs
45	/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csproj.CoreCompileInputs.cache
46	/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csproj.CopyComplete
47	/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.dll
48	/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.pdb

SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache ¶ binary modified 0 0

NO CONTENT: modified file, binary diff hidden

isometric-park-fna/Components/TreeDeltaComponent.cs ¶ +8 -6

             using Encompass;
+            using isometricparkfna.Utils;
             namespace isometricparkfna.Components
             {
                 public struct TreeDeltaComponent : IComponent
                 {
-                    public int deltaTrees;
+                    public Fact<int> deltaTrees;
                     public string deltaTreesName
                     {
                         get
                         {
-                            if (deltaTrees <= -18)
+                            if (deltaTrees.Value <= -18)
                             {
                                 return "Unsustainable";
                             }
-                            else if (MathUtils.BetweenExclusive(deltaTrees, -18, -6))
+                            else if (MathUtils.BetweenExclusive(deltaTrees.Value, -18, -6))
                             {
                                 return "Moderately unsustainable";
                             }
-                            else if (MathUtils.Between(deltaTrees, -6, 0))
+                            else if (MathUtils.Between(deltaTrees.Value, -6, 0))
                             {
                                 return "Somewhat unsustainable";
                             }
-                            else if (deltaTrees == 0)
+                            else if (deltaTrees.Value == 0)
                             {
                                 return "Break even";
                             }
-                            else if (deltaTrees > 0)
+                            else if (deltaTrees.Value > 0)
                             {
                                 return "Restoration";
                             }

isometric-park-fna/Engines/SimulationBridgeEngine.cs ¶ +1 -1

                                 {
                                     var removed = 0;
                                     var tree_squares = area.squares.Where((square) => simulation.map.cells[(int)square.X][(int)square.Y].hasTree);
-                                    var to_remove = -delta.deltaTrees;
+                                    var to_remove = -delta.deltaTrees.Value;
                                     //calculate the probability in order to get the expected number of removed trees
                                     var expected = to_remove;

isometric-park-fna/Engines/Spawners/ContractSpawner.cs ¶ +2 -1

             using isometricparkfna.Messages;
             using isometricparkfna.Components;
+            using isometricparkfna.Utils;
             namespace isometricparkfna.Spawners {
             					AddComponent(contract, nameAndDescription);
             					AddComponent(contract, new SelectedComponent { selected = false });
             					AddComponent(contract, new ContractStatusComponent { status = ContractStatus.Proposed, date = this.simulation.DateTime });
-            					AddComponent(contract, new TreeDeltaComponent { deltaTrees = deltaTrees });
+            					AddComponent(contract, new TreeDeltaComponent { deltaTrees = new Fact<int>(deltaTrees) });
             					AddComponent(contract, new BudgetLineComponent
             							{
             							category = "Contracts",

isometric-park-fna/UI/DebugWindow.cs ¶ +1 -1

                         {
                             ImGui.PlotLines("Frame Rate", ref debugInfo.pastFps[0], debugInfo.pastFps.Length);
                         }
                             foreach (string k in additionalInfo.Keys)
                             {

isometric-park-fna/isometric-park-fna.csproj ¶ +2 0

                 <Compile Include="Utils\MathUtils.cs" />
                 <Compile Include="Utils\Extensions.cs" />
                 <Compile Include="Utils\Node.cs" />
+                <Compile Include="Utils\Fact.cs" />
+                <Compile Include="Utils\FactRange.cs" />
                 <Compile Include="UI\*.cs" />
               </ItemGroup>
               <ItemGroup>

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r413:1338aca1d507 - Sat, 21 Aug 2021 08:52:41

Sign in to your account

Commit r413:1338aca1d507 public

Author

r413:1338aca1d507 - Sat, 21 Aug 2021 08:52:41

Commit `r413:1338aca1d507` public