Preparing to add matrices to the list
This commit is contained in:
parent
88dee75f7d
commit
4987f1b0d2
4 changed files with 127 additions and 82 deletions
93
program.odin
93
program.odin
|
|
@ -1,45 +1,9 @@
|
|||
package main
|
||||
|
||||
import fixed_pool "libraries/pool"
|
||||
import rl "libraries/raylib"
|
||||
import ui "libraries/snths_ui"
|
||||
|
||||
Field :: struct($T: typeid) {
|
||||
value: f32,
|
||||
input: FieldInput,
|
||||
}
|
||||
|
||||
FIELD_BYTE_COUNT :: 8
|
||||
FieldInput :: [FIELD_BYTE_COUNT]byte
|
||||
FieldPool :: struct($T: typeid) {
|
||||
values: fixed_pool.Pool(T),
|
||||
inputs: fixed_pool.Pool(FieldInput),
|
||||
}
|
||||
|
||||
field_pool_get :: proc(pool: ^FieldPool($T), count: int) -> (values: []T, inputs: []FieldInput) {
|
||||
return fixed_pool.get(&pool.values, count), fixed_pool.get(&pool.inputs, count)
|
||||
}
|
||||
|
||||
field_pool_clear :: proc(pool: ^FieldPool($T)) {
|
||||
fixed_pool.clear(&pool.values)
|
||||
fixed_pool.clear(&pool.inputs)
|
||||
}
|
||||
|
||||
field_pool_init :: proc(pool: ^FieldPool($T), capacity: int, allocator := context.allocator) {
|
||||
fixed_pool.init(&pool.values, capacity, allocator)
|
||||
fixed_pool.init(&pool.inputs, capacity, allocator)
|
||||
}
|
||||
|
||||
field_pool_free_range :: proc(pool: ^FieldPool($T), from: int, count: int) {
|
||||
fixed_pool.free_range(&pool.values, from, count)
|
||||
fixed_pool.free_range(&pool.inputs, from, count)
|
||||
}
|
||||
|
||||
field_pool_get_allocated_elems :: proc(pool: ^FieldPool($T)) -> #soa[]Field(T) {
|
||||
values := fixed_pool.get_allocated_elems(pool.values)
|
||||
fields := fixed_pool.get_allocated_elems(pool.inputs)
|
||||
return soa_zip(value = values, input = fields)
|
||||
}
|
||||
import "libraries/fixed_pool"
|
||||
import "core:fmt"
|
||||
|
||||
FontStyle :: struct {
|
||||
font: rl.Font,
|
||||
|
|
@ -69,6 +33,7 @@ program: Program
|
|||
Program :: struct {
|
||||
ui_context: ui.Context,
|
||||
matrix_field_pool: FieldPool(f32),
|
||||
matrix_count: int,
|
||||
grid: Grid,
|
||||
font_style: FontStyle,
|
||||
state: ProgramState,
|
||||
|
|
@ -108,7 +73,7 @@ program_build_ui :: proc() -> []ui.Element {
|
|||
}
|
||||
|
||||
ui.start(&program.ui_context, {0, 0}, {WINDOW_WIDTH, WINDOW_HEIGHT})
|
||||
top_bar_container := ui.container_begin({ui.Size_Percentage(1.0), ui.Size_Pixels(64.0)}, container_config)
|
||||
top_bar_container := ui.container_begin({ui.Size_Percentage(1.0), ui.Size_Pixels(48.0)}, container_config)
|
||||
top_bar_inner_height := ui.get_element_inner_area(top_bar_container^).height
|
||||
top_bar_button_dimensions := ui.Dimensions {ui.Size_Pixels(top_bar_inner_height), ui.Size_Pixels(top_bar_inner_height)}
|
||||
top_bar_button_config := ui.ElementConfiguration {margin = V2_ONE * 4}
|
||||
|
|
@ -122,43 +87,29 @@ program_build_ui :: proc() -> []ui.Element {
|
|||
}
|
||||
ui.container_end()
|
||||
|
||||
ui.container_begin({ui.SIZE_AUTO, ui.Size_PercentageRemainder(1.0)}, container_config)
|
||||
{
|
||||
mat: matrix[3, 3]f32
|
||||
container_config := ui.ElementConfiguration{margin = V2_ONE * 4.0, label = ""}
|
||||
ui.container_begin({ui.Size_Percentage(0.2), ui.Size_PercentageRemainder(1.0)}, container_config)
|
||||
for i in 0..<program.matrix_count {
|
||||
container_config := ui.ElementConfiguration{margin = V2_ONE * 4.0, label = fmt.ctprintf("Matrix %d", i)}
|
||||
container_dimensions := ui.Dimensions {ui.SIZE_AUTO, ui.SIZE_AUTO}
|
||||
config := container_config
|
||||
config.label = "Matrix 0"
|
||||
ui_mat3(&mat, 0.0, 1000.0, container_dimensions, container_config)
|
||||
mat := cast(^mat3)&program.matrix_field_pool.values.pool[i * 9]
|
||||
value_strings := program.matrix_field_pool.inputs.pool[i * 9 : i * 9 + 9]
|
||||
ui_mat3(mat, value_strings, container_dimensions, container_config)
|
||||
}
|
||||
ui.container_end()
|
||||
return ui.end()
|
||||
}
|
||||
|
||||
ui_mat3 :: proc(mat: ^mat3, min, max: f32, dimensions: ui.Dimensions, config: ui.ElementConfiguration) {
|
||||
ui.container_begin({ui.SIZE_AUTO, ui.SIZE_AUTO}, config)
|
||||
ui_mat3 :: proc(mat: ^mat3, value_strings: []FieldInput, dimensions: ui.Dimensions, config: ui.ElementConfiguration) {
|
||||
ui.container_begin(dimensions, config)
|
||||
matrix_input_config := ui.ElementConfiguration {margin = V2_ONE * 4.0}
|
||||
matrix_input_dimensions := ui.Dimensions {ui.Size_Pixels(96.0), ui.Size_Pixels(48.0)}
|
||||
matrix_input_data := ui.ElementData_FloatInput {value = nil, min = min, max = max}
|
||||
data := matrix_input_data
|
||||
data.value = &mat[0, 0]
|
||||
ui.input_float(matrix_input_dimensions, matrix_input_config, data)
|
||||
ui.same_line()
|
||||
ui.input_float(matrix_input_dimensions, matrix_input_config, data)
|
||||
ui.same_line()
|
||||
ui.input_float(matrix_input_dimensions, matrix_input_config, data)
|
||||
|
||||
ui.input_float(matrix_input_dimensions, matrix_input_config, data)
|
||||
ui.same_line()
|
||||
ui.input_float(matrix_input_dimensions, matrix_input_config, data)
|
||||
ui.same_line()
|
||||
ui.input_float(matrix_input_dimensions, matrix_input_config, data)
|
||||
|
||||
ui.input_float(matrix_input_dimensions, matrix_input_config, data)
|
||||
ui.same_line()
|
||||
ui.input_float(matrix_input_dimensions, matrix_input_config, data)
|
||||
ui.same_line()
|
||||
ui.input_float(matrix_input_dimensions, matrix_input_config, data)
|
||||
matrix_input_dimensions := ui.Dimensions {ui.Size_Percentage(1.0 / 3.0), ui.Size_Percentage(1.0 / 3.0)}
|
||||
#unroll for i in 0..<3 {
|
||||
ui.input_float(matrix_input_dimensions, matrix_input_config, {value = &mat[i, 0], value_string = field_input_as_cstring(&value_strings[i * 3 + 0])})
|
||||
ui.same_line()
|
||||
ui.input_float(matrix_input_dimensions, matrix_input_config, {value = &mat[i, 1], value_string = field_input_as_cstring(&value_strings[i * 3 + 1])})
|
||||
ui.same_line()
|
||||
ui.input_float(matrix_input_dimensions, matrix_input_config, {value = &mat[i, 2], value_string = field_input_as_cstring(&value_strings[i * 3 + 2])})
|
||||
}
|
||||
ui.container_end()
|
||||
}
|
||||
|
||||
|
|
@ -171,10 +122,10 @@ program_render_ui :: proc(elements: []ui.Element) {
|
|||
case .Button:
|
||||
rl.GuiButton(area, element.label)
|
||||
case .Slider:
|
||||
data := element.data.float_input_data
|
||||
data := element.data
|
||||
rl.GuiSlider(area, element.label, "", data.value, data.min, data.max)
|
||||
case .InputFloat:
|
||||
data := element.data.float_input_data
|
||||
data := element.data
|
||||
str: cstring = " "
|
||||
rl.GuiTextBox(area, str, i32(len(str) - 1), false)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue