From 991352b0d2767e6bd1a46f554db4ac9d208c13ad Mon Sep 17 00:00:00 2001 From: aura Date: Mon, 16 Mar 2026 15:40:03 +0100 Subject: finish prop rewrite --- src/editor/properties.cpp | 171 ++++++++++++++-------------------------------- 1 file changed, 52 insertions(+), 119 deletions(-) (limited to 'src/editor/properties.cpp') diff --git a/src/editor/properties.cpp b/src/editor/properties.cpp index 3b15dc8..c9eb991 100644 --- a/src/editor/properties.cpp +++ b/src/editor/properties.cpp @@ -9,36 +9,36 @@ const I32 PROPVIEW_PAD = 10; const I32 PROPVIEW_ACTION_BTN_W = 20; const I32 PROPVIEW_ACTION_BTN_GAP = 5; -static I32 propview_col_left() { +I32 propview_col_left() { return PROPVIEW_PAD; } -static I32 propview_col_right( GUI_EDITOR_PROPVIEW* view ) { +I32 propview_col_right( GUI_EDITOR_PROPVIEW* view ) { if( !view ) return PROPVIEW_PAD; return max( PROPVIEW_PAD, view->w - PROPVIEW_PAD ); } -static I32 propview_input_width( GUI_EDITOR_PROPVIEW* view ) { +I32 propview_input_width( GUI_EDITOR_PROPVIEW* view ) { return max( 120, propview_col_right( view ) - propview_col_left() ); } -static I32 propview_sub_input_x( I32 x ) { +I32 propview_sub_input_x( I32 x ) { return x + 10; } -static I32 propview_sub_input_width( GUI_EDITOR_PROPVIEW* view, I32 x ) { - I32 right = propview_col_right( view ); - return max( 100, right - propview_sub_input_x( x ) ); -} +// I32 propview_sub_input_width( GUI_EDITOR_PROPVIEW* view, I32 x ) { +// I32 right = propview_col_right( view ); +// return max( 100, right - propview_sub_input_x( x ) ); +// } -static I32 propview_action_x( GUI_EDITOR_PROPVIEW* view ) { +I32 propview_action_x( GUI_EDITOR_PROPVIEW* view ) { I32 right = propview_col_right( view ); return max( propview_col_left(), right - PROPVIEW_ACTION_BTN_W ); } -static I32 propview_action2_x( GUI_EDITOR_PROPVIEW* view ) { +I32 propview_action2_x( GUI_EDITOR_PROPVIEW* view ) { return max( propview_col_left(), propview_action_x( view ) - PROPVIEW_ACTION_BTN_W - PROPVIEW_ACTION_BTN_GAP @@ -71,18 +71,21 @@ void gui_editor_propview_select( GUI_EDITOR_PROPVIEW* view, void* what, U8 selty void gui_editor_propview_create_eobj_props( GUI_EDITOR_PROPVIEW* view, EOBJECT* e, I32* x, I32* y, I32 w ); void gui_editor_propview_create_eobj_prop( GUI_EDITOR_PROPVIEW* view, EDITOR_PROP* prop, I32* x, I32* y, I32 w, I32 space ) { - F32 step = editor->propgrid ? editor->grid : 0.25f; F32 action_x = propview_action_x( view ); I32 action2_x = propview_action2_x( view ); const char* n = prop->displayname; F32 min = prop->min; F32 max = prop->max; + F32 step; + + if( prop->step ) step = prop->step; + else step = editor->propgrid ? editor->grid : 0.25f; switch( prop->type ) { case EPROP_F32: gui_floatinput( *x, *y, w, n, (F32*)eprop_ptr( prop ), min, max, step ); *y += (space+18); break; case EPROP_VEC2: gui_vectorinput( *x, *y, w, n, (F32*)eprop_ptr( prop ), 2, min, max, step, "xy", "%.03f" ); *y += (space+18); break; - case EPROP_VEC3: gui_vectorinput( *x, *y, w, n, (F32*)eprop_ptr( prop ), 3, min, max, step, "xyz", "%.03f" ); *y += (space+18); break; - case EPROP_VEC4: gui_vectorinput( *x, *y, w, n, (F32*)eprop_ptr( prop ), 3, min, max, step, "xyzw", "%0.03f" ); *y += (space+18); break; + case EPROP_VEC3: gui_vectorinput( *x, *y, w, n, (F32*)eprop_ptr( prop ), 3, min, max, step, "xyz", "%.02f" ); *y += (space+18); break; + case EPROP_VEC4: gui_vectorinput( *x, *y, w, n, (F32*)eprop_ptr( prop ), 3, min, max, step, "xyzw", "%0.02f" ); *y += (space+18); break; case EPROP_CLR: gui_colorinput( *x, *y, w, n, (CLR*)eprop_ptr( prop ) ); *y += (space+18); break; case EPROP_MAPPROP: { MAP_PROPREF* ref = (MAP_PROPREF*)eprop_ptr( prop ); @@ -117,12 +120,43 @@ void gui_editor_propview_create_eobj_prop( GUI_EDITOR_PROPVIEW* view, EDITOR_PRO picker->cb = pfn( void* ) { gui_editor_propview_update( editor->gui.props ); }; } ); btn->extra = tex; *y += space; } break; + case EPROP_VERTEX_LIST: { + LIST* list = ( LIST* )eprop_ptr( prop ); + gui_label( *x, *y, "%s : %d", n, list->size ); *y += space; + for( U32 i = 0; i < list->size; ++i ) { + MAP_VERTEX* v = &list->data[i]; + gui_label( (*x) + 10, *y, "[%d] -> [%s]", i, to_str( v->pos ).data ); + GUI_BUTTON* btn = gui_button( action_x, *y, 20, 20, "\x1A", pfn( void* ptr ) { + GUI_BUTTON* btn = (GUI_BUTTON*)ptr; + gui_editor_propview_select( editor->gui.props, btn->extra, EDITOR_SELECT_PVERTEX ); + } ); btn->extra = v; *y += space; + } + } break; default: break; } } void gui_editor_propview_create_eobj_prop_ro( GUI_EDITOR_PROPVIEW* view, EDITOR_PROP* prop, I32* x, I32* y, I32 w, I32 space ) { - + STR str = prop->displayname; + str += " : ["; + void* ptr = eprop_ptr( prop ); + + switch( prop->type ) { + case EPROP_F32: str += to_str( *(F32*)ptr ); break; + case EPROP_VEC2: str += to_str( *(VEC2*)ptr ); break; + case EPROP_VEC3: str += to_str( *(VEC3*)ptr ); break; + case EPROP_VEC4: str += to_str( *(VEC4*)ptr ); break; + case EPROP_CLR: str += to_str( *(CLR*)ptr ); break; + case EPROP_U32: str += to_str( *(U32*)ptr ); break; + case EPROP_U64: str += to_str( *(U64*)ptr ); break; + case EPROP_I32: str += to_str( *(I32*)ptr ); break; + case EPROP_I64: str += to_str( *(I64*)ptr ); break; + case EPROP_STRING: str += to_str( *(CLR*)ptr ); break; + } + + str += "]"; + gui_label( *x, *y, str.data ); + *y += space; } void gui_editor_propview_create_eobj_props( GUI_EDITOR_PROPVIEW* view, EOBJECT* e, I32* x, I32* y, I32 w ) { @@ -137,66 +171,6 @@ void gui_editor_propview_create_eobj_props( GUI_EDITOR_PROPVIEW* view, EOBJECT* } } - -// returns the subentry height -I32 gui_editor_propview_surfprops_subentry( - GUI_EDITOR_PROPVIEW* view, - I32 x, - I32 y, - I32* propid, - SURF_PROPS* props -) { - I32 oldy = y; - I32 space = 20; - I32 action_x = propview_action_x( view ); - I32 action2_x = propview_action2_x( view ); - gui_label( x, y, "prop id: %d", *propid ); - GUI_BUTTON* newprop = gui_button( action2_x, y, 20, 20, "+", pfn( void* ptr ) { - GUI_BUTTON* btn = (GUI_BUTTON*)ptr; - SURF_PROPS props; - props.tex = 0; - props.clr = { 1.f, 1.f, 1.f, 1.f }; - - editor->map->props.push( props ); - *(U32*)(btn->extra) = editor->map->props.size - 1; - // Keep the newest prop visible in the assets panel (pixel scroll). - editor->gui.assets_scroll = ( editor->map->props.size + 1 ) * 28; - gui_editor_propview_update( editor->gui.props ); - } ); - newprop->extra = propid; - GUI_BUTTON* goprop = gui_button( action_x, y, 20, 20, "\x1A", pfn( void* ptr ) { - GUI_BUTTON* btn = (GUI_BUTTON*)ptr; - gui_editor_propview_select( editor->gui.props, btn->extra, EDITOR_SELECT_SURFPROPS ); - } ); - goprop->extra = props; - - y += space; - - if( props->tex ) - gui_label( x + 10, y, "texture: %s", props->tex->name ); - else - gui_label( x + 10, y, "texture: none" ); - - GUI_BUTTON* btn = gui_button( action_x, y, 20, 20, "\x1A", pfn( void* ptr ) { - GUI_BUTTON* btn = (GUI_BUTTON*)ptr; - GL_TEX2D** ptex = (GL_TEX2D**)btn->extra; - GUI_EDITOR_TEXTUREPICKER* picker = gui_editor_texturepicker( 200, 100, 400, 400, ptex ); - picker->cb = pfn( void* ) { gui_editor_propview_update( editor->gui.props ); }; - } ); - - btn->extra = &props->tex; - y += space; - gui_colorinput( - propview_sub_input_x( x ), - y, - propview_sub_input_width( view, x ), - "color", - &props->clr - ); y += (space+18); - - return y - oldy; -} - void gui_editor_propview_create_wallprops( GUI_EDITOR_PROPVIEW* view ) { MAP_WALL* s = (MAP_WALL*)view->curselect; WORLD_MAP* m = editor->map; @@ -215,37 +189,15 @@ void gui_editor_propview_create_wallprops( GUI_EDITOR_PROPVIEW* view ) { void gui_editor_propview_create_polyprops( GUI_EDITOR_PROPVIEW* view ) { MAP_POLYGON* p = (MAP_POLYGON*)view->curselect; WORLD_MAP* m = editor->map; - SURF_PROPS* props = polygon_get_props( m, p ); - I32 x = 10, y = 10; I32 space = 20; I32 poly_idx = m->polygons.idx_where( fn( MAP_POLYGON* mp ) { return p == mp; } ); - I32 action_x = propview_action_x( view ); gui_label( x, y, "idx: %d", poly_idx ); y += space; - y += gui_editor_propview_surfprops_subentry( view, x, y, &p->propid.id, props ); - - gui_label( x, y, "vertices: %d", p->vertices.size ); y += space; - I32 idx = 0; - p->vertices.each( fn( MAP_VERTEX* v ) { - gui_label( x + 10, y, "[%d] -> { %.02f, %.02f, %.02f }", idx, v->pos.x, v->pos.y, v->pos.z ); - GUI_BUTTON* btn = gui_button( action_x, y - 2, 20, 20, "\x1A", pfn( void* ptr ) { - GUI_EDITOR_PROPVIEW* view = editor->gui.props; - GUI_BUTTON* btn = (GUI_BUTTON*)ptr; - MAP_POLYGON* p = (MAP_POLYGON*)view->curselect; - I64 idx = (I64)btn->extra; - if( p ) // p100 - gui_editor_propview_select( view, &p->vertices[idx], EDITOR_SELECT_PVERTEX ); - } ); - - y += space; - btn->extra = (void*)( (I64)idx++ ); - } ); - gui_label( x, y, "mins: { %1.02f, %1.02f, %1.02f }", p->mins.x, p->mins.y, p->mins.z ); y += space; - gui_label( x, y, "maxs: { %1.02f, %1.02f, %1.02f }", p->maxs.x, p->maxs.y, p->maxs.z ); y += space; + return gui_editor_propview_create_eobj_props( view, p, &x, &y, propview_input_width( view ) ); } void gui_editor_propview_create_mapprops( GUI_EDITOR_PROPVIEW* view ) { @@ -296,12 +248,10 @@ void gui_editor_propview_create_pvertexprops( GUI_EDITOR_PROPVIEW* view ) { return vert_idx != -1; } ); - F32 step = editor->propgrid? editor->grid : 0.25f; I32 action_x = propview_action_x( view ); gui_label( x, y, "idx: %d", vert_idx ); y += space; gui_label( x, y, "polygon idx: %d", poly_idx ); - gui_button( action_x, y - 2, 20, 20, "\x1A", pfn( void* ) { GUI_EDITOR_PROPVIEW* view = editor->gui.props; MAP_VERTEX* v = (MAP_VERTEX*)view->curselect; @@ -313,13 +263,9 @@ void gui_editor_propview_create_pvertexprops( GUI_EDITOR_PROPVIEW* view ) { if( polygon ) gui_editor_propview_select( view, polygon, EDITOR_SELECT_POLY ); - } ); - y += space; + } ); y += space; - GUI_VECTORINPUT* posinput = gui_vectorinput( x, y, propview_input_width( view ), "position", (F32*)&v->pos, 3, -INFINITY, INFINITY, step ); y += (space+18); - posinput->cb = pfn( void* ptr ) { map_check_bounds( editor->map ); }; - gui_vectorinput( x, y, propview_input_width( view ), "texture coordinates", (F32*)&v->uv, 2, 0.f, 1.f, 0.005f, "xy", "%.03f" ); y += (space+18); - gui_colorinput( x, y, propview_input_width( view ), "color", &v->clr ); y += (space+18); + return gui_editor_propview_create_eobj_props( view, v, &x, &y, propview_input_width( view ) ); } @@ -348,22 +294,9 @@ void gui_editor_propview_create_surfprops( GUI_EDITOR_PROPVIEW* view ) { I32 i = m->props.idx_where( fn( SURF_PROPS* mp ) { return mp == p; } ); if( i == -1 ) return; - I32 action_x = propview_action_x( view ); gui_label( x, y, "prop id: %d", i ); y += space; - if( p->tex ) - gui_label( x, y, "texture: %s", assets_abspath( p->tex->name ) ); - else - gui_label( x, y, "texture: none" ); - GUI_BUTTON* btn = gui_button( action_x, y, 20, 20, "\x1A", pfn( void* ptr ) { - GUI_BUTTON* btn = (GUI_BUTTON*)ptr; - GL_TEX2D** ptex = (GL_TEX2D**)btn->extra; - GUI_EDITOR_TEXTUREPICKER* picker = gui_editor_texturepicker( 200, 100, 400, 400, ptex ); - picker->cb = pfn( void* ) { gui_editor_propview_update( editor->gui.props ); }; - } ); - btn->extra = &p->tex; - y += space; - gui_colorinput( x, y, propview_input_width( view ), "color", &p->clr ); y += (space+18); + return gui_editor_propview_create_eobj_props( view, p, &x, &y, propview_input_width( view ) ); } void gui_editor_propview_create_entprops( GUI_EDITOR_PROPVIEW* view ) { -- cgit v1.2.3