[brlcad-commits] CVS: brlcad/src/mged edsol.c,14.15,14.16
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: Erik G. <eri...@us...> - 2006-08-18 20:07:59
|
Update of /cvsroot/brlcad/brlcad/src/mged In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29445 Modified Files: edsol.c Log Message: stub out metaball editing stuff and wire it into -c mode Index: edsol.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/mged/edsol.c,v retrieving revision 14.15 retrieving revision 14.16 diff -w -u -r14.15 -r14.16 --- edsol.c 18 Aug 2006 19:28:22 -0000 14.15 +++ edsol.c 18 Aug 2006 20:07:51 -0000 14.16 @@ -82,7 +82,7 @@ static void arb8_edge(int arg), ars_ed(int arg), ell_ed(int arg), tgc_ed(int arg), tor_ed(int arg), spline_ed(int arg); static void nmg_ed(int arg), pipe_ed(int arg), vol_ed(int arg), ebm_ed(int arg), dsp_ed(int arg), cline_ed(int arg), bot_ed(int arg), extr_ed(int arg); static void rpc_ed(int arg), rhc_ed(int arg), part_ed(int arg), epa_ed(int arg), ehy_ed(int arg), eto_ed(int arg); -static void superell_ed(int arg); +static void superell_ed(int arg), metaball_ed(int arg); static void arb7_edge(int arg), arb6_edge(int arg), arb5_edge(int arg), arb4_point(int arg); static void arb8_mv_face(int arg), arb7_mv_face(int arg), arb6_mv_face(int arg); @@ -242,7 +242,14 @@ #define MENU_SUPERELL_SCALE_B 114 #define MENU_SUPERELL_SCALE_C 115 #define MENU_SUPERELL_SCALE_ABC 116 - +#define MENU_METABALL_SET_THRESHHOLD 117 +#define MENU_METABALL_SELECT 118 +#define MENU_METABALL_NEXT_PT 119 +#define MENU_METABALL_PREV_PT 120 +#define MENU_METABALL_MOV_PT 121 +#define MENU_METABALL_PT_FLDSTR 122 +#define MENU_METABALL_DEL_PT 123 +#define MENU_METABALL_ADD_PT 124 struct menu_item cline_menu[] = { { "CLINE MENU", (void (*)())NULL, 0 }, @@ -657,6 +664,19 @@ { "", (void (*)())NULL, 0 } }; +struct menu_item metaball_menu[] = { + { "METABALL MENU", (void (*)())NULL, 0 }, + { "Set Threshhold", metaball_ed, MENU_METABALL_SET_THRESHHOLD }, + { "Select Point", metaball_ed, MENU_METABALL_SELECT }, + { "Next Point", metaball_ed, MENU_METABALL_NEXT_PT }, + { "Previous Point", metaball_ed, MENU_METABALL_PREV_PT }, + { "Move Point", metaball_ed, MENU_METABALL_MOV_PT }, + { "Set Point fldstr", metaball_ed, MENU_METABALL_PT_FLDSTR }, + { "Delete Point", metaball_ed, MENU_METABALL_DEL_PT }, + { "Add Point", metaball_ed, MENU_METABALL_ADD_PT }, + { "", (void (*)())NULL, 0 } +}; + struct menu_item *which_menu[] = { point4_menu, edge5_menu, @@ -1202,6 +1222,35 @@ return; } +static void +metaball_ed(int arg) +{ + bu_log("Woop: %d\n", arg); fflush(stdout); + if(dbip == DBI_NULL) + return; + + switch( arg ) + { + case MENU_METABALL_SET_THRESHHOLD: + break; + case MENU_METABALL_SELECT: + break; + case MENU_METABALL_NEXT_PT: + break; + case MENU_METABALL_PREV_PT: + break; + case MENU_METABALL_MOV_PT: + break; + case MENU_METABALL_PT_FLDSTR: + break; + case MENU_METABALL_DEL_PT: + break; + case MENU_METABALL_ADD_PT: + break; + } + return; +} + /*ARGSUSED*/ static void spline_ed(int arg) @@ -2551,6 +2600,9 @@ case ID_PIPE: mmenu_set_all( MENU_L1, pipe_menu ); break; + case ID_METABALL: + mmenu_set_all( MENU_L1, metaball_menu ); + break; case ID_VOL: mmenu_set_all( MENU_L1, vol_menu ); break; |