diff --git a/isometric-park-fna/UI/Graph.cs b/isometric-park-fna/UI/Graph.cs --- a/isometric-park-fna/UI/Graph.cs +++ b/isometric-park-fna/UI/Graph.cs @@ -44,8 +44,9 @@ - public static uint[] colors = {0xFF000000, 0xFFFF0000, 0xFF00FF00, 0xFF0000FF, - 0xFF999999, 0xFFAA0000, 0xFF00AA00, 0xFF0000AA, 0xFF000000}; + public static uint[] colors = { ImGuiColor.BLACK, ImGuiColor.RED, ImGuiColor.GREEN, + ImGuiColor.BLUE, ImGuiColor.DARKGREY, ImGuiColor.LIGHTRED, ImGuiColor.LIGHTGREEN, + ImGuiColor.LIGHTBLUE, ImGuiColor.BLACK }; public static Dictionary data_sets_color = new List() .Concat(money_series) @@ -62,7 +63,7 @@ var tick_position = position; for(int i = 0; i < points; i++) { - draw_list.AddLine(tick_position, Num.Vector2.Add(tick_position, tick_adjust), 0xFFAAAAAA, 1.0f); + draw_list.AddLine(tick_position, Num.Vector2.Add(tick_position, tick_adjust), ImGuiColor.LIGHTGREY, 1.0f); if (vertical) { tick_position = new Num.Vector2(position.X, position.Y + ((i + 1) * tick_spacing)); @@ -88,7 +89,7 @@ for(int i = 0; i < labels; i++) { var value = Scale(range, domain, (int)(vertical ? tick_position.Y : tick_position.X)); var label = String.Format("{0}", value); - draw_list.AddText(font, 11.0f, tick_absolute_position, 0xFF000000, label); + draw_list.AddText(font, 11.0f, tick_absolute_position, ImGuiColor.BLACK, label); //Logging.Info(String.Format("Drawing {0:} at {1} ({2})", label, tick_absolute_position, tick_position)); if (vertical) { @@ -264,12 +265,12 @@ //Y Axis draw_list.AddLine(Num.Vector2.Add(new Num.Vector2(padding, padding), c), Num.Vector2.Add(new Num.Vector2(padding, 200), c), - 0xFFAAAAAA, 1.0f); + ImGuiColor.LIGHTGREY, 0.0f); //X Axis draw_list.AddLine(Num.Vector2.Add(new Num.Vector2(padding, 200 -padding), c), Num.Vector2.Add(new Num.Vector2(350, 200 - padding), c), - 0xFFAAAAAA, 1.0f); + ImGuiColor.LIGHTGREY, 1.0f); foreach (var key in keys) { diff --git a/isometric-park-fna/UI/ImGuiColor.cs b/isometric-park-fna/UI/ImGuiColor.cs new file mode 100644 --- /dev/null +++ b/isometric-park-fna/UI/ImGuiColor.cs @@ -0,0 +1,17 @@ + +namespace isometricparkfna.UI { + + enum ImGuiColor : uint { + BLACK = 0xFFFFFFFF, + RED = 0xFFFF0000, + GREEN = 0xFF00FF00, + BLUE = 0xFF0000FF, + DARKGREY = 0xFF999999, + LIGHTRED = 0xFFAA0000, + LIGHTGREEN = 0xFF00AA00, + LIGHTBLUE = 0xFF0000AA, + LIGHTGREY = 0xFFAAAAAA + + } + +} \ No newline at end of file