Skip to content

Commit d8aece8

Browse files
starseekerstarseeker
committed
Eliminate parameter from ft_edit
1 parent 5687597 commit d8aece8

File tree

28 files changed

+83
-82
lines changed

28 files changed

+83
-82
lines changed

‎include/rt/functab.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,8 @@ struct rt_solid_edit_functab {
364364
fastf_t local2base);
365365
#define EDFUNCTAB_FUNC_READ_PARAMS_CAST(_func) ((int(*)(struct rt_db_internal *, const char *, const struct bn_tol *, fastf_t))((void (*)(void))_func))
366366

367-
int(*ft_edit)(struct rt_solid_edit *s, int edflag);
368-
#define EDFUNCTAB_FUNC_EDIT_CAST(_func) ((int(*)(struct rt_solid_edit *, int))((void (*)(void))_func))
367+
int(*ft_edit)(struct rt_solid_edit *s);
368+
#define EDFUNCTAB_FUNC_EDIT_CAST(_func) ((int(*)(struct rt_solid_edit *))((void (*)(void))_func))
369369

370370
/* Translate mouse info into edit ready info. mousevec [X] and [Y] are in
371371
* the range -1.0...+1.0, corresponding to viewspace.

‎src/librt/edit.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ rt_solid_edit_process(struct rt_solid_edit *s)
402402
const struct rt_db_internal *ip = &s->es_int;
403403
if (EDOBJ[ip->idb_type].ft_edit) {
404404
bu_vls_trunc(s->log_str, 0);
405-
if ((*EDOBJ[ip->idb_type].ft_edit)(s, s->edit_flag)) {
405+
if ((*EDOBJ[ip->idb_type].ft_edit)(s)) {
406406
if (bu_vls_strlen(s->log_str)) {
407407
rt_solid_edit_map_clbk_get(&f, &d, s->m, ECMD_PRINT_STR, 0, BU_CLBK_DURING);
408408
if (f)

‎src/librt/primitives/arb8/edarb.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1239,7 +1239,7 @@ edarb_move_face_mousevec(struct rt_solid_edit *s, const vect_t mousevec)
12391239
}
12401240

12411241
int
1242-
rt_solid_edit_arb_edit(struct rt_solid_edit *s, int edflag)
1242+
rt_solid_edit_arb_edit(struct rt_solid_edit *s)
12431243
{
12441244
struct bu_vls error_msg = BU_VLS_INIT_ZERO;
12451245
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)
12561256
bu_vls_free(&error_msg);
12571257

12581258

1259-
switch (edflag) {
1259+
switch (s->edit_flag) {
12601260
case RT_SOLID_EDIT_SCALE:
12611261
/* scale the solid uniformly about its vertex point */
12621262
ret = rt_solid_edit_generic_sscale(s, &s->es_int);
@@ -1317,7 +1317,7 @@ rt_solid_edit_arb_edit_xy(
13171317
case RT_SOLID_EDIT_SCALE:
13181318
case RT_SOLID_EDIT_PSCALE:
13191319
rt_solid_edit_generic_sscale_xy(s, mousevec);
1320-
rt_solid_edit_arb_edit(s, s->edit_flag);
1320+
rt_solid_edit_arb_edit(s);
13211321
return 0;
13221322
case RT_SOLID_EDIT_TRANS:
13231323
rt_solid_edit_generic_strans_xy(&pos_view, s, mousevec);
@@ -1340,7 +1340,7 @@ rt_solid_edit_arb_edit_xy(
13401340
}
13411341

13421342
rt_update_edit_absolute_tran(s, pos_view);
1343-
rt_solid_edit_arb_edit(s, s->edit_flag);
1343+
rt_solid_edit_arb_edit(s);
13441344

13451345
return 0;
13461346
}

‎src/librt/primitives/ars/edars.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -829,12 +829,12 @@ ecmd_ars_move_pt(struct rt_solid_edit *s)
829829
}
830830

831831
int
832-
rt_solid_edit_ars_edit(struct rt_solid_edit *s, int edflag)
832+
rt_solid_edit_ars_edit(struct rt_solid_edit *s)
833833
{
834834
bu_clbk_t f = NULL;
835835
void *d = NULL;
836836

837-
switch (edflag) {
837+
switch (s->edit_flag) {
838838
case RT_SOLID_EDIT_SCALE:
839839
/* scale the solid uniformly about its vertex point */
840840
return rt_solid_edit_generic_sscale(s, &s->es_int);
@@ -923,7 +923,7 @@ rt_solid_edit_ars_edit_xy(
923923
case RT_SOLID_EDIT_SCALE:
924924
case RT_SOLID_EDIT_PSCALE:
925925
rt_solid_edit_generic_sscale_xy(s, mousevec);
926-
rt_solid_edit_ars_edit(s, s->edit_flag);
926+
rt_solid_edit_ars_edit(s);
927927
return 0;
928928
case RT_SOLID_EDIT_TRANS:
929929
rt_solid_edit_generic_strans_xy(&pos_view, s, mousevec);
@@ -948,7 +948,7 @@ rt_solid_edit_ars_edit_xy(
948948
}
949949

950950
rt_update_edit_absolute_tran(s, pos_view);
951-
rt_solid_edit_ars_edit(s, s->edit_flag);
951+
rt_solid_edit_ars_edit(s);
952952

953953
return 0;
954954
}

‎src/librt/primitives/bot/edbot.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -722,10 +722,10 @@ ecmd_bot_pickt(struct rt_solid_edit *s, const vect_t mousevec)
722722
}
723723

724724
int
725-
rt_solid_edit_bot_edit(struct rt_solid_edit *s, int edflag)
725+
rt_solid_edit_bot_edit(struct rt_solid_edit *s)
726726
{
727727
struct rt_bot_edit *b = (struct rt_bot_edit *)s->ipe_ptr;
728-
switch (edflag) {
728+
switch (s->edit_flag) {
729729
case RT_SOLID_EDIT_SCALE:
730730
/* scale the solid uniformly about its vertex point */
731731
b->bot_verts[0] = -1;
@@ -798,7 +798,7 @@ rt_solid_edit_bot_edit_xy(
798798
case RT_SOLID_EDIT_SCALE:
799799
case RT_SOLID_EDIT_PSCALE:
800800
rt_solid_edit_generic_sscale_xy(s, mousevec);
801-
rt_solid_edit_bot_edit(s, s->edit_flag);
801+
rt_solid_edit_bot_edit(s);
802802
return 0;
803803
case RT_SOLID_EDIT_TRANS:
804804
rt_solid_edit_generic_strans_xy(&pos_view, s, mousevec);
@@ -833,7 +833,7 @@ rt_solid_edit_bot_edit_xy(
833833
}
834834

835835
rt_update_edit_absolute_tran(s, pos_view);
836-
rt_solid_edit_bot_edit(s, s->edit_flag);
836+
rt_solid_edit_bot_edit(s);
837837

838838
return 0;
839839
}

‎src/librt/primitives/bspline/edbspline.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -349,9 +349,9 @@ ecmd_vtrans(struct rt_solid_edit *s)
349349

350350

351351
int
352-
rt_solid_edit_bspline_edit(struct rt_solid_edit *s, int edflag)
352+
rt_solid_edit_bspline_edit(struct rt_solid_edit *s)
353353
{
354-
switch (edflag) {
354+
switch (s->edit_flag) {
355355
case RT_SOLID_EDIT_SCALE:
356356
/* scale the solid uniformly about its vertex point */
357357
return rt_solid_edit_generic_sscale(s, &s->es_int);
@@ -391,7 +391,7 @@ rt_solid_edit_bspline_edit_xy(
391391
case RT_SOLID_EDIT_SCALE:
392392
case RT_SOLID_EDIT_PSCALE:
393393
rt_solid_edit_generic_sscale_xy(s, mousevec);
394-
rt_solid_edit_bspline_edit(s, s->edit_flag);
394+
rt_solid_edit_bspline_edit(s);
395395
return 0;
396396
case RT_SOLID_EDIT_TRANS:
397397
rt_solid_edit_generic_strans_xy(&pos_view, s, mousevec);
@@ -421,7 +421,7 @@ rt_solid_edit_bspline_edit_xy(
421421
}
422422

423423
rt_update_edit_absolute_tran(s, pos_view);
424-
rt_solid_edit_bspline_edit(s, s->edit_flag);
424+
rt_solid_edit_bspline_edit(s);
425425

426426
return 0;
427427
}

‎src/librt/primitives/cline/edcline.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -290,9 +290,9 @@ ecmd_cline_move_h_mousevec(struct rt_solid_edit *s, const vect_t mousevec)
290290
}
291291

292292
int
293-
rt_solid_edit_cline_edit(struct rt_solid_edit *s, int edflag)
293+
rt_solid_edit_cline_edit(struct rt_solid_edit *s)
294294
{
295-
switch (edflag) {
295+
switch (s->edit_flag) {
296296
case RT_SOLID_EDIT_SCALE:
297297
/* scale the solid uniformly about its vertex point */
298298
return rt_solid_edit_generic_sscale(s, &s->es_int);
@@ -335,7 +335,7 @@ rt_solid_edit_cline_edit_xy(
335335
case ECMD_CLINE_SCALE_T:
336336
case ECMD_CLINE_SCALE_R:
337337
rt_solid_edit_generic_sscale_xy(s, mousevec);
338-
rt_solid_edit_cline_edit(s, s->edit_flag);
338+
rt_solid_edit_cline_edit(s);
339339
return 0;
340340
case RT_SOLID_EDIT_TRANS:
341341
rt_solid_edit_generic_strans_xy(&pos_view, s, mousevec);
@@ -352,7 +352,7 @@ rt_solid_edit_cline_edit_xy(
352352
}
353353

354354
rt_update_edit_absolute_tran(s, pos_view);
355-
rt_solid_edit_cline_edit(s, s->edit_flag);
355+
rt_solid_edit_cline_edit(s);
356356

357357
return 0;
358358
}

‎src/librt/primitives/dsp/eddsp.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,9 @@ ecmd_dsp_fname(struct rt_solid_edit *s)
238238
}
239239

240240
int
241-
rt_solid_edit_dsp_edit(struct rt_solid_edit *s, int edflag)
241+
rt_solid_edit_dsp_edit(struct rt_solid_edit *s)
242242
{
243-
switch (edflag) {
243+
switch (s->edit_flag) {
244244
case RT_SOLID_EDIT_SCALE:
245245
/* scale the solid uniformly about its vertex point */
246246
return rt_solid_edit_generic_sscale(s, &s->es_int);
@@ -285,7 +285,7 @@ rt_solid_edit_dsp_edit_xy(
285285
case ECMD_DSP_SCALE_Y:
286286
case ECMD_DSP_SCALE_ALT:
287287
rt_solid_edit_generic_sscale_xy(s, mousevec);
288-
rt_solid_edit_dsp_edit(s, s->edit_flag);
288+
rt_solid_edit_dsp_edit(s);
289289
return 0;
290290
case RT_SOLID_EDIT_TRANS:
291291
rt_solid_edit_generic_strans_xy(&pos_view, s, mousevec);
@@ -299,7 +299,7 @@ rt_solid_edit_dsp_edit_xy(
299299
}
300300

301301
rt_update_edit_absolute_tran(s, pos_view);
302-
rt_solid_edit_dsp_edit(s, s->edit_flag);
302+
rt_solid_edit_dsp_edit(s);
303303

304304
return 0;
305305
}

‎src/librt/primitives/ebm/edebm.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,9 @@ ecmd_ebm_height(struct rt_solid_edit *s)
231231
}
232232

233233
int
234-
rt_solid_edit_ebm_edit(struct rt_solid_edit *s, int edflag)
234+
rt_solid_edit_ebm_edit(struct rt_solid_edit *s)
235235
{
236-
switch (edflag) {
236+
switch (s->edit_flag) {
237237
case RT_SOLID_EDIT_SCALE:
238238
/* scale the solid uniformly about its vertex point */
239239
return rt_solid_edit_generic_sscale(s, &s->es_int);
@@ -279,7 +279,7 @@ rt_solid_edit_ebm_edit_xy(
279279
case RT_SOLID_EDIT_PSCALE:
280280
case ECMD_EBM_HEIGHT:
281281
rt_solid_edit_generic_sscale_xy(s, mousevec);
282-
rt_solid_edit_ebm_edit(s, s->edit_flag);
282+
rt_solid_edit_ebm_edit(s);
283283
return 0;
284284
case RT_SOLID_EDIT_TRANS:
285285
rt_solid_edit_generic_strans_xy(&pos_view, s, mousevec);
@@ -293,7 +293,7 @@ rt_solid_edit_ebm_edit_xy(
293293
}
294294

295295
rt_update_edit_absolute_tran(s, pos_view);
296-
rt_solid_edit_ebm_edit(s, s->edit_flag);
296+
rt_solid_edit_ebm_edit(s);
297297

298298
return 0;
299299
}

‎src/librt/primitives/edgeneric.c

+4-5
Original file line numberDiff line numberDiff line change
@@ -227,11 +227,10 @@ rt_solid_edit_generic_menu_str(struct bu_vls *mstr, const struct rt_db_internal
227227

228228
int
229229
rt_solid_edit_generic_edit(
230-
struct rt_solid_edit *s,
231-
int edflag
230+
struct rt_solid_edit *s
232231
)
233232
{
234-
switch (edflag) {
233+
switch (s->edit_flag) {
235234
case RT_SOLID_EDIT_SCALE:
236235
/* scale the solid uniformly about its vertex point */
237236
rt_solid_edit_generic_sscale(s, &s->es_int);
@@ -321,7 +320,7 @@ rt_solid_edit_generic_edit_xy(
321320
case RT_SOLID_EDIT_PSCALE:
322321
rt_solid_edit_generic_sscale_xy(s, mousevec);
323322
if (EDOBJ[ip->idb_type].ft_edit)
324-
return (*EDOBJ[ip->idb_type].ft_edit)(s, s->edit_flag);
323+
return (*EDOBJ[ip->idb_type].ft_edit)(s);
325324
return 0;
326325
case RT_SOLID_EDIT_TRANS:
327326
rt_solid_edit_generic_strans_xy(&pos_view, s, mousevec);
@@ -337,7 +336,7 @@ rt_solid_edit_generic_edit_xy(
337336
rt_update_edit_absolute_tran(s, pos_view);
338337

339338
if (EDOBJ[ip->idb_type].ft_edit)
340-
return (*EDOBJ[ip->idb_type].ft_edit)(s, s->edit_flag);
339+
return (*EDOBJ[ip->idb_type].ft_edit)(s);
341340

342341
return 0;
343342
}

‎src/librt/primitives/edit_private.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ rt_solid_edit_generic_strans_xy(vect_t *pos_view,
7474
const vect_t mousevec
7575
);
7676

77-
int rt_solid_edit_generic_edit(struct rt_solid_edit *s, int edflag);
77+
int rt_solid_edit_generic_edit(
78+
struct rt_solid_edit *s
79+
);
7880

7981
int
8082
rt_solid_edit_generic_edit_xy(

‎src/librt/primitives/edtable.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ extern "C" {
3737
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); \
3838
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); \
3939
extern void rt_solid_edit_##name##_read_params(struct rt_db_internal *ip, const char *fc, const struct bn_tol *tol, fastf_t local2base); \
40-
extern int rt_solid_edit_##name##_edit(struct rt_solid_edit *s, int edflag); \
40+
extern int rt_solid_edit_##name##_edit(struct rt_solid_edit *s); \
4141
extern int rt_solid_edit_##name##_edit_xy(struct rt_solid_edit *s, vect_t mousevec); \
4242
extern void *rt_solid_edit_##name##_prim_edit_create(struct rt_solid_edit *s); \
4343
extern void rt_solid_edit_##name##_prim_edit_destroy(void *); \

‎src/librt/primitives/ehy/edehy.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,9 @@ rt_solid_edit_ehy_pscale(struct rt_solid_edit *s, int mode)
285285
}
286286

287287
int
288-
rt_solid_edit_ehy_edit(struct rt_solid_edit *s, int edflag)
288+
rt_solid_edit_ehy_edit(struct rt_solid_edit *s)
289289
{
290-
switch (edflag) {
290+
switch (s->edit_flag) {
291291
case RT_SOLID_EDIT_SCALE:
292292
/* scale the solid uniformly about its vertex point */
293293
return rt_solid_edit_generic_sscale(s, &s->es_int);

‎src/librt/primitives/ell/edell.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,9 @@ rt_solid_edit_ell_pscale(struct rt_solid_edit *s, int mode)
268268
}
269269

270270
int
271-
rt_solid_edit_ell_edit(struct rt_solid_edit *s, int edflag)
271+
rt_solid_edit_ell_edit(struct rt_solid_edit *s)
272272
{
273-
switch (edflag) {
273+
switch (s->edit_flag) {
274274
case RT_SOLID_EDIT_SCALE:
275275
/* scale the solid uniformly about its vertex point */
276276
return rt_solid_edit_generic_sscale(s, &s->es_int);

‎src/librt/primitives/epa/edepa.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,9 @@ rt_solid_edit_epa_pscale(struct rt_solid_edit *s, int mode)
257257
}
258258

259259
int
260-
rt_solid_edit_epa_edit(struct rt_solid_edit *s, int edflag)
260+
rt_solid_edit_epa_edit(struct rt_solid_edit *s)
261261
{
262-
switch (edflag) {
262+
switch (s->edit_flag) {
263263
case RT_SOLID_EDIT_SCALE:
264264
/* scale the solid uniformly about its vertex point */
265265
return rt_solid_edit_generic_sscale(s, &s->es_int);

‎src/librt/primitives/eto/edeto.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -365,9 +365,9 @@ rt_solid_edit_eto_pscale(struct rt_solid_edit *s, int mode)
365365
}
366366

367367
int
368-
rt_solid_edit_eto_edit(struct rt_solid_edit *s, int edflag)
368+
rt_solid_edit_eto_edit(struct rt_solid_edit *s)
369369
{
370-
switch (edflag) {
370+
switch (s->edit_flag) {
371371
case RT_SOLID_EDIT_SCALE:
372372
/* scale the solid uniformly about its vertex point */
373373
return rt_solid_edit_generic_sscale(s, &s->es_int);

‎src/librt/primitives/extrude/edextrude.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,9 @@ ecmd_extr_mov_h_mousevec(struct rt_solid_edit *s, const vect_t mousevec)
325325
}
326326

327327
int
328-
rt_solid_edit_extrude_edit(struct rt_solid_edit *s, int edflag)
328+
rt_solid_edit_extrude_edit(struct rt_solid_edit *s)
329329
{
330-
switch (edflag) {
330+
switch (s->edit_flag) {
331331
case RT_SOLID_EDIT_SCALE:
332332
/* scale the solid uniformly about its vertex point */
333333
return rt_solid_edit_generic_sscale(s, &s->es_int);
@@ -369,7 +369,7 @@ rt_solid_edit_extrude_edit_xy(
369369
case RT_SOLID_EDIT_PSCALE:
370370
case ECMD_EXTR_SCALE_H:
371371
rt_solid_edit_generic_sscale_xy(s, mousevec);
372-
rt_solid_edit_extrude_edit(s, s->edit_flag);
372+
rt_solid_edit_extrude_edit(s);
373373
return 0;
374374
case RT_SOLID_EDIT_TRANS:
375375
rt_solid_edit_generic_strans_xy(&pos_view, s, mousevec);
@@ -386,7 +386,7 @@ rt_solid_edit_extrude_edit_xy(
386386
}
387387

388388
rt_update_edit_absolute_tran(s, pos_view);
389-
rt_solid_edit_extrude_edit(s, s->edit_flag);
389+
rt_solid_edit_extrude_edit(s);
390390

391391
return 0;
392392
}

‎src/librt/primitives/hyp/edhyp.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -356,9 +356,9 @@ rt_solid_edit_hyp_pscale(struct rt_solid_edit *s, int mode)
356356
}
357357

358358
int
359-
rt_solid_edit_hyp_edit(struct rt_solid_edit *s, int edflag)
359+
rt_solid_edit_hyp_edit(struct rt_solid_edit *s)
360360
{
361-
switch (edflag) {
361+
switch (s->edit_flag) {
362362
case RT_SOLID_EDIT_SCALE:
363363
/* scale the solid uniformly about its vertex point */
364364
return rt_solid_edit_generic_sscale(s, &s->es_int);

0 commit comments

Comments
 (0)