more memory optimize stuff, cache cosf/sinf values for rectangle drawing

Author: mike-ward

_gui.v

@@ -5,8 +5,12 @@
 @[has_globals]
 module gui
 
+import math
+
 __global gui_theme = theme_dark_no_padding
 __global gui_tooltip = TooltipState{}
+__global cosf_values = [32]f32{}
+__global sinf_values = [32]f32{}
 
 pub const version = '0.1.0'
 pub const app_title = 'GUI'
@@ -16,3 +20,15 @@ mut:
 	id     u32
 	bounds DrawClip
 }
+
+fn init() {
+	// cosf_values, sinf_values are used in render2.v for drawing rounded
+	// corners on rectangles. Yes, there are several magic numbers here
+	// and the drawing routines assume these arrays are initialized and
+	// are the correct size.
+	for idx in 0 .. 31 {
+		rad := f32(math.radians(idx * 3))
+		cosf_values[idx] = math.cosf(rad)
+		sinf_values[idx] = math.sinf(rad)
+	}
+}

animation.v

@@ -27,7 +27,6 @@ mut:
 pub fn (mut window Window) animation_add(mut animation Animation) {
 	window.animations = window.animations.filter(it.id != animation.id)
 	unsafe { window.animations.flags.set(.noslices) }
-	defer { unsafe { window.animations.flags.clear(.noslices) } }
 	animation.start = time.now()
 	window.animations << animation
 }

examples/column_scroll.v

@@ -16,7 +16,6 @@ fn main() {
 	size := 10_000 // 10K!
 	mut items := []gui.View{cap: size + 1}
 	unsafe { items.flags.set(.noslices) }
-	defer { unsafe { items.flags.clear(.noslices) } }
 	for i in 1 .. size + 1 {
 		items << gui.text(text: '${i:05} text list item')
 	}

examples/date_picker_options.v

@@ -99,7 +99,6 @@ fn example_date_picker(app DatePickerApp, mut window gui.Window) gui.View {
 
 	mut allowed_weekdays := []gui.DatePickerWeekdays{}
 	unsafe { allowed_weekdays.flags.set(.noslices) }
-	defer { unsafe { allowed_weekdays.flags.clear(.noslices) } }
 	if app.allow_monday {
 		allowed_weekdays << .monday
 	}
@@ -649,7 +648,6 @@ fn set_theme(mut window gui.Window) {
 			gui.theme_light_bordered
 		}
 	} else {
-		println('x')
 		if app.use_system_font {
 			create_system_font_theme(gui.theme_dark_bordered_cfg, gui.theme_dark_bordered_cfg.text_style)
 		} else {

examples/fonts.v

@@ -94,10 +94,8 @@ fn font_panel(window &gui.Window) gui.View {
 	app := window.state[FontsApp]()
 	mut rows := []gui.View{}
 	unsafe { rows.flags.set(.noslices) }
-	defer { unsafe { rows.flags.clear(.noslices) } }
 	mut cols := []gui.View{}
 	unsafe { rows.flags.set(.noslices) }
-	defer { unsafe { rows.flags.clear(.noslices) } }
 	width := f32(gui.theme().n3.size) * 1.5
 
 	text_style := match app.selected_family {

examples/showcase.v

@@ -1344,13 +1344,11 @@ fn icon_catalog(mut w gui.Window) gui.View {
 	chunks := chunk_map(gui.icons_map, 4)
 	mut all_icons := []gui.View{cap: chunks.len}
 	unsafe { all_icons.flags.set(.noslices) }
-	defer { unsafe { all_icons.flags.clear(.noslices) } }
 
 	// create rows of icons/text
 	for chunk in chunks {
 		mut icons := []gui.View{cap: chunk.len}
 		unsafe { icons.flags.set(.noslices) }
-		defer { unsafe { icons.flags.clear(.noslices) } }
 		for key, val in chunk {
 			icons << gui.column(
 				min_width: longest
@@ -1381,7 +1379,6 @@ fn icon_catalog(mut w gui.Window) gui.View {
 fn chunk_map[K, V](input map[K]V, chunk_size int) []map[K]V {
 	mut chunks := []map[K]V{cap: input.keys().len / chunk_size + 1}
 	unsafe { chunks.flags.set(.noslices) }
-	defer { unsafe { chunks.flags.clear(.noslices) } }
 	mut current_chunk := map[K]V{}
 	mut count := 0
 
@@ -1789,7 +1786,6 @@ fn table_with_sortable_columns(mut table_data TableData, mut window gui.Window)
 	// Replace with first row with clickable column headers
 	mut tds := []gui.TableCellCfg{}
 	unsafe { tds.flags.set(.noslices) }
-	defer { unsafe { tds.flags.clear(.noslices) } }
 	for idx, cell in table_cfg.data[0].cells {
 		tds << gui.TableCellCfg{
 			...cell

layout.v

@@ -41,7 +41,6 @@ fn layout_arrange(mut layout Layout, mut window Window) []Layout {
 	// They also complicate the fuck out of things.
 	mut floating_layouts := []Layout{}
 	unsafe { floating_layouts.flags.set(.noslices) }
-	defer { unsafe { floating_layouts.flags.clear(.noslices) } }
 	layout_remove_floating_layouts(mut layout, mut floating_layouts)
 	fix_float_parents(mut floating_layouts)
 
@@ -59,7 +58,6 @@ fn layout_arrange(mut layout Layout, mut window Window) []Layout {
 	layout_pipeline(mut layout, mut window)
 	mut layouts := [layout]
 	unsafe { layouts.flags.set(.noslices) }
-	defer { unsafe { layouts.flags.clear(.noslices) } }
 
 	// Compute the floating layouts. Because they are appended to
 	// the layout array, they get rendered after the main layout.
@@ -110,7 +108,6 @@ fn layout_parents(mut layout Layout, parent &Layout) {
 // the layout logic.
 fn layout_remove_floating_layouts(mut layout Layout, mut layouts []Layout) {
 	unsafe { layout.children.flags.set(.noslices) }
-	defer { unsafe { layout.children.flags.clear(.noslices) } }
 	for i, mut child in layout.children {
 		if child.shape.float {
 			layouts << child

layout2.v

@@ -72,7 +72,6 @@ fn (node &Layout) find_next_focusable(ids []u32, mut w Window) ?Shape {
 fn (node &Layout) get_focus_ids() []u32 {
 	mut focus_ids := []u32{}
 	unsafe { focus_ids.flags.set(.noslices) }
-	defer { unsafe { focus_ids.flags.clear(.noslices) } }
 	if node.shape.id_focus > 0 && !node.shape.focus_skip {
 		focus_ids << node.shape.id_focus
 	}

render2.v

@@ -1,8 +1,8 @@
+@[has_globals]
 module gui
 
 import sokol.sgl
 import gg
-import math
 
 fn draw_rounded_rect_filled(x f32, y f32, w f32, h f32, radius f32, c gg.Color, ctx &gg.Context) {
 	if w <= 0 || h <= 0 || radius < 0 {
@@ -39,9 +39,8 @@ fn draw_rounded_rect_filled(x f32, y f32, w f32, h f32, radius f32, c gg.Color,
 	mut dxs := [32]f32{}
 	mut dys := [32]f32{}
 	for i in 0 .. 31 {
-		rad := f32(math.radians(i * 3))
-		dxs[i] = r * math.cosf(rad)
-		dys[i] = r * math.sinf(rad)
+		dxs[i] = r * cosf_values[i]
+		dys[i] = r * sinf_values[i]
 	}
 
 	if r != 0 {
@@ -147,9 +146,8 @@ fn draw_rounded_rect_empty(x f32, y f32, w f32, h f32, radius f32, c gg.Color, c
 	mut dxs := [32]f32{}
 	mut dys := [32]f32{}
 	for i in 0 .. 31 {
-		rad := f32(math.radians(i * 3))
-		dxs[i] = r * math.cosf(rad)
-		dys[i] = r * math.sinf(rad)
+		dxs[i] = r * cosf_values[i]
+		dys[i] = r * sinf_values[i]
 	}
 
 	if r != 0 {

shape.v

@@ -4,78 +4,77 @@ import rand
 import datatypes
 
 // Shape is the only data structure in GUI used to draw to the screen.
+// Members are arranged for packing to reduce memory footprint.
 pub struct Shape {
 pub:
 	id       string // user assigned
-	id_focus u32    // >0 indicates shape is focusable. Value determines tabbing order
 	name     string // internal shape name, useful for debugging
 	type     ShapeType
 	uid      u64 = rand.u64() // internal use only
+	id_focus u32 // >0 indicates shape is focusable. Value determines tabbing order
 	axis     Axis
 	cfg      voidptr
 pub mut:
-	clip       bool
+	// --- text spans (likely largest field, place early) ---
+	text_spans datatypes.LinkedList[TextSpan] // rich text format spans
+	// --- strings grouped together ---
+	text       string
+	image_name string // filename of image
+	text_lines []string
+	// --- callback functions grouped together ---
+	on_char               fn (voidptr, mut Event, mut Window)    = unsafe { nil }
+	on_keydown            fn (voidptr, mut Event, mut Window)    = unsafe { nil }
+	on_click              fn (voidptr, mut Event, mut Window)    = unsafe { nil }
+	on_mouse_move         fn (voidptr, mut Event, mut Window)    = unsafe { nil }
+	on_mouse_up           fn (voidptr, mut Event, mut Window)    = unsafe { nil }
+	on_char_shape         fn (&Shape, mut Event, mut Window)     = unsafe { nil }
+	on_keydown_shape      fn (&Shape, mut Event, mut Window)     = unsafe { nil }
+	on_mouse_down_shape   fn (&Shape, mut Event, mut Window)     = unsafe { nil }
+	on_mouse_move_shape   fn (&Shape, mut Event, mut Window)     = unsafe { nil }
+	on_mouse_up_shape     fn (&Shape, mut Event, mut Window)     = unsafe { nil }
+	on_mouse_scroll_shape fn (&Shape, mut Event, mut Window)     = unsafe { nil }
+	amend_layout          fn (mut Layout, mut Window)            = unsafe { nil }
+	on_hover              fn (mut Layout, mut Event, mut Window) = unsafe { nil }
+	// --- larger structs ---
 	shape_clip DrawClip // used for hit-testing
 	color      Color
-	disabled   bool
-	fill       bool
-	focus_skip bool
-	// --- sizes, positions ---
-	x          f32
-	y          f32
-	width      f32
-	min_width  f32
-	max_width  f32
-	height     f32
-	min_height f32
-	max_height f32
-	h_align    HorizontalAlign
-	v_align    VerticalAlign
 	padding    Padding
-	radius     f32
+	text_style TextStyle
 	sizing     Sizing
-	spacing    f32
-	// -- text ---
-	text                string
-	text_lines          []string
-	text_style          TextStyle
-	text_mode           TextMode
-	text_is_password    bool
-	text_is_placeholder bool
-	text_sel_beg        u32
-	text_sel_end        u32
-	text_tab_size       u32 = 4
-	text_spans          datatypes.LinkedList[TextSpan] // rich text format spans
-	// --- image ---
-	image_name string // filename of image
-	// --- float ---
-	float          bool
-	float_anchor   FloatAttach
-	float_tie_off  FloatAttach
+	// --- f32 fields grouped together (4-byte alignment) ---
+	x              f32
+	y              f32
+	width          f32
+	min_width      f32
+	max_width      f32
+	height         f32
+	min_height     f32
+	max_height     f32
+	radius         f32
+	spacing        f32
 	float_offset_x f32
 	float_offset_y f32
-	// -- scrolling ---
-	id_scroll   u32  // >0 indicates shape is scrollable
-	over_draw   bool // allows scrollbars to draw in padding area
-	scroll_mode ScrollMode
-	// --- user callbacks ---
-	on_char       fn (voidptr, mut Event, mut Window) = unsafe { nil }
-	on_keydown    fn (voidptr, mut Event, mut Window) = unsafe { nil }
-	on_click      fn (voidptr, mut Event, mut Window) = unsafe { nil }
-	on_mouse_move fn (voidptr, mut Event, mut Window) = unsafe { nil }
-	on_mouse_up   fn (voidptr, mut Event, mut Window) = unsafe { nil }
-	// --- for internal use and not intended for end users   ---
-	// --- however, composite views can set these in the     ---
-	// --- layout amend callback. See input view for example ---
-	on_char_shape         fn (&Shape, mut Event, mut Window) = unsafe { nil }
-	on_keydown_shape      fn (&Shape, mut Event, mut Window) = unsafe { nil }
-	on_mouse_down_shape   fn (&Shape, mut Event, mut Window) = unsafe { nil }
-	on_mouse_move_shape   fn (&Shape, mut Event, mut Window) = unsafe { nil }
-	on_mouse_up_shape     fn (&Shape, mut Event, mut Window) = unsafe { nil }
-	on_mouse_scroll_shape fn (&Shape, mut Event, mut Window) = unsafe { nil }
-	// amend_layout called after all other layout operations complete
-	amend_layout fn (mut Layout, mut Window)            = unsafe { nil }
-	on_hover     fn (mut Layout, mut Event, mut Window) = unsafe { nil }
+	// --- u32 fields grouped together (4-byte alignment) ---
+	id_scroll     u32 // >0 indicates shape is scrollable
+	text_sel_beg  u32
+	text_sel_end  u32
+	text_tab_size u32 = 4
+	// --- enums (typically 4-byte alignment) ---
+	h_align       HorizontalAlign
+	v_align       VerticalAlign
+	text_mode     TextMode
+	scroll_mode   ScrollMode
+	float_anchor  FloatAttach
+	float_tie_off FloatAttach
+	// --- boolean fields grouped at the end (1-byte each, can be packed) ---
+	clip                bool
+	disabled            bool
+	fill                bool
+	focus_skip          bool
+	text_is_password    bool
+	text_is_placeholder bool
+	float               bool
+	over_draw           bool // allows scrollbars to draw in padding area
 }
 
 // ShapeType defines the kind of Shape.