From a7c2d13bcca784350d851b665b8a19697e113b34 Mon Sep 17 00:00:00 2001 From: San Jacobs Date: Thu, 17 Aug 2023 01:48:00 +0200 Subject: Screw everything, we do oui now --- src/main.odin | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 125 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main.odin b/src/main.odin index bcbaeec..17517c7 100644 --- a/src/main.odin +++ b/src/main.odin @@ -1,4 +1,5 @@ package main +import "../lib/oui" import "core:fmt" import "core:math" @@ -78,6 +79,11 @@ main :: proc() { big_font: Font = LoadFontEx("res/UbuntuMono-Regular.ttf", big_font_size, nil, 0) defer UnloadFont(big_font) + // oui stuff + + c0 := oui.context_create(1028, 1028 * 8) + defer oui.context_destroy(c0) + oui.context_make_current(c0) // Setting up the timelines @@ -116,13 +122,42 @@ main :: proc() { // clicking will put a white border around the timeblock, // and display information about the block in the // bottom left of the screen. - + + mousePosition: = rl.GetMousePosition() + oui.set_cursor(int(mousePosition.x), int(mousePosition.y)) + oui.set_button(.Left, rl.IsMouseButtonPressed(rl.MouseButton(0))) // DRAW // ------------------------------------------ BeginDrawing() ClearBackground(BGCOLOR) + + // hotloop + oui.begin_layout() + + a_panel := panel() + oui.set_layout(a_panel, .Absolute) + oui.set_size(a_panel, 200, 200) + oui.set_offset(a_panel, 20, 20) + + a_button := button("Testerino", 50) + if oui.latest_clicked() { + fmt.println("CLICKO BOIO") + } + oui.set_cut(a_panel, .Left) + oui.set_height(a_button, 50) + oui.set_offset(a_button, 20, 20) + + oui.item_insert(a_panel, a_button) + + oui.end_layout() + + ui_draw(0) + // DRAW HERE OR BELOW + oui.process() + + /* DrawTextEx(font, "Date", {20, 8}, font_size, 0, RAYWHITE); DrawTextEx(font, "Calltime", {105, 8}, font_size, 0, RAYWHITE); DrawTextEx(font, "Wraptime", {f32(width)-83, 8}, font_size, 0, RAYWHITE); @@ -176,7 +211,7 @@ main :: proc() { DrawTextEx(small_font, total_sum, {f32(width)-120, f32(height)-43}, small_font_size, 0, RAYWHITE); DrawTextEx(big_font, inc_soc, {f32(width)-120, f32(height)-29}, big_font_size, 0, RAYWHITE); - + */ EndDrawing() } } @@ -187,3 +222,91 @@ PBGCOLOR : rl.Color : {40, 40, 40, 255} DAY_HEIGHT :: 35 TIMELINE_START :: 175 TIMELINE_END :: -85 + +Item :: oui.Item +Call :: oui.Call + +Data_Element :: enum int { + Panel, + Button, + Text_Input, + Timeblock, +// ... +} + +Data_Head :: struct { + subtype: Data_Element, +} + +Data_Panel :: struct { + using _: Data_Head, +} + +Data_Button :: struct { + using _: Data_Head, + text: string, + selected: bool, +} + +button_callback :: proc(item: Item, event: Call) -> int { + data := cast(^Data_Button) oui.get_handle(item) + + #partial switch event { + case .Cursor_Handle: + //return int(Cursor_Type.Hand) + } + + return -1 +} + +panel :: proc() -> Item { + item := oui.item_make() + + data := oui.alloc_typed(item, Data_Panel) + data.subtype = .Panel + + return item +} + +button :: proc(text: string, width: int, selected := false) -> Item { + item := oui.item_make() + oui.set_size(item, width, 35) + oui.set_callback(item, button_callback) + + data := oui.alloc_typed(item, Data_Button) + data.subtype = .Button + data.text = text + data.selected = selected + + return item +} + +// recursive loop +ui_draw_children :: proc(item: oui.Item) { + list := oui.children_sorted(item) + for kid in list { + ui_draw(kid) + } +} + +ui_draw :: proc(item: oui.Item) { + head := cast(^Data_Head) oui.get_handle(item) + rect := oui.get_rect(item) + + //fmt.println(rect, head, item) + + if head == nil { + ui_draw_children(item) + return + } + + #partial switch head.subtype { + //case .Panel_Root: + // ... render any type of item + case .Button: + rl.DrawRectangle(i32(rect.l), i32(rect.t), i32(rect.r-rect.l), i32(rect.b-rect.t), PBGCOLOR) + case .Panel: + rl.DrawRectangle(i32(rect.l), i32(rect.t), i32(rect.r-rect.l), i32(rect.b-rect.t), rl.RED) + ui_draw_children(item) + } +} \ No newline at end of file -- cgit v1.2.1 From 408c473839fcc8bdb0f7ac843031507ae99e33f0 Mon Sep 17 00:00:00 2001 From: San Jacobs Date: Thu, 17 Aug 2023 02:35:08 +0200 Subject: Made it easier to switch back to old unfinished UI for reference --- src/main.odin | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main.odin b/src/main.odin index 17517c7..1657c0f 100644 --- a/src/main.odin +++ b/src/main.odin @@ -133,6 +133,7 @@ main :: proc() { ClearBackground(BGCOLOR) +when true { // hotloop oui.begin_layout() @@ -157,7 +158,7 @@ main :: proc() { // DRAW HERE OR BELOW oui.process() - /* +} else { DrawTextEx(font, "Date", {20, 8}, font_size, 0, RAYWHITE); DrawTextEx(font, "Calltime", {105, 8}, font_size, 0, RAYWHITE); DrawTextEx(font, "Wraptime", {f32(width)-83, 8}, font_size, 0, RAYWHITE); @@ -211,7 +212,7 @@ main :: proc() { DrawTextEx(small_font, total_sum, {f32(width)-120, f32(height)-43}, small_font_size, 0, RAYWHITE); DrawTextEx(big_font, inc_soc, {f32(width)-120, f32(height)-29}, big_font_size, 0, RAYWHITE); - */ +} EndDrawing() } } -- cgit v1.2.1 From 40687c8c5624dda5bd6b9c6b0e281fb079755040 Mon Sep 17 00:00:00 2001 From: San Jacobs Date: Sat, 26 Aug 2023 12:57:44 +0200 Subject: WIP OUI stuff --- src/main.odin | 120 +++++++---------------------------------- src/ui_implementation.odin | 130 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 100 deletions(-) create mode 100644 src/ui_implementation.odin (limited to 'src') diff --git a/src/main.odin b/src/main.odin index 1657c0f..25cdf22 100644 --- a/src/main.odin +++ b/src/main.odin @@ -137,12 +137,26 @@ when true { // hotloop oui.begin_layout() - a_panel := panel() - oui.set_layout(a_panel, .Absolute) - oui.set_size(a_panel, 200, 200) - oui.set_offset(a_panel, 20, 20) - a_button := button("Testerino", 50) + master_container := panel() + oui.set_layout(master_container, .Absolute) + oui.set_size(master_container, int(GetScreenWidth()), int(GetScreenHeight())) + + top_bar := panel(BGCOLOR) + oui.set_cut(master_container, .Top) + oui.set_height(top_bar, 30) + oui.item_insert(master_container, top_bar) + + date_label := label("Date", font) + + bottom_bar := panel(PBGCOLOR) + oui.set_cut(master_container, .Bottom) + oui.set_height(bottom_bar, 50) + oui.item_insert(master_container, bottom_bar) + + + +/* a_button := button("Testerino", 50) if oui.latest_clicked() { fmt.println("CLICKO BOIO") } @@ -150,7 +164,7 @@ when true { oui.set_height(a_button, 50) oui.set_offset(a_button, 20, 20) - oui.item_insert(a_panel, a_button) + oui.item_insert(a_panel, a_button)*/ oui.end_layout() @@ -217,97 +231,3 @@ when true { } } -BGCOLOR : rl.Color : {30, 30, 30, 255} -PBGCOLOR : rl.Color : {40, 40, 40, 255} - -DAY_HEIGHT :: 35 -TIMELINE_START :: 175 -TIMELINE_END :: -85 - -Item :: oui.Item -Call :: oui.Call - -Data_Element :: enum int { - Panel, - Button, - Text_Input, - Timeblock, -// ... -} - -Data_Head :: struct { - subtype: Data_Element, -} - -Data_Panel :: struct { - using _: Data_Head, -} - -Data_Button :: struct { - using _: Data_Head, - text: string, - selected: bool, -} - -button_callback :: proc(item: Item, event: Call) -> int { - data := cast(^Data_Button) oui.get_handle(item) - - #partial switch event { - case .Cursor_Handle: - //return int(Cursor_Type.Hand) - } - - return -1 -} - -panel :: proc() -> Item { - item := oui.item_make() - - data := oui.alloc_typed(item, Data_Panel) - data.subtype = .Panel - - return item -} - -button :: proc(text: string, width: int, selected := false) -> Item { - item := oui.item_make() - oui.set_size(item, width, 35) - oui.set_callback(item, button_callback) - - data := oui.alloc_typed(item, Data_Button) - data.subtype = .Button - data.text = text - data.selected = selected - - return item -} - -// recursive loop -ui_draw_children :: proc(item: oui.Item) { - list := oui.children_sorted(item) - for kid in list { - ui_draw(kid) - } -} - -ui_draw :: proc(item: oui.Item) { - head := cast(^Data_Head) oui.get_handle(item) - rect := oui.get_rect(item) - - //fmt.println(rect, head, item) - - if head == nil { - ui_draw_children(item) - return - } - - #partial switch head.subtype { - //case .Panel_Root: - // ... render any type of item - case .Button: - rl.DrawRectangle(i32(rect.l), i32(rect.t), i32(rect.r-rect.l), i32(rect.b-rect.t), PBGCOLOR) - case .Panel: - rl.DrawRectangle(i32(rect.l), i32(rect.t), i32(rect.r-rect.l), i32(rect.b-rect.t), rl.RED) - ui_draw_children(item) - } -} \ No newline at end of file diff --git a/src/ui_implementation.odin b/src/ui_implementation.odin new file mode 100644 index 0000000..4842a76 --- /dev/null +++ b/src/ui_implementation.odin @@ -0,0 +1,130 @@ +package main + +import "../lib/oui" +import rl "vendor:raylib" + + + +BGCOLOR : rl.Color : {30, 30, 30, 255} +PBGCOLOR : rl.Color : {40, 40, 40, 255} + +DAY_HEIGHT :: 35 +TIMELINE_START :: 175 +TIMELINE_END :: -85 + + + +Item :: oui.Item +Call :: oui.Call + +Data_Element :: enum int { + Panel, + Button, + Label, + Text_Input, + Timeblock, +// ... +} + +Data_Head :: struct { + subtype: Data_Element, +} + +Data_Panel :: struct { + using _: Data_Head, + color: rl.Color, +} + +Data_Button :: struct { + using _: Data_Head, + text: string, + selected: bool, +} + +Data_Label :: struct { + using _: Data_Head, + text: string, + alignment: Text_Alignment, +} + +button_callback :: proc(item: Item, event: Call) -> int { + data := cast(^Data_Button) oui.get_handle(item) + + #partial switch event { + case .Cursor_Handle: + //return int(Cursor_Type.Hand) + } + + return -1 +} + +panel :: proc(color : rl.Color = rl.RED) -> Item { + item := oui.item_make() + + data := oui.alloc_typed(item, Data_Panel) + data.subtype = .Panel + data.color = color + + return item +} + +button :: proc(text: string, width: int, selected := false) -> Item { + item := oui.item_make() + oui.set_size(item, width, 35) + oui.set_callback(item, button_callback) + + data := oui.alloc_typed(item, Data_Button) + data.subtype = .Button + data.text = text + data.selected = selected + + return item +} + +Text_Alignment :: enum int { + Left, + Right, +} +label :: proc(text: string, font: rl.Font, alignment: Text_Alignment = .Left) -> Item { + item := oui.item_make() + + data := oui.alloc_typed(item, Data_Label) + data.subtype = .Label + data.text = text + data.alignment = alignment + + return item +} + +// recursive loop +ui_draw_children :: proc(item: oui.Item) { + list := oui.children_sorted(item) + for kid in list { + ui_draw(kid) + } +} + +ui_draw :: proc(item: oui.Item) { + head := cast(^Data_Head) oui.get_handle(item) + rect := oui.get_rect(item) + + //fmt.println(rect, head, item) + + if head == nil { + ui_draw_children(item) + return + } + + #partial switch head.subtype { + //case .Panel_Root: + // ... render any type of item + case .Button: + rl.DrawRectangle(i32(rect.l), i32(rect.t), i32(rect.r-rect.l), i32(rect.b-rect.t), PBGCOLOR) + case .Panel: + subtyped := cast(^Data_Panel) head + rl.DrawRectangle(i32(rect.l), i32(rect.t), i32(rect.r-rect.l), i32(rect.b-rect.t), subtyped.color) + ui_draw_children(item) + case .Label: + + } +} \ No newline at end of file -- cgit v1.2.1 From e77dec086f94da480af8c42bec6cac8e873a6931 Mon Sep 17 00:00:00 2001 From: San Jacobs Date: Fri, 13 Oct 2023 12:00:49 +0200 Subject: Progressed ability to write text using new oui system --- src/main.odin | 16 ++++++++++------ src/ui_implementation.odin | 20 +++++++++++++++++--- 2 files changed, 27 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/main.odin b/src/main.odin index 25cdf22..96a56d5 100644 --- a/src/main.odin +++ b/src/main.odin @@ -7,6 +7,8 @@ import "core:slice" import "core:strings" import rl "vendor:raylib" +UBUNTU_MONO := #load("../res/UbuntuMono-Regular.ttf") + main :: proc() { // TODO: Replace the dynamic array of Workday-pointers with @@ -68,6 +70,7 @@ main :: proc() { // Loading fonts - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - font_size :: 18 + //font: Font = LoadFontFromMemory("ttf", &UBUNTU_MONO, i32(len(UBUNTU_MONO)), font_size, nil, 0) font: Font = LoadFontEx("res/UbuntuMono-Regular.ttf", font_size, nil, 0) defer UnloadFont(font) @@ -139,20 +142,21 @@ when true { master_container := panel() - oui.set_layout(master_container, .Absolute) - oui.set_size(master_container, int(GetScreenWidth()), int(GetScreenHeight())) + oui.set_layout(master_container, .Absolute) + oui.set_size(master_container, int(GetScreenWidth()), int(GetScreenHeight())) top_bar := panel(BGCOLOR) oui.set_cut(master_container, .Top) oui.set_height(top_bar, 30) oui.item_insert(master_container, top_bar) - date_label := label("Date", font) + date_label := label("Date abcg", big_font) + oui.item_insert(top_bar, date_label) bottom_bar := panel(PBGCOLOR) - oui.set_cut(master_container, .Bottom) - oui.set_height(bottom_bar, 50) - oui.item_insert(master_container, bottom_bar) + oui.set_cut(master_container, .Bottom) + oui.set_height(bottom_bar, 50) + oui.item_insert(master_container, bottom_bar) diff --git a/src/ui_implementation.odin b/src/ui_implementation.odin index 4842a76..7c5f9e3 100644 --- a/src/ui_implementation.odin +++ b/src/ui_implementation.odin @@ -1,6 +1,8 @@ package main import "../lib/oui" +import "core:strings" +import "core:fmt" import rl "vendor:raylib" @@ -44,6 +46,8 @@ Data_Button :: struct { Data_Label :: struct { using _: Data_Head, text: string, + font: rl.Font, + font_size: i32, alignment: Text_Alignment, } @@ -84,6 +88,7 @@ button :: proc(text: string, width: int, selected := false) -> Item { Text_Alignment :: enum int { Left, Right, + Center } label :: proc(text: string, font: rl.Font, alignment: Text_Alignment = .Left) -> Item { item := oui.item_make() @@ -91,6 +96,7 @@ label :: proc(text: string, font: rl.Font, alignment: Text_Alignment = .Left) -> data := oui.alloc_typed(item, Data_Label) data.subtype = .Label data.text = text + data.font_size = font.baseSize // This should not be necesssary data.alignment = alignment return item @@ -121,10 +127,18 @@ ui_draw :: proc(item: oui.Item) { case .Button: rl.DrawRectangle(i32(rect.l), i32(rect.t), i32(rect.r-rect.l), i32(rect.b-rect.t), PBGCOLOR) case .Panel: - subtyped := cast(^Data_Panel) head - rl.DrawRectangle(i32(rect.l), i32(rect.t), i32(rect.r-rect.l), i32(rect.b-rect.t), subtyped.color) + data := cast(^Data_Panel) head + rl.DrawRectangle(i32(rect.l), i32(rect.t), i32(rect.r-rect.l), i32(rect.b-rect.t), data.color) ui_draw_children(item) case .Label: - + data := cast(^Data_Label) oui.get_handle(item) + + // For some reason, data.font.baseSize == 0 here. It doesn't outside of this function. Dunno why. + font_height := f32(data.font_size) + + rl.DrawTextEx(data.font, strings.unsafe_string_to_cstring(data.text), { 0, 0 }, font_height, 0.0, rl.RAYWHITE); + //rl.DrawTextEx(rl.GetFontDefault(), strings.unsafe_string_to_cstring(data.text), { 0, 0 }, 40, 0, rl.WHITE); + //rl.DrawFPS(0, 0) + //fmt.println(font_height) } } \ No newline at end of file -- cgit v1.2.1 From 0256cea0b389506bc97d1c026d566706e1cc8e76 Mon Sep 17 00:00:00 2001 From: San Jacobs Date: Fri, 13 Oct 2023 18:29:41 +0200 Subject: Fixed font loading in labels --- src/ui_implementation.odin | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/ui_implementation.odin b/src/ui_implementation.odin index 7c5f9e3..594e5a1 100644 --- a/src/ui_implementation.odin +++ b/src/ui_implementation.odin @@ -88,7 +88,7 @@ button :: proc(text: string, width: int, selected := false) -> Item { Text_Alignment :: enum int { Left, Right, - Center + Center, } label :: proc(text: string, font: rl.Font, alignment: Text_Alignment = .Left) -> Item { item := oui.item_make() @@ -97,6 +97,7 @@ label :: proc(text: string, font: rl.Font, alignment: Text_Alignment = .Left) -> data.subtype = .Label data.text = text data.font_size = font.baseSize // This should not be necesssary + data.font = font data.alignment = alignment return item @@ -135,7 +136,7 @@ ui_draw :: proc(item: oui.Item) { // For some reason, data.font.baseSize == 0 here. It doesn't outside of this function. Dunno why. font_height := f32(data.font_size) - + rl.DrawTextEx(data.font, strings.unsafe_string_to_cstring(data.text), { 0, 0 }, font_height, 0.0, rl.RAYWHITE); //rl.DrawTextEx(rl.GetFontDefault(), strings.unsafe_string_to_cstring(data.text), { 0, 0 }, 40, 0, rl.WHITE); //rl.DrawFPS(0, 0) -- cgit v1.2.1 From a32fc0f0f6bf3acc18e03fb436564cc135717157 Mon Sep 17 00:00:00 2001 From: San Jacobs Date: Fri, 13 Oct 2023 18:33:26 +0200 Subject: Leveraged fix to remove redundancies --- src/ui_implementation.odin | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src') diff --git a/src/ui_implementation.odin b/src/ui_implementation.odin index 594e5a1..5aa294c 100644 --- a/src/ui_implementation.odin +++ b/src/ui_implementation.odin @@ -96,7 +96,6 @@ label :: proc(text: string, font: rl.Font, alignment: Text_Alignment = .Left) -> data := oui.alloc_typed(item, Data_Label) data.subtype = .Label data.text = text - data.font_size = font.baseSize // This should not be necesssary data.font = font data.alignment = alignment @@ -134,10 +133,7 @@ ui_draw :: proc(item: oui.Item) { case .Label: data := cast(^Data_Label) oui.get_handle(item) - // For some reason, data.font.baseSize == 0 here. It doesn't outside of this function. Dunno why. - font_height := f32(data.font_size) - - rl.DrawTextEx(data.font, strings.unsafe_string_to_cstring(data.text), { 0, 0 }, font_height, 0.0, rl.RAYWHITE); + rl.DrawTextEx(data.font, strings.unsafe_string_to_cstring(data.text), { 0, 0 }, f32(data.font.baseSize), 0.0, rl.RAYWHITE); //rl.DrawTextEx(rl.GetFontDefault(), strings.unsafe_string_to_cstring(data.text), { 0, 0 }, 40, 0, rl.WHITE); //rl.DrawFPS(0, 0) //fmt.println(font_height) -- cgit v1.2.1 From a8ae49ea33b9575597012cb5b3927583184c4c73 Mon Sep 17 00:00:00 2001 From: San Jacobs Date: Fri, 13 Oct 2023 18:47:06 +0200 Subject: Fonts are now embedded in the program --- src/main.odin | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/main.odin b/src/main.odin index 96a56d5..1ae20c6 100644 --- a/src/main.odin +++ b/src/main.odin @@ -70,16 +70,18 @@ main :: proc() { // Loading fonts - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - font_size :: 18 - //font: Font = LoadFontFromMemory("ttf", &UBUNTU_MONO, i32(len(UBUNTU_MONO)), font_size, nil, 0) - font: Font = LoadFontEx("res/UbuntuMono-Regular.ttf", font_size, nil, 0) + font: Font = LoadFontFromMemory(".ttf", raw_data(UBUNTU_MONO), i32(len(UBUNTU_MONO)), font_size, nil, 0) + //font: Font = LoadFontEx("res/UbuntuMono-Regular.ttf", font_size, nil, 0) defer UnloadFont(font) small_font_size :: 14 - small_font: Font = LoadFontEx("res/UbuntuMono-Regular.ttf", small_font_size, nil, 0) + small_font: Font = LoadFontFromMemory(".ttf", raw_data(UBUNTU_MONO), i32(len(UBUNTU_MONO)), small_font_size, nil, 0) + //small_font: Font = LoadFontEx("res/UbuntuMono-Regular.ttf", small_font_size, nil, 0) defer UnloadFont(small_font) big_font_size :: 24 - big_font: Font = LoadFontEx("res/UbuntuMono-Regular.ttf", big_font_size, nil, 0) + big_font: Font = LoadFontFromMemory(".ttf", raw_data(UBUNTU_MONO), i32(len(UBUNTU_MONO)), big_font_size, nil, 0) + //big_font: Font = LoadFontEx("res/UbuntuMono-Regular.ttf", big_font_size, nil, 0) defer UnloadFont(big_font) // oui stuff @@ -150,7 +152,7 @@ when true { oui.set_height(top_bar, 30) oui.item_insert(master_container, top_bar) - date_label := label("Date abcg", big_font) + date_label := label("Date abcg", font) oui.item_insert(top_bar, date_label) bottom_bar := panel(PBGCOLOR) @@ -234,4 +236,3 @@ when true { EndDrawing() } } - -- cgit v1.2.1 From 1197fa1b73bb60dd7bbc67d046e5f8172c3dcfab Mon Sep 17 00:00:00 2001 From: San Jacobs Date: Fri, 13 Oct 2023 19:11:55 +0200 Subject: Added text justification setting --- src/main.odin | 2 +- src/ui_implementation.odin | 23 ++++++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/main.odin b/src/main.odin index 1ae20c6..e06639f 100644 --- a/src/main.odin +++ b/src/main.odin @@ -152,7 +152,7 @@ when true { oui.set_height(top_bar, 30) oui.item_insert(master_container, top_bar) - date_label := label("Date abcg", font) + date_label := label("Date", font) oui.item_insert(top_bar, date_label) bottom_bar := panel(PBGCOLOR) diff --git a/src/ui_implementation.odin b/src/ui_implementation.odin index 5aa294c..4706728 100644 --- a/src/ui_implementation.odin +++ b/src/ui_implementation.odin @@ -45,7 +45,7 @@ Data_Button :: struct { Data_Label :: struct { using _: Data_Head, - text: string, + text: cstring, font: rl.Font, font_size: i32, alignment: Text_Alignment, @@ -86,6 +86,7 @@ button :: proc(text: string, width: int, selected := false) -> Item { } Text_Alignment :: enum int { + // Techically called justification, but text_alignment is more self-explanatory. Left, Right, Center, @@ -95,7 +96,7 @@ label :: proc(text: string, font: rl.Font, alignment: Text_Alignment = .Left) -> data := oui.alloc_typed(item, Data_Label) data.subtype = .Label - data.text = text + data.text = strings.unsafe_string_to_cstring(text) data.font = font data.alignment = alignment @@ -132,10 +133,18 @@ ui_draw :: proc(item: oui.Item) { ui_draw_children(item) case .Label: data := cast(^Data_Label) oui.get_handle(item) - - rl.DrawTextEx(data.font, strings.unsafe_string_to_cstring(data.text), { 0, 0 }, f32(data.font.baseSize), 0.0, rl.RAYWHITE); - //rl.DrawTextEx(rl.GetFontDefault(), strings.unsafe_string_to_cstring(data.text), { 0, 0 }, 40, 0, rl.WHITE); - //rl.DrawFPS(0, 0) - //fmt.println(font_height) + + horizontal_position : f32 + + switch data.alignment { + case .Left: + horizontal_position = f32(rect.l) + case .Right: + horizontal_position = f32(rect.l) - rl.MeasureTextEx(data.font, data.text, f32(data.font.baseSize), 0.0).x + case .Center: + horizontal_position = f32(rect.l) - f32(int((rl.MeasureTextEx(data.font, data.text, f32(data.font.baseSize), 0.0).x)/2)) + } + + rl.DrawTextEx(data.font, data.text, { horizontal_position, f32(rect.t+50) }, f32(data.font.baseSize), 0.0, rl.RAYWHITE); } } \ No newline at end of file -- cgit v1.2.1 From 56b701ded16bad6f4599be61263c1574d5297288 Mon Sep 17 00:00:00 2001 From: San Jacobs Date: Sat, 14 Oct 2023 12:14:02 +0200 Subject: Fonts are now in the global scope --- src/main.odin | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/main.odin b/src/main.odin index e06639f..9689598 100644 --- a/src/main.odin +++ b/src/main.odin @@ -9,6 +9,10 @@ import rl "vendor:raylib" UBUNTU_MONO := #load("../res/UbuntuMono-Regular.ttf") +font : rl.Font +big_font : rl.Font +small_font : rl.Font + main :: proc() { // TODO: Replace the dynamic array of Workday-pointers with @@ -70,18 +74,15 @@ main :: proc() { // Loading fonts - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - font_size :: 18 - font: Font = LoadFontFromMemory(".ttf", raw_data(UBUNTU_MONO), i32(len(UBUNTU_MONO)), font_size, nil, 0) - //font: Font = LoadFontEx("res/UbuntuMono-Regular.ttf", font_size, nil, 0) + font = LoadFontFromMemory(".ttf", raw_data(UBUNTU_MONO), i32(len(UBUNTU_MONO)), font_size, nil, 0) defer UnloadFont(font) small_font_size :: 14 - small_font: Font = LoadFontFromMemory(".ttf", raw_data(UBUNTU_MONO), i32(len(UBUNTU_MONO)), small_font_size, nil, 0) - //small_font: Font = LoadFontEx("res/UbuntuMono-Regular.ttf", small_font_size, nil, 0) + small_font = LoadFontFromMemory(".ttf", raw_data(UBUNTU_MONO), i32(len(UBUNTU_MONO)), small_font_size, nil, 0) defer UnloadFont(small_font) big_font_size :: 24 - big_font: Font = LoadFontFromMemory(".ttf", raw_data(UBUNTU_MONO), i32(len(UBUNTU_MONO)), big_font_size, nil, 0) - //big_font: Font = LoadFontEx("res/UbuntuMono-Regular.ttf", big_font_size, nil, 0) + big_font = LoadFontFromMemory(".ttf", raw_data(UBUNTU_MONO), i32(len(UBUNTU_MONO)), big_font_size, nil, 0) defer UnloadFont(big_font) // oui stuff -- cgit v1.2.1 From d6cb7ac37d86d0c4ee03982813b94275fd62016a Mon Sep 17 00:00:00 2001 From: San Jacobs Date: Sat, 14 Oct 2023 12:18:23 +0200 Subject: Added cute padding to text --- src/main.odin | 3 ++- src/ui_implementation.odin | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main.odin b/src/main.odin index 9689598..ac3f693 100644 --- a/src/main.odin +++ b/src/main.odin @@ -151,9 +151,10 @@ when true { top_bar := panel(BGCOLOR) oui.set_cut(master_container, .Top) oui.set_height(top_bar, 30) + oui.set_margin(top_bar, 6) oui.item_insert(master_container, top_bar) - date_label := label("Date", font) + date_label := label("Date", font, .Left) oui.item_insert(top_bar, date_label) bottom_bar := panel(PBGCOLOR) diff --git a/src/ui_implementation.odin b/src/ui_implementation.odin index 4706728..27bcc65 100644 --- a/src/ui_implementation.odin +++ b/src/ui_implementation.odin @@ -145,6 +145,6 @@ ui_draw :: proc(item: oui.Item) { horizontal_position = f32(rect.l) - f32(int((rl.MeasureTextEx(data.font, data.text, f32(data.font.baseSize), 0.0).x)/2)) } - rl.DrawTextEx(data.font, data.text, { horizontal_position, f32(rect.t+50) }, f32(data.font.baseSize), 0.0, rl.RAYWHITE); + rl.DrawTextEx(data.font, data.text, { horizontal_position, f32(rect.t) }, f32(data.font.baseSize), 0.0, rl.RAYWHITE); } } \ No newline at end of file -- cgit v1.2.1 From fd262c11c3c0f627927ecc7fd5115899033018bb Mon Sep 17 00:00:00 2001 From: San Jacobs Date: Sat, 14 Oct 2023 13:11:39 +0200 Subject: New OUI version --- src/main.odin | 53 ++++++++++++++++++++++++++++------------- src/ui_implementation.odin | 59 ++++++++++++++++++++++++++++++---------------- 2 files changed, 75 insertions(+), 37 deletions(-) (limited to 'src') diff --git a/src/main.odin b/src/main.odin index ac3f693..79b1a1e 100644 --- a/src/main.odin +++ b/src/main.odin @@ -13,6 +13,8 @@ font : rl.Font big_font : rl.Font small_font : rl.Font +c0 : ^oui.Context + main :: proc() { // TODO: Replace the dynamic array of Workday-pointers with @@ -87,9 +89,10 @@ main :: proc() { // oui stuff - c0 := oui.context_create(1028, 1028 * 8) + c0 = new(oui.Context) + defer free(c0) + oui.context_init(c0, 1028, 1028 * 8) defer oui.context_destroy(c0) - oui.context_make_current(c0) // Setting up the timelines @@ -130,8 +133,8 @@ main :: proc() { // bottom left of the screen. mousePosition: = rl.GetMousePosition() - oui.set_cursor(int(mousePosition.x), int(mousePosition.y)) - oui.set_button(.Left, rl.IsMouseButtonPressed(rl.MouseButton(0))) + oui.set_cursor(c0, int(mousePosition.x), int(mousePosition.y)) + oui.set_button(c0, .Left, rl.IsMouseButtonPressed(rl.MouseButton(0))) // DRAW // ------------------------------------------ @@ -141,26 +144,42 @@ main :: proc() { when true { // hotloop - oui.begin_layout() + oui.begin_layout(c0) master_container := panel() - oui.set_layout(master_container, .Absolute) - oui.set_size(master_container, int(GetScreenWidth()), int(GetScreenHeight())) + master_container.id = oui.push_id(c0, "big_mr_boss_man") + master_container.layout = .Absolute + master_container.layout_size = {int(GetScreenWidth()), int(GetScreenHeight())} - top_bar := panel(BGCOLOR) - oui.set_cut(master_container, .Top) - oui.set_height(top_bar, 30) - oui.set_margin(top_bar, 6) - oui.item_insert(master_container, top_bar) + { + top_bar := panel_line(master_container, BGCOLOR, 30) + top_bar.id = oui.push_id(c0, "small_boie") + defer oui.pop_id(c0) + top_bar.layout_margin = 6 date_label := label("Date", font, .Left) oui.item_insert(top_bar, date_label) + } + { bottom_bar := panel(PBGCOLOR) - oui.set_cut(master_container, .Bottom) - oui.set_height(bottom_bar, 50) + bottom_bar.id = oui.push_id(c0, "not_small_boie") + defer oui.pop_id(c0) + bottom_bar.layout_cut_children = .Left + master_container.layout_cut_children = .Bottom + bottom_bar.layout_size.y = 50 oui.item_insert(master_container, bottom_bar) + } + + { + middle_section := panel(WBGCOLOR) + middle_section.id = oui.push_id(c0, "middle_section") + defer oui.pop_id(c0) + master_container.layout_cut_children = .Fill + oui.item_insert(master_container, middle_section) + } + @@ -174,11 +193,11 @@ when true { oui.item_insert(a_panel, a_button)*/ - oui.end_layout() + oui.end_layout(c0) - ui_draw(0) + ui_draw(master_container) // DRAW HERE OR BELOW - oui.process() + oui.process(c0) } else { DrawTextEx(font, "Date", {20, 8}, font_size, 0, RAYWHITE); diff --git a/src/ui_implementation.odin b/src/ui_implementation.odin index 27bcc65..cf38cc3 100644 --- a/src/ui_implementation.odin +++ b/src/ui_implementation.odin @@ -8,6 +8,7 @@ import rl "vendor:raylib" BGCOLOR : rl.Color : {30, 30, 30, 255} +WBGCOLOR : rl.Color : {20, 25, 25, 255} PBGCOLOR : rl.Color : {40, 40, 40, 255} DAY_HEIGHT :: 35 @@ -51,8 +52,8 @@ Data_Label :: struct { alignment: Text_Alignment, } -button_callback :: proc(item: Item, event: Call) -> int { - data := cast(^Data_Button) oui.get_handle(item) +button_callback :: proc(ctxt: ^oui.Context, item: ^Item, event: Call) -> int { + data := cast(^Data_Button) item.handle #partial switch event { case .Cursor_Handle: @@ -62,22 +63,39 @@ button_callback :: proc(item: Item, event: Call) -> int { return -1 } -panel :: proc(color : rl.Color = rl.RED) -> Item { - item := oui.item_make() +panel :: proc(color : rl.Color = rl.RED) -> ^Item { + item := oui.item_make(c0) - data := oui.alloc_typed(item, Data_Panel) + data := oui.alloc_typed(c0, item, Data_Panel) data.subtype = .Panel data.color = color - return item + return item +} + +panel_line :: proc(parent: ^Item, color : rl.Color, height: int = 40) -> (item: ^Item) { + item = oui.item_make(c0) + item.layout_cut_children = .Left + item.layout_size.y = height + + old := parent.layout_cut_children + parent.layout_cut_children = .Top + oui.item_insert(parent, item) + parent.layout_cut_children = old + + data := oui.alloc_typed(c0, item, Data_Panel) + data.subtype = .Panel + data.color = color + + return } -button :: proc(text: string, width: int, selected := false) -> Item { - item := oui.item_make() - oui.set_size(item, width, 35) - oui.set_callback(item, button_callback) +button :: proc(text: string, width: int, selected := false) -> ^Item { + item := oui.item_make(c0) + item.layout_size = {width, 35} + item.callback = button_callback - data := oui.alloc_typed(item, Data_Button) + data := oui.alloc_typed(c0, item, Data_Button) data.subtype = .Button data.text = text data.selected = selected @@ -91,10 +109,10 @@ Text_Alignment :: enum int { Right, Center, } -label :: proc(text: string, font: rl.Font, alignment: Text_Alignment = .Left) -> Item { - item := oui.item_make() +label :: proc(text: string, font: rl.Font, alignment: Text_Alignment = .Left) -> ^Item { + item := oui.item_make(c0) - data := oui.alloc_typed(item, Data_Label) + data := oui.alloc_typed(c0, item, Data_Label) data.subtype = .Label data.text = strings.unsafe_string_to_cstring(text) data.font = font @@ -104,16 +122,17 @@ label :: proc(text: string, font: rl.Font, alignment: Text_Alignment = .Left) -> } // recursive loop -ui_draw_children :: proc(item: oui.Item) { - list := oui.children_sorted(item) +ui_draw_children :: proc(item: ^oui.Item) { + list := oui.children_list(c0, item) + if len(list)>0 do fmt.println(list[len(list)-1]) for kid in list { ui_draw(kid) } } -ui_draw :: proc(item: oui.Item) { - head := cast(^Data_Head) oui.get_handle(item) - rect := oui.get_rect(item) +ui_draw :: proc(item: ^oui.Item) { + head := cast(^Data_Head) item.handle + rect := item.bounds //fmt.println(rect, head, item) @@ -132,7 +151,7 @@ ui_draw :: proc(item: oui.Item) { rl.DrawRectangle(i32(rect.l), i32(rect.t), i32(rect.r-rect.l), i32(rect.b-rect.t), data.color) ui_draw_children(item) case .Label: - data := cast(^Data_Label) oui.get_handle(item) + data := cast(^Data_Label) item.handle horizontal_position : f32 -- cgit v1.2.1 From fca6955979f4791acb016ef5da86fed1013b524e Mon Sep 17 00:00:00 2001 From: San Jacobs Date: Sat, 14 Oct 2023 14:03:07 +0200 Subject: There are themes! There is button with text! There is increased comfy! --- src/main.odin | 22 ++++++++++---- src/ui_implementation.odin | 71 +++++++++++++++++++++++++++++++++------------- 2 files changed, 68 insertions(+), 25 deletions(-) (limited to 'src') diff --git a/src/main.odin b/src/main.odin index 79b1a1e..fcb425d 100644 --- a/src/main.odin +++ b/src/main.odin @@ -111,6 +111,8 @@ main :: proc() { for !WindowShouldClose() { // MAIN LOOP ---- MAIN LOOP ---- MAIN LOOP ---- MAIN LOOP + free_all(context.temp_allocator) + if IsWindowResized() { height = GetScreenHeight() width = GetScreenWidth() @@ -140,7 +142,7 @@ main :: proc() { // ------------------------------------------ BeginDrawing() - ClearBackground(BGCOLOR) + ClearBackground(rl.RED) when true { // hotloop @@ -153,7 +155,7 @@ when true { master_container.layout_size = {int(GetScreenWidth()), int(GetScreenHeight())} { - top_bar := panel_line(master_container, BGCOLOR, 30) + top_bar := panel_line(master_container, theme.background_top, 30) top_bar.id = oui.push_id(c0, "small_boie") defer oui.pop_id(c0) top_bar.layout_margin = 6 @@ -161,9 +163,9 @@ when true { date_label := label("Date", font, .Left) oui.item_insert(top_bar, date_label) } - + { - bottom_bar := panel(PBGCOLOR) + bottom_bar := panel(theme.background_bottom) bottom_bar.id = oui.push_id(c0, "not_small_boie") defer oui.pop_id(c0) bottom_bar.layout_cut_children = .Left @@ -173,11 +175,21 @@ when true { } { - middle_section := panel(WBGCOLOR) + middle_section := panel(theme.background) middle_section.id = oui.push_id(c0, "middle_section") defer oui.pop_id(c0) master_container.layout_cut_children = .Fill oui.item_insert(master_container, middle_section) + + { + line := panel_line(middle_section, theme.background, 40) + line.id = oui.push_id(c0, "a_line") + defer oui.pop_id(c0) + { + a_button := button("Testor", 100) + oui.item_insert(line, a_button) + } + } } diff --git a/src/ui_implementation.odin b/src/ui_implementation.odin index cf38cc3..3e9b913 100644 --- a/src/ui_implementation.odin +++ b/src/ui_implementation.odin @@ -6,10 +6,21 @@ import "core:fmt" import rl "vendor:raylib" +Theme :: struct { + background: rl.Color, + background_top: rl.Color, + background_bottom: rl.Color, + button: rl.Color, + text: rl.Color, +} -BGCOLOR : rl.Color : {30, 30, 30, 255} -WBGCOLOR : rl.Color : {20, 25, 25, 255} -PBGCOLOR : rl.Color : {40, 40, 40, 255} +theme : Theme = { + background = {20, 25, 25, 255}, + background_top = {30, 35, 35, 255}, + background_bottom = {40, 40, 40, 255}, + button = {80, 80, 80, 255}, + text = rl.RAYWHITE, +} DAY_HEIGHT :: 35 TIMELINE_START :: 175 @@ -46,7 +57,7 @@ Data_Button :: struct { Data_Label :: struct { using _: Data_Head, - text: cstring, + text: string, font: rl.Font, font_size: i32, alignment: Text_Alignment, @@ -114,17 +125,39 @@ label :: proc(text: string, font: rl.Font, alignment: Text_Alignment = .Left) -> data := oui.alloc_typed(c0, item, Data_Label) data.subtype = .Label - data.text = strings.unsafe_string_to_cstring(text) + data.text = text data.font = font data.alignment = alignment return item } +calculate_text_alignment :: proc(text: cstring, font: rl.Font, alignment: Text_Alignment, rect: oui.RectI) -> (output: [2]int) { + + measurement := rl.MeasureTextEx(font, text, f32(font.baseSize), 0.0) + + switch alignment { + case .Left: + output.x = rect.l + case .Right: + output.x = rect.r - int(measurement.x) + case .Center: + output.x = (rect.l+(rect.r-rect.l)/2) - int(measurement.x/2) + } + + output.y = (rect.t+(rect.b-rect.t)/2) - int(measurement.y/2) + + return +} +i2f :: proc "contextless" (input: [2]int) -> rl.Vector2 { + return { f32(input.x), f32(input.y) } +} +f2i :: proc "contextless" (input: [2]f32) -> [2]int { + return { int(input.x), int(input.y) } +} // recursive loop ui_draw_children :: proc(item: ^oui.Item) { list := oui.children_list(c0, item) - if len(list)>0 do fmt.println(list[len(list)-1]) for kid in list { ui_draw(kid) } @@ -145,25 +178,23 @@ ui_draw :: proc(item: ^oui.Item) { //case .Panel_Root: // ... render any type of item case .Button: - rl.DrawRectangle(i32(rect.l), i32(rect.t), i32(rect.r-rect.l), i32(rect.b-rect.t), PBGCOLOR) + data := cast(^Data_Button) item.handle + rl.DrawRectangle(i32(rect.l), i32(rect.t), i32(rect.r-rect.l), i32(rect.b-rect.t), theme.button) + + text := strings.clone_to_cstring(data.text, context.temp_allocator) + position := calculate_text_alignment(text, font, .Center, rect) + + rl.DrawTextEx(font, text, i2f(position), f32(font.baseSize), 0.0, theme.text); + case .Panel: data := cast(^Data_Panel) head rl.DrawRectangle(i32(rect.l), i32(rect.t), i32(rect.r-rect.l), i32(rect.b-rect.t), data.color) ui_draw_children(item) case .Label: data := cast(^Data_Label) item.handle - - horizontal_position : f32 - - switch data.alignment { - case .Left: - horizontal_position = f32(rect.l) - case .Right: - horizontal_position = f32(rect.l) - rl.MeasureTextEx(data.font, data.text, f32(data.font.baseSize), 0.0).x - case .Center: - horizontal_position = f32(rect.l) - f32(int((rl.MeasureTextEx(data.font, data.text, f32(data.font.baseSize), 0.0).x)/2)) - } - - rl.DrawTextEx(data.font, data.text, { horizontal_position, f32(rect.t) }, f32(data.font.baseSize), 0.0, rl.RAYWHITE); + text := strings.clone_to_cstring(data.text, context.temp_allocator) + position := calculate_text_alignment(text, data.font, data.alignment, rect) + + rl.DrawTextEx(data.font, text, i2f(position), f32(data.font.baseSize), 0.0, theme.text); } } \ No newline at end of file -- cgit v1.2.1 From 44d408583ab8811f2b89d8fcb9e21b98f1409b7d Mon Sep 17 00:00:00 2001 From: San Jacobs Date: Sat, 14 Oct 2023 16:19:16 +0200 Subject: There is a theme editor now??? --- src/main.odin | 65 +++++++++++---------- src/time.odin | 14 ++--- src/ui_implementation.odin | 139 +++++++++++++++++++++++++++++++++------------ 3 files changed, 145 insertions(+), 73 deletions(-) (limited to 'src') diff --git a/src/main.odin b/src/main.odin index fcb425d..bed835a 100644 --- a/src/main.odin +++ b/src/main.odin @@ -4,6 +4,7 @@ import "../lib/oui" import "core:fmt" import "core:math" import "core:slice" +import "core:runtime" import "core:strings" import rl "vendor:raylib" @@ -136,7 +137,8 @@ main :: proc() { mousePosition: = rl.GetMousePosition() oui.set_cursor(c0, int(mousePosition.x), int(mousePosition.y)) - oui.set_button(c0, .Left, rl.IsMouseButtonPressed(rl.MouseButton(0))) + if rl.IsMouseButtonPressed(rl.MouseButton(0)) do oui.set_button(c0, .Left, true) + if rl.IsMouseButtonReleased(rl.MouseButton(0)) do oui.set_button(c0, .Left, false) // DRAW // ------------------------------------------ @@ -150,22 +152,24 @@ when true { master_container := panel() - master_container.id = oui.push_id(c0, "big_mr_boss_man") + master_container.id = oui.push_id(c0, "big_mr_boss_man") // Make ID for master thing just because. + // Does not need to be freed because master. master_container.layout = .Absolute master_container.layout_size = {int(GetScreenWidth()), int(GetScreenHeight())} { - top_bar := panel_line(master_container, theme.background_top, 30) - top_bar.id = oui.push_id(c0, "small_boie") - defer oui.pop_id(c0) + top_bar := panel_line(master_container, theme.background_bar, 30) + top_bar.id = oui.push_id(c0, "small_boie") // Make ID for anything that will have children. + defer oui.pop_id(c0) // These need to be pop'ed before the next item at the same level in the hierachy. top_bar.layout_margin = 6 - date_label := label("Date", font, .Left) - oui.item_insert(top_bar, date_label) + oui.item_insert(top_bar, label("Date", font, .Left)) + oui.item_insert(top_bar, label("Calltime", font, .Left)) + oui.item_insert(top_bar, label("Lunch", font, .Left)) } { - bottom_bar := panel(theme.background_bottom) + bottom_bar := panel(theme.background_bar) bottom_bar.id = oui.push_id(c0, "not_small_boie") defer oui.pop_id(c0) bottom_bar.layout_cut_children = .Left @@ -178,32 +182,35 @@ when true { middle_section := panel(theme.background) middle_section.id = oui.push_id(c0, "middle_section") defer oui.pop_id(c0) + middle_section.layout_margin = 10 // Spacing from edges + middle_section.layout_cut_gap = 5 // Spacing between children master_container.layout_cut_children = .Fill oui.item_insert(master_container, middle_section) - { - line := panel_line(middle_section, theme.background, 40) - line.id = oui.push_id(c0, "a_line") + // To loop over the members of a struct you need to do this goofy shit: + info := runtime.type_info_base(type_info_of(Theme)) + st := info.variant.(runtime.Type_Info_Struct) + root := uintptr(&theme) + for offset, i in st.offsets { + + line := panel_line(middle_section, theme.background, 25) + line.layout_cut_gap = 10 + line.id = oui.push_id(c0, fmt.tprintf("line_%d", i)) defer oui.pop_id(c0) - { - a_button := button("Testor", 100) - oui.item_insert(line, a_button) - } + + oui.item_insert(line, label(st.names[i], font, )) + + // To then access the member of the struct you're looping over + // you need to do this shit: + // v------------------------v + color_sliders(line, cast(^Color) (root+offset)) } - } - - - -/* a_button := button("Testerino", 50) - if oui.latest_clicked() { - fmt.println("CLICKO BOIO") + output_theme_button := button("output theme", 100) + oui.item_insert(middle_section, output_theme_button) + if oui.is_clicked(c0, output_theme_button) do fmt.printf("%#v", theme) } - oui.set_cut(a_panel, .Left) - oui.set_height(a_button, 50) - oui.set_offset(a_button, 20, 20) - - oui.item_insert(a_panel, a_button)*/ + oui.end_layout(c0) @@ -227,7 +234,7 @@ when true { // (At least, given how lunch breaks are currently implemented, // as holes in the workday) - DrawRectangle(10, DAY_HEIGHT*i32(i+1)-4, width-20, DAY_HEIGHT-1, PBGCOLOR) + DrawRectangle(10, DAY_HEIGHT*i32(i+1)-4, width-20, DAY_HEIGHT-1, theme.background_top) for block, j in day.blocks { if j == day.total_timeblocks do break block_color: = GREEN @@ -261,7 +268,7 @@ when true { } } - DrawRectangle(0, height-50, width+10, 60, PBGCOLOR) + DrawRectangle(0, height-50, width+10, 60, theme.background_top) DrawTextEx(small_font, total_sum, {f32(width)-120, f32(height)-43}, small_font_size, 0, RAYWHITE); DrawTextEx(big_font, inc_soc, {f32(width)-120, f32(height)-29}, big_font_size, 0, RAYWHITE); diff --git a/src/time.odin b/src/time.odin index 44c810a..b607e51 100644 --- a/src/time.odin +++ b/src/time.odin @@ -89,7 +89,7 @@ new_workday :: proc(previous_wrap : Moment, // Paragraph 6.7 says that up to 2 hours of unused warned overtime counts as worktime, // though so that at least one hour of the unused overtime is not counted. // (It's unclear if an 8-hour day that ends 3 hours in counts as having 5 hours of unused overtime) - max(clamp(sub(planned_wrap, {0, 1, 0}), wrap, add(wrap, {0, 2, 0})), + time_max(time_clamp(sub(planned_wrap, {0, 1, 0}), wrap, add(wrap, {0, 2, 0})), add(call, {0, 4, 0})), 1, ""} // ^ Minimum 4 hour day ^ @@ -169,7 +169,7 @@ new_workday :: proc(previous_wrap : Moment, if getweekday(block.start) == .Sunday do upvalue(&block, 2, "Sunday") // Sundays are +100% if !(less(call, Moment{0, 7, call.day, call.month, call.year}) && - less(min(add(call, Delta{0,8,0}), wrap), Moment{0, 17, call.day, call.month, call.year} )) { + less(time_min(add(call, Delta{0,8,0}), wrap), Moment{0, 17, call.day, call.month, call.year} )) { // This was added for rule 6.11c, but in a world without a defined normal workday, // that rule is already covered already by 6.11g, so this is empty. } @@ -389,7 +389,7 @@ maxDelta :: proc(delta_a: Delta, delta_b: Delta) -> Delta { if sortable(delta_a) > sortable(delta_b) do return delta_a return delta_b } -max :: proc{maxDelta, maxMoment} +time_max :: proc{maxDelta, maxMoment} minMoment :: proc(moment_a: Moment, moment_b: Moment) -> Moment { if sortable(moment_a) < sortable(moment_b) do return moment_a @@ -399,15 +399,15 @@ minDelta :: proc(delta_a: Delta, delta_b: Delta) -> Delta { if sortable(delta_a) < sortable(delta_b) do return delta_a return delta_b } -min :: proc{minDelta, minMoment} +time_min :: proc{minDelta, minMoment} clampMoment :: proc(moment: Moment, moment_min: Moment, moment_max: Moment) -> Moment { - return min(max(moment, moment_min), moment_max) + return time_min(time_max(moment, moment_min), moment_max) } clampDelta :: proc(delta: Delta, delta_min: Delta, delta_max: Delta) -> Delta { - return min(max(delta, delta_min), delta_max) + return time_min(time_max(delta, delta_min), delta_max) } -clamp :: proc{clampMoment, clampDelta} +time_clamp :: proc{clampMoment, clampDelta} greatMoment :: proc(moment_a: Moment, moment_b: Moment) -> bool { return bool(sortable(moment_a) > sortable(moment_b)) diff --git a/src/ui_implementation.odin b/src/ui_implementation.odin index 3e9b913..6b0947d 100644 --- a/src/ui_implementation.odin +++ b/src/ui_implementation.odin @@ -8,32 +8,43 @@ import rl "vendor:raylib" Theme :: struct { background: rl.Color, - background_top: rl.Color, - background_bottom: rl.Color, + background_bar: rl.Color, button: rl.Color, + base: rl.Color, + slider_bar: rl.Color, text: rl.Color, } -theme : Theme = { +/*theme : Theme = { background = {20, 25, 25, 255}, background_top = {30, 35, 35, 255}, background_bottom = {40, 40, 40, 255}, button = {80, 80, 80, 255}, + base = {60, 60, 60, 255}, + slider_bar = {170, 170, 170, 255}, text = rl.RAYWHITE, +}*/ + +theme : Theme = { + background = {25 , 27 , 29 , 255,}, + background_bar = {43 , 43 , 48 , 255,}, + button = {91 , 91 , 204, 255,}, + base = {60 , 60 , 60 , 255,}, + slider_bar = {91 , 91 , 204, 255,}, + text = {255, 255, 255, 252,}, } DAY_HEIGHT :: 35 TIMELINE_START :: 175 TIMELINE_END :: -85 - - Item :: oui.Item Call :: oui.Call Data_Element :: enum int { Panel, Button, + Slider, Label, Text_Input, Timeblock, @@ -55,6 +66,12 @@ Data_Button :: struct { selected: bool, } +Data_Slider :: struct { + using _: Data_Head, + text: string, + value: ^u8, +} + Data_Label :: struct { using _: Data_Head, text: string, @@ -63,17 +80,6 @@ Data_Label :: struct { alignment: Text_Alignment, } -button_callback :: proc(ctxt: ^oui.Context, item: ^Item, event: Call) -> int { - data := cast(^Data_Button) item.handle - - #partial switch event { - case .Cursor_Handle: - //return int(Cursor_Type.Hand) - } - - return -1 -} - panel :: proc(color : rl.Color = rl.RED) -> ^Item { item := oui.item_make(c0) @@ -105,6 +111,7 @@ button :: proc(text: string, width: int, selected := false) -> ^Item { item := oui.item_make(c0) item.layout_size = {width, 35} item.callback = button_callback + item.id = oui.gen_id(c0, text) data := oui.alloc_typed(c0, item, Data_Button) data.subtype = .Button @@ -113,6 +120,50 @@ button :: proc(text: string, width: int, selected := false) -> ^Item { return item } +button_callback :: proc(ctxt: ^oui.Context, item: ^Item, event: Call) -> int { + data := cast(^Data_Button) item.handle + + #partial switch event { + case .Cursor_Handle: + //return int(Cursor_Type.Hand) + } + + return -1 +} + +slider :: proc(id: string, text: string, width: int, value: ^u8) -> ^Item { + item := oui.item_make(c0) + item.layout_size = {width, 25} + item.id = oui.gen_id(c0, id) + item.callback = slider_callback + + data := oui.alloc_typed(c0, item, Data_Slider) + data.subtype = .Slider + data.text = text + data.value = value + + return item +} +slider_callback :: proc(ctxt: ^oui.Context, item: ^Item, event: Call) -> int { + data := cast(^Data_Slider) item.handle + rect := item.bounds + + #partial switch event { + case .Left_Capture: + cursor_position := clamp(oui.get_cursor(c0).x, rect.l, rect.r) + + data.value^ = u8(255*(f32(cursor_position - rect.l) / f32(rect.r - rect.l))) + } + + return -1 +} +color_sliders :: proc(parent: ^Item, color: ^rl.Color) { + width :: 167 + oui.item_insert(parent, slider("slider_r", fmt.tprintf("%d", color.r), width, &color.r)) + oui.item_insert(parent, slider("slider_g", fmt.tprintf("%d", color.g), width, &color.g)) + oui.item_insert(parent, slider("slider_b", fmt.tprintf("%d", color.b), width, &color.b)) + oui.item_insert(parent, slider("slider_a", fmt.tprintf("%d", color.a), width, &color.a)) +} Text_Alignment :: enum int { // Techically called justification, but text_alignment is more self-explanatory. @@ -122,6 +173,7 @@ Text_Alignment :: enum int { } label :: proc(text: string, font: rl.Font, alignment: Text_Alignment = .Left) -> ^Item { item := oui.item_make(c0) + item.layout_size = {150, 25} data := oui.alloc_typed(c0, item, Data_Label) data.subtype = .Label @@ -175,26 +227,39 @@ ui_draw :: proc(item: ^oui.Item) { } #partial switch head.subtype { - //case .Panel_Root: - // ... render any type of item - case .Button: - data := cast(^Data_Button) item.handle - rl.DrawRectangle(i32(rect.l), i32(rect.t), i32(rect.r-rect.l), i32(rect.b-rect.t), theme.button) - - text := strings.clone_to_cstring(data.text, context.temp_allocator) - position := calculate_text_alignment(text, font, .Center, rect) - - rl.DrawTextEx(font, text, i2f(position), f32(font.baseSize), 0.0, theme.text); - - case .Panel: - data := cast(^Data_Panel) head - rl.DrawRectangle(i32(rect.l), i32(rect.t), i32(rect.r-rect.l), i32(rect.b-rect.t), data.color) - ui_draw_children(item) - case .Label: - data := cast(^Data_Label) item.handle - text := strings.clone_to_cstring(data.text, context.temp_allocator) - position := calculate_text_alignment(text, data.font, data.alignment, rect) - - rl.DrawTextEx(data.font, text, i2f(position), f32(data.font.baseSize), 0.0, theme.text); + //case .Panel_Root: + // ... render any type of item + case .Button: + data := cast(^Data_Button) item.handle + rl.DrawRectangle(i32(rect.l), i32(rect.t), i32(rect.r-rect.l), i32(rect.b-rect.t), theme.button) + + text := strings.clone_to_cstring(data.text, context.temp_allocator) + position := calculate_text_alignment(text, font, .Center, rect) + + rl.DrawTextEx(font, text, i2f(position), f32(font.baseSize), 0.0, theme.text); + + //fmt.println(item.anim) + + case .Slider: + data := cast(^Data_Slider) head + rl.DrawRectangle(i32(rect.l), i32(rect.t), i32(rect.r-rect.l), i32(rect.b-rect.t), theme.base) + rl.DrawRectangle(i32(rect.l+1), i32(rect.t+1), i32(f32(rect.r-rect.l)*(f32(data.value^)/255)-2), i32(rect.b-rect.t-2), theme.slider_bar) + + text := strings.clone_to_cstring(data.text, context.temp_allocator) + position := calculate_text_alignment(text, font, .Center, rect) + + rl.DrawTextEx(font, text, i2f(position), f32(font.baseSize), 0.0, theme.text); + + case .Panel: + data := cast(^Data_Panel) head + rl.DrawRectangle(i32(rect.l), i32(rect.t), i32(rect.r-rect.l), i32(rect.b-rect.t), data.color) + ui_draw_children(item) + + case .Label: + data := cast(^Data_Label) item.handle + text := strings.clone_to_cstring(data.text, context.temp_allocator) + position := calculate_text_alignment(text, data.font, data.alignment, rect) + + rl.DrawTextEx(data.font, text, i2f(position), f32(data.font.baseSize), 0.0, theme.text); } } \ No newline at end of file -- cgit v1.2.1 From a437a92bb39894beb91d6c4308d04852bc0d5eac Mon Sep 17 00:00:00 2001 From: San Jacobs Date: Sat, 14 Oct 2023 17:05:01 +0200 Subject: Advancements on theme and layout --- src/main.odin | 35 ++++++++++++++++++++++++----------- src/ui_implementation.odin | 22 ++++++++++------------ 2 files changed, 34 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/main.odin b/src/main.odin index bed835a..e0a4507 100644 --- a/src/main.odin +++ b/src/main.odin @@ -159,23 +159,36 @@ when true { { top_bar := panel_line(master_container, theme.background_bar, 30) - top_bar.id = oui.push_id(c0, "small_boie") // Make ID for anything that will have children. + top_bar.id = oui.push_id(c0, "top_bar") // Make ID for anything that will have children. defer oui.pop_id(c0) // These need to be pop'ed before the next item at the same level in the hierachy. top_bar.layout_margin = 6 - oui.item_insert(top_bar, label("Date", font, .Left)) - oui.item_insert(top_bar, label("Calltime", font, .Left)) - oui.item_insert(top_bar, label("Lunch", font, .Left)) + oui.item_insert(top_bar, label("Date", font, 100, .Center)) + oui.item_insert(top_bar, label("Calltime", font, 100, .Center)) + oui.item_insert(top_bar, label("Lunch", font, 100, .Center)) } { bottom_bar := panel(theme.background_bar) - bottom_bar.id = oui.push_id(c0, "not_small_boie") + bottom_bar.id = oui.push_id(c0, "bottom_bar") defer oui.pop_id(c0) bottom_bar.layout_cut_children = .Left master_container.layout_cut_children = .Bottom bottom_bar.layout_size.y = 50 + bottom_bar.layout_margin = 10 // Spacing from edges oui.item_insert(master_container, bottom_bar) + + pre_sos_price := label("120 000 kr", big_font, 0, .Right) + bottom_bar.layout_cut_children = .Right + oui.item_insert(bottom_bar, pre_sos_price) + + post_sos_price := label("160 000 kr", small_font, 300, .Right) + bottom_bar.layout_cut_children = .Right + oui.item_insert(bottom_bar, post_sos_price) + + price_reason := label("Reason for price of highlighted timeblock", font, 300,) + bottom_bar.layout_cut_children = .Left + oui.item_insert(bottom_bar, price_reason) } { @@ -234,17 +247,17 @@ when true { // (At least, given how lunch breaks are currently implemented, // as holes in the workday) - DrawRectangle(10, DAY_HEIGHT*i32(i+1)-4, width-20, DAY_HEIGHT-1, theme.background_top) + DrawRectangle(10, DAY_HEIGHT*i32(i+1)-4, width-20, DAY_HEIGHT-1, theme.background_bar) for block, j in day.blocks { if j == day.total_timeblocks do break - block_color: = GREEN + block_color: = theme.price_100 switch { case block.value > 2.1: - block_color = PURPLE + block_color = theme.price_300 case block.value > 1.6: - block_color = RED + block_color = theme.price_200 case block.value > 1.1: - block_color = ORANGE + block_color = theme.price_150 } DrawRectangle(TIMELINE_START+i32(math.round(day.fractions[j].start*f32(width+TIMELINE_END-TIMELINE_START))), @@ -268,7 +281,7 @@ when true { } } - DrawRectangle(0, height-50, width+10, 60, theme.background_top) + DrawRectangle(0, height-50, width+10, 60, theme.background_bar) DrawTextEx(small_font, total_sum, {f32(width)-120, f32(height)-43}, small_font_size, 0, RAYWHITE); DrawTextEx(big_font, inc_soc, {f32(width)-120, f32(height)-29}, big_font_size, 0, RAYWHITE); diff --git a/src/ui_implementation.odin b/src/ui_implementation.odin index 6b0947d..e4b4f80 100644 --- a/src/ui_implementation.odin +++ b/src/ui_implementation.odin @@ -13,18 +13,12 @@ Theme :: struct { base: rl.Color, slider_bar: rl.Color, text: rl.Color, + price_100: rl.Color, + price_150: rl.Color, + price_200: rl.Color, + price_300: rl.Color, } -/*theme : Theme = { - background = {20, 25, 25, 255}, - background_top = {30, 35, 35, 255}, - background_bottom = {40, 40, 40, 255}, - button = {80, 80, 80, 255}, - base = {60, 60, 60, 255}, - slider_bar = {170, 170, 170, 255}, - text = rl.RAYWHITE, -}*/ - theme : Theme = { background = {25 , 27 , 29 , 255,}, background_bar = {43 , 43 , 48 , 255,}, @@ -32,6 +26,10 @@ theme : Theme = { base = {60 , 60 , 60 , 255,}, slider_bar = {91 , 91 , 204, 255,}, text = {255, 255, 255, 252,}, + price_100 = {30 , 240, 30 , 255,}, + price_150 = {240, 200, 30 , 255,}, + price_200 = {240, 30 , 30 , 255,}, + price_300 = {240, 30 , 240, 255,}, } DAY_HEIGHT :: 35 @@ -171,9 +169,9 @@ Text_Alignment :: enum int { Right, Center, } -label :: proc(text: string, font: rl.Font, alignment: Text_Alignment = .Left) -> ^Item { +label :: proc(text: string, font: rl.Font, width: int = 150, alignment: Text_Alignment = .Left) -> ^Item { item := oui.item_make(c0) - item.layout_size = {150, 25} + item.layout_size = {width, 25} data := oui.alloc_typed(c0, item, Data_Label) data.subtype = .Label -- cgit v1.2.1 From 2e3a7e10756954dc5a99d617a1c0eef327d3adbb Mon Sep 17 00:00:00 2001 From: San Jacobs Date: Sun, 15 Oct 2023 14:37:29 +0200 Subject: Normalized timelines and editor for spacing and sizing --- src/main.odin | 195 ++++++++++++++++++++++++++++++++------------- src/time.odin | 10 +++ src/ui_implementation.odin | 168 +++++++++++++++++++++++++++++++++----- 3 files changed, 297 insertions(+), 76 deletions(-) (limited to 'src') diff --git a/src/main.odin b/src/main.odin index e0a4507..5f6449b 100644 --- a/src/main.odin +++ b/src/main.odin @@ -14,6 +14,9 @@ font : rl.Font big_font : rl.Font small_font : rl.Font +FRACT_MIN : f32 = 0.0 +FRACT_MAX : f32 = 1.0 + c0 : ^oui.Context main :: proc() { @@ -59,9 +62,8 @@ main :: proc() { defer delete(date_text) wrap_text[len(wrap_text)-1] = 0 - total_sum: cstring = "3500 NOK + 26%" - inc_soc: cstring = "4276 NOK" - text_height: f32 + total_sum: cstring = "3500 NOK + 26%" // Only here for legacy UI + inc_soc: cstring = "4276 NOK" // Only here for legacy UI using rl @@ -76,17 +78,13 @@ main :: proc() { SetWindowMinSize(width, height) // Loading fonts - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - font_size :: 18 - font = LoadFontFromMemory(".ttf", raw_data(UBUNTU_MONO), i32(len(UBUNTU_MONO)), font_size, nil, 0) - defer UnloadFont(font) - small_font_size :: 14 - small_font = LoadFontFromMemory(".ttf", raw_data(UBUNTU_MONO), i32(len(UBUNTU_MONO)), small_font_size, nil, 0) - defer UnloadFont(small_font) - - big_font_size :: 24 - big_font = LoadFontFromMemory(".ttf", raw_data(UBUNTU_MONO), i32(len(UBUNTU_MONO)), big_font_size, nil, 0) + small_font = LoadFontFromMemory(".ttf", raw_data(UBUNTU_MONO), i32(len(UBUNTU_MONO)), 14, nil, 0) + font = LoadFontFromMemory(".ttf", raw_data(UBUNTU_MONO), i32(len(UBUNTU_MONO)), 18, nil, 0) + big_font = LoadFontFromMemory(".ttf", raw_data(UBUNTU_MONO), i32(len(UBUNTU_MONO)), 24, nil, 0) defer UnloadFont(big_font) + defer UnloadFont(font) + defer UnloadFont(small_font) // oui stuff @@ -155,17 +153,24 @@ when true { master_container.id = oui.push_id(c0, "big_mr_boss_man") // Make ID for master thing just because. // Does not need to be freed because master. master_container.layout = .Absolute + master_container.sort_children = true master_container.layout_size = {int(GetScreenWidth()), int(GetScreenHeight())} { top_bar := panel_line(master_container, theme.background_bar, 30) top_bar.id = oui.push_id(c0, "top_bar") // Make ID for anything that will have children. - defer oui.pop_id(c0) // These need to be pop'ed before the next item at the same level in the hierachy. - top_bar.layout_margin = 6 + defer oui.pop_id(c0) // They must be pop'ed before the next equal-in-hiarchy item + top_bar.layout_margin = 10 + + oui.item_insert(top_bar, label("Date", font, sizings.date, .Center)) + oui.item_insert(top_bar, label("Calltimes", font, sizings.call, .Center)) - oui.item_insert(top_bar, label("Date", font, 100, .Center)) - oui.item_insert(top_bar, label("Calltime", font, 100, .Center)) - oui.item_insert(top_bar, label("Lunch", font, 100, .Center)) + top_bar.layout_cut_children = .Right + oui.item_insert(top_bar, label("Price", font, sizings.price, .Center)) + oui.item_insert(top_bar, label("Wrap", font, sizings.wrap, .Center)) + + top_bar.layout_cut_children = .Fill + oui.item_insert(top_bar, label("Timeline", font, 0, .Center)) } { @@ -174,21 +179,29 @@ when true { defer oui.pop_id(c0) bottom_bar.layout_cut_children = .Left master_container.layout_cut_children = .Bottom + bottom_bar.z_index = 10 // Makes this render over/after the middle section bottom_bar.layout_size.y = 50 bottom_bar.layout_margin = 10 // Spacing from edges + bottom_bar.layout_cut_gap = 5 // Spacing between children oui.item_insert(master_container, bottom_bar) - - pre_sos_price := label("120 000 kr", big_font, 0, .Right) - bottom_bar.layout_cut_children = .Right - oui.item_insert(bottom_bar, pre_sos_price) - - post_sos_price := label("160 000 kr", small_font, 300, .Right) - bottom_bar.layout_cut_children = .Right - oui.item_insert(bottom_bar, post_sos_price) price_reason := label("Reason for price of highlighted timeblock", font, 300,) bottom_bar.layout_cut_children = .Left oui.item_insert(bottom_bar, price_reason) + + totals := panel(theme.background_bar) + totals.layout_cut_children = .Top + totals.layout_size.x = 50 + bottom_bar.layout_cut_children = .Right + oui.item_insert(bottom_bar, totals) + + pre_sos_price := label("120 000 kr", small_font, 0, .Right) + pre_sos_price.layout_size.y = 11 + oui.item_insert(totals, pre_sos_price) + + post_sos_price := label("160 000 kr", big_font, 300, .Right) + post_sos_price.layout_size.y = 27 + oui.item_insert(totals, post_sos_price) } { @@ -196,45 +209,117 @@ when true { middle_section.id = oui.push_id(c0, "middle_section") defer oui.pop_id(c0) middle_section.layout_margin = 10 // Spacing from edges - middle_section.layout_cut_gap = 5 // Spacing between children + middle_section.layout_cut_gap = sizings.inter_timeline // Spacing between children master_container.layout_cut_children = .Fill oui.item_insert(master_container, middle_section) - // To loop over the members of a struct you need to do this goofy shit: - info := runtime.type_info_base(type_info_of(Theme)) - st := info.variant.(runtime.Type_Info_Struct) - root := uintptr(&theme) - for offset, i in st.offsets { + + // - - - - WORKDAYS - - - - + + FRACT_MAX = workdays[0].fractions[0].start + FRACT_MIN = FRACT_MAX // TODO: Optimize this. It doesn't need to re-calculated every frame + + for day, i in workdays { + + for fract, i in day.fractions { + if fract.start < FRACT_MIN do FRACT_MIN = fract.start + if fract.end > FRACT_MAX do FRACT_MAX = fract.end + if i+1 == day.total_timeblocks do break + } + + line := panel_line(middle_section, theme.background) + line.layout_cut_children = .Left + line.layout_cut_gap = 0 + line.layout_margin = 0 + line.layout_size.y = sizings.timeline + oui.item_insert(line, label(dayprint(day.call), font, sizings.date, .Center)) + oui.item_insert(line, label(clockprint(day.call), font, sizings.call, .Center)) + + line.layout_cut_children = .Right + oui.item_insert(line, label("3500 kr", font, sizings.price, .Center)) + oui.item_insert(line, label(clockprint(day.wrap), font, sizings.wrap, .Center)) + + line.layout_cut_children = .Fill + timeline(line, day) + } + new_workday := button("+", 100) + middle_section.layout_cut_children = .Top + oui.item_insert(middle_section, new_workday) + if oui.is_clicked(c0, new_workday) do fmt.println("NEW WORKDAY!") + + + + // - - - - SIZINGS EDITOR - - - - + { + oui.item_insert(middle_section, label("Sizings Editor", big_font, 100, .Center)) - line := panel_line(middle_section, theme.background, 25) - line.layout_cut_gap = 10 - line.id = oui.push_id(c0, fmt.tprintf("line_%d", i)) - defer oui.pop_id(c0) + // To loop over the members of a struct you need to do this goofy shit: + info := runtime.type_info_base(type_info_of(Sizings)) + st := info.variant.(runtime.Type_Info_Struct) + root := uintptr(&sizings) + for offset, i in st.offsets { - oui.item_insert(line, label(st.names[i], font, )) + line := panel_line(middle_section, theme.background, 25) + line.id = oui.push_id(c0, fmt.tprintf("sizings_line_%d", i)) + defer oui.pop_id(c0) + + oui.item_insert(line, label(st.names[i], font, )) + + // To then access the member of the struct you're looping over + // you need to do this shit: + // v----------------------v + current_value := cast(^int) (root+offset) + + oui.item_insert(line, slider_int(fmt.tprintf("sizings-%d", i), fmt.tprintf("%d", current_value^), 300, current_value, 0, 200)) + } + output_button := button("output sizings", 100) + middle_section.layout_cut_children = .Top + oui.item_insert(middle_section, output_button) + if oui.is_clicked(c0, output_button) do fmt.printf("%#v", sizings) + } + + + // - - - - THEME EDITOR - - - - + { + oui.item_insert(middle_section, label("Theme Editor", big_font, 100, .Center)) + + // To loop over the members of a struct you need to do this goofy shit: + info := runtime.type_info_base(type_info_of(Theme)) + st := info.variant.(runtime.Type_Info_Struct) + root := uintptr(&theme) + for offset, i in st.offsets { - // To then access the member of the struct you're looping over - // you need to do this shit: - // v------------------------v - color_sliders(line, cast(^Color) (root+offset)) + line := panel_line(middle_section, theme.background, 25) + line.layout_cut_gap = 10 + line.id = oui.push_id(c0, fmt.tprintf("line_%d", i)) + defer oui.pop_id(c0) + + oui.item_insert(line, label(st.names[i], font, )) + + // To then access the member of the struct you're looping over + // you need to do this shit: + // v------------------------v + color_sliders(line, cast(^Color) (root+offset)) + } + output_theme_button := button("output theme", 100) + middle_section.layout_cut_children = .Top + oui.item_insert(middle_section, output_theme_button) + if oui.is_clicked(c0, output_theme_button) do fmt.printf("%#v", theme) } - output_theme_button := button("output theme", 100) - oui.item_insert(middle_section, output_theme_button) - if oui.is_clicked(c0, output_theme_button) do fmt.printf("%#v", theme) } - + oui.end_layout(c0) - + ui_draw(master_container) - // DRAW HERE OR BELOW + oui.process(c0) } else { - DrawTextEx(font, "Date", {20, 8}, font_size, 0, RAYWHITE); - DrawTextEx(font, "Calltime", {105, 8}, font_size, 0, RAYWHITE); - DrawTextEx(font, "Wraptime", {f32(width)-83, 8}, font_size, 0, RAYWHITE); + DrawTextEx(font, "Date", {20, 8}, f32(font.baseSize), 0, RAYWHITE); + DrawTextEx(font, "Calltime", {105, 8}, f32(font.baseSize), 0, RAYWHITE); + DrawTextEx(font, "Wraptime", {f32(width)-83, 8}, f32(font.baseSize), 0, RAYWHITE); for day, i in workdays { @@ -271,20 +356,20 @@ when true { copy(wrap_text, clockprint(day.wrap)) copy(date_text, toString(day.call)) - text_height = math.round(f32(i+1)*DAY_HEIGHT+(DAY_HEIGHT-font_size)*0.25) + text_height := math.round(f32(i+1)*DAY_HEIGHT+(DAY_HEIGHT-f32(font.baseSize))*0.25) - DrawTextEx(font, cstring(&date_text[0]), {20, text_height}, font_size, 0, RAYWHITE); - DrawTextEx(font, cstring(&wrap_text[0]), {f32(width)-70, text_height}, font_size, 0, RAYWHITE); + DrawTextEx(font, cstring(&date_text[0]), {20, text_height}, f32(font.baseSize), 0, RAYWHITE); + DrawTextEx(font, cstring(&wrap_text[0]), {f32(width)-70, text_height}, f32(font.baseSize), 0, RAYWHITE); if i == len(workdays)-1 { - DrawTextEx(big_font, "+", {20, DAY_HEIGHT*f32(i+2)}, big_font_size, 0, RAYWHITE) + DrawTextEx(big_font, "+", {20, DAY_HEIGHT*f32(i+2)}, f32(big_font.baseSize), 0, RAYWHITE) } } DrawRectangle(0, height-50, width+10, 60, theme.background_bar) - DrawTextEx(small_font, total_sum, {f32(width)-120, f32(height)-43}, small_font_size, 0, RAYWHITE); - DrawTextEx(big_font, inc_soc, {f32(width)-120, f32(height)-29}, big_font_size, 0, RAYWHITE); + DrawTextEx(small_font, total_sum, {f32(width)-120, f32(height)-43}, f32(small_font.baseSize), 0, RAYWHITE); + DrawTextEx(big_font, inc_soc, {f32(width)-120, f32(height)-29}, f32(big_font.baseSize), 0, RAYWHITE); } EndDrawing() } diff --git a/src/time.odin b/src/time.odin index b607e51..1f2ffbd 100644 --- a/src/time.odin +++ b/src/time.odin @@ -602,6 +602,16 @@ clockprintTimeblock :: proc(block: Timeblock) -> string { } clockprint :: proc{clockprintTimeblock, clockprintMoment} +dayprintMoment :: proc(moment: Moment) -> string { + using moment + return fmt.tprintf("%4i-%2i-%2i", year, month, day) +} +dayprintTimeblock :: proc(block: Timeblock) -> string { + using block + return fmt.tprintf("%s -> %s", dayprint(start), dayprint(end)) +} +dayprint :: proc{dayprintTimeblock, dayprintMoment} + popBlock :: proc(workday: ^Workday, index: int, count: int = 1) { using workday when ODIN_DEBUG do fmt.printf("popBlock() running to remove %i block(s) from index %i\n", count, index) diff --git a/src/ui_implementation.odin b/src/ui_implementation.odin index e4b4f80..6839b57 100644 --- a/src/ui_implementation.odin +++ b/src/ui_implementation.odin @@ -10,6 +10,8 @@ Theme :: struct { background: rl.Color, background_bar: rl.Color, button: rl.Color, + button_hover: rl.Color, + button_click: rl.Color, base: rl.Color, slider_bar: rl.Color, text: rl.Color, @@ -23,6 +25,8 @@ theme : Theme = { background = {25 , 27 , 29 , 255,}, background_bar = {43 , 43 , 48 , 255,}, button = {91 , 91 , 204, 255,}, + button_hover = {91 , 91 , 204, 255,}, + button_click = {91 , 91 , 204, 255,}, base = {60 , 60 , 60 , 255,}, slider_bar = {91 , 91 , 204, 255,}, text = {255, 255, 255, 252,}, @@ -32,9 +36,28 @@ theme : Theme = { price_300 = {240, 30 , 240, 255,}, } -DAY_HEIGHT :: 35 -TIMELINE_START :: 175 -TIMELINE_END :: -85 +Sizings :: struct { + date: int, + call: int, + wrap: int, + price: int, + lunch: int, + timeline: int, + inter_timeline: int, +} +sizings : Sizings = { + date = 110, + call = 85, + wrap = 90, + price = 100, + lunch = 100, + timeline = 32, + inter_timeline = 5, +} + +DAY_HEIGHT :: 35 // Only here for legacy UI +TIMELINE_START :: 175 // Only here for legacy UI +TIMELINE_END :: -85 // Only here for legacy UI Item :: oui.Item Call :: oui.Call @@ -42,10 +65,12 @@ Call :: oui.Call Data_Element :: enum int { Panel, Button, - Slider, + SliderU8, + SliderInt, Label, Text_Input, Timeblock, + Timeline, // ... } @@ -64,7 +89,15 @@ Data_Button :: struct { selected: bool, } -Data_Slider :: struct { +Data_SliderInt :: struct { + using _: Data_Head, + text: string, + value: ^int, + min: int, + max: int, +} + +Data_SliderU8 :: struct { using _: Data_Head, text: string, value: ^u8, @@ -78,6 +111,11 @@ Data_Label :: struct { alignment: Text_Alignment, } +Data_Timeline :: struct { + using _: Data_Head, + day: ^Workday, +} + panel :: proc(color : rl.Color = rl.RED) -> ^Item { item := oui.item_make(c0) @@ -129,21 +167,50 @@ button_callback :: proc(ctxt: ^oui.Context, item: ^Item, event: Call) -> int { return -1 } -slider :: proc(id: string, text: string, width: int, value: ^u8) -> ^Item { +slider_int :: proc(id: string, text: string, width: int, value: ^int, min: int, max: int) -> ^Item { + item := oui.item_make(c0) + item.layout_size = {width, 25} + item.id = oui.gen_id(c0, id) + item.callback = slider_int_callback + + data := oui.alloc_typed(c0, item, Data_SliderInt) + data.subtype = .SliderInt + data.text = text + data.value = value + data.min = min + data.max = max + + return item +} +slider_int_callback :: proc(ctxt: ^oui.Context, item: ^Item, event: Call) -> int { + data := cast(^Data_SliderInt) item.handle + rect := item.bounds + + #partial switch event { + case .Left_Capture: + cursor_position := clamp(oui.get_cursor(c0).x, rect.l, rect.r) + + data.value^ = int(f32(data.min) + (f32(data.max - data.min) * (f32(cursor_position - rect.l) / f32(rect.r - rect.l)))) + } + + return -1 +} + +slider_u8 :: proc(id: string, text: string, width: int, value: ^u8) -> ^Item { item := oui.item_make(c0) item.layout_size = {width, 25} item.id = oui.gen_id(c0, id) - item.callback = slider_callback + item.callback = slider_u8_callback - data := oui.alloc_typed(c0, item, Data_Slider) - data.subtype = .Slider + data := oui.alloc_typed(c0, item, Data_SliderU8) + data.subtype = .SliderU8 data.text = text data.value = value return item } -slider_callback :: proc(ctxt: ^oui.Context, item: ^Item, event: Call) -> int { - data := cast(^Data_Slider) item.handle +slider_u8_callback :: proc(ctxt: ^oui.Context, item: ^Item, event: Call) -> int { + data := cast(^Data_SliderU8) item.handle rect := item.bounds #partial switch event { @@ -157,10 +224,21 @@ slider_callback :: proc(ctxt: ^oui.Context, item: ^Item, event: Call) -> int { } color_sliders :: proc(parent: ^Item, color: ^rl.Color) { width :: 167 - oui.item_insert(parent, slider("slider_r", fmt.tprintf("%d", color.r), width, &color.r)) - oui.item_insert(parent, slider("slider_g", fmt.tprintf("%d", color.g), width, &color.g)) - oui.item_insert(parent, slider("slider_b", fmt.tprintf("%d", color.b), width, &color.b)) - oui.item_insert(parent, slider("slider_a", fmt.tprintf("%d", color.a), width, &color.a)) + oui.item_insert(parent, slider_u8("slider_r", fmt.tprintf("%d", color.r), width, &color.r)) + oui.item_insert(parent, slider_u8("slider_g", fmt.tprintf("%d", color.g), width, &color.g)) + oui.item_insert(parent, slider_u8("slider_b", fmt.tprintf("%d", color.b), width, &color.b)) + oui.item_insert(parent, slider_u8("slider_a", fmt.tprintf("%d", color.a), width, &color.a)) +} + +timeline :: proc(parent: ^Item, day: ^Workday) -> ^Item { + item := oui.item_make(c0) + + data := oui.alloc_typed(c0, item, Data_Timeline) + data.subtype = .Timeline + data.day = day + + oui.item_insert(parent, item) + return item } Text_Alignment :: enum int { @@ -181,9 +259,9 @@ label :: proc(text: string, font: rl.Font, width: int = 150, alignment: Text_Ali return item } -calculate_text_alignment :: proc(text: cstring, font: rl.Font, alignment: Text_Alignment, rect: oui.RectI) -> (output: [2]int) { +calculate_text_alignment :: proc(text: cstring, font: rl.Font, alignment: Text_Alignment, rect: oui.RectI, spacing: f32 = 0) -> (output: [2]int) { - measurement := rl.MeasureTextEx(font, text, f32(font.baseSize), 0.0) + measurement := rl.MeasureTextEx(font, text, f32(font.baseSize), spacing) switch alignment { case .Left: @@ -229,17 +307,28 @@ ui_draw :: proc(item: ^oui.Item) { // ... render any type of item case .Button: data := cast(^Data_Button) item.handle + text_spacing := clamp(item.anim.hot - item.anim.active, 0, item.anim.hot)*2 rl.DrawRectangle(i32(rect.l), i32(rect.t), i32(rect.r-rect.l), i32(rect.b-rect.t), theme.button) text := strings.clone_to_cstring(data.text, context.temp_allocator) - position := calculate_text_alignment(text, font, .Center, rect) + position := calculate_text_alignment(text, font, .Center, rect, text_spacing) - rl.DrawTextEx(font, text, i2f(position), f32(font.baseSize), 0.0, theme.text); + rl.DrawTextEx(font, text, i2f(position), f32(font.baseSize), text_spacing, theme.text); //fmt.println(item.anim) - case .Slider: - data := cast(^Data_Slider) head + case .SliderInt: + data := cast(^Data_SliderInt) head + rl.DrawRectangle(i32(rect.l), i32(rect.t), i32(rect.r-rect.l), i32(rect.b-rect.t), theme.base) + rl.DrawRectangle(i32(rect.l+1), i32(rect.t+1), i32(f32(rect.r-rect.l)*(f32(data.value^)/f32(data.max))-2), i32(rect.b-rect.t-2), theme.slider_bar) + + text := strings.clone_to_cstring(data.text, context.temp_allocator) + position := calculate_text_alignment(text, font, .Center, rect) + + rl.DrawTextEx(font, text, i2f(position), f32(font.baseSize), 0.0, theme.text); + + case .SliderU8: + data := cast(^Data_SliderU8) head rl.DrawRectangle(i32(rect.l), i32(rect.t), i32(rect.r-rect.l), i32(rect.b-rect.t), theme.base) rl.DrawRectangle(i32(rect.l+1), i32(rect.t+1), i32(f32(rect.r-rect.l)*(f32(data.value^)/255)-2), i32(rect.b-rect.t-2), theme.slider_bar) @@ -259,5 +348,42 @@ ui_draw :: proc(item: ^oui.Item) { position := calculate_text_alignment(text, data.font, data.alignment, rect) rl.DrawTextEx(data.font, text, i2f(position), f32(data.font.baseSize), 0.0, theme.text); + + case .Timeline: + data := cast(^Data_Timeline) item.handle + + width := int(f32(rect.r - rect.l)/(FRACT_MAX - FRACT_MIN)) + + for fracts, i in data.day.fractions { + + color := theme.price_100 + value := data.day.blocks[i].value + + switch { + case value>2.1: + color = theme.price_300 + case value>1.6: + color = theme.price_200 + case value>1.1: + color = theme.price_150 + } + + + + rl.DrawRectangle(i32(rect.l + int(f32(width)*fracts.start) - int(f32(width)*FRACT_MIN)), + i32(rect.t), + i32(f32(width) * (fracts.end - fracts.start)+0.99), + i32(rect.b - rect.t), + color) + // Dark middle of blocks, glowing edge. Disabled for now. + /*rl.DrawRectangle(i32(rect.l + int(f32(width)*fracts.start) - int(f32(width)*FRACT_MIN) + 1), + i32(rect.t) + 1, + i32(f32(width+1) * (fracts.end - fracts.start)-1.01), + i32(rect.b - rect.t)-2, + {0,0,0,100})*/ + if i+1 == data.day.total_timeblocks { + break + } + } } } \ No newline at end of file -- cgit v1.2.1