summaryrefslogtreecommitdiff
path: root/src/editor
diff options
context:
space:
mode:
Diffstat (limited to 'src/editor')
-rw-r--r--src/editor/editor.cpp12
-rw-r--r--src/editor/editor.h16
-rw-r--r--src/editor/editor_contextmenu.cpp35
-rw-r--r--src/editor/editor_infobox.cpp2
-rw-r--r--src/editor/editor_menubar.cpp46
-rw-r--r--src/editor/properties.cpp252
-rw-r--r--src/editor/properties.h160
-rw-r--r--src/editor/toolview.cpp20
8 files changed, 331 insertions, 212 deletions
diff --git a/src/editor/editor.cpp b/src/editor/editor.cpp
index dee5080..ba61961 100644
--- a/src/editor/editor.cpp
+++ b/src/editor/editor.cpp
@@ -56,7 +56,6 @@ static U8 editor_clr_eq( const CLR& a, const CLR& b ) {
static U8 editor_vertex_eq( const MAP_VERTEX& a, const MAP_VERTEX& b ) {
return a.pos == b.pos
- && a.normal == b.normal
&& a.uv == b.uv
&& editor_clr_eq( a.clr, b.clr );
}
@@ -604,15 +603,15 @@ STAT editor_new_map( GAME_EDITOR* e, const char* mapname ) {
WORLD_MAP* m = new WORLD_MAP;
defer( map_free( e->game, m ) );
- strcpy( m->name, mapname );
- strcat( m->name, ".hmap" );
+ m->name = mapname;
+ m->name += ".hmap";
m->startpos = { 10.f, 10.f, 0.f };
m->props.push( { .clr = { 1.f, 1.f, 1.f, 1.f } } );
m->walls.push( {
+ .propid = 0,
.start = { 0 , 0, -40.f },
.end = { 10.f, 0, 80.f },
- .propid = 0
} );
CFG_SECTION* map_cfg = map_serialize( m );
@@ -641,11 +640,10 @@ STAT editor_save_map( GAME_EDITOR* e ) {
if( !serialized ) return STAT_ERR;
defer( cfg_free( serialized ) );
- char full_path[256];
- sprintf( full_path, "../assets/maps/%s", e->map->name );
+ STR full_path = { "../assets/maps/%s", e->map->name.data };
if( !OK( cfg_save( serialized, full_path ) ) ) {
- dlog( "failed to save map %s", full_path );
+ dlog( "failed to save map %s", full_path.data );
return STAT_ERR;
}
diff --git a/src/editor/editor.h b/src/editor/editor.h
index 828f2e4..33396df 100644
--- a/src/editor/editor.h
+++ b/src/editor/editor.h
@@ -66,7 +66,7 @@ enum EditorObjectType_t {
typedef void( *EDITOR_CONTEXTMENU_CALLBACK )( void* data );
struct EDITOR_CONTEXTMENU_ITEM;
-typedef U8( *EDITOR_CONTEXTMENU_ENABLED_CALLBACK )( const EDITOR_CONTEXTMENU_ITEM* item );
+typedef U8( *EDITOR_CONTEXTMENU_ENABLED_CALLBACK )( EDITOR_CONTEXTMENU_ITEM* item );
struct EDITOR_CONTEXTMENU_ITEM {
char text[64]{};
@@ -209,9 +209,6 @@ extern void editor_create_map_view( GAME_EDITOR* e );
extern void editor_update_properties_column( GAME_EDITOR* e );
extern const char* editor_tool_name();
extern void editor_set_view_mode( I32 mode );
-extern void editor_show_contextmenu( I32 x, I32 y, LIST<EDITOR_CONTEXTMENU_ITEM>* items, const char* title = 0 );
-extern void editor_hide_contextmenu();
-extern U8 editor_contextmenu_open();
extern void editor_undo_clear( GAME_EDITOR* e );
extern void editor_undo_record_create_walls( GAME_EDITOR* e, I32 start_idx, I32 count );
extern void editor_undo_record_create_poly( GAME_EDITOR* e, I32 start_idx );
@@ -220,6 +217,17 @@ extern void editor_undo_record_create_entity( GAME_EDITOR* e, I32 start_idx );
extern U8 editor_undo( GAME_EDITOR* e );
extern U8 editor_redo( GAME_EDITOR* e );
+extern void editor_show_contextmenu( I32 x, I32 y, LIST<EDITOR_CONTEXTMENU_ITEM>* items, const char* title = 0 );
+extern void editor_hide_contextmenu();
+extern U8 editor_contextmenu_open();
+extern void editor_contextmenu_set_item(
+ EDITOR_CONTEXTMENU_ITEM* item,
+ const char* text,
+ EDITOR_CONTEXTMENU_CALLBACK cb = 0,
+ void* data = 0,
+ EDITOR_CONTEXTMENU_ENABLED_CALLBACK enabled_cb = 0
+);
+
struct GUI_EDITORWINDOW : GUI_WINDOW {};
struct GUI_EDITOR_3DVIEW : GUI_VIEW {
U8 heldoutbounds;
diff --git a/src/editor/editor_contextmenu.cpp b/src/editor/editor_contextmenu.cpp
index 2b0bb1f..4f9dbe6 100644
--- a/src/editor/editor_contextmenu.cpp
+++ b/src/editor/editor_contextmenu.cpp
@@ -1,6 +1,6 @@
#include "editor_gui_internal.h"
-static U8 editor_contextmenu_item_enabled( const EDITOR_CONTEXTMENU_ITEM* item ) {
+U8 editor_contextmenu_item_enabled( EDITOR_CONTEXTMENU_ITEM* item ) {
if( !item )
return 0;
@@ -10,15 +10,15 @@ static U8 editor_contextmenu_item_enabled( const EDITOR_CONTEXTMENU_ITEM* item )
return item->enabled;
}
-static I32 editor_contextmenu_title_h( const GUI_EDITOR_CONTEXTMENU* menu ) {
+I32 editor_contextmenu_title_h( GUI_EDITOR_CONTEXTMENU* menu ) {
return ( menu && menu->title[0] ) ? 18 : 0;
}
-static I32 editor_contextmenu_row_h() {
+I32 editor_contextmenu_row_h() {
return 20;
}
-static I32 editor_contextmenu_width( LIST<EDITOR_CONTEXTMENU_ITEM>* items, const char* title ) {
+I32 editor_contextmenu_width( LIST<EDITOR_CONTEXTMENU_ITEM>* items, const char* title ) {
I32 width = EDITOR_TOOLBAR_DROPDOWN_W;
if( title && title[0] ) {
I32 text_w = 0;
@@ -38,7 +38,7 @@ static I32 editor_contextmenu_width( LIST<EDITOR_CONTEXTMENU_ITEM>* items, const
return width;
}
-static I32 editor_contextmenu_height( LIST<EDITOR_CONTEXTMENU_ITEM>* items, const char* title ) {
+I32 editor_contextmenu_height( LIST<EDITOR_CONTEXTMENU_ITEM>* items, const char* title ) {
I32 height = 4 + editor_contextmenu_row_h() * ( items ? (I32)items->size : 0 );
if( title && title[0] )
height += 18 + 1;
@@ -52,7 +52,7 @@ static I32 editor_contextmenu_items_y( GUI_EDITOR_CONTEXTMENU* menu ) {
return y;
}
-static I32 editor_contextmenu_hit_test( GUI_EDITOR_CONTEXTMENU* menu, I32 mx, I32 my ) {
+I32 editor_contextmenu_hit_test( GUI_EDITOR_CONTEXTMENU* menu, I32 mx, I32 my ) {
if( !menu || !menu->items )
return -1;
@@ -72,7 +72,7 @@ static I32 editor_contextmenu_hit_test( GUI_EDITOR_CONTEXTMENU* menu, I32 mx, I3
return idx;
}
-static void gui_editor_contextmenu_draw_fn( void* ptr ) {
+void gui_editor_contextmenu_draw_fn( void* ptr ) {
GUI_EDITOR_CONTEXTMENU* menu = (GUI_EDITOR_CONTEXTMENU*)ptr;
if( !menu || !menu->items || !menu->items->size )
return;
@@ -128,7 +128,7 @@ static void gui_editor_contextmenu_draw_fn( void* ptr ) {
}
}
-static void gui_editor_contextmenu_input_fn( void* ptr ) {
+void gui_editor_contextmenu_input_fn( void* ptr ) {
GUI_EDITOR_CONTEXTMENU* menu = (GUI_EDITOR_CONTEXTMENU*)ptr;
if( !menu || !menu->items || !menu->items->size )
return;
@@ -199,6 +199,25 @@ U8 editor_contextmenu_open() {
return editor && editor->gui.contextmenu && editor->gui.contextmenu->enabled;
}
+
+void editor_contextmenu_set_item(
+ EDITOR_CONTEXTMENU_ITEM* item,
+ const char* text,
+ EDITOR_CONTEXTMENU_CALLBACK cb,
+ void* data,
+ EDITOR_CONTEXTMENU_ENABLED_CALLBACK enabled_cb
+) {
+ if( !item )
+ return;
+
+ item->items.clear();
+ snprintf( item->text, sizeof( item->text ), "%s", text ? text : "" );
+ item->cb = cb;
+ item->data = data;
+ item->enabled = 1;
+ item->enabled_cb = enabled_cb;
+}
+
void editor_show_contextmenu( I32 x, I32 y, LIST<EDITOR_CONTEXTMENU_ITEM>* items, const char* title ) {
editor_hide_contextmenu();
if( !editor || !editor->wnd || !items || !items->size )
diff --git a/src/editor/editor_infobox.cpp b/src/editor/editor_infobox.cpp
index 9f9060d..479b59d 100644
--- a/src/editor/editor_infobox.cpp
+++ b/src/editor/editor_infobox.cpp
@@ -100,7 +100,7 @@ static void gui_editor_infobox_draw_assets( GUI_EDITOR_INFOBOX* box, I32 panel_x
I32 text_x = tx + EDITOR_ASSETS_THUMB + 8;
CLR txt = ui_clr.txt;
if( map_entry ) {
- gui_draw_str( text_x, row_y + 7, ALIGN_L, FNT_JPN12, txt, "[map] -> %s", map->name );
+ gui_draw_str( text_x, row_y + 7, ALIGN_L, FNT_JPN12, txt, "[map] -> %s", map->name.data );
} else if( p->tex ) {
gui_draw_str( text_x, row_y + 7, ALIGN_L, FNT_JPN12, txt, "[%d] -> %s", idx - 1, p->tex->name );
} else {
diff --git a/src/editor/editor_menubar.cpp b/src/editor/editor_menubar.cpp
index b89d1c6..cef2650 100644
--- a/src/editor/editor_menubar.cpp
+++ b/src/editor/editor_menubar.cpp
@@ -66,56 +66,38 @@ void editor_raise_header_toolbar( GAME_EDITOR* e ) {
parent->children.push( bar );
}
-static void editor_contextmenu_set_item(
- EDITOR_CONTEXTMENU_ITEM* item,
- const char* text,
- EDITOR_CONTEXTMENU_CALLBACK cb = 0,
- void* data = 0,
- EDITOR_CONTEXTMENU_ENABLED_CALLBACK enabled_cb = 0
-) {
- if( !item )
- return;
-
- item->items.clear();
- snprintf( item->text, sizeof( item->text ), "%s", text ? text : "" );
- item->cb = cb;
- item->data = data;
- item->enabled = 1;
- item->enabled_cb = enabled_cb;
-}
-
-static void editor_contextmenu_save_cb( void* ) {
+void editor_contextmenu_save_cb( void* ) {
if( editor )
editor_save_map( editor );
}
-static void editor_contextmenu_undo_cb( void* ) {
+void editor_contextmenu_undo_cb( void* ) {
if( editor )
editor_undo( editor );
}
-static void editor_contextmenu_redo_cb( void* ) {
+void editor_contextmenu_redo_cb( void* ) {
if( editor )
editor_redo( editor );
}
-static void editor_contextmenu_set_view_mode_cb( void* data ) {
+void editor_contextmenu_set_view_mode_cb( void* data ) {
editor_set_view_mode( (I32)(I64)data );
}
-static void editor_contextmenu_set_tool_cb( void* data ) {
+void editor_contextmenu_set_tool_cb( void* data ) {
editor_settool( (U8)(I64)data );
}
-static U8 editor_contextmenu_undo_enabled( const EDITOR_CONTEXTMENU_ITEM* ) {
+U8 editor_contextmenu_undo_enabled( EDITOR_CONTEXTMENU_ITEM* ) {
return editor && editor->undo_actions.size > 0;
}
-static U8 editor_contextmenu_redo_enabled( const EDITOR_CONTEXTMENU_ITEM* ) {
+U8 editor_contextmenu_redo_enabled( EDITOR_CONTEXTMENU_ITEM* ) {
return editor && editor->redo_actions.size > 0;
}
-static void editor_toolbar_init_entries( GUI_EDITOR_TOOLBAR* bar ) {
+void editor_toolbar_init_entries( GUI_EDITOR_TOOLBAR* bar ) {
if( !bar )
return;
@@ -146,7 +128,7 @@ static void editor_toolbar_init_entries( GUI_EDITOR_TOOLBAR* bar ) {
editor_contextmenu_set_item( &bar->entries[3].items[4], "object", editor_contextmenu_set_tool_cb, (void*)(I64)EDITOR_TOOL_OBJECT );
}
-static I32 editor_toolbar_root_width( const EDITOR_CONTEXTMENU_ITEM* entry ) {
+I32 editor_toolbar_root_width( const EDITOR_CONTEXTMENU_ITEM* entry ) {
if( !entry )
return 44;
@@ -155,7 +137,7 @@ static I32 editor_toolbar_root_width( const EDITOR_CONTEXTMENU_ITEM* entry ) {
return max( 44, text_w + 16 );
}
-static void editor_toolbar_root_rect( GUI_EDITOR_TOOLBAR* bar, I32 idx, I32* rx, I32* ry, I32* rw, I32* rh ) {
+void editor_toolbar_root_rect( GUI_EDITOR_TOOLBAR* bar, I32 idx, I32* rx, I32* ry, I32* rw, I32* rh ) {
I32 x = gui_relx( bar );
I32 y = gui_rely( bar );
I32 cx = x + 8;
@@ -172,11 +154,11 @@ struct EDITOR_TOOLBAR_HIT {
I32 root{-1};
};
-static U8 editor_toolbar_pt_in_rect( I32 mx, I32 my, I32 x, I32 y, I32 w, I32 h ) {
+U8 editor_toolbar_pt_in_rect( I32 mx, I32 my, I32 x, I32 y, I32 w, I32 h ) {
return mx >= x && mx < x + w && my >= y && my < y + h;
}
-static EDITOR_TOOLBAR_HIT editor_toolbar_hit_test( GUI_EDITOR_TOOLBAR* bar, I32 mx, I32 my ) {
+EDITOR_TOOLBAR_HIT editor_toolbar_hit_test( GUI_EDITOR_TOOLBAR* bar, I32 mx, I32 my ) {
EDITOR_TOOLBAR_HIT hit{};
for( I32 i = 0; i < (I32)bar->entries.size; ++i ) {
I32 x = 0, y = 0, w = 0, h = 0;
@@ -190,7 +172,7 @@ static EDITOR_TOOLBAR_HIT editor_toolbar_hit_test( GUI_EDITOR_TOOLBAR* bar, I32
return hit;
}
-static void gui_editor_toolbar_draw_fn( void* ptr ) {
+void gui_editor_toolbar_draw_fn( void* ptr ) {
GUI_EDITOR_TOOLBAR* bar = (GUI_EDITOR_TOOLBAR*)ptr;
I32 x = gui_relx( bar );
I32 y = gui_rely( bar );
@@ -229,7 +211,7 @@ static void gui_editor_toolbar_draw_fn( void* ptr ) {
}
}
-static void gui_editor_toolbar_input_fn( void* ptr ) {
+void gui_editor_toolbar_input_fn( void* ptr ) {
GUI_EDITOR_TOOLBAR* bar = (GUI_EDITOR_TOOLBAR*)ptr;
I32 mx = 0, my = 0;
gui_cursor_pos( &mx, &my );
diff --git a/src/editor/properties.cpp b/src/editor/properties.cpp
index ac21bb0..c9eb991 100644
--- a/src/editor/properties.cpp
+++ b/src/editor/properties.cpp
@@ -1,3 +1,4 @@
+#include "properties.h"
#include "editor.h"
#include "../render/gl.h"
#include "../game/assets.h"
@@ -8,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
@@ -66,122 +67,137 @@ void gui_editor_propview_select( GUI_EDITOR_PROPVIEW* view, void* what, U8 selty
gui_editor_propview_update( view );
}
-// 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 );
+
+
+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 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;
+ 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", "%.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 );
+ SURF_PROPS* props = map_get_props( editor->map, *ref );
+ gui_label( *x, *y, "prop id: %d", *ref );
+
+ GUI_BUTTON* newprop = gui_button( action2_x, *y, 20, 20, "+", pfn( void* ptr ) {
+ GUI_BUTTON* btn = (GUI_BUTTON*)ptr;
+ SURF_PROPS props{ .tex = 0, .clr = CLR::WHITE() };
+ editor->map->props.push( props );
+
+ ((MAP_PROPREF*)btn->extra)->id = editor->map->props.size - 1;
+ editor->gui.assets_scroll = ( editor->map->props.size + 1 ) * 28;
+ gui_editor_propview_update( editor->gui.props );
+ } ); newprop->extra = ref;
+
+ 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;
+
+ *x += 10; gui_editor_propview_create_eobj_props( view, props, x, y, w - 10 ); *x -= 10;
+ } break;
+ case EPROP_TEXTURE: {
+ GL_TEX2D** tex = (GL_TEX2D**)eprop_ptr( prop );
+ if( *tex ) gui_label( *x, *y, "%s: %s", n, (*tex)->name );
+ else gui_label( *x, *y, "%s: none", n );
+ 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 = tex; *y += space;
+ } break;
+ case EPROP_VERTEX_LIST: {
+ LIST<MAP_VERTEX>* list = ( LIST<MAP_VERTEX>* )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;
+ }
+}
- y += space;
+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;
+ }
- if( props->tex )
- gui_label( x + 10, y, "texture: %s", props->tex->name );
- else
- gui_label( x + 10, y, "texture: none" );
+ str += "]";
+ gui_label( *x, *y, str.data );
+ *y += space;
+}
- 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 ); };
- } );
+void gui_editor_propview_create_eobj_props( GUI_EDITOR_PROPVIEW* view, EOBJECT* e, I32* x, I32* y, I32 w ) {
+ I32 space = 20;
- 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;
+ for( auto& it : e->eprops ) {
+ EDITOR_PROP* eprop = eprop_from_ref( e, it );
+ if( eprop->readonly )
+ gui_editor_propview_create_eobj_prop_ro( view, eprop, x, y, w, space );
+ else
+ gui_editor_propview_create_eobj_prop( view, eprop, x, y, w, space );
+ }
}
void gui_editor_propview_create_wallprops( GUI_EDITOR_PROPVIEW* view ) {
MAP_WALL* s = (MAP_WALL*)view->curselect;
WORLD_MAP* m = editor->map;
- SURF_PROPS* props = wall_get_props( m, s );
I32 x = 10, y = 10;
I32 space = 20;
- F32 step = editor->propgrid? editor->grid : 0.25f;
I32 wall_idx = m->walls.idx_where( fn( MAP_WALL* ms ) {
return s == ms;
} );
gui_label( x, y, "idx: %d", wall_idx ); y += space;
- y += gui_editor_propview_surfprops_subentry( view, x, y, &s->propid, props );
-
- GUI_VECTORINPUT* posinput;
- posinput = gui_vectorinput( x, y, propview_input_width( view ), "start", (F32*)&s->start, 3, -INFINITY, INFINITY, step ); y += (space+18);
- posinput->cb = pfn( void* ) { map_check_bounds( editor->map ); };
- posinput = gui_vectorinput( x, y, propview_input_width( view ), "end", (F32*)&s->end, 3, -INFINITY, INFINITY, step ); y += (space+18);
- posinput->cb = pfn( void* ) { map_check_bounds( editor->map ); };
+ return gui_editor_propview_create_eobj_props( view, s, &x, &y, propview_input_width( 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, 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 ) {
@@ -192,7 +208,7 @@ void gui_editor_propview_create_mapprops( GUI_EDITOR_PROPVIEW* view ) {
F32 step = editor->propgrid? editor->grid : 0.25f;
- gui_label( x, y, "name: %s", m->name ); y += space;
+ gui_label( x, y, "name: %s", m->name.data ); y += space;
gui_label( x, y, "walls: %d", m->walls.size ); y += space;
gui_label( x, y, "polygons: %d", m->polygons.size ); y += space;
gui_label( x, y, "props: %d", m->props.size ); y += space;
@@ -232,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;
@@ -249,15 +263,12 @@ 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 ) );
}
+
void gui_editor_propview_create_spriteprops( GUI_EDITOR_PROPVIEW* view ) {
MAP_SPRITE* s = (MAP_SPRITE*)view->curselect;
WORLD_MAP* m = editor->map;
@@ -268,27 +279,9 @@ void gui_editor_propview_create_spriteprops( GUI_EDITOR_PROPVIEW* view ) {
I32 sprite_idx = m->sprites.idx_where( fn( MAP_SPRITE* ms ) {
return ms == s;
} );
- I32 action_x = propview_action_x( view );
-
- F32 step = editor->propgrid? editor->grid : 0.25f;
gui_label( x, y, "idx: %d", sprite_idx ); y += space;
- gui_vectorinput( x, y, propview_input_width( view ), "position", (F32*)&s->pos, 3, -INFINITY, INFINITY, step ); y += (space+18);
- gui_vectorinput( x, y, propview_input_width( view ), "size", (F32*)&s->size, 2, 1.f, INFINITY, 1.f, "wh" ); y += (space+18);
- gui_colorinput( x, y, propview_input_width( view ), "color", &s->clr ); y += (space+18);
- if( s->tex )
- gui_label( x, y, "texture: %s", s->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 = &s->tex;
- y += space;
+ return gui_editor_propview_create_eobj_props( view, s, &x, &y, propview_input_width( view ) );
}
void gui_editor_propview_create_surfprops( GUI_EDITOR_PROPVIEW* view ) {
@@ -301,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 ) {
diff --git a/src/editor/properties.h b/src/editor/properties.h
index 34ac765..d663a6b 100644
--- a/src/editor/properties.h
+++ b/src/editor/properties.h
@@ -1,7 +1,6 @@
#pragma once
#include "../gamedef.h"
-#include <concepts>
#if IS_EDITOR
#include <math.h>
@@ -9,17 +8,46 @@
#define EPROP( _type, name, value, display ) \
_type name = value; \
- EDITOR_PROP name##_prop{ .pdata = &name, .type = eprop_type<_type>(), .displayname = display, .parent = this };
+ EDITOR_PROP name##_prop{ &name, eprop_type<_type>(), display, this, 0 }
+
+#define EPROP_RO( _type, name, value, display ) \
+ _type name = value; \
+ EDITOR_PROP name##_prop{ &name, eprop_type<_type>(), display, this, 1 }
#define EPROP_RANGED( _type, name, value, display, _min, _max ) \
- _type name{ value }; \
- EDITOR_PROP{ \
- .pdata = &name, \
- .type = eprop_type<_type>(), \
- .displayname = display, \
- .parent = this, \
- .min = _min, \
- .max = _max \
+ _type name = value; \
+ EDITOR_PROP name##_prop{ \
+ &name, \
+ eprop_type<_type>(), \
+ display, \
+ this, \
+ _min, \
+ _max, \
+ 0 \
+ }
+
+#define EPROP_STEP( _type, name, value, display, step ) \
+ _type name = value; \
+ EDITOR_PROP name##_prop{ \
+ &name, \
+ eprop_type<_type>(), \
+ display, \
+ step, \
+ this, \
+ 0 \
+ }
+
+#define EPROP_RANGED_STEP( _type, name, value, display, min, max, step ) \
+ _type name = value; \
+ EDITOR_PROP name##_prop{ \
+ &name, \
+ eprop_type<_type>(), \
+ display, \
+ step, \
+ this, \
+ min, \
+ max, \
+ 0 \
}
enum EditorPropType_t {
@@ -34,15 +62,27 @@ enum EditorPropType_t {
EPROP_I64,
EPROP_F32,
EPROP_F64,
+ EPROP_VEC2,
+ EPROP_VEC3,
+ EPROP_VEC4,
+ EPROP_CLR,
+ EPROP_MAPPROP,
EPROP_STRING,
EPROP_OBJ,
EPROP_LIST,
+ EPROP_TEXTURE,
EPROP_TEXTURE_LIST,
+ EPROP_VERTEX,
+ EPROP_VERTEX_LIST
+};
+
+struct EPROP_ENTRY {
+ U64 offset;
};
// editor map object
struct EOBJECT {
- LIST<struct EDITOR_PROP*> eprops{};
+ LIST<EPROP_ENTRY> eprops{};
};
template <typename T>
@@ -50,13 +90,89 @@ concept __eobject_base = __is_base_of(EOBJECT, T);
// editor object property
struct EDITOR_PROP {
- void* pdata;
+ EDITOR_PROP( void* _pdata, U8 _type, STR _displayname, struct EOBJECT* _parent, U8 _readonly = 0 ) {
+ type = _type;
+ displayname = _displayname;
+ min = -INFINITY;
+ max = INFINITY;
+ step = 0;
+ readonly = _readonly;
+
+ U64 _this = (U64)this;
+ U64 pdata = (U64)_pdata;
+ U64 parent = (U64)_parent;
+ U64 offset = _this - parent;
+
+ _parent->eprops.push( { offset } );
+
+ offset = _this - pdata;
+ dataoff = offset;
+ }
+
+ EDITOR_PROP( void* _pdata, U8 _type, STR _displayname, F32 _step, struct EOBJECT* _parent, U8 _readonly = 0 ) {
+ type = _type;
+ displayname = _displayname;
+ min = -INFINITY;
+ max = INFINITY;
+ step = _step;
+ readonly = _readonly;
+
+ U64 _this = (U64)this;
+ U64 pdata = (U64)_pdata;
+ U64 parent = (U64)_parent;
+ U64 offset = _this - parent;
+
+ _parent->eprops.push( { offset } );
+
+ offset = _this - pdata;
+ dataoff = offset;
+ }
+
+ EDITOR_PROP( void* _pdata, U8 _type, STR _displayname, struct EOBJECT* _parent, F32 _min, F32 _max, U8 _readonly = 0 ) {
+ type = _type;
+ displayname = _displayname;
+ min = _min;
+ max = _max;
+ step = 0;
+ readonly = _readonly;
+
+ U64 _this = (U64)this;
+ U64 pdata = (U64)_pdata;
+ U64 parent = (U64)_parent;
+ U64 offset = _this - parent;
+
+ _parent->eprops.push( { offset } );
+
+ offset = _this - pdata;
+ dataoff = offset;
+ }
+
+ EDITOR_PROP( void* _pdata, U8 _type, STR _displayname, F32 _step, struct EOBJECT* _parent, F32 _min, F32 _max, U8 _readonly = 0 ) {
+ type = _type;
+ displayname = _displayname;
+ min = _min;
+ max = _max;
+ step = _step;
+ readonly = _readonly;
+
+ U64 _this = (U64)this;
+ U64 pdata = (U64)_pdata;
+ U64 parent = (U64)_parent;
+ U64 offset = _this - parent;
+
+ _parent->eprops.push( { offset } );
+
+ offset = _this - pdata;
+ dataoff = offset;
+ }
+
+ U64 dataoff;
U8 type;
STR displayname;
F64 min{ -INFINITY };
F64 max{ INFINITY };
- struct EOBJECT* parent;
-
+ F32 step;
+ U8 readonly;
template <typename T> struct __eprop_type {
static const U8 type = EPROP_INVALID;
@@ -72,11 +188,27 @@ struct EDITOR_PROP {
template <> struct __eprop_type<F32> { static const U8 type = EPROP_F32; };
template <> struct __eprop_type<F64> { static const U8 type = EPROP_F64; };
template <> struct __eprop_type<STR> { static const U8 type = EPROP_STRING; };
+ template <> struct __eprop_type<struct CLR> { static const U8 type = EPROP_CLR; };
+ template <> struct __eprop_type<struct VEC2> { static const U8 type = EPROP_VEC2; };
+ template <> struct __eprop_type<struct VEC3> { static const U8 type = EPROP_VEC3; };
+ template <> struct __eprop_type<struct VEC4> { static const U8 type = EPROP_VEC4; };
+ template <> struct __eprop_type<struct MAP_PROPREF> { static const U8 type = EPROP_MAPPROP; };
+ template <> struct __eprop_type<struct GL_TEX2D*> { static const U8 type = EPROP_TEXTURE; };
template <__eobject_base T> struct __eprop_type<T> { static const U8 type = EPROP_OBJ; };
template <typename LT> struct __eprop_type<LIST<LT>> { static const U8 type = EPROP_LIST; };
template <> struct __eprop_type<LIST<struct MAP_TEXTURE_ENTRY*>> { static const U8 type = EPROP_TEXTURE_LIST; };
+ template <> struct __eprop_type<struct MAP_VERTEX> { static const U8 type = EPROP_VERTEX; };
+ template <> struct __eprop_type<LIST<struct MAP_VERTEX>> { static const U8 type = EPROP_VERTEX_LIST; };
};
+inline EDITOR_PROP* eprop_from_ref( EOBJECT* obj, EPROP_ENTRY e ) {
+ return (EDITOR_PROP*)( (U64)obj + e.offset );
+}
+
+inline void* eprop_ptr( EDITOR_PROP* prop ) {
+ return (void*)( (U64)prop - prop->dataoff);
+}
+
template <typename T>
const U8 eprop_type() {
return EDITOR_PROP::__eprop_type<T>::type;
diff --git a/src/editor/toolview.cpp b/src/editor/toolview.cpp
index 25c308d..6bbaa3a 100644
--- a/src/editor/toolview.cpp
+++ b/src/editor/toolview.cpp
@@ -22,11 +22,11 @@ GUI_EDITOR_TOOLVIEW* gui_editor_toolview_from_item_child( GUI_BASE* child ) {
}
I32 gui_editor_toolview_visible_h( GUI_EDITOR_TOOLVIEW* view ) {
- return std::max( 1, view->h - 4 );
+ return max( 1, view->h - 4 );
}
I32 gui_editor_toolview_max_scroll( GUI_EDITOR_TOOLVIEW* view ) {
- return std::max( 0, view->content_h - gui_editor_toolview_visible_h( view ) );
+ return max( 0, view->content_h - gui_editor_toolview_visible_h( view ) );
}
void gui_editor_toolview_clamp_scroll( GUI_EDITOR_TOOLVIEW* view ) {
@@ -34,7 +34,7 @@ void gui_editor_toolview_clamp_scroll( GUI_EDITOR_TOOLVIEW* view ) {
return;
I32 max_scroll = gui_editor_toolview_max_scroll( view );
- view->scroll = std::min( std::max( 0, view->scroll ), max_scroll );
+ view->scroll = min( max( 0, view->scroll ), max_scroll );
if( view->itemview ) {
view->itemview->y = TOOLVIEW_TITLE_OFFSET - view->scroll;
}
@@ -417,17 +417,17 @@ void gui_editor_toolview_draw_scrollbar( GUI_EDITOR_TOOLVIEW* view, I32 x, I32 y
I32 track_x = x + view->w - TOOLVIEW_SCROLLBAR_W - 3;
I32 track_y = y + 2;
- I32 track_h = std::max( 8, h - 4 );
+ I32 track_h = max( 8, h - 4 );
gui_draw_frect( track_x, track_y, TOOLVIEW_SCROLLBAR_W, track_h, ui_clr.bg_alt );
gui_draw_rect( track_x, track_y, TOOLVIEW_SCROLLBAR_W, track_h, ui_clr.border );
I32 visible_h = gui_editor_toolview_visible_h( view );
- I32 thumb_h = std::max( TOOLVIEW_SCROLLBAR_MIN_H, ( track_h * visible_h ) / std::max( 1, view->content_h ) );
- thumb_h = std::min( thumb_h, track_h );
- I32 travel = std::max( 1, track_h - thumb_h );
- I32 thumb_y = track_y + ( travel * view->scroll ) / std::max( 1, max_scroll );
+ I32 thumb_h = max( TOOLVIEW_SCROLLBAR_MIN_H, ( track_h * visible_h ) / max( 1, view->content_h ) );
+ thumb_h = min( thumb_h, track_h );
+ I32 travel = max( 1, track_h - thumb_h );
+ I32 thumb_y = track_y + ( travel * view->scroll ) / max( 1, max_scroll );
- gui_draw_frect( track_x + 1, thumb_y + 1, TOOLVIEW_SCROLLBAR_W - 2, std::max( 1, thumb_h - 2 ), ui_clr.txt );
+ gui_draw_frect( track_x + 1, thumb_y + 1, TOOLVIEW_SCROLLBAR_W - 2, max( 1, thumb_h - 2 ), ui_clr.txt );
}
void gui_editor_toolview_draw_fn( void* ptr ) {
@@ -453,7 +453,7 @@ void gui_editor_toolview_draw_fn( void* ptr ) {
if( max_scroll > 0 )
clip_w -= TOOLVIEW_SCROLLBAR_W + 2;
- gui_draw_push_clip( x + 2, y + 2, std::max( 1, clip_w ), std::max( 1, h - 4 ) );
+ gui_draw_push_clip( x + 2, y + 2, max( 1, clip_w ), max( 1, h - 4 ) );
view->itemview->draw_fn( view->itemview );
gui_draw_pop_clip();
gui_editor_toolview_draw_scrollbar( view, x, y, h );
generated by cgit v1.2.3 (git 2.26.2) at 2026-06-15 21:10:06 +0000