Dropdown element
This commit is contained in:
parent
ff32ac6227
commit
af44a9c367
4 changed files with 159 additions and 22 deletions
|
|
@ -25,7 +25,7 @@ usage :: proc(pool: Pool($T)) -> int {
|
|||
return pool.usage
|
||||
}
|
||||
|
||||
get_allocated_elems :: proc(pool: Pool($T)) -> []T {
|
||||
get_allocated_elements :: proc(pool: Pool($T)) -> []T {
|
||||
return pool.pool[:pool.usage]
|
||||
}
|
||||
|
||||
|
|
|
|||
84
program.odin
84
program.odin
|
|
@ -3,8 +3,6 @@ package main
|
|||
import rl "libraries/raylib"
|
||||
import fixed_pool "libraries/pool"
|
||||
import "base:runtime"
|
||||
import "core:math"
|
||||
import "core:math/linalg"
|
||||
import "core:fmt"
|
||||
|
||||
WINDOW_WIDTH :: 1280
|
||||
|
|
@ -25,6 +23,7 @@ FontStyle :: struct {
|
|||
Program :: struct {
|
||||
ui_state: UiState,
|
||||
matrix_field_pool: FieldPool(f32),
|
||||
matrix_mode: MatrixType,
|
||||
grid: Grid,
|
||||
font_style: FontStyle,
|
||||
}
|
||||
|
|
@ -99,11 +98,9 @@ draw_text_aligned :: proc(text: cstring, position: v2, style: FontStyle, halign:
|
|||
draw_text(text, position, style, color)
|
||||
}
|
||||
|
||||
field_pool_add_mat2 :: proc(pool: ^FieldPool(f32), m: mat2) {
|
||||
values, _ := field_pool_get(pool, 4)
|
||||
m := m
|
||||
floats := cast([^]f32)&m[0, 0]
|
||||
#unroll for i in 0..<4 {values[i] = floats[i]}
|
||||
UiButton_AddMat2CallbackData :: struct {
|
||||
program: ^Program,
|
||||
mat: mat2,
|
||||
}
|
||||
|
||||
program_add_mat2 :: proc(data: rawptr) {
|
||||
|
|
@ -111,9 +108,45 @@ program_add_mat2 :: proc(data: rawptr) {
|
|||
field_pool_add_mat2(&data.program.matrix_field_pool, data.mat)
|
||||
}
|
||||
|
||||
UiButton_AddMat2CallbackData :: struct {
|
||||
field_pool_add_mat2 :: proc(pool: ^FieldPool(f32), m: mat2) {
|
||||
values, _ := field_pool_get(pool, 4)
|
||||
m := m
|
||||
floats := cast([^]f32)&m[0, 0]
|
||||
#unroll for i in 0..<4 {values[i] = floats[i]}
|
||||
}
|
||||
|
||||
UiButton_AddMat3CallbackData :: struct {
|
||||
program: ^Program,
|
||||
mat: mat2,
|
||||
mat: mat3,
|
||||
}
|
||||
|
||||
program_add_mat3 :: proc(data: rawptr) {
|
||||
data := cast(^UiButton_AddMat3CallbackData)data
|
||||
field_pool_add_mat3(&data.program.matrix_field_pool, data.mat)
|
||||
}
|
||||
|
||||
field_pool_add_mat3 :: proc(pool: ^FieldPool(f32), m: mat3) {
|
||||
values, _ := field_pool_get(pool, 9)
|
||||
m := m
|
||||
floats := cast([^]f32)&m[0, 0]
|
||||
#unroll for i in 0..<9 {values[i] = floats[i]}
|
||||
}
|
||||
|
||||
UiButton_AddMat4CallbackData :: struct {
|
||||
program: ^Program,
|
||||
mat: mat4,
|
||||
}
|
||||
|
||||
program_add_mat4 :: proc(data: rawptr) {
|
||||
data := cast(^UiButton_AddMat3CallbackData)data
|
||||
field_pool_add_mat3(&data.program.matrix_field_pool, data.mat)
|
||||
}
|
||||
|
||||
field_pool_add_mat4 :: proc(pool: ^FieldPool(f32), m: mat4) {
|
||||
values, _ := field_pool_get(pool, 16)
|
||||
m := m
|
||||
floats := cast([^]f32)&m[0, 0]
|
||||
#unroll for i in 0..<16 {values[i] = floats[i]}
|
||||
}
|
||||
|
||||
measure_text :: proc(text: cstring, style: FontStyle) -> v2 {
|
||||
|
|
@ -161,16 +194,13 @@ init :: proc() {
|
|||
}
|
||||
|
||||
update :: proc() {
|
||||
if rl.IsMouseButtonPressed(.LEFT) {
|
||||
ui_element_focus_reset(&program.ui_state)
|
||||
}
|
||||
|
||||
matrix_add_button_callback_data := UiButton_AddMat2CallbackData {
|
||||
program = &program,
|
||||
mat = mat2{0, 1, 2, 3},
|
||||
}
|
||||
|
||||
ui_button_size_top_bar := v2{32.0, 32.0}
|
||||
ui_dropdown_size_top_bar := v2{96.0, 32.0}
|
||||
ui_start(&program.ui_state)
|
||||
ui_container_begin({label = ""})
|
||||
ui_button(ui_button_size_top_bar, {label = "#10#", callback = program_add_mat2, callback_data = cast(rawptr)&matrix_add_button_callback_data})
|
||||
|
|
@ -178,22 +208,22 @@ update :: proc() {
|
|||
ui_button(ui_button_size_top_bar, {label = "#11#"})
|
||||
ui_same_line()
|
||||
ui_button(ui_button_size_top_bar, {label = "#12#"})
|
||||
ui_same_line()
|
||||
matrix_options := enum_to_raygui_options_string(MatrixType, context.temp_allocator)
|
||||
matrix_mode_ref := cast(^i32)&program.matrix_mode
|
||||
ui_dropdown(ui_dropdown_size_top_bar, {label = matrix_options, active = matrix_mode_ref})
|
||||
ui_container_end()
|
||||
ui_container_begin({label = "Matrices"})
|
||||
field_pool := &program.matrix_field_pool
|
||||
if fixed_pool.usage(field_pool.values) == 0 {
|
||||
ui_text({text = "Add matrices", color = rl.WHITE})
|
||||
} else {
|
||||
fields := field_pool_get_allocated_elems(field_pool)
|
||||
matrix_count := len(fields) / 4
|
||||
matrix_field_input_size := v2{48.0, 32.0}
|
||||
inputs := fixed_pool.get_allocated_elements(program.matrix_field_pool.inputs)
|
||||
matrix_count := len(inputs) / 4
|
||||
field_size := v2{48.0, 32.0}
|
||||
for i in 0..<matrix_count {
|
||||
ui_input(matrix_field_input_size, {label = "", min = 0, max = 1000, input = fields[i * 4 + 0].input[:]})
|
||||
ui_same_line()
|
||||
ui_input(matrix_field_input_size, {label = "", min = 0, max = 1000, input = fields[i * 4 + 1].input[:]})
|
||||
ui_input(matrix_field_input_size, {label = "", min = 0, max = 1000, input = fields[i * 4 + 2].input[:]})
|
||||
ui_same_line()
|
||||
ui_input(matrix_field_input_size, {label = "", min = 0, max = 1000, input = fields[i * 4 + 3].input[:]})
|
||||
inputs_slice: [][]byte = {inputs[i * 4 + 0][:], inputs[i * 4 + 1][:], inputs[i * 4 + 2][:], inputs[i * 4 + 3][:]}
|
||||
ui_mat2(field_size, inputs_slice, 0, 1000)
|
||||
}
|
||||
}
|
||||
ui_container_end()
|
||||
|
|
@ -228,6 +258,16 @@ update :: proc() {
|
|||
data := element.data.(UiElementData_Text)
|
||||
style := program.ui_state.style
|
||||
draw_text(data.text, rect_get_tl(element.area), style.font_style, data.color)
|
||||
case .DropDown:
|
||||
data := element.data.(UiElementData_DropDown)
|
||||
edit_mode := ui_element_is_editing(program.ui_state, element.id)
|
||||
if rl.GuiDropdownBox(element.area, data.label, data.active, edit_mode) {
|
||||
if edit_mode {
|
||||
ui_element_focus_reset(&program.ui_state)
|
||||
} else {
|
||||
ui_element_focus(&program.ui_state, element.id)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
81
ui.odin
81
ui.odin
|
|
@ -12,6 +12,7 @@ UiElementType :: enum {
|
|||
Button,
|
||||
Container,
|
||||
Text,
|
||||
DropDown,
|
||||
}
|
||||
|
||||
UiElementData :: union {
|
||||
|
|
@ -19,6 +20,7 @@ UiElementData :: union {
|
|||
UiElementData_Input,
|
||||
UiElementData_Container,
|
||||
UiElementData_Text,
|
||||
UiElementData_DropDown,
|
||||
}
|
||||
|
||||
UiElement :: struct {
|
||||
|
|
@ -139,6 +141,82 @@ ui_text :: proc(data: UiElementData_Text) {
|
|||
append(&state.elements, UiElement{id = state.id_current, area = area, type = .Text, data = data})
|
||||
}
|
||||
|
||||
ui_mat2 :: proc(input_field_size: v2, inputs: [][]byte, min, max: f32) {
|
||||
ui_input(input_field_size, {label = "", input = inputs[0], min = min, max = max})
|
||||
ui_same_line()
|
||||
ui_input(input_field_size, {label = "", input = inputs[1], min = min, max = max})
|
||||
|
||||
ui_input(input_field_size, {label = "", input = inputs[2], min = min, max = max})
|
||||
ui_same_line()
|
||||
ui_input(input_field_size, {label = "", input = inputs[3], min = min, max = max})
|
||||
}
|
||||
|
||||
ui_mat3 :: proc(input_field_size: v2, inputs: [][]byte, min, max: f32) {
|
||||
ui_input(input_field_size, {label = "", input = inputs[0], min = min, max = max})
|
||||
ui_same_line()
|
||||
ui_input(input_field_size, {label = "", input = inputs[1], min = min, max = max})
|
||||
ui_same_line()
|
||||
ui_input(input_field_size, {label = "", input = inputs[2], min = min, max = max})
|
||||
|
||||
ui_input(input_field_size, {label = "", input = inputs[3], min = min, max = max})
|
||||
ui_same_line()
|
||||
ui_input(input_field_size, {label = "", input = inputs[4], min = min, max = max})
|
||||
ui_same_line()
|
||||
ui_input(input_field_size, {label = "", input = inputs[5], min = min, max = max})
|
||||
|
||||
ui_input(input_field_size, {label = "", input = inputs[6], min = min, max = max})
|
||||
ui_same_line()
|
||||
ui_input(input_field_size, {label = "", input = inputs[7], min = min, max = max})
|
||||
ui_same_line()
|
||||
ui_input(input_field_size, {label = "", input = inputs[8], min = min, max = max})
|
||||
}
|
||||
|
||||
ui_mat4 :: proc(input_field_size: v2, inputs: [][]byte, min, max: f32) {
|
||||
ui_input(input_field_size, {label = "", input = inputs[0], min = min, max = max})
|
||||
ui_same_line()
|
||||
ui_input(input_field_size, {label = "", input = inputs[1], min = min, max = max})
|
||||
ui_same_line()
|
||||
ui_input(input_field_size, {label = "", input = inputs[2], min = min, max = max})
|
||||
ui_same_line()
|
||||
ui_input(input_field_size, {label = "", input = inputs[3], min = min, max = max})
|
||||
|
||||
ui_input(input_field_size, {label = "", input = inputs[4], min = min, max = max})
|
||||
ui_same_line()
|
||||
ui_input(input_field_size, {label = "", input = inputs[5], min = min, max = max})
|
||||
ui_same_line()
|
||||
ui_input(input_field_size, {label = "", input = inputs[6], min = min, max = max})
|
||||
ui_same_line()
|
||||
ui_input(input_field_size, {label = "", input = inputs[7], min = min, max = max})
|
||||
|
||||
ui_input(input_field_size, {label = "", input = inputs[8], min = min, max = max})
|
||||
ui_same_line()
|
||||
ui_input(input_field_size, {label = "", input = inputs[9], min = min, max = max})
|
||||
ui_same_line()
|
||||
ui_input(input_field_size, {label = "", input = inputs[10], min = min, max = max})
|
||||
ui_same_line()
|
||||
ui_input(input_field_size, {label = "", input = inputs[11], min = min, max = max})
|
||||
|
||||
ui_input(input_field_size, {label = "", input = inputs[12], min = min, max = max})
|
||||
ui_same_line()
|
||||
ui_input(input_field_size, {label = "", input = inputs[13], min = min, max = max})
|
||||
ui_same_line()
|
||||
ui_input(input_field_size, {label = "", input = inputs[14], min = min, max = max})
|
||||
ui_same_line()
|
||||
ui_input(input_field_size, {label = "", input = inputs[15], min = min, max = max})
|
||||
}
|
||||
|
||||
UiElementData_DropDown :: struct {
|
||||
label: cstring,
|
||||
active: ^i32,
|
||||
}
|
||||
|
||||
ui_dropdown :: proc(size: v2, data: UiElementData_DropDown) {
|
||||
state := state_current
|
||||
area := _ui_advance_element(state, size)
|
||||
state.id_current.element_index += 1
|
||||
append(&state.elements, UiElement{id = state.id_current, area = area, type = .DropDown, data = data})
|
||||
}
|
||||
|
||||
ui_same_line :: proc() {
|
||||
state_current.same_line = true
|
||||
}
|
||||
|
|
@ -162,7 +240,8 @@ ui_id_invalid :: proc() -> UiElementId {
|
|||
_ui_advance_element :: proc(state: ^UiState, size: v2) -> rect2 {
|
||||
if state.group_element_count > 0 {
|
||||
if state.same_line {
|
||||
state.position.x += size.x + state.style.padding
|
||||
previous_element := state.elements[len(state.elements) - 1]
|
||||
state.position.x += previous_element.area.width + state.style.padding
|
||||
state.same_line = false
|
||||
} else {
|
||||
state.position_left.y += size.y + state.style.padding
|
||||
|
|
|
|||
18
utils.odin
18
utils.odin
|
|
@ -1,7 +1,11 @@
|
|||
package main
|
||||
|
||||
import rl "libraries/raylib"
|
||||
import "base:intrinsics"
|
||||
import "core:strings"
|
||||
import "core:fmt"
|
||||
import "core:math/linalg"
|
||||
import "core:mem"
|
||||
|
||||
// Wraps os.read_entire_file and os.write_entire_file, but they also work with emscripten.
|
||||
@(require_results)
|
||||
|
|
@ -28,6 +32,20 @@ irect2 :: struct {x, y, width, height: i32}
|
|||
tri2 :: [3]v2
|
||||
Bezier :: [3]v2
|
||||
|
||||
/// ### MISCELANIOUS ### ///
|
||||
enum_to_raygui_options_string :: proc($T: typeid, allocator: mem.Allocator) -> cstring where intrinsics.type_is_enum(T) {
|
||||
b := strings.builder_make(allocator)
|
||||
for element, i in T {
|
||||
option := fmt.aprint(element, allocator = allocator)
|
||||
strings.write_string(&b, strings.to_ada_case(option, allocator))
|
||||
strings.write_rune(&b, ';')
|
||||
}
|
||||
strings.builder_replace_all(&b, "_", " ")
|
||||
b.buf[len(b.buf) - 1] = 0
|
||||
return cstring(raw_data(b.buf[:len(b.buf)]))
|
||||
}
|
||||
|
||||
|
||||
/// ### RECTANGLES ### ///
|
||||
rect_from :: proc {
|
||||
rect2_from_v2,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue