alysbrooks-public/games/isometric-park-fna Commit - r534:83d9621d56f6

alysbrooks-public » games » isometric-park-fna

Commit `r534:83d9621d56f6` public

parent | child

Description:

Fix code style.

Commit status:

[Not Reviewed]

References:

m6-tiles-and-trees

Diff options:

| |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r534:83d9621d56f6 - Sun, 06 Feb 2022 23:54:39

isometric-park-fna/CellMap.cs ¶ +1 -4

                     public int ZoneWidth = 10;
                     public int ZoneHeight = 10;
                     public int MapMultiplier; //Adjusts for larger maps.
                         }
                     }
                     public CellMap()
                     {
                         //TileMap(MapWidth, MapHeight);
                         this.MapMultiplier = (int)(((this.MapWidth / 50) + (this.MapHeight / 50)) / 2);
                         for (int i = 0; i < height; i++)
                         {
                             List<Cell> newRow = new List<Cell>();
                         GenericEvergreen,
                         GenericDeciduous,
                         GenericShrub
                     }
                     public class Cell

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

                                             }
                                             else if (delta.deltaTrees.Value > 0)
                                             {
-            				    var random_type = random_generator.Next(0, 3);
+                                                var random_type = random_generator.Next(0, 3);
                                                 cell.AddTree(this.simulation.DateTime, (CellMap.TreeType)random_type);
                                                 added++;
                                             }

isometric-park-fna/Engines/Spawners/ContractSpawner.cs ¶ +3 -10

                     private Random random_generator;
                     public const int DEFAULT_MIN_SQUARES = 75;
-                    // public const int DEFAULT_SQUARES = 25;
                     public const int DEFAULT_SQUARES = 100;
                     public const int CONTRACT_MINIMUM = 50;
                     public const int CONTRACT_MAXIMUM = 400;
                     private int MapWidth;
                     private int MapHeight;
-            	private int MapMultiplier; //Adjustment factor for larger maps
+                    private int MapMultiplier; //Adjustment factor for larger maps
                     private Simulation simulation;
                     private Grammar grammar;
                         this.simulation = simulation;
                         this.grammar = grammar;
-            	    this.MapMultiplier = this.simulation.map.MapMultiplier;        }
+                        this.MapMultiplier = this.simulation.map.MapMultiplier;
+                    }
                     private Vector2 FindStart(HashSet<Vector2> occupied_squares)
                     {
                                 return new_square;
                             }
                         }
-                        // return null;
                         return Vector2.Zero;
                     }
                     protected override void Spawn(in SpawnContractMessage message)
                     {
                         //for now:
                         var occupied = new List<Vector2>();
                         var image_index = random_generator.Next(1, 7);
-                        // int max_squares = (message.max_squares == 0) ? DEFAULT_SQUARES : message.max_squares;
-                        // int min_squares = (message.min_squares == null) ? DEFAULT_MIN_SQUARES : (int)message.min_squares;
                         int max_squares = (organization_type, message.min_squares) switch {
                             (OrganizationType.Family, null) => random_generator.Next(50, 100 * this.MapMultiplier),
                                 (OrganizationType.LargeCorporation, null) => random_generator.Next(90, 250 * this.MapMultiplier),

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

                                     int random_month = random_generator.Next(1, 13);
                                     DateTime random_date = new DateTime(random_year, random_month, 1);
-            			int random_type = random_generator.Next(0, 4);
+                                    int random_type = random_generator.Next(0, 4);
                                     cell.AddTree(random_date, (TreeType)random_type);
                                 }

isometric-park-fna/FNAGame.cs ¶ +25 -25

                                 // if (this.cull(x, y))
                                 // {
-                                    batch.Draw(
+                                batch.Draw(
-                                        Tile.TileSetTexture,
+                                    Tile.TileSetTexture,
-                                        new Rectangle(
+                                    new Rectangle(
-                                            screenx,
+                                        screenx,
-                                            screeny,
+                                        screeny,
-                                            Tile.TileWidth * scale_factor, Tile.TileHeight * scale_factor),
+                                        Tile.TileWidth * scale_factor, Tile.TileHeight * scale_factor),
-                                        Tile.GetSourceRectangle(1),
+                                    Tile.GetSourceRectangle(1),
-                                        Color.White,
+                                    Color.White,
 .0f,
-                                        Vector2.Zero,
+                                    Vector2.Zero,
-                                        SpriteEffects.None,
+                                    SpriteEffects.None,
 .9f);
-                                    this.tilesDrawn++;
+                                this.tilesDrawn++;
                                 // }
                             }
                         }
                             }
                             */
                         tileBatch.Begin(SpriteSortMode.BackToFront,
-                                    BlendState.AlphaBlend,
+                                        BlendState.AlphaBlend,
-                                    null,
+                                        null,
-                                    null,
+                                        null,
-                                    null,
+                                        null,
-                                    null,
+                                        null,
-                                    camera.get_transformation(GraphicsDevice));
+                                        camera.get_transformation(GraphicsDevice));
             #if DEBUG
                         drawTileAt(4, 4, 140, 3);
                                             drawTileAt(i, j, 210, 2);
                                         }
                                         else {
-                                        drawTileAt(i, j, 122, 2); //122, 203, 221
+                                            drawTileAt(i, j, 122, 2); //122, 203, 221
                                         }
                                         // if ((i + j) % 8 == 0)
                                         // {
                             if (treeStatus != CellStatus.Clear)
                             {
                                 status_left = String.Format("{0:},{1:} {2} {3} ({4})", this.mouseGrid.X, this.mouseGrid.Y,
-                                        treeStatusAdjective,
+                                                            treeStatusAdjective,
-                                        treeType,
+                                                            treeType,
-                                        this.in_active_zone ? "Contracted" : (this.in_zone ? "Proposed Contract": "Unused"));
+                                                            this.in_active_zone ? "Contracted" : (this.in_zone ? "Proposed Contract": "Unused"));
                             }
                             else {
                                 status_left = String.Format("{0:},{1:} {2} ({3})", this.mouseGrid.X, this.mouseGrid.Y,
-                                        treeStatusAdjective,
+                                                            treeStatusAdjective,
-                                        this.in_active_zone ? "Contracted" : (this.in_zone ? "Proposed Contract": "Unused"));
+                                                            this.in_active_zone ? "Contracted" : (this.in_zone ? "Proposed Contract": "Unused"));
                             }
                         }

isometric-park-fna/ImGuiRenderer.cs ¶ +2 -2

                         var context = ImGui.CreateContext();
                         ImGui.SetCurrentContext(context);
                         var plotContext = ImPlot.CreateContext();
-            	    ImPlot.SetCurrentContext(plotContext);
+                        ImPlot.SetCurrentContext(plotContext);
-            	    ImPlot.SetImGuiContext(context);
+                        ImPlot.SetImGuiContext(context);
                         _game = game ?? throw new ArgumentNullException(nameof(game));
                         _graphicsDevice = game.GraphicsDevice;

isometric-park-fna/Messages/ToggleWindowTypeMessage.cs ¶ +1 -1

                     Options,
                     NewGame,
                     Dialog,
-            	Graph,
+                    Graph,
                 }

isometric-park-fna/Renderers/ImGuiWindowRenderer.cs ¶ +3 -3

                                         break;
                                     case Window.NewGame:
                                         NewGameWindow.Render(this.BridgeEngine.font, this.BridgeEngine.italicFont, this.BridgeEngine);
-            			    break;
+                                        break;
-            			case Window.Graph:
+                                    case Window.Graph:
-            			    GraphWindow.Render(this.BridgeEngine.font, this.simulation, this.BridgeEngine);
+                                        GraphWindow.Render(this.BridgeEngine.font, this.simulation, this.BridgeEngine);
                                         break;
                                     case Window.Dialog:
                                         dialog_count++;

isometric-park-fna/Simulation.cs ¶ +5 -5

                     public int trees;
                     public int dead_trees;
                     public int crowded_trees;
-                    //Kind of a hack but allos for tracking figures over time without creating a whole new infrastructure
+                    //Kind of a hack but allows for tracking figures over time without creating a whole new infrastructure
                 }
                     public System.Collections.Generic.IEnumerable<Budget> allBudgets()
                     {
-                            foreach(var budget in this.budgets)
+                        foreach(var budget in this.budgets)
+                        {
-                                    yield return budget;
+                            yield return budget;
+                        }
                     }
                     private Grammar grammar;

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

                                     ImGui.Text(string.Format("fps: {0:F3}", debugInfo.fps));
                                     ImGui.Text(string.Format("Draw Time: {0:F3}", debugInfo.drawTime.TotalMilliseconds.ToString()));
                                     ImGui.Text(string.Format("\tTree: {0:F3}; Grid: {1:F3}; Tile: {2:F3}",
-            									debugInfo.treeDrawTime.TotalMilliseconds.ToString(),
+                                                             debugInfo.treeDrawTime.TotalMilliseconds.ToString(),
-            									debugInfo.gridDrawTime.TotalMilliseconds.ToString(),
+                                                             debugInfo.gridDrawTime.TotalMilliseconds.ToString(),
-            									debugInfo.tileDrawTime.TotalMilliseconds.ToString()));
+                                                             debugInfo.tileDrawTime.TotalMilliseconds.ToString()));
                                     ImGui.Text(string.Format("Update Time: {0:F3}", debugInfo.updateTime.TotalMilliseconds.ToString()));
                                     ImGui.Text(string.Format("Tiles Drawn: {0:F}", debugInfo.tilesDrawn));
                                         this.show_test_window = !this.show_test_window;
                                     }
-            						if (ImGui.Button("Implot Test Window")){
+                                    if (ImGui.Button("Implot Test Window")) {
-            							show_implot_test_window = !show_implot_test_window;
+                                        show_implot_test_window = !show_implot_test_window;
+                                    }
                                     if (ImGui.Button("Test Logging"))
                                     {
                                         Logging.Log(LogLevel.Critical, "Test");
                                 ImGui.SetNextWindowPos(new Num.Vector2(650, 20), ImGuiCond.FirstUseEver);
                                 ImGui.ShowDemoWindow(ref show_test_window);
                             }
-            				if (this.show_implot_test_window)
+                            if (this.show_implot_test_window)
+                            {
-                            ImPlot.ShowDemoWindow(ref this.show_implot_test_window);
+                                ImPlot.ShowDemoWindow(ref this.show_implot_test_window);
+                            }
                         }
                     }
                 }

isometric-park-fna/UI/Graph.cs ¶ +104 -103

@@ -27,16 +27,17
27	public static bool show_upkeep = false;	27	public static bool show_upkeep = false;
28		28
29	private static string[] money_series = { "Total Funds",	29	private static string[] money_series = { "Total Funds",
30	"Subsidies", "Upkeep", "Contracts", "Cashflow", "Misc"};	30	"Subsidies", "Upkeep", "Contracts", "Cashflow", "Misc"
		31	};
31	private static string[] tree_series = { "Total trees", "Dead trees", "Crowded trees"};	32	private static string[] tree_series = { "Total trees", "Dead trees", "Crowded trees"};
32		33
33	public static Dictionary<string, IEnumerable<double>> data_sets = new Dictionary<string, IEnumerable<double>>();	34	public static Dictionary<string, IEnumerable<double>> data_sets = new Dictionary<string, IEnumerable<double>>();
34		35
35	public static Dictionary<String, bool> data_sets_show = new List<string>()	36	public static Dictionary<String, bool> data_sets_show = new List<string>()
36	.Concat(money_series)	37	.Concat(money_series)
37	.Concat(tree_series)	38	.Concat(tree_series)
38	.Select(e => (e, false))	39	.Select(e => (e, false))
39	.ToDictionary(t => t.Item1, t=> t.Item2);	40	.ToDictionary(t => t.Item1, t=> t.Item2);
40		41
41		42
42	public static void Render(ImFontPtr font, Simulation sim, ImGuiWindowBridgeEngine engine)	43	public static void Render(ImFontPtr font, Simulation sim, ImGuiWindowBridgeEngine engine)
@@ -44,128 +45,128
44	bool newShow = true;	45	bool newShow = true;
45		46
46		47
47	ImGui.PushFont(font);	48	ImGui.PushFont(font);
48		49
49	ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.None;	50	ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.None;
50	StyleSets.defaultSet.push();	51	StyleSets.defaultSet.push();
51		52
52	if(GraphWindow.hadFocus)	53	if(GraphWindow.hadFocus)
53	{	54	{
54	ImGui.PushStyleColor(ImGuiCol.Text, StyleSets.white);	55	ImGui.PushStyleColor(ImGuiCol.Text, StyleSets.white);
55	}	56	}
56	ImGui.SetNextWindowSize(new Num.Vector2(400, 400));	57	ImGui.SetNextWindowSize(new Num.Vector2(400, 400));
57		58
58	ImGui.Begin("Graph", ref newShow, ImGuiWindowFlags.NoResize \| ImGuiWindowFlags.NoCollapse \| ImGuiWindowFlags.AlwaysAutoResize \| ImGuiWindowFlags.NoSavedSettings);	59	ImGui.Begin("Graph", ref newShow, ImGuiWindowFlags.NoResize \| ImGuiWindowFlags.NoCollapse \| ImGuiWindowFlags.AlwaysAutoResize \| ImGuiWindowFlags.NoSavedSettings);
59	if (GraphWindow.hadFocus)	60	if (GraphWindow.hadFocus)
60	{	61	{
61	ImGui.PopStyleColor();	62	ImGui.PopStyleColor();
62	}	63	}
63	GraphWindow.hadFocus = ImGui.IsWindowFocused();	64	GraphWindow.hadFocus = ImGui.IsWindowFocused();
64		65
65	data_sets["Total Funds"] = sim.allBudgets().Select(b => (double)b.money);	66	data_sets["Total Funds"] = sim.allBudgets().Select(b => (double)b.money);
66	data_sets["Subsidies"] = sim.allBudgets().Select(b => (double)b.subsidy);	67	data_sets["Subsidies"] = sim.allBudgets().Select(b => (double)b.subsidy);
67	data_sets["Upkeep"] = sim.allBudgets().Select(b => (double)b.upkeep);	68	data_sets["Upkeep"] = sim.allBudgets().Select(b => (double)b.upkeep);
68	data_sets["Contracts"] = sim.allBudgets().Select(b => (double)b.contracts);	69	data_sets["Contracts"] = sim.allBudgets().Select(b => (double)b.contracts);
69	data_sets["Misc"] = sim.allBudgets().Select(b => (double)b.misc);	70	data_sets["Misc"] = sim.allBudgets().Select(b => (double)b.misc);
70	data_sets["Cashflow"] = sim.allBudgets().Select(b => (double)b.cashflow);	71	data_sets["Cashflow"] = sim.allBudgets().Select(b => (double)b.cashflow);
		72
		73	data_sets["Total trees"] = sim.allBudgets().Select(b => (double)b.trees);
		74	data_sets["Dead trees"] = sim.allBudgets().Select(b => (double)b.dead_trees);
		75	data_sets["Crowded trees"] = sim.allBudgets().Select(b => (double)b.crowded_trees);
		76
		77	var periods = 12.0d * GraphWindow.year;
		78	var keys = data_sets_show.Keys.ToList();
		79
		80	var totals = data_sets["Total Funds"];
71		81
72	data_sets["Total trees"] = sim.allBudgets().Select(b => (double)b.trees);	82	var max = 0.0d;
73	data_sets["Dead trees"] = sim.allBudgets().Select(b => (double)b.dead_trees);	83	var min = 0.0d;
74	data_sets["Crowded trees"] = sim.allBudgets().Select(b => (double)b.crowded_trees);
75		84
76	var periods = 12.0d * GraphWindow.year;	85	foreach( var key in keys) {
77	~~var~~ ~~keys~~ = ~~data_sets_show~~.~~Keys~~.~~ToLis~~t();	86	if (data_sets_show[key] && totals.Count() > 0) {
		87	var series_max = data_sets[key].Max() * 1.10f;
		88	max = Math.Max(series_max, max);
		89	}
		90	}
78		91
79	var totals = data_sets["Total Funds"];	92	foreach( var key in keys) {
80		93	if (data_sets_show[key] && totals.Count() > 0) {
81	var max = 0.0d;	94	var series_min = data_sets[key].Min();
82	var min = 0.0d;	95	series_min = series_min >= 0? series_min * 0.90f : series_min *1.10f;
		96	min = Math.Min(series_min, min);
		97	}
		98	}
83		99
84	foreach( var key in keys) {	100	ImPlot.PushStyleVar(ImPlotStyleVar.LineWeight, 2.0f);
85	if (data_sets_show[key] && totals.Count() > 0) {	101	ImPlot.PushStyleVar(ImPlotStyleVar.MinorAlpha, 0.0f);
86	var series_max = data_sets[key].Max() * 1.10f;	102	// ImPlot.PushStyleVar(ImPlotStyleVar.MajorGridSize, new Num.Vector2(0.0f, 0.0f));
87	max = Math.Max(series_max, max);	103	// ImPlot.PushStyleVar(ImPlotStyleVar.MinorGridSize, new Num.Vector2(0.0f, 0.0f));
88	}
89	}
90		104
91	foreach( var key in keys) {	105	ImPlot.SetNextPlotLimits(totals.Count()-periods, totals.Count(), min, max, ImGuiCond.Always);
92	if (data_sets_show[key] && totals.Count() > 0) {	106	if( ImPlot.BeginPlot("My Plot", null, null, new Num.Vector2(-1,0), ImPlotFlags.NoLegend \| ImPlotFlags.NoMousePos )) {
93	var series_min = data_sets[key].Min();	107	// Span<double> totals = new Span<double>(new double[]{0.0, 1.0, 2.0, 9.0});
94	series_min = series_min >= 0? series_min * 0.90f : series_min *1.10f;	108	foreach (var key in keys) {
95	min = Math.Min(series_min, min);	109	var show = data_sets_show[key];
		110	var data = data_sets[key];
		111	var data_array = data_sets[key].ToArray();
		112	if (data_array.Length > 0 && show)
		113	{
		114	ImPlot.PlotLine(key, ref data_array[0], data_array.Length);
		115	ImPlot.AnnotateClamped(data_array.Length-1, data_array[data_array.Length-1],
		116	new Num.Vector2(5, -10), StyleSets.grey, key);
96	}	117	}
97	}	118	}
98		119
99	ImPlot.PushStyleVar(ImPlotStyleVar.LineWeight, 2.0f);	120	ImPlot.EndPlot();
100	ImPlot.PushStyleVar(ImPlotStyleVar.MinorAlpha, 0.0f);	121	}
101	// ImPlot.PushStyleVar(ImPlotStyleVar.MajorGridSize, new Num.Vector2(0.0f, 0.0f));	122
102	// ImPlot.PushStyleVar(ImPlotStyleVar.MinorGridSize, new Num.Vector2(0.0f, 0.0f));	123	ImPlot.PopStyleVar(2);
103		124
104	ImPlot.SetNextPlotLimits(totals.Count()-periods, totals.Count(), min, max , ImGuiCond.Always);	125	ImGui.RadioButton("1 year", ref GraphWindow.year, 1);
105	if( ImPlot.BeginPlot("My Plot", null, null, new Num.Vector2(-1,0), ImPlotFlags.NoLegend \| ImPlotFlags.NoMousePos )) {	126	ImGui.SameLine();
106	// Span<double> totals = new Span<double>(new double[]{0.0, 1.0, 2.0, 9.0});	127	ImGui.RadioButton("5 years", ref GraphWindow.year, 5);
107	foreach (var key in keys) {	128	ImGui.SameLine();
108	var show = data_sets_show[key];	129	ImGui.RadioButton("25 years", ref GraphWindow.year, 25);
109	var data = data_sets[key];	130	ImGui.SameLine();
110	var data_array = data_sets[key].ToArray();	131	ImGui.RadioButton("100 years", ref GraphWindow.year, 100);
111	if (data_array.Length > 0 && show)	132
112	{	133	ImGui.Text("Trees:");
113	ImPlot.PlotLine(key, ref data_array[0], data_array.Length);	134	for (int i = 0; i < tree_series.Length; i++)
114	ImPlot.AnnotateClamped(data_array.Length-1, data_array[data_array.Length-1],	135	{
115	new Num.Vector2(5, -10), StyleSets.grey, key);	136	var key = tree_series[i];
116	}	137	if (Menu.activeButton(key, data_sets_show[key], StyleSets.selected, StyleSets.white))
117	}	138	{
118		139	data_sets_show[key] = !data_sets_show[key];
119	ImPlot.EndPlot();
120	}	140	}
121		141
122	ImPlot.PopStyleVar(2);	142	if (i != tree_series.Length-1)
123
124	ImGui.RadioButton("1 year", ref GraphWindow.year, 1);
125	ImGui.SameLine();
126	ImGui.RadioButton("5 years", ref GraphWindow.year, 5);
127	ImGui.SameLine();
128	ImGui.RadioButton("25 years", ref GraphWindow.year, 25);
129	ImGui.SameLine();
130	ImGui.RadioButton("100 years", ref GraphWindow.year, 100);
131
132	ImGui.Text("Trees:");
133	for (int i = 0; i < tree_series.Length; i++)
134	{	143	{
135	var key = tree_series[i];	144	ImGui.SameLine();
136	if (Menu.activeButton(key, data_sets_show[key], StyleSets.selected, StyleSets.white))
137	{
138	data_sets_show[key] = !data_sets_show[key];
139	}
140
141	if (i != tree_series.Length-1)
142	{
143	ImGui.SameLine();
144	}
145
146	}	145	}
147		146
148	ImGui.Text("Money:");	147	}
149	for (int i = 0; i < money_series.Length; i++)	148
		149	ImGui.Text("Money:");
		150	for (int i = 0; i < money_series.Length; i++)
		151	{
		152	var key = money_series[i];
		153	if (Menu.activeButton(key, data_sets_show[key], StyleSets.selected, StyleSets.white))
150	{	154	{
151	~~var~~ key = ~~money_series~~[i];	155	data_sets_show[key] = !data_sets_show[key];
152	if (Menu.activeButton(key, data_sets_show[key], StyleSets.selected, StyleSets.white))	156	}
153	{	157	if ((i % 4 != 3) && (i != money_series.Length-1)) {
154	data_sets_show[key] = !data_sets_show[key];	158	ImGui.SameLine();
155	}	159	}
156	if ((i % 4 != 3) && (i != money_series.Length-1)) {
157	ImGui.SameLine();
158	}
159		160
160	}	161	}
161		162
162		163
163		164
164		165
165	ImGui.End();	166	ImGui.End();
166	ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.Left;	167	ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.Left;
167	StyleSets.defaultSet.pop();	168	StyleSets.defaultSet.pop();
168	ImGui.PopFont();	169	ImGui.PopFont();
169		170
170	}	171	}
171	}	172	}

isometric-park-fna/UI/OptionsWindow.cs ¶ +23 -23

                     private static ProfanityLevel profanityLevel = default;
-            	private static bool origFullscreen = OptionsWindow.newFullscreen;
+                    private static bool origFullscreen = OptionsWindow.newFullscreen;
-            	private static Vector2 origResolution = OptionsWindow.newResolution;
+                    private static Vector2 origResolution = OptionsWindow.newResolution;
-            	private static string origFontName = OptionsWindow.fontName;
+                    private static string origFontName = OptionsWindow.fontName;
-            	private static int origFontSize = OptionsWindow.fontSize;
+                    private static int origFontSize = OptionsWindow.fontSize;
-            	private static ProfanityLevel origProfanityLevel = OptionsWindow.profanityLevel;
+                    private static ProfanityLevel origProfanityLevel = OptionsWindow.profanityLevel;
                     public static void Initialize(Vector2 resolution, bool fullscreen, ProfanityLevel profanityLevel)
                     {
                         ImGui.SameLine();
                         if (ImGui.BeginCombo("##resolutions", string.Format("{0}x{1}",
-                                                               newResolution.X, newResolution.Y)))
+                                             newResolution.X, newResolution.Y)))
                         {
                             foreach(var (width_option, height_option) in new[] {(1280, 640),
                                 fontName = OptionsWindow.fontName
                             });
-            		origFullscreen = OptionsWindow.newFullscreen;
+                            origFullscreen = OptionsWindow.newFullscreen;
-            		origResolution = OptionsWindow.newResolution;
+                            origResolution = OptionsWindow.newResolution;
-            		origFontName = OptionsWindow.fontName;
+                            origFontName = OptionsWindow.fontName;
-            		origFontSize = OptionsWindow.fontSize;
+                            origFontSize = OptionsWindow.fontSize;
-            		origProfanityLevel = OptionsWindow.profanityLevel;
+                            origProfanityLevel = OptionsWindow.profanityLevel;
                         }
                         ImGui.SameLine();
                                 fontName = OptionsWindow.fontName
                             });
-            		origFullscreen = OptionsWindow.newFullscreen;
+                            origFullscreen = OptionsWindow.newFullscreen;
-            		origResolution = OptionsWindow.newResolution;
+                            origResolution = OptionsWindow.newResolution;
-            		origFontName = OptionsWindow.fontName;
+                            origFontName = OptionsWindow.fontName;
-            		origFontSize = OptionsWindow.fontSize;
+                            origFontSize = OptionsWindow.fontSize;
-            		origProfanityLevel = OptionsWindow.profanityLevel;
+                            origProfanityLevel = OptionsWindow.profanityLevel;
                         }
                         ImGui.SameLine();
-            	    if (ImGui.Button("Cancel")) {
+                        if (ImGui.Button("Cancel")) {
                             bridgeEngine.typeMessages.Add(new ToggleWindowTypeMessage {Window = Window.Options});
-            		OptionsWindow.newFullscreen = origFullscreen;
+                            OptionsWindow.newFullscreen = origFullscreen;
-            		OptionsWindow.newResolution = origResolution;
+                            OptionsWindow.newResolution = origResolution;
-            		OptionsWindow.fontName = origFontName;
+                            OptionsWindow.fontName = origFontName;
-            		OptionsWindow.fontSize = origFontSize;
+                            OptionsWindow.fontSize = origFontSize;
-            		OptionsWindow.profanityLevel = origProfanityLevel;
+                            OptionsWindow.profanityLevel = origProfanityLevel;
+                        }
                         ImGui.End();

isometric-park-fna/Utils/MathUtils.cs ¶ +32 -32

@@ -2,14 +2,14
2	using JM.LinqFaster;	2	using JM.LinqFaster;
3	namespace isometricparkfna	3	namespace isometricparkfna
4	{	4	{
5	public class EmptyArrayException : Exception {	5	public class EmptyArrayException : Exception {
6	public EmptyArrayException() {	6	public EmptyArrayException() {
7	}	7	}
8		8
9	public EmptyArrayException(string message) : base(message) {	9	public EmptyArrayException(string message) : base(message) {
10	}	10	}
11		11
12	}	12	}
13	public class MathUtils	13	public class MathUtils
14	{	14	{
15	public MathUtils()	15	public MathUtils()
@@ -136,38 +136,38
136	return integers[index];	136	return integers[index];
137	}	137	}
138		138
139	public static float Percentile(float[] floats, float percentile) {	139	public static float Percentile(float[] floats, float percentile) {
140	if (floats.Length > 0) {	140	if (floats.Length > 0) {
141	Array.Sort(floats);	141	Array.Sort(floats);
142	var raw_position = (floats.Length-1) * percentile;	142	var raw_position = (floats.Length-1) * percentile;
143		143
144	var lower_position = (int)raw_position;	144	var lower_position = (int)raw_position;
145	var higher_position = Math.Min((int)(raw_position+1), floats.Length-1);	145	var higher_position = Math.Min((int)(raw_position+1), floats.Length-1);
146		146
147	var remainder = (raw_position % 1);	147	var remainder = (raw_position % 1);
148		148
149	return (floats[lower_position] * (1-remainder)) + (floats[higher_position] * remainder);	149	return (floats[lower_position] * (1-remainder)) + (floats[higher_position] * remainder);
150	}	150	}
151	else {	151	else {
152	throw new EmptyArrayException("Array must not be empty");	152	throw new EmptyArrayException("Array must not be empty");
153	}	153	}
154	}	154	}
155		155
156	public static double Percentile(double[] doubles, double percentile) {	156	public static double Percentile(double[] doubles, double percentile) {
157	if (doubles.Length > 0) {	157	if (doubles.Length > 0) {
158	Array.Sort(doubles);	158	Array.Sort(doubles);
159	var raw_position = (doubles.Length-1) * percentile;	159	var raw_position = (doubles.Length-1) * percentile;
160		160
161	var lower_position = (int)raw_position;	161	var lower_position = (int)raw_position;
162	var higher_position = Math.Min((int)raw_position + 1, doubles.Length -1);	162	var higher_position = Math.Min((int)raw_position + 1, doubles.Length -1);
163		163
164	var remainder = (raw_position % 1);	164	var remainder = (raw_position % 1);
165		165
166	return (doubles[lower_position] * (1-remainder)) + (doubles[higher_position] * remainder);	166	return (doubles[lower_position] * (1-remainder)) + (doubles[higher_position] * remainder);
167	}	167	}
168	else {	168	else {
169	throw new EmptyArrayException("Array must not be empty");	169	throw new EmptyArrayException("Array must not be empty");
170	}	170	}
171	}	171	}
172	}	172	}
173	}	173	}

Write
Preview

You need to be logged in to leave comments. Login now

	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

r534:83d9621d56f6 - Sun, 06 Feb 2022 23:54:39

Sign in to your account

Commit r534:83d9621d56f6 public

Author

r534:83d9621d56f6 - Sun, 06 Feb 2022 23:54:39

Commit `r534:83d9621d56f6` public