Eliminate parameter from ft_edit

BRL-CAD · Feb 6, 2025 · d8aece8 · d8aece8
1 parent 5687597
commit d8aece8
Show file tree

Hide file tree

Showing 28 changed files with 83 additions and 82 deletions.
diff --git a/include/rt/functab.h b/include/rt/functab.h
@@ -364,8 +364,8 @@ struct rt_solid_edit_functab {
             fastf_t local2base);
 #define EDFUNCTAB_FUNC_READ_PARAMS_CAST(_func) ((int(*)(struct rt_db_internal *, const char *, const struct bn_tol *, fastf_t))((void (*)(void))_func))
 
-    int(*ft_edit)(struct rt_solid_edit *s, int edflag);
-#define EDFUNCTAB_FUNC_EDIT_CAST(_func) ((int(*)(struct rt_solid_edit *, int))((void (*)(void))_func))
+    int(*ft_edit)(struct rt_solid_edit *s);
+#define EDFUNCTAB_FUNC_EDIT_CAST(_func) ((int(*)(struct rt_solid_edit *))((void (*)(void))_func))
 
     /* Translate mouse info into edit ready info.  mousevec [X] and [Y] are in
      * the range -1.0...+1.0, corresponding to viewspace.

diff --git a/src/librt/edit.cpp b/src/librt/edit.cpp
@@ -402,7 +402,7 @@ rt_solid_edit_process(struct rt_solid_edit *s)
     const struct rt_db_internal *ip = &s->es_int;
     if (EDOBJ[ip->idb_type].ft_edit) {
 	bu_vls_trunc(s->log_str, 0);
-	if ((*EDOBJ[ip->idb_type].ft_edit)(s, s->edit_flag)) {
+	if ((*EDOBJ[ip->idb_type].ft_edit)(s)) {
 	    if (bu_vls_strlen(s->log_str)) {
 		rt_solid_edit_map_clbk_get(&f, &d, s->m, ECMD_PRINT_STR, 0, BU_CLBK_DURING);
 		if (f)

diff --git a/src/librt/primitives/arb8/edarb.c b/src/librt/primitives/arb8/edarb.c
@@ -1239,7 +1239,7 @@ edarb_move_face_mousevec(struct rt_solid_edit *s, const vect_t mousevec)
 }
 
 int
-rt_solid_edit_arb_edit(struct rt_solid_edit *s, int edflag)
+rt_solid_edit_arb_edit(struct rt_solid_edit *s)
 {
     struct bu_vls error_msg = BU_VLS_INIT_ZERO;
     struct rt_arb_internal *arb = (struct rt_arb_internal *)s->es_int.idb_ptr;
@@ -1256,7 +1256,7 @@ rt_solid_edit_arb_edit(struct rt_solid_edit *s, int edflag)
     bu_vls_free(&error_msg);
 
 
-    switch (edflag) {
+    switch (s->edit_flag) {
 	case RT_SOLID_EDIT_SCALE:
 	    /* scale the solid uniformly about its vertex point */
 	    ret = rt_solid_edit_generic_sscale(s, &s->es_int);
@@ -1317,7 +1317,7 @@ rt_solid_edit_arb_edit_xy(
 	case RT_SOLID_EDIT_SCALE:
 	case RT_SOLID_EDIT_PSCALE:
 	    rt_solid_edit_generic_sscale_xy(s, mousevec);
-	    rt_solid_edit_arb_edit(s, s->edit_flag);
+	    rt_solid_edit_arb_edit(s);
 	    return 0;
 	case RT_SOLID_EDIT_TRANS:
 	    rt_solid_edit_generic_strans_xy(&pos_view, s, mousevec);
@@ -1340,7 +1340,7 @@ rt_solid_edit_arb_edit_xy(
     }
 
     rt_update_edit_absolute_tran(s, pos_view);
-    rt_solid_edit_arb_edit(s, s->edit_flag);
+    rt_solid_edit_arb_edit(s);
 
     return 0;
 }

diff --git a/src/librt/primitives/ars/edars.c b/src/librt/primitives/ars/edars.c
@@ -829,12 +829,12 @@ ecmd_ars_move_pt(struct rt_solid_edit *s)
 }
 
 int
-rt_solid_edit_ars_edit(struct rt_solid_edit *s, int edflag)
+rt_solid_edit_ars_edit(struct rt_solid_edit *s)
 {
     bu_clbk_t f = NULL;
     void *d = NULL;
 
-    switch (edflag) {
+    switch (s->edit_flag) {
 	case RT_SOLID_EDIT_SCALE:
 	    /* scale the solid uniformly about its vertex point */
 	    return rt_solid_edit_generic_sscale(s, &s->es_int);
@@ -923,7 +923,7 @@ rt_solid_edit_ars_edit_xy(
 	case RT_SOLID_EDIT_SCALE:
 	case RT_SOLID_EDIT_PSCALE:
 	    rt_solid_edit_generic_sscale_xy(s, mousevec);
-	    rt_solid_edit_ars_edit(s, s->edit_flag);
+	    rt_solid_edit_ars_edit(s);
 	    return 0;
 	case RT_SOLID_EDIT_TRANS:
 	    rt_solid_edit_generic_strans_xy(&pos_view, s, mousevec);
@@ -948,7 +948,7 @@ rt_solid_edit_ars_edit_xy(
     }
 
     rt_update_edit_absolute_tran(s, pos_view);
-    rt_solid_edit_ars_edit(s, s->edit_flag);
+    rt_solid_edit_ars_edit(s);
 
     return 0;
 }

diff --git a/src/librt/primitives/bot/edbot.c b/src/librt/primitives/bot/edbot.c
@@ -722,10 +722,10 @@ ecmd_bot_pickt(struct rt_solid_edit *s, const vect_t mousevec)
 }
 
 int
-rt_solid_edit_bot_edit(struct rt_solid_edit *s, int edflag)
+rt_solid_edit_bot_edit(struct rt_solid_edit *s)
 {
     struct rt_bot_edit *b = (struct rt_bot_edit *)s->ipe_ptr;
-    switch (edflag) {
+    switch (s->edit_flag) {
 	case RT_SOLID_EDIT_SCALE:
 	    /* scale the solid uniformly about its vertex point */
 	    b->bot_verts[0] = -1;
@@ -798,7 +798,7 @@ rt_solid_edit_bot_edit_xy(
 	case RT_SOLID_EDIT_SCALE:
 	case RT_SOLID_EDIT_PSCALE:
 	    rt_solid_edit_generic_sscale_xy(s, mousevec);
-	    rt_solid_edit_bot_edit(s, s->edit_flag);
+	    rt_solid_edit_bot_edit(s);
 	    return 0;
 	case RT_SOLID_EDIT_TRANS:
 	    rt_solid_edit_generic_strans_xy(&pos_view, s, mousevec);
@@ -833,7 +833,7 @@ rt_solid_edit_bot_edit_xy(
     }
 
     rt_update_edit_absolute_tran(s, pos_view);
-    rt_solid_edit_bot_edit(s, s->edit_flag);
+    rt_solid_edit_bot_edit(s);
 
     return 0;
 }

diff --git a/src/librt/primitives/bspline/edbspline.c b/src/librt/primitives/bspline/edbspline.c
@@ -349,9 +349,9 @@ ecmd_vtrans(struct rt_solid_edit *s)
 
 
 int
-rt_solid_edit_bspline_edit(struct rt_solid_edit *s, int edflag)
+rt_solid_edit_bspline_edit(struct rt_solid_edit *s)
 {
-    switch (edflag) {
+    switch (s->edit_flag) {
 	case RT_SOLID_EDIT_SCALE:
 	    /* scale the solid uniformly about its vertex point */
 	    return rt_solid_edit_generic_sscale(s, &s->es_int);
@@ -391,7 +391,7 @@ rt_solid_edit_bspline_edit_xy(
 	case RT_SOLID_EDIT_SCALE:
 	case RT_SOLID_EDIT_PSCALE:
 	    rt_solid_edit_generic_sscale_xy(s, mousevec);
-	    rt_solid_edit_bspline_edit(s, s->edit_flag);
+	    rt_solid_edit_bspline_edit(s);
 	    return 0;
 	case RT_SOLID_EDIT_TRANS:
 	    rt_solid_edit_generic_strans_xy(&pos_view, s, mousevec);
@@ -421,7 +421,7 @@ rt_solid_edit_bspline_edit_xy(
     }
 
     rt_update_edit_absolute_tran(s, pos_view);
-    rt_solid_edit_bspline_edit(s, s->edit_flag);
+    rt_solid_edit_bspline_edit(s);
 
     return 0;
 }

diff --git a/src/librt/primitives/cline/edcline.c b/src/librt/primitives/cline/edcline.c
@@ -290,9 +290,9 @@ ecmd_cline_move_h_mousevec(struct rt_solid_edit *s, const vect_t mousevec)
 }
 
 int
-rt_solid_edit_cline_edit(struct rt_solid_edit *s, int edflag)
+rt_solid_edit_cline_edit(struct rt_solid_edit *s)
 {
-    switch (edflag) {
+    switch (s->edit_flag) {
 	case RT_SOLID_EDIT_SCALE:
 	    /* scale the solid uniformly about its vertex point */
 	    return rt_solid_edit_generic_sscale(s, &s->es_int);
@@ -335,7 +335,7 @@ rt_solid_edit_cline_edit_xy(
 	case ECMD_CLINE_SCALE_T:
 	case ECMD_CLINE_SCALE_R:
 	    rt_solid_edit_generic_sscale_xy(s, mousevec);
-	    rt_solid_edit_cline_edit(s, s->edit_flag);
+	    rt_solid_edit_cline_edit(s);
 	    return 0;
 	case RT_SOLID_EDIT_TRANS:
 	    rt_solid_edit_generic_strans_xy(&pos_view, s, mousevec);
@@ -352,7 +352,7 @@ rt_solid_edit_cline_edit_xy(
     }
 
     rt_update_edit_absolute_tran(s, pos_view);
-    rt_solid_edit_cline_edit(s, s->edit_flag);
+    rt_solid_edit_cline_edit(s);
 
     return 0;
 }

diff --git a/src/librt/primitives/dsp/eddsp.c b/src/librt/primitives/dsp/eddsp.c
@@ -238,9 +238,9 @@ ecmd_dsp_fname(struct rt_solid_edit *s)
 }
 
 int
-rt_solid_edit_dsp_edit(struct rt_solid_edit *s, int edflag)
+rt_solid_edit_dsp_edit(struct rt_solid_edit *s)
 {
-    switch (edflag) {
+    switch (s->edit_flag) {
 	case RT_SOLID_EDIT_SCALE:
 	    /* scale the solid uniformly about its vertex point */
 	    return rt_solid_edit_generic_sscale(s, &s->es_int);
@@ -285,7 +285,7 @@ rt_solid_edit_dsp_edit_xy(
 	case ECMD_DSP_SCALE_Y:
 	case ECMD_DSP_SCALE_ALT:
 	    rt_solid_edit_generic_sscale_xy(s, mousevec);
-	    rt_solid_edit_dsp_edit(s, s->edit_flag);
+	    rt_solid_edit_dsp_edit(s);
 	    return 0;
 	case RT_SOLID_EDIT_TRANS:
 	    rt_solid_edit_generic_strans_xy(&pos_view, s, mousevec);
@@ -299,7 +299,7 @@ rt_solid_edit_dsp_edit_xy(
     }
 
     rt_update_edit_absolute_tran(s, pos_view);
-    rt_solid_edit_dsp_edit(s, s->edit_flag);
+    rt_solid_edit_dsp_edit(s);
 
     return 0;
 }

diff --git a/src/librt/primitives/ebm/edebm.c b/src/librt/primitives/ebm/edebm.c
@@ -231,9 +231,9 @@ ecmd_ebm_height(struct rt_solid_edit *s)
 }
 
 int
-rt_solid_edit_ebm_edit(struct rt_solid_edit *s, int edflag)
+rt_solid_edit_ebm_edit(struct rt_solid_edit *s)
 {
-    switch (edflag) {
+    switch (s->edit_flag) {
 	case RT_SOLID_EDIT_SCALE:
 	    /* scale the solid uniformly about its vertex point */
 	    return rt_solid_edit_generic_sscale(s, &s->es_int);
@@ -279,7 +279,7 @@ rt_solid_edit_ebm_edit_xy(
 	case RT_SOLID_EDIT_PSCALE:
 	case ECMD_EBM_HEIGHT:
 	    rt_solid_edit_generic_sscale_xy(s, mousevec);
-	    rt_solid_edit_ebm_edit(s, s->edit_flag);
+	    rt_solid_edit_ebm_edit(s);
 	    return 0;
 	case RT_SOLID_EDIT_TRANS:
 	    rt_solid_edit_generic_strans_xy(&pos_view, s, mousevec);
@@ -293,7 +293,7 @@ rt_solid_edit_ebm_edit_xy(
     }
 
     rt_update_edit_absolute_tran(s, pos_view);
-    rt_solid_edit_ebm_edit(s, s->edit_flag);
+    rt_solid_edit_ebm_edit(s);
 
     return 0;
 }

diff --git a/src/librt/primitives/edgeneric.c b/src/librt/primitives/edgeneric.c
@@ -227,11 +227,10 @@ rt_solid_edit_generic_menu_str(struct bu_vls *mstr, const struct rt_db_internal
 
 int
 rt_solid_edit_generic_edit(
-	struct rt_solid_edit *s,
-	int edflag
+	struct rt_solid_edit *s
 	)
 {
-    switch (edflag) {
+    switch (s->edit_flag) {
 	case RT_SOLID_EDIT_SCALE:
 	    /* scale the solid uniformly about its vertex point */
 	    rt_solid_edit_generic_sscale(s, &s->es_int);
@@ -321,7 +320,7 @@ rt_solid_edit_generic_edit_xy(
 	case RT_SOLID_EDIT_PSCALE:
 	    rt_solid_edit_generic_sscale_xy(s, mousevec);
 	    if (EDOBJ[ip->idb_type].ft_edit)
-		return (*EDOBJ[ip->idb_type].ft_edit)(s, s->edit_flag);
+		return (*EDOBJ[ip->idb_type].ft_edit)(s);
 	    return 0;
 	case RT_SOLID_EDIT_TRANS:
 	    rt_solid_edit_generic_strans_xy(&pos_view, s, mousevec);
@@ -337,7 +336,7 @@ rt_solid_edit_generic_edit_xy(
     rt_update_edit_absolute_tran(s, pos_view);
 
     if (EDOBJ[ip->idb_type].ft_edit)
-	return (*EDOBJ[ip->idb_type].ft_edit)(s, s->edit_flag);
+	return (*EDOBJ[ip->idb_type].ft_edit)(s);
 
     return 0;
 }

diff --git a/src/librt/primitives/edit_private.h b/src/librt/primitives/edit_private.h
@@ -74,7 +74,9 @@ rt_solid_edit_generic_strans_xy(vect_t *pos_view,
 	const vect_t mousevec
 	);
 
-int rt_solid_edit_generic_edit(struct rt_solid_edit *s, int edflag);
+int rt_solid_edit_generic_edit(
+	struct rt_solid_edit *s
+	);
 
 int
 rt_solid_edit_generic_edit_xy(

diff --git a/src/librt/primitives/edtable.cpp b/src/librt/primitives/edtable.cpp
@@ -37,7 +37,7 @@ extern "C" {
     extern void rt_solid_edit_##name##_e_axes_pos(struct rt_solid_edit *s, const struct rt_db_internal *ip, const struct bn_tol *tol); \
     extern void rt_solid_edit_##name##_write_params(struct bu_vls *p, const struct rt_db_internal *ip, const struct bn_tol *tol, fastf_t base2local); \
     extern void rt_solid_edit_##name##_read_params(struct rt_db_internal *ip, const char *fc, const struct bn_tol *tol, fastf_t local2base); \
-    extern int rt_solid_edit_##name##_edit(struct rt_solid_edit *s, int edflag); \
+    extern int rt_solid_edit_##name##_edit(struct rt_solid_edit *s); \
     extern int rt_solid_edit_##name##_edit_xy(struct rt_solid_edit *s, vect_t mousevec); \
     extern void *rt_solid_edit_##name##_prim_edit_create(struct rt_solid_edit *s); \
     extern void rt_solid_edit_##name##_prim_edit_destroy(void *); \

diff --git a/src/librt/primitives/ehy/edehy.c b/src/librt/primitives/ehy/edehy.c
@@ -285,9 +285,9 @@ rt_solid_edit_ehy_pscale(struct rt_solid_edit *s, int mode)
 }
 
 int
-rt_solid_edit_ehy_edit(struct rt_solid_edit *s, int edflag)
+rt_solid_edit_ehy_edit(struct rt_solid_edit *s)
 {
-    switch (edflag) {
+    switch (s->edit_flag) {
 	case RT_SOLID_EDIT_SCALE:
 	    /* scale the solid uniformly about its vertex point */
 	    return rt_solid_edit_generic_sscale(s, &s->es_int);

diff --git a/src/librt/primitives/ell/edell.c b/src/librt/primitives/ell/edell.c
@@ -268,9 +268,9 @@ rt_solid_edit_ell_pscale(struct rt_solid_edit *s, int mode)
 }
 
 int
-rt_solid_edit_ell_edit(struct rt_solid_edit *s, int edflag)
+rt_solid_edit_ell_edit(struct rt_solid_edit *s)
 {
-    switch (edflag) {
+    switch (s->edit_flag) {
 	case RT_SOLID_EDIT_SCALE:
 	    /* scale the solid uniformly about its vertex point */
 	    return rt_solid_edit_generic_sscale(s, &s->es_int);

diff --git a/src/librt/primitives/epa/edepa.c b/src/librt/primitives/epa/edepa.c
@@ -257,9 +257,9 @@ rt_solid_edit_epa_pscale(struct rt_solid_edit *s, int mode)
 }
 
 int
-rt_solid_edit_epa_edit(struct rt_solid_edit *s, int edflag)
+rt_solid_edit_epa_edit(struct rt_solid_edit *s)
 {
-    switch (edflag) {
+    switch (s->edit_flag) {
 	case RT_SOLID_EDIT_SCALE:
 	    /* scale the solid uniformly about its vertex point */
 	    return rt_solid_edit_generic_sscale(s, &s->es_int);

diff --git a/src/librt/primitives/eto/edeto.c b/src/librt/primitives/eto/edeto.c
@@ -365,9 +365,9 @@ rt_solid_edit_eto_pscale(struct rt_solid_edit *s, int mode)
 }
 
 int
-rt_solid_edit_eto_edit(struct rt_solid_edit *s, int edflag)
+rt_solid_edit_eto_edit(struct rt_solid_edit *s)
 {
-    switch (edflag) {
+    switch (s->edit_flag) {
 	case RT_SOLID_EDIT_SCALE:
 	    /* scale the solid uniformly about its vertex point */
 	    return rt_solid_edit_generic_sscale(s, &s->es_int);

diff --git a/src/librt/primitives/extrude/edextrude.c b/src/librt/primitives/extrude/edextrude.c
@@ -325,9 +325,9 @@ ecmd_extr_mov_h_mousevec(struct rt_solid_edit *s, const vect_t mousevec)
 }
 
 int
-rt_solid_edit_extrude_edit(struct rt_solid_edit *s, int edflag)
+rt_solid_edit_extrude_edit(struct rt_solid_edit *s)
 {
-    switch (edflag) {
+    switch (s->edit_flag) {
 	case RT_SOLID_EDIT_SCALE:
 	    /* scale the solid uniformly about its vertex point */
 	    return rt_solid_edit_generic_sscale(s, &s->es_int);
@@ -369,7 +369,7 @@ rt_solid_edit_extrude_edit_xy(
 	case RT_SOLID_EDIT_PSCALE:
 	case ECMD_EXTR_SCALE_H:
 	    rt_solid_edit_generic_sscale_xy(s, mousevec);
-	    rt_solid_edit_extrude_edit(s, s->edit_flag);
+	    rt_solid_edit_extrude_edit(s);
 	    return 0;
 	case RT_SOLID_EDIT_TRANS:
 	    rt_solid_edit_generic_strans_xy(&pos_view, s, mousevec);
@@ -386,7 +386,7 @@ rt_solid_edit_extrude_edit_xy(
     }
 
     rt_update_edit_absolute_tran(s, pos_view);
-    rt_solid_edit_extrude_edit(s, s->edit_flag);
+    rt_solid_edit_extrude_edit(s);
 
     return 0;
 }

diff --git a/src/librt/primitives/hyp/edhyp.c b/src/librt/primitives/hyp/edhyp.c
@@ -356,9 +356,9 @@ rt_solid_edit_hyp_pscale(struct rt_solid_edit *s, int mode)
 }
 
 int
-rt_solid_edit_hyp_edit(struct rt_solid_edit *s, int edflag)
+rt_solid_edit_hyp_edit(struct rt_solid_edit *s)
 {
-    switch (edflag) {
+    switch (s->edit_flag) {
 	case RT_SOLID_EDIT_SCALE:
 	    /* scale the solid uniformly about its vertex point */
 	    return rt_solid_edit_generic_sscale(s, &s->es_int);