Removed unneeded pool data structures
This commit is contained in:
parent
4987f1b0d2
commit
7949c1ca5d
4 changed files with 45 additions and 108 deletions
58
program.odin
58
program.odin
|
|
@ -2,7 +2,6 @@ package main
|
|||
|
||||
import rl "libraries/raylib"
|
||||
import ui "libraries/snths_ui"
|
||||
import "libraries/fixed_pool"
|
||||
import "core:fmt"
|
||||
|
||||
FontStyle :: struct {
|
||||
|
|
@ -30,9 +29,17 @@ program_set_message_state :: proc(program: ^Program, message: ProgramMessageType
|
|||
|
||||
program: Program
|
||||
|
||||
InputFloatField :: [32]byte
|
||||
MATRIX_POOL_SIZE :: 4096
|
||||
|
||||
input_float_field_as_cstring :: proc(field: ^InputFloatField) -> cstring {
|
||||
return cstring(&field[0])
|
||||
}
|
||||
|
||||
Program :: struct {
|
||||
ui_context: ui.Context,
|
||||
matrix_field_pool: FieldPool(f32),
|
||||
matrix_float_pool: []f32,
|
||||
matrix_value_string_pool: []InputFloatField,
|
||||
matrix_count: int,
|
||||
grid: Grid,
|
||||
font_style: FontStyle,
|
||||
|
|
@ -46,8 +53,20 @@ Grid :: struct {
|
|||
zoom: f32,
|
||||
}
|
||||
|
||||
matrix_pool_max :: proc() -> int {
|
||||
return len(program.matrix_float_pool) / 9
|
||||
}
|
||||
|
||||
matrix_pool_get_mat3 :: proc() -> ^mat3 {
|
||||
assert(program.matrix_count + 1 < matrix_pool_max(), "Max matrix count exceeded")
|
||||
mat := cast(^mat3)&program.matrix_float_pool[program.matrix_count * 9]
|
||||
program.matrix_count += 1
|
||||
return mat
|
||||
}
|
||||
|
||||
program_init :: proc(allocator := context.allocator) {
|
||||
field_pool_init(&program.matrix_field_pool, 4096, allocator)
|
||||
program.matrix_float_pool = make(type_of(program.matrix_float_pool), MATRIX_POOL_SIZE)
|
||||
program.matrix_value_string_pool = make(type_of(program.matrix_value_string_pool), MATRIX_POOL_SIZE)
|
||||
program.font_style = {
|
||||
font = rl.GetFontDefault(),
|
||||
size = 16.0,
|
||||
|
|
@ -62,8 +81,14 @@ program_init :: proc(allocator := context.allocator) {
|
|||
}
|
||||
|
||||
program_update :: proc() {
|
||||
if rl.IsKeyPressed(.ENTER) {
|
||||
matrix_pool_get_mat3()
|
||||
}
|
||||
ui_elements := program_build_ui()
|
||||
program_render_ui(ui_elements)
|
||||
if rl.IsKeyPressed(.TAB) {
|
||||
ui.focus_next_element(&program.ui_context)
|
||||
}
|
||||
program_render_ui(&program.ui_context, ui_elements)
|
||||
}
|
||||
|
||||
program_build_ui :: proc() -> []ui.Element {
|
||||
|
|
@ -90,30 +115,34 @@ program_build_ui :: proc() -> []ui.Element {
|
|||
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}
|
||||
mat := cast(^mat3)&program.matrix_field_pool.values.pool[i * 9]
|
||||
value_strings := program.matrix_field_pool.inputs.pool[i * 9 : i * 9 + 9]
|
||||
container_dimensions := ui.Dimensions {ui.Size_Percentage(1.0), ui.Size_Pixels(112.0)}
|
||||
mat := cast(^mat3)&program.matrix_float_pool[i * 9]
|
||||
value_strings := program.matrix_value_string_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, value_strings: []FieldInput, dimensions: ui.Dimensions, config: ui.ElementConfiguration) {
|
||||
ui_mat3 :: proc(mat: ^mat3, value_strings: []InputFloatField, 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_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])})
|
||||
data: ui.ElementData_FloatInput
|
||||
data = {value = &mat[i, 0], value_string = input_float_field_as_cstring(&value_strings[i * 3 + 0])}
|
||||
ui.input_float(matrix_input_dimensions, matrix_input_config, data)
|
||||
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])})
|
||||
data = {value = &mat[i, 1], value_string = input_float_field_as_cstring(&value_strings[i * 3 + 1])}
|
||||
ui.input_float(matrix_input_dimensions, matrix_input_config, data)
|
||||
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])})
|
||||
data = {value = &mat[i, 2], value_string = input_float_field_as_cstring(&value_strings[i * 3 + 2])}
|
||||
ui.input_float(matrix_input_dimensions, matrix_input_config, data)
|
||||
}
|
||||
ui.container_end()
|
||||
}
|
||||
|
||||
program_render_ui :: proc(elements: []ui.Element) {
|
||||
program_render_ui :: proc(ctx: ^ui.Context, elements: []ui.Element) {
|
||||
for element in elements {
|
||||
area := rl.Rectangle(element.area)
|
||||
switch element.type {
|
||||
|
|
@ -126,8 +155,9 @@ program_render_ui :: proc(elements: []ui.Element) {
|
|||
rl.GuiSlider(area, element.label, "", data.value, data.min, data.max)
|
||||
case .InputFloat:
|
||||
data := element.data
|
||||
str: cstring = " "
|
||||
rl.GuiTextBox(area, str, i32(len(str) - 1), false)
|
||||
if rl.GuiValueBoxFloat(area, element.label, data.value_string, data.value, ui.is_element_focused(ctx, element)) == 1 {
|
||||
ui.focus_element(ctx, element)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue