BRL-CAD/brlcad
3
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More removal of unneeded resource pointers from functions

Browse Source 
This lets us eliminate quite a few additional instances of rt_uniresource in
the code.
This commit is contained in:
Clifford Yapp committed 2026-04-27 15:13:32 -04:00
1 parent 0718165c44
commit 667998ce6d
182 files changed
+493 -507
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/ged/objects.h
+29 -2
View File
@@ -95,7 +95,9 @@ __BEGIN_DECLS
return (_flags); \
}
/** Get internal representation */
/**
* Get internal representation
* DEPRECATED */
#define GED_DB_GET_INTERNAL(_gedp, _intern, _dp, _mat, _resource, _flags) \
if (rt_db_get_internal((_intern), (_dp), (_gedp)->dbip, (_mat)) < 0) { \
int ged_db_get_internal_quiet = (_flags) & GED_QUIET; \
@@ -105,7 +107,10 @@ __BEGIN_DECLS
return (_flags); \
}
/** Put internal representation */
/**
* Put internal representation
* DEPRECATED
*/
#define GED_DB_PUT_INTERNAL(_gedp, _dp, _intern, _resource, _flags) \
if (rt_db_put_internal((_dp), (_gedp)->dbip, (_intern)) < 0) { \
int ged_db_put_internal_quiet = (_flags) & GED_QUIET; \
@@ -115,6 +120,28 @@ __BEGIN_DECLS
return (_flags); \
}
/** Get internal representation */
#define GED_DB_GET_INTERN(_gedp, _intern, _dp, _mat, _flags) \
if (rt_db_get_internal((_intern), (_dp), (_gedp)->dbip, (_mat)) < 0) { \
int ged_db_get_internal_quiet = (_flags) & GED_QUIET; \
if (!ged_db_get_internal_quiet) { \
bu_vls_printf((_gedp)->ged_result_str, "Database read failure."); \
} \
return (_flags); \
}
/** Put internal representation */
#define GED_DB_PUT_INTERN(_gedp, _dp, _intern, _flags) \
if (rt_db_put_internal((_dp), (_gedp)->dbip, (_intern)) < 0) { \
int ged_db_put_internal_quiet = (_flags) & GED_QUIET; \
if (!ged_db_put_internal_quiet) { \
bu_vls_printf((_gedp)->ged_result_str, "Database write failure."); \
} \
return (_flags); \
}
__END_DECLS
#endif /* GED_OBJECTS_H */
include/ged/view.h
-1
View File
@@ -213,7 +213,6 @@ struct draw_update_data_t {
const struct bn_tol *tol;
const struct bg_tess_tol *ttol;
struct bv_mesh_lod_context *mesh_c;
struct resource *res;
};
GED_EXPORT extern unsigned long long dl_name_hash(struct ged *gedp);
include/qtcad/QgMeasureFilter.h
-1
View File
@@ -127,7 +127,6 @@ class QTCAD_EXPORT QMeasure3DFilter : public QgMeasureFilter
struct bu_ptbl scene_obj_set = BU_PTBL_INIT_ZERO;
struct application *ap = NULL;
struct rt_i *rtip = NULL;
struct resource *resp = NULL;
};
#endif /* QGMEASUREFILTER_H */
include/rt/boolweave.h
-1
View File
@@ -31,7 +31,6 @@
#include "bu/bitv.h"
#include "bu/ptbl.h"
#include "rt/application.h"
#include "rt/resource.h"
#include "rt/seg.h"
#include "rt/ray_partition.h"
include/rt/calc.h
+3 -7
View File
@@ -128,8 +128,7 @@ rt_bound_instance(point_t *bmin, point_t *bmax,
struct db_i *dbip,
const struct bg_tess_tol *ttol,
const struct bn_tol *tol,
mat_t *s_mat,
struct resource *res
mat_t *s_mat
);
/**
@@ -162,8 +161,7 @@ RT_EXPORT extern int rt_shader_mat(mat_t model_to_shader,
const struct rt_i *rtip,
const struct region *rp,
point_t p_min, /* input/output: shader/region min point */
point_t p_max, /* input/output: shader/region max point */
struct resource *resp);
point_t p_max); /* input/output: shader/region max point */
/* mirror.c */
RT_EXPORT extern struct rt_db_internal *rt_mirror(struct db_i *dpip,
@@ -174,9 +172,7 @@ RT_EXPORT extern struct rt_db_internal *rt_mirror(struct db_i *dpip,
RT_EXPORT extern void rt_plot_all_bboxes(FILE *fp,
struct rt_i *rtip);
RT_EXPORT extern void rt_plot_all_solids(FILE *fp,
struct rt_i *rtip,
struct resource *resp);
RT_EXPORT extern void rt_plot_all_solids(FILE *fp, struct rt_i *rtip);
/* pr.c */
include/rt/conv.h
+24 -12
View File
@@ -32,19 +32,31 @@
__BEGIN_DECLS
RT_EXPORT extern union tree *rt_booltree_leaf_tess(struct db_tree_state *tsp,
const struct db_full_path *pathp,
struct rt_db_internal *ip,
void *client_data);
RT_EXPORT extern union tree *rt_booltree_leaf_tess(
struct db_tree_state *tsp,
const struct db_full_path *pathp,
struct rt_db_internal *ip,
void *client_data);
RT_EXPORT extern union tree *rt_booltree_evaluate(union tree *tp,
struct bu_list *vlfree,
const struct bn_tol *tol,
struct resource *resp,
int (*do_bool)(union tree *, union tree *, union tree *, int op, struct bu_list *, const struct bn_tol *, void *),
int verbose,
void *data
);
DEPRECATED RT_EXPORT extern union tree *rt_booltree_evaluate(
union tree *tp,
struct bu_list *vlfree,
const struct bn_tol *tol,
struct resource *resp,
int (*do_bool)(union tree *, union tree *, union tree *, int op, struct bu_list *, const struct bn_tol *, void *),
int verbose,
void *data
);
RT_EXPORT extern union tree *rt_booltree_eval(
union tree *tp,
struct bu_list *vlfree,
const struct bn_tol *tol,
int (*do_bool)(union tree *, union tree *, union tree *, int op, struct bu_list *, const struct bn_tol *, void *),
int verbose,
void *data
);
__END_DECLS
include/rt/db_fullpath.h
+3 -14
View File
@@ -31,7 +31,6 @@
__BEGIN_DECLS
struct resource; /* forward declaration */
struct db_i; /* forward declaration */
struct directory; /* forward declaration */
@@ -245,11 +244,7 @@ RT_EXPORT extern int db_full_path_cyclic(const struct db_full_path *fp, const ch
*
* Called in librt/db_tree.c, mged/dodraw.c, and mged/animedit.c
*/
RT_EXPORT extern int db_path_to_mat(struct db_i *dbip,
struct db_full_path *pathp,
mat_t mat, /* result */
int depth, /* number of arcs */
struct resource *resp);
RT_EXPORT extern int db_path_to_mat(struct db_i *dbip, struct db_full_path *pathp, mat_t mat, int depth); /* number of arcs */
/**
* For a given path, return the "net" boolean operation of the
@@ -258,10 +253,7 @@ RT_EXPORT extern int db_path_to_mat(struct db_i *dbip,
* op is reported as an intersection. Else, union is reported.
*/
RT_EXPORT extern int
db_fp_op(const struct db_full_path *pathp,
struct db_i *dbip,
int depth, /* number of arcs - 0 == all */
struct resource *resp);
db_fp_op(const struct db_full_path *pathp, struct db_i *dbip, int depth); /* number of arcs - 0 == all */
/**
* Determine the color operative at the current directory pointer (the leaf
@@ -269,10 +261,7 @@ db_fp_op(const struct db_full_path *pathp,
*
* If nothing can be determined default color is set.
*/
RT_EXPORT extern void db_full_path_color(struct bu_color *c,
struct db_full_path *pathp,
struct db_i *dbip,
struct resource *resp);
RT_EXPORT extern void db_full_path_color(struct bu_color *c, struct db_full_path *pathp, struct db_i *dbip);
/** @} */
include/rt/db_internal.h
+3 -2
View File
@@ -34,11 +34,12 @@
#include "bu/avs.h"
#include "bn/mat.h"
#include "rt/defines.h"
#include "rt/resource.h"
__BEGIN_DECLS
struct rt_functab; /* forward declaration */
struct rt_functab; /* forward declaration */
struct db_i; /* forward declaration */
struct directory; /* forward declaration */
/**
* A handle on the internal format of a BRL-CAD database object.
include/rt/db_io.h
+14 -5
View File
@@ -34,11 +34,15 @@
#include "bu/avs.h"
#include "rt/db5.h"
#include "rt/defines.h"
#include "rt/resource.h"
__BEGIN_DECLS
struct rt_db_internal; /* forward declaration */
struct db_i; /* forward declaration */
struct directory; /* forward declaration */
struct rt_wdb; /* forward declaration */
/* db_open.c */
@@ -172,14 +176,21 @@ RT_EXPORT extern void db5_export_object3(struct bu_external *out,
* 0 OK
* -1 FAIL
*/
RT_EXPORT extern int rt_db_cvt_to_external5(struct bu_external *ext,
RT_EXPORT extern int rt_db_cvt_to_ext5(struct bu_external *ext,
const char *name,
const struct rt_db_internal *ip,
double conv2mm,
struct db_i *dbip,
struct resource *resp,
const int major);
DEPRECATED RT_EXPORT extern int rt_db_cvt_to_external5(struct bu_external *ext,
const char *name,
const struct rt_db_internal *ip,
double conv2mm,
struct db_i *dbip,
struct resource *resp,
const int major);
/*
* Modify name of external object, if necessary.
@@ -852,8 +863,7 @@ RT_EXPORT extern int db_rename(struct db_i *,
* entry is referenced by a COMBination in the database).
*
*/
RT_EXPORT extern void db_update_nref(struct db_i *dbip,
struct resource *resp);
RT_EXPORT extern void db_update_nref(struct db_i *dbip);
/* db_flags.c */
@@ -918,7 +928,6 @@ RT_EXPORT extern void db_alloc_dir_block(struct db_i *dbip);
*/
RT_EXPORT extern void rt_alloc_seg_block(struct resource *res);
/**
* Read named MGED db, build toc.
*/
include/rt/edit.h
-1
View File
@@ -77,7 +77,6 @@
#include "bv/defines.h"
#include "rt/defines.h"
#include "rt/db_internal.h"
#include "rt/resource.h"
__BEGIN_DECLS
include/rt/func.h
-1
View File
@@ -42,7 +42,6 @@
#include "rt/functab.h"
#include "rt/hit.h"
#include "rt/piece.h"
#include "rt/resource.h"
#include "rt/seg.h"
#include "rt/soltab.h"
#include "rt/tol.h"
include/rt/functab.h
+2 -1
View File
@@ -47,7 +47,6 @@
#include "rt/edit.h"
#include "rt/hit.h"
#include "rt/misc.h"
#include "rt/resource.h"
#include "rt/rt_instance.h"
#include "rt/seg.h"
#include "rt/soltab.h"
@@ -61,6 +60,8 @@
__BEGIN_DECLS
struct rt_piecestate; /* forward declaration for ft_piece_shot / ft_piece_hitsegs */
/**
* This needs to be at the end of the raytrace.h header file, so that
* all the structure names are known. The "union record" and "struct
include/rt/misc.h
+2 -7
View File
@@ -32,14 +32,9 @@
__BEGIN_DECLS
RT_EXPORT extern int rt_find_paths(struct db_i *dbip,
struct directory *start,
struct directory *end,
struct bu_ptbl *paths,
struct resource *resp);
RT_EXPORT extern int rt_find_paths(struct db_i *dbip, struct directory *start, struct directory *end);
RT_EXPORT extern struct bu_bitv *rt_get_solidbitv(size_t nbits,
struct resource *resp);
RT_EXPORT extern struct bu_bitv *rt_get_solidbitv(size_t nbits, struct resource *resp);
/* table.c */
RT_EXPORT extern int rt_id_solid(struct bu_external *ep);
include/rt/prep.h
+2 -9
View File
@@ -29,7 +29,6 @@
#include "bu/ptbl.h"
#include "rt/defines.h"
#include "rt/tree.h"
#include "rt/resource.h"
#include "rt/rt_instance.h"
__BEGIN_DECLS
@@ -55,15 +54,9 @@ struct rt_reprep_obj_list {
/* prep.c */
RT_EXPORT extern int rt_unprep(struct rt_i *rtip,
struct rt_reprep_obj_list *objs,
struct resource *resp);
struct rt_reprep_obj_list *objs);
RT_EXPORT extern int rt_reprep(struct rt_i *rtip,
struct rt_reprep_obj_list *objs,
struct resource *resp);
RT_EXPORT extern int re_prep_solids(struct rt_i *rtip,
int num_solids,
char **solid_names,
struct resource *resp);
struct rt_reprep_obj_list *objs);
/**
* Add a pre-prepped soltab into the rt_i space-partitioning structures.
include/rt/private.h
-2
View File
@@ -29,7 +29,6 @@
#include "common.h"
#include "vmath.h"
#include "rt/application.h"
#include "rt/resource.h"
#include "rt/space_partition.h" /* cutter */
#include "rt/xray.h"
@@ -59,7 +58,6 @@ struct rt_shootray_status {
fastf_t model_end;
struct xray newray; /**< @brief closer ray start */
struct application *ap;
struct resource * resp;
vect_t inv_dir; /**< @brief inverses of ap->a_ray.r_dir */
vect_t abs_inv_dir; /**< @brief absolute values of inv_dir */
int rstep[3]; /**< @brief -/0/+ dir of ray in axis */
include/rt/region.h
+1 -3
View File
@@ -35,7 +35,6 @@
__BEGIN_DECLS
union tree; /* forward declaration */
struct resource; /* forward declaration */
struct db_i; /* forward declaration */
/**
@@ -112,8 +111,7 @@ RT_EXPORT extern void rt_pr_region(const struct region *rp);
*/
RT_EXPORT extern int db_region_mat(mat_t m, /* result */
struct db_i *dbip,
const char *name,
struct resource *resp);
const char *name);
__END_DECLS
include/rt/space_partition.h
+8 -1
View File
@@ -97,11 +97,18 @@ RT_EXPORT extern void remove_from_bsp(struct soltab *stp,
struct bn_tol *tol);
RT_EXPORT extern void insert_in_bsp(struct soltab *stp,
union cutter *cutp);
RT_EXPORT extern void fill_out_bsp(struct rt_i *rtip,
DEPRECATED RT_EXPORT extern void fill_out_bsp(struct rt_i *rtip,
union cutter *cutp,
struct resource *resp,
fastf_t bb[6]);
RT_EXPORT extern void nfill_out_bsp(struct rt_i *rtip,
union cutter *cutp,
fastf_t bb[6]);
/**
* Add a solid into a given boxnode, extending the lists there. This
* is used only for building the root node, which will then be
include/rt/tree.h
+5 -9
View File
@@ -37,6 +37,7 @@
#include "rt/mater.h"
#include "rt/op.h"
#include "rt/region.h"
#include "rt/resource.h"
#include "rt/soltab.h"
#include "rt/tol.h"
#include "nmg.h"
@@ -44,7 +45,6 @@
__BEGIN_DECLS
union tree; /* forward declaration */
struct resource; /* forward declaration */
struct rt_i; /* forward declaration */
struct rt_comb_internal; /* forward declaration */
struct rt_db_internal; /* forward declaration */
@@ -89,11 +89,10 @@ struct db_tree_state {
const struct bn_tol * ts_tol; /**< @brief Math tolerance */
struct model ** ts_m; /**< @brief ptr to ptr to NMG "model" */
struct rt_i * ts_rtip; /**< @brief Helper for rt_gettrees() */
struct resource * ts_resp; /**< @brief Per-CPU data */
};
#define RT_DBTS_INIT_ZERO { RT_DBTS_MAGIC, NULL, 0, 0, 0, 0, 0, RT_MATER_INFO_INIT_ZERO, MAT_INIT_ZERO, 0, BU_AVS_INIT_ZERO, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
#define RT_DBTS_INIT_ZERO { RT_DBTS_MAGIC, NULL, 0, 0, 0, 0, 0, RT_MATER_INFO_INIT_ZERO, MAT_INIT_ZERO, 0, BU_AVS_INIT_ZERO, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
/* from mged_initial_tree_state */
#define RT_DBTS_INIT_IDN { RT_DBTS_MAGIC, NULL, 0, 0, 0, 0, 100, RT_MATER_INFO_INIT_IDN, MAT_INIT_IDN, 0, BU_AVS_INIT_ZERO, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
#define RT_DBTS_INIT_IDN { RT_DBTS_MAGIC, NULL, 0, 0, 0, 0, 100, RT_MATER_INFO_INIT_IDN, MAT_INIT_IDN, 0, BU_AVS_INIT_ZERO, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
/* Used to replace old rt_initial_tree_state global */
#define RT_DBTS_INIT(_p) do { \
@@ -121,7 +120,6 @@ struct db_tree_state {
(_p)->ts_tol = NULL; \
(_p)->ts_m = NULL; \
(_p)->ts_rtip = NULL; \
(_p)->ts_resp = NULL; \
} while (0)
#define TS_SOFAR_MINUS 1 /**< @brief Subtraction encountered above */
@@ -149,13 +147,12 @@ struct db_traverse
struct db_i *,
struct directory *,
void *);
struct resource *resp;
void *client_data;
};
#define RT_DB_TRAVERSE_INIT(_p) {(_p)->magic = RT_DB_TRAVERSE_MAGIC; \
(_p)->dbip = ((void *)0); (_p)->comb_enter_func = ((void *)0); \
(_p)->comb_exit_func = ((void *)0); (_p)->leaf_func = ((void *)0); \
(_p)->resp = ((void *)0); (_p)->client_data = ((void *)0);}
(_p)->client_data = ((void *)0);}
#define RT_CK_DB_TRAVERSE(_p) BU_CKMAG(_p, RT_DB_TRAVERSE_MAGIC, "db_traverse")
struct combined_tree_state {
@@ -750,8 +747,7 @@ RT_EXPORT extern union tree *db_mkgift_tree(struct rt_tree_array *trees,
size_t subtreecount);
RT_EXPORT extern void rt_optim_tree(union tree *tp,
struct resource *resp);
RT_EXPORT extern void rt_optim_tree(union tree *tp, struct resource *resp);
include/rt/wdb.h
-3
View File
@@ -36,8 +36,6 @@
__BEGIN_DECLS
struct resource; /* forward declaration */
/* struct rt_wdb database types (for wdb_type struct entry).
* The "default" types will return the wdbp associated with
* the dbip - i.e., if the dbip is an inmem it will return
@@ -67,7 +65,6 @@ struct rt_wdb {
struct bg_tess_tol wdb_ttol;
struct bn_tol wdb_tol;
struct resource* wdb_resp;
/* variables for name prefixing */
struct bu_vls wdb_prestr;
regress/ged/push.cpp
+1 -1
View File
@@ -124,7 +124,7 @@ main(int argc, const char **argv)
}
// Make sure our reference counts are up to date
db_update_nref(gedp->dbip, &rt_uniresource);
db_update_nref(gedp->dbip);
// Perform the specified push operation on all example objects
for (size_t i = 0; i <= 19; i++) {
src/conv/g-var.c
+1 -1
View File
@@ -468,7 +468,7 @@ int main(int argc, char *argv[])
}
/* find requested object */
db_update_nref(dbip, &rt_uniresource);
db_update_nref(dbip);
dp = db_lookup(dbip, object, 0);
if (dp == RT_DIR_NULL)
src/conv/obj-g.c
-1
View File
@@ -3842,7 +3842,6 @@ main(int argc, char **argv)
}
db_close(fd_out->dbip);
rt_clean_resource_basic(NULL, &rt_uniresource);
(void)time(&overall_end_time);
overall_elapsed_time = overall_end_time - overall_start_time;
src/conv/step/g-ap203e2/g-ap203e2.cpp
+1 -1
View File
@@ -121,7 +121,7 @@ main(int argc, char *argv[])
if (convert_tops_list) {
/* Need db_update_nref for DB_LS_TOPS to work */
db_update_nref(dbip, &rt_uniresource);
db_update_nref(dbip);
path_cnt = db_ls(dbip, DB_LS_TOPS, NULL, &paths);
if (!path_cnt) {
std::cerr << "ERROR: no objects found in .g file" << "\n" << std::endl;
src/conv/step/g-ap214/g-ap214.cpp
+1 -1
View File
@@ -119,7 +119,7 @@ main(int argc, char *argv[])
if (convert_tops_list) {
/* Need db_update_nref for DB_LS_TOPS to work */
db_update_nref(dbip, &rt_uniresource);
db_update_nref(dbip);
path_cnt = db_ls(dbip, DB_LS_TOPS, NULL, &paths);
if (!path_cnt) {
std::cerr << "ERROR: no objects found in .g file" << "\n" << std::endl;
src/conv/step/g-step/g-step.cpp
+1 -1
View File
@@ -119,7 +119,7 @@ main(int argc, char *argv[])
if (convert_tops_list) {
/* Need db_update_nref for DB_LS_TOPS to work */
db_update_nref(dbip, &rt_uniresource);
db_update_nref(dbip);
path_cnt = db_ls(dbip, DB_LS_TOPS, NULL, &paths);
if (!path_cnt) {
std::cerr << "ERROR: no objects found in .g file" << "\n" << std::endl;
src/external/Creo/main.cpp
Vendored
+2 -2
View File
@@ -234,7 +234,7 @@ output_parts(struct creo_conv_info *cinfo)
bu_free(children, "free child list");
db_delete(cinfo->wdbp->dbip, rdp);
db_dirdelete(cinfo->wdbp->dbip, rdp);
db_update_nref(cinfo->wdbp->dbip, &rt_uniresource);
db_update_nref(cinfo->wdbp->dbip);
}
}
@@ -297,7 +297,7 @@ output_assems(struct creo_conv_info *cinfo)
/* Kill the existing object - it's out of sync with Creo */
db_delete(cinfo->wdbp->dbip, adp);
db_dirdelete(cinfo->wdbp->dbip, adp);
db_update_nref(cinfo->wdbp->dbip, &rt_uniresource);
db_update_nref(cinfo->wdbp->dbip);
}
}
src/external/Cubit/g-sat.cpp
Vendored
-1
View File
@@ -1184,7 +1184,6 @@ main(int argc, char *argv[])
RT_DBTS_INIT(&init_state);
init_state.ts_dbip = rtip->rti_dbip;
init_state.ts_rtip = rtip;
init_state.ts_resp = NULL;
init_state.ts_tol = &tol;
init_state.ts_ttol = &ttol;
bu_avs_init(&init_state.ts_attrs, 1, "avs in tree_state");
src/gtools/beset/beset.c
+4 -4
View File
@@ -156,7 +156,7 @@ int main(int argc, char *argv[]) {
snprintf(dbname, 256, "gen%.3d", g);
pop.db_c = db_create(dbname, BRLCAD_DB_FORMAT_LATEST);
pop_gop(REPRODUCE, argv[ac+2], NULL, argv[ac+2], NULL, source_db, pop.db_c, &rt_uniresource);
pop_gop(REPRODUCE, argv[ac+2], NULL, argv[ac+2], NULL, source_db, pop.db_c);
/* calculate sum of all fitnesses and find
@@ -186,7 +186,7 @@ int main(int argc, char *argv[]) {
/* keep upper N */
if (i >= pop.size - opts.keep_upper) {
pop_gop(REPRODUCE, NL(pop.parent[i].id), NULL, NL(pop.child[i].id), NULL,
pop.db_p, pop.db_c, &rt_uniresource);
pop.db_p, pop.db_c);
continue;
}
@@ -203,7 +203,7 @@ int main(int argc, char *argv[]) {
#endif
/* perform the genetic operation and output the child to the child database */
pop_gop(gop, NL(pop.parent[parent1].id), NULL, NL(pop.child[i].id), NULL,
pop.db_p, pop.db_c, &rt_uniresource);
pop.db_p, pop.db_c);
} else {
/* If we're performing crossover, we need a second parent */
parent2 = pop_wrand_ind(pop.parent, pop.size, total_fitness, opts.kill_lower);
@@ -215,7 +215,7 @@ int main(int argc, char *argv[]) {
#endif
/* perform the genetic operation and output the children to the child database */
pop_gop(gop, NL(pop.parent[parent1].id), NL(pop.parent[parent2].id), NL(pop.child[i-1].id), NL(pop.child[i].id),
pop.db_p, pop.db_c, &rt_uniresource);
pop.db_p, pop.db_c);
}
}
src/gtools/beset/population.c
+9 -11
View File
@@ -315,7 +315,6 @@ pop_mutate(int type, void *ptr)
void
pop_functree(struct db_i *dbi_p, struct db_i *dbi_c,
union tree *tp,
struct resource *resp,
char *name
)
{
@@ -388,10 +387,10 @@ pop_functree(struct db_i *dbi_p, struct db_i *dbi_c,
* to be modified to point to the new child node */
if (crossover && node_idx == crossover_node)
crossover_parent = &tp->tr_b.tb_left;
pop_functree( dbi_p, dbi_c, tp->tr_b.tb_left, resp, name);
pop_functree( dbi_p, dbi_c, tp->tr_b.tb_left, name);
if (crossover && node_idx == crossover_node)
crossover_parent = &tp->tr_b.tb_right;
pop_functree( dbi_p, dbi_c, tp->tr_b.tb_right, resp, name);
pop_functree( dbi_p, dbi_c, tp->tr_b.tb_right, name);
break;
default:
@@ -400,7 +399,7 @@ pop_functree(struct db_i *dbi_p, struct db_i *dbi_c,
}
void
pop_gop(int gop, char *parent1_id, char *parent2_id, char *child1_id, char *child2_id, struct db_i *dbi_p, struct db_i *dbi_c, struct resource *resp)
pop_gop(int gop, char *parent1_id, char *parent2_id, char *child1_id, char *child2_id, struct db_i *dbi_p, struct db_i *dbi_c)
{
struct rt_db_internal in1, in2;
struct rt_comb_internal *parent1;
@@ -414,7 +413,6 @@ pop_gop(int gop, char *parent1_id, char *parent2_id, char *child1_id, char *chil
RT_CHECK_DBI( dbi_p );
RT_CHECK_DBI( dbi_c );
RT_CK_RESOURCE( resp );
crossover_point = (union tree *)NULL;
@@ -428,7 +426,7 @@ pop_gop(int gop, char *parent1_id, char *parent2_id, char *child1_id, char *chil
mutate = 0;
switch (gop) {
case REPRODUCE:
pop_functree(dbi_p, dbi_c, parent1->tree, resp, child1_id);
pop_functree(dbi_p, dbi_c, parent1->tree, child1_id);
break;
case CROSSOVER:
@@ -447,7 +445,7 @@ pop_gop(int gop, char *parent1_id, char *parent2_id, char *child1_id, char *chil
crossover_parent = &parent1->tree;
crossover_node = (int)(pop_rand() * db_count_tree_nodes(parent1->tree, 0));
node_idx = 0;
pop_functree(dbi_p, dbi_c, parent1->tree, resp, NULL);
pop_functree(dbi_p, dbi_c, parent1->tree, NULL);
cross_parent = crossover_parent;
cpoint = crossover_point;
@@ -491,9 +489,9 @@ pop_gop(int gop, char *parent1_id, char *parent2_id, char *child1_id, char *chil
crossover = 0;
/*duplicate shapes held in trees*/
pop_functree(dbi_p, dbi_c, parent1->tree, resp, child1_id);
pop_functree(dbi_p, dbi_c, parent1->tree, child1_id);
shape_number = 0;
pop_functree(dbi_p, dbi_c, parent2->tree, resp, child2_id);
pop_functree(dbi_p, dbi_c, parent2->tree, child2_id);
if ((dp = db_diradd(dbi_c, child2_id, -1, 0, dp->d_flags, (void *)&dp->d_minor_type)) == RT_DIR_NULL)
@@ -508,7 +506,7 @@ pop_gop(int gop, char *parent1_id, char *parent2_id, char *child1_id, char *chil
crossover_node = (int)(pop_rand() * db_count_tree_nodes(parent1->tree, 0));
node_idx = 0;
mutate = 1;
pop_functree(dbi_p, dbi_c, parent1->tree, resp, child1_id);
pop_functree(dbi_p, dbi_c, parent1->tree, child1_id);
mutate = 0;
break;
/*
@@ -518,7 +516,7 @@ pop_gop(int gop, char *parent1_id, char *parent2_id, char *child1_id, char *chil
s_node = n;
node = 0;
//find node
pop_functree(dbi_p, dbi_c, parent1->tree, resp, NULL);
pop_functree(dbi_p, dbi_c, parent1->tree, NULL);
*/
src/gtools/beset/population.h
+2 -3
View File
@@ -73,9 +73,8 @@ fastf_t pop_rand (void);
int pop_find_nodes(union tree *tp);
void pop_gop(int gop, char *parent1, char *parent2, char * child1, char *child2, struct db_i *dbi_p,
struct db_i *dbi_c, struct resource *resp);
int pop_put_internal(const char *n, struct directory *dp, struct db_i *dbip, struct rt_db_internal *ip,
struct resource *resp);
struct db_i *dbi_c);
int pop_put_internal(const char *n, struct directory *dp, struct db_i *dbip, struct rt_db_internal *ip);
#endif /* GTOOLS_BESET_POPULATION_H */
src/gtools/gchecker.cpp
+1 -1
View File
@@ -176,7 +176,7 @@ main(int argc, const char **argv)
// Make sure our reference counts are up to date, so we can tell
// which objects are top level
db_update_nref(gedp->dbip, &rt_uniresource);
db_update_nref(gedp->dbip);
std::vector<struct directory *> objs;
if (argc > 1) {
src/gtools/gdiff/group.cpp
+1 -1
View File
@@ -587,7 +587,7 @@ std::string content_hash(struct db_i *dbip, bool use_names, bool use_geometry, i
if (!dbip)
return std::string();
db_update_nref(dbip, &rt_uniresource);
db_update_nref(dbip);
tlsh::Tlsh hasher;
if (use_names) {
src/gtools/gdiff/main.cpp
+5 -5
View File
@@ -400,7 +400,7 @@ main(int argc, const char **argv)
db_close(left_dbip);
bu_exit(-1, "db_dirbuild failed on geometry database file %s\n", argv[0]);
}
db_update_nref(left_dbip, &rt_uniresource);
db_update_nref(left_dbip);
if ((right_dbip = db_open(argv[1], DB_OPEN_READONLY)) == DBI_NULL) {
bu_exit(-1, "Cannot open geometry database file %s\n", argv[1]);
@@ -411,7 +411,7 @@ main(int argc, const char **argv)
db_close(right_dbip);
bu_exit(-1, "db_dirbuild failed on geometry database file %s\n", argv[1]);
}
db_update_nref(right_dbip, &rt_uniresource);
db_update_nref(right_dbip);
diff_return = do_diff(left_dbip, right_dbip, state);
}
@@ -447,7 +447,7 @@ main(int argc, const char **argv)
db_close(left_dbip);
bu_exit(-1, "db_dirbuild failed on geometry database file %s\n", argv[0]);
}
db_update_nref(left_dbip, &rt_uniresource);
db_update_nref(left_dbip);
if ((ancestor_dbip = db_open(argv[1], DB_OPEN_READONLY)) == DBI_NULL) {
bu_exit(-1, "Cannot open geometry database file %s\n", argv[1]);
@@ -458,7 +458,7 @@ main(int argc, const char **argv)
db_close(ancestor_dbip);
bu_exit(-1, "db_dirbuild failed on geometry database file %s\n", argv[1]);
}
db_update_nref(ancestor_dbip, &rt_uniresource);
db_update_nref(ancestor_dbip);
if ((right_dbip = db_open(argv[2], DB_OPEN_READONLY)) == DBI_NULL) {
bu_exit(-1, "Cannot open geometry database file %s\n", argv[2]);
@@ -469,7 +469,7 @@ main(int argc, const char **argv)
db_close(left_dbip);
bu_exit(-1, "db_dirbuild failed on geometry database file %s\n", argv[2]);
}
db_update_nref(right_dbip, &rt_uniresource);
db_update_nref(right_dbip);
diff_return = do_diff3(left_dbip, ancestor_dbip, right_dbip, state);
}
src/libdm/labels.c
-1
View File
@@ -572,7 +572,6 @@ dm_draw_prim_labels(struct dm *dmp,
db_full_path_init(&path);
ts = wdbp->wdb_initial_tree_state; /* struct copy */
ts.ts_dbip = wdbp->dbip;
ts.ts_resp = &rt_uniresource;
MAT_IDN(ts.ts_mat);
if (db_follow_path_for_state(&ts, &path, name, 0)) {
src/libgcv/gcv.c
+1 -1
View File
@@ -559,7 +559,7 @@ gcv_execute(struct gcv_context *context, const struct gcv_filter *filter,
size_t num_objects;
struct directory **toplevel_dirs;
db_update_nref(context->dbip, &rt_uniresource);
db_update_nref(context->dbip);
num_objects = db_ls(context->dbip, DB_LS_TOPS, NULL, &toplevel_dirs);
if (num_objects) {
src/libgcv/plugins/fastgen4/fastgen4_write.cpp
+1 -2
View File
@@ -1304,7 +1304,7 @@ path_to_mat(db_i &db, const db_full_path &path, mat_t &result)
db_full_path_init(&temp);
db_dup_full_path(&temp, &path);
if (!db_path_to_mat(&db, &temp, result, 0, &rt_uniresource))
if (!db_path_to_mat(&db, &temp, result, 0))
throw std::runtime_error("db_path_to_mat() failed");
}
@@ -1360,7 +1360,6 @@ path_is_subtracted(db_i &db, const db_full_path &path)
{
db_tree_state tree_state;
RT_DBTS_INIT(&tree_state);
tree_state.ts_resp = &rt_uniresource;
tree_state.ts_dbip = &db;
db_full_path end_path;
src/libgcv/plugins/obj/obj_read.c
-2
View File
@@ -3586,8 +3586,6 @@ obj_read(struct gcv_context *context, const struct gcv_opts *gcv_options, const
obj_contents_destroy(ga.contents);
obj_parser_destroy(ga.parser);
rt_clean_resource(NULL, &rt_uniresource);
return 1;
}
src/libged/3ptarb/3ptarb.c
+1 -1
View File
@@ -250,7 +250,7 @@ ged_3ptarb_core(struct ged *gedp, int argc, const char *argv[])
GED_DB_DIRADD(gedp, dp, argv[1], RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (void *)&internal.idb_type, BRLCAD_ERROR);
GED_DB_PUT_INTERNAL(gedp, dp, &internal, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &internal, BRLCAD_ERROR);
return BRLCAD_OK;
}
src/libged/adjust/adjust.c
+1 -1
View File
@@ -63,7 +63,7 @@ ged_adjust_core(struct ged *gedp, int argc, const char *argv[])
GED_DB_LOOKUP(gedp, dp, name, LOOKUP_QUIET, BRLCAD_ERROR);
GED_DB_GET_INTERNAL(gedp, &intern, dp, (matp_t)NULL, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp, (matp_t)NULL, BRLCAD_ERROR);
RT_CK_DB_INTERNAL(&intern);
/* Find out what type of object we are dealing with and tweak it. */
src/libged/analyze/analyze.cpp
+1 -1
View File
@@ -325,7 +325,7 @@ _analyze_cmd_summarize(void *bs, int argc, const char **argv)
if (ndp == RT_DIR_NULL)
continue;
GED_DB_GET_INTERNAL(gedp, &intern, ndp, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, ndp, bn_mat_identity, BRLCAD_ERROR);
_ged_do_list(gedp, ndp, 1);
analyze_do_summary(gedp, &intern);
src/libged/analyze/op_pnts_vol.cpp
+2 -2
View File
@@ -208,7 +208,7 @@ op_pnts_vol(
// Unpack the points object
struct directory *dp = db_lookup(gedp->dbip, pnts_obj, LOOKUP_QUIET);
struct rt_db_internal tpnts_intern;
GED_DB_GET_INTERNAL(gedp, &tpnts_intern, dp, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &tpnts_intern, dp, bn_mat_identity, BRLCAD_ERROR);
if (tpnts_intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_PNTS) {
bu_vls_printf(gedp->ged_result_str, "%s is not a pnts object, aborting", pnts_obj);
rt_db_free_internal(&tpnts_intern);
@@ -402,7 +402,7 @@ op_pnts_vol(
if (output_pnts_obj) {
opnts->count = pntcnt;
GED_DB_DIRADD(gedp, dp, output_pnts_obj, RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (void *)&internal.idb_type, BRLCAD_ERROR);
GED_DB_PUT_INTERNAL(gedp, dp, &internal, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &internal, BRLCAD_ERROR);
bu_vls_printf(gedp->ged_result_str, "Generated pnts object %s\n", output_pnts_obj);
}
src/libged/arb/arb.c
+1 -1
View File
@@ -123,7 +123,7 @@ ged_arb_core(struct ged *gedp, int argc, const char *argv[])
VJOIN1(arb->pt[i+4], arb->pt[i], -50.8, norm1);
GED_DB_DIRADD(gedp, dp, argv[1], RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (void *)&internal.idb_type, BRLCAD_ERROR);
GED_DB_PUT_INTERNAL(gedp, dp, &internal, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &internal, BRLCAD_ERROR);
return BRLCAD_OK;
}
src/libged/arb/rotate_arb_face.c
+1 -1
View File
@@ -215,7 +215,7 @@ ged_rotate_arb_face_core(struct ged *gedp, int argc, const char *argv[])
VMOVE(arb->pt[i], arb_pt);
}
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &intern, BRLCAD_ERROR);
}
rt_db_free_internal(&intern);
src/libged/arced/arced.c
-1
View File
@@ -85,7 +85,6 @@ ged_arced_core(struct ged *gedp, int argc, const char *argv[])
bu_vls_printf(gedp->ged_result_str, "%s: not a combination", dp->d_namep);
return BRLCAD_ERROR;
}
/* GED_DB_GET_INTERNAL(gedp, &intern, (fastf_t *)NULL, &rt_uniresource, BRLCAD_ERROR); */
if (rt_db_get_internal(&intern, dp, gedp->dbip, (fastf_t *)NULL) < 0) {
db_free_1anim(anp);
bu_vls_printf(gedp->ged_result_str, "Database read error, aborting");
src/libged/bev/bev.c
+1 -1
View File
@@ -293,7 +293,7 @@ ged_bev_core(struct ged *gedp, int argc, const char *argv[])
bev_nmg_model = (struct model *)NULL;
GED_DB_DIRADD(gedp, dp, newname, RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (void *)&intern.idb_type, BRLCAD_ERROR);
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &intern, BRLCAD_ERROR);
tmp_tree->tr_d.td_r = (struct nmgregion *)NULL;
src/libged/bot/bot.cpp
+2 -3
View File
@@ -155,7 +155,7 @@ _bot_obj_setup(struct _ged_bot_info *gb, const char *name)
BU_GET(gb->intern, struct rt_db_internal);
GED_DB_GET_INTERNAL(gb->gedp, gb->intern, gb->dp, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gb->gedp, gb->intern, gb->dp, bn_mat_identity, BRLCAD_ERROR);
RT_CK_DB_INTERNAL(gb->intern);
if (gb->intern->idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) {
@@ -593,7 +593,7 @@ _bot_cmd_isect(void *bs, int argc, const char **argv)
struct directory *bot_dp_2;
struct rt_db_internal intern_2;
GED_DB_LOOKUP(gb->gedp, bot_dp_2, argv[1], LOOKUP_NOISY, BRLCAD_ERROR & GED_QUIET);
GED_DB_GET_INTERNAL(gb->gedp, &intern_2, bot_dp_2, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gb->gedp, &intern_2, bot_dp_2, bn_mat_identity, BRLCAD_ERROR);
if (intern_2.idb_major_type != DB5_MAJORTYPE_BRLCAD || intern_2.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) {
bu_vls_printf(gb->gedp->ged_result_str, ": object %s is not of type bot\n", argv[1]);
rt_db_free_internal(&intern_2);
@@ -1009,7 +1009,6 @@ bot_output(struct bu_tbl *table, struct db_i *dbip, struct directory *dp)
struct rt_db_internal intern;
struct bu_external ext = BU_EXTERNAL_INIT_ZERO;
RT_DB_INTERNAL_INIT(&intern);
RT_CK_RESOURCE(&rt_uniresource);
if (db_get_external(&ext, dp, dbip) < 0)
return;
if (rt_db_external5_to_internal5(&intern, &ext, dp->d_namep, dbip, NULL) < 0) {
src/libged/bot/bot_condense.c
+2 -2
View File
@@ -62,7 +62,7 @@ ged_bot_condense_core(struct ged *gedp, int argc, const char *argv[])
}
GED_DB_LOOKUP(gedp, old_dp, argv[2], LOOKUP_NOISY, BRLCAD_ERROR & GED_QUIET);
GED_DB_GET_INTERNAL(gedp, &intern, old_dp, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, old_dp, bn_mat_identity, BRLCAD_ERROR);
if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD || intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) {
bu_vls_printf(gedp->ged_result_str, "%s: %s is not a BOT solid!\n", argv[0], argv[2]);
@@ -76,7 +76,7 @@ ged_bot_condense_core(struct ged *gedp, int argc, const char *argv[])
bu_vls_printf(gedp->ged_result_str, "%s: %d dead vertices eliminated\n", argv[0], count2);
GED_DB_DIRADD(gedp, new_dp, argv[1], RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (void *)&intern.idb_type, BRLCAD_ERROR);
GED_DB_PUT_INTERNAL(gedp, new_dp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, new_dp, &intern, BRLCAD_ERROR);
return BRLCAD_OK;
}
src/libged/bot/bot_decimate.c
+1 -1
View File
@@ -139,7 +139,7 @@ ged_bot_decimate_core(struct ged *gedp, int argc, const char *argv[])
/* import the current solid */
RT_DB_INTERNAL_INIT(&intern);
struct rt_wdb *wdbp = wdb_dbopen(gedp->dbip, RT_WDB_TYPE_DB_DEFAULT);
GED_DB_GET_INTERNAL(gedp, &intern, dp, NULL, wdbp->wdb_resp, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp, NULL, BRLCAD_ERROR);
/* make sure this is a BOT solid */
if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD || intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) {
src/libged/bot/bot_face_fuse.c
+2 -2
View File
@@ -61,7 +61,7 @@ ged_bot_face_fuse_core(struct ged *gedp, int argc, const char *argv[])
}
GED_DB_LOOKUP(gedp, old_dp, argv[2], LOOKUP_NOISY, BRLCAD_ERROR & GED_QUIET);
GED_DB_GET_INTERNAL(gedp, &intern, old_dp, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, old_dp, bn_mat_identity, BRLCAD_ERROR);
if (intern.idb_type != ID_BOT) {
bu_vls_printf(gedp->ged_result_str, "%s: %s is not a BOT solid!\n", argv[0], argv[2]);
@@ -74,7 +74,7 @@ ged_bot_face_fuse_core(struct ged *gedp, int argc, const char *argv[])
(void) rt_bot_face_fuse(bot);
GED_DB_DIRADD(gedp, new_dp, argv[1], RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (void *)&intern.idb_type, BRLCAD_ERROR);
GED_DB_PUT_INTERNAL(gedp, new_dp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, new_dp, &intern, BRLCAD_ERROR);
return BRLCAD_OK;
}
src/libged/bot/bot_face_sort.c
+2 -2
View File
@@ -77,7 +77,7 @@ ged_bot_face_sort_core(struct ged *gedp, int argc, const char *argv[])
continue;
}
GED_DB_GET_INTERNAL(gedp, &intern, dp, bn_mat_identity, NULL, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp, bn_mat_identity, BRLCAD_ERROR);
if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD || intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) {
rt_db_free_internal(&intern);
@@ -100,7 +100,7 @@ ged_bot_face_sort_core(struct ged *gedp, int argc, const char *argv[])
continue;
}
GED_DB_PUT_INTERNAL(gedp, dp, &intern, NULL, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &intern, BRLCAD_ERROR);
}
return BRLCAD_OK;
src/libged/bot/bot_flip.c
+2 -2
View File
@@ -71,7 +71,7 @@ ged_bot_flip_core(struct ged *gedp, int argc, const char *argv[])
if ((dp = db_lookup(gedp->dbip, obj, LOOKUP_QUIET)) == RT_DIR_NULL) {
bu_vls_printf(gedp->ged_result_str, "%s: db_lookup(%s) error\n", argv[0], obj);
} else {
GED_DB_GET_INTERNAL(gedp, &intern, dp, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp, bn_mat_identity, BRLCAD_ERROR);
if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD || intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) {
bu_vls_printf(gedp->ged_result_str, "%s: %s is not a BOT solid!\n", argv[0], obj);
@@ -79,7 +79,7 @@ ged_bot_flip_core(struct ged *gedp, int argc, const char *argv[])
bot = (struct rt_bot_internal *)intern.idb_ptr;
rt_bot_flip(bot);
GED_DB_PUT_INTERNAL(gedp, dp, &intern, NULL, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &intern, BRLCAD_ERROR);
}
}
bu_free(obj, "free obj");
src/libged/bot/bot_fuse.c
+2 -2
View File
@@ -218,7 +218,7 @@ ged_bot_fuse_core(struct ged *gedp, int argc, const char **argv)
bu_log("%s: start\n", argv[0]);
GED_DB_LOOKUP(gedp, old_dp, argv[i+1], LOOKUP_NOISY, BRLCAD_ERROR & GED_QUIET);
GED_DB_GET_INTERNAL(gedp, &intern, old_dp, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, old_dp, bn_mat_identity, BRLCAD_ERROR);
if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD || intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) {
bu_vls_printf(gedp->ged_result_str, "%s: %s is not a BOT solid!\n", argv[0], argv[i+1]);
@@ -314,7 +314,7 @@ ged_bot_fuse_core(struct ged *gedp, int argc, const char **argv)
intern2.idb_ptr = (void *)bot;
GED_DB_DIRADD(gedp, new_dp, argv[i], RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (void *)&intern2.idb_type, BRLCAD_ERROR);
GED_DB_PUT_INTERNAL(gedp, new_dp, &intern2, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, new_dp, &intern2, BRLCAD_ERROR);
bu_log("%s: Created new BOT (%s)\n", argv[0], argv[i]);
bu_log("%s: Done.\n", argv[0]);
src/libged/bot/bot_merge.c
+2 -2
View File
@@ -64,7 +64,7 @@ ged_bot_merge_core(struct ged *gedp, int argc, const char *argv[])
continue;
}
GED_DB_GET_INTERNAL(gedp, &intern, dp, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp, bn_mat_identity, BRLCAD_ERROR);
if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD || intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) {
bu_vls_printf(gedp->ged_result_str, "%s: %s is not a BOT solid! Skipping.\n", argv[0], argv[i]);
@@ -95,7 +95,7 @@ ged_bot_merge_core(struct ged *gedp, int argc, const char *argv[])
intern.idb_ptr = rt_bot_merge(idx, (const struct rt_bot_internal * const *)(bots));
GED_DB_DIRADD(gedp, new_dp, argv[1], RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (void *)&intern.idb_type, BRLCAD_ERROR);
GED_DB_PUT_INTERNAL(gedp, new_dp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, new_dp, &intern, BRLCAD_ERROR);
for (i = 0; i < idx; ++i) {
/* fill in an rt_db_internal so we can free it */
src/libged/bot/bot_smooth.c
+2 -2
View File
@@ -99,7 +99,7 @@ ged_bot_smooth_core(struct ged *gedp, int argc, const char *argv[])
dp_new = dp_old;
}
GED_DB_GET_INTERNAL(gedp, &intern, dp_old, NULL, NULL, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp_old, NULL, BRLCAD_ERROR);
if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD || intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) {
bu_vls_printf(gedp->ged_result_str, "%s is not a BOT primitive\n", old_bot_name);
@@ -120,7 +120,7 @@ ged_bot_smooth_core(struct ged *gedp, int argc, const char *argv[])
GED_DB_DIRADD(gedp, dp_new, new_bot_name, RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (void *)&intern.idb_type, BRLCAD_ERROR);
}
GED_DB_PUT_INTERNAL(gedp, dp_new, &intern, NULL, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp_new, &intern, BRLCAD_ERROR);
rt_db_free_internal(&intern);
return BRLCAD_OK;
src/libged/bot/bot_split.c
+1 -1
View File
@@ -77,7 +77,7 @@ ged_bot_split_core(struct ged *gedp, int argc, const char *argv[])
continue;
}
GED_DB_GET_INTERNAL(gedp, &intern, dp, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp, bn_mat_identity, BRLCAD_ERROR);
if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD || intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) {
rt_db_free_internal(&intern);
src/libged/bot/bot_sync.c
+2 -2
View File
@@ -71,7 +71,7 @@ ged_bot_sync_core(struct ged *gedp, int argc, const char *argv[])
bu_vls_printf(gedp->ged_result_str, "%s: db_lookup(%s) error\n", argv[0], obj);
} else {
GED_DB_GET_INTERNAL(gedp, &intern, dp, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp, bn_mat_identity, BRLCAD_ERROR);
if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD || intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) {
rt_db_free_internal(&intern);
@@ -81,7 +81,7 @@ ged_bot_sync_core(struct ged *gedp, int argc, const char *argv[])
bot = (struct rt_bot_internal *)intern.idb_ptr;
rt_bot_sync(bot);
GED_DB_PUT_INTERNAL(gedp, dp, &intern, NULL, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &intern, BRLCAD_ERROR);
}
}
bu_free(obj, "free obj");
src/libged/bot/bot_vertex_fuse.c
+2 -2
View File
@@ -63,7 +63,7 @@ ged_bot_vertex_fuse_core(struct ged *gedp, int argc, const char *argv[])
}
GED_DB_LOOKUP(gedp, old_dp, argv[2], LOOKUP_NOISY, BRLCAD_ERROR & GED_QUIET);
GED_DB_GET_INTERNAL(gedp, &intern, old_dp, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, old_dp, bn_mat_identity, BRLCAD_ERROR);
if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD || intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) {
bu_vls_printf(gedp->ged_result_str, "%s: %s is not a BOT solid!\n", argv[0], argv[2]);
@@ -77,7 +77,7 @@ ged_bot_vertex_fuse_core(struct ged *gedp, int argc, const char *argv[])
bu_vls_printf(gedp->ged_result_str, "Fused %d vertices\n", count);
GED_DB_DIRADD(gedp, new_dp, argv[1], RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (void *)&intern.idb_type, BRLCAD_ERROR);
GED_DB_PUT_INTERNAL(gedp, new_dp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, new_dp, &intern, BRLCAD_ERROR);
return BRLCAD_OK;
}
src/libged/bot/decimate.cpp
+1 -1
View File
@@ -255,7 +255,7 @@ _bot_cmd_decimate(void* bs, int argc, const char** argv)
}
struct rt_db_internal intern;
RT_DB_INTERNAL_INIT(&intern);
GED_DB_GET_INTERNAL(gedp, &intern, dp, NULL, NULL, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp, NULL, BRLCAD_ERROR);
struct rt_bot_internal *obot = (struct rt_bot_internal*)intern.idb_ptr;
// Decimate with GCT
src/libged/bot/edbot.c
+4 -4
View File
@@ -173,7 +173,7 @@ ged_bot_edge_split(struct ged *gedp, int argc, const char *argv[])
break;
}
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &intern, BRLCAD_ERROR);
rt_db_free_internal(&intern);
return BRLCAD_OK;
}
@@ -286,7 +286,7 @@ ged_bot_face_split(struct ged *gedp, int argc, const char *argv[])
bu_vls_printf(gedp->ged_result_str, "%zu", last_vi);
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &intern, BRLCAD_ERROR);
rt_db_free_internal(&intern);
return BRLCAD_OK;
}
@@ -458,7 +458,7 @@ ged_bot_move_pnt(struct ged *gedp, int argc, const char *argv[])
}
}
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &intern, BRLCAD_ERROR);
rt_db_free_internal(&intern);
return BRLCAD_OK;
@@ -562,7 +562,7 @@ ged_bot_move_pnts(struct ged *gedp, int argc, const char *argv[])
}
}
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &intern, BRLCAD_ERROR);
rt_db_free_internal(&intern);
return BRLCAD_OK;
src/libged/bot/remesh.cpp
+1 -1
View File
@@ -448,7 +448,7 @@ _bot_cmd_remesh(void *bs, int argc, const char **argv)
GED_DB_DIRADD(gedp, dp_output, bu_vls_cstr(&output_bot_name), RT_DIR_PHONY_ADDR, 0, RT_DIR_SOLID, (void *)&gb->intern->idb_type, BRLCAD_ERROR);
}
GED_DB_PUT_INTERNAL(gedp, dp_output, gb->intern, NULL, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp_output, gb->intern, BRLCAD_ERROR);
bu_vls_free(&output_bot_name);
src/libged/bot/repair.cpp
+1 -1
View File
@@ -172,7 +172,7 @@ _bot_cmd_repair(void *bs, int argc, const char **argv)
gb->solid_name = std::string(argv[i]);
BU_GET(gb->intern, struct rt_db_internal);
GED_DB_GET_INTERNAL(gb->gedp, gb->intern, gb->dp, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gb->gedp, gb->intern, gb->dp, bn_mat_identity, BRLCAD_ERROR);
RT_CK_DB_INTERNAL(gb->intern);
struct rt_bot_internal *bot = (struct rt_bot_internal *)(gb->intern->idb_ptr);
src/libged/brep/brep.cpp
+9 -9
View File
@@ -193,7 +193,7 @@ _brep_cmd_boolean(void *bs, int argc, const char **argv)
}
}
struct rt_db_internal intern2;
GED_DB_GET_INTERNAL(gedp, &intern2, dp2, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern2, dp2, bn_mat_identity, BRLCAD_ERROR);
RT_CK_DB_INTERNAL(&intern2);
db_op_t op = DB_OP_NULL;
@@ -344,7 +344,7 @@ _brep_cmd_bots(void *bs, int argc, const char **argv)
bu_vls_printf(gedp->ged_result_str, "Error: %s is not a solid or does not exist in database", obj_names[i]);
return BRLCAD_ERROR;
}
GED_DB_GET_INTERNAL(gedp, &intern, dp, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp, bn_mat_identity, BRLCAD_ERROR);
RT_CK_DB_INTERNAL(&intern);
bi = (struct rt_brep_internal*)intern.idb_ptr;
if (!RT_BREP_TEST_MAGIC(bi)) {
@@ -465,7 +465,7 @@ _brep_cmd_brep(void *bs, int argc, const char **argv)
// brep_conversion_comb frees the intern, so make a new copy specifically for it to avoid
// a double-free with the top level cleanup of gb->intern
struct rt_db_internal intern;
GED_DB_GET_INTERNAL(gedp, &intern, gb->dp, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, gb->dp, bn_mat_identity, BRLCAD_ERROR);
RT_CK_DB_INTERNAL(&intern);
struct rt_wdb *wdbp = wdb_dbopen(gedp->dbip, RT_WDB_TYPE_DB_DEFAULT);
@@ -574,15 +574,15 @@ _brep_cmd_dump(void *bs, int argc, const char **argv)
// Find all brep paths
struct bu_ptbl breps = BU_PTBL_INIT_ZERO;
const char *brep_search = "-type brep";
db_update_nref(gedp->dbip, &rt_uniresource);
db_update_nref(gedp->dbip);
(void)db_search(&breps, DB_SEARCH_TREE, brep_search, 1, &gb->dp, gedp->dbip, NULL, NULL, NULL);
for (size_t i = 0; i < BU_PTBL_LEN(&breps); i++) {
struct db_full_path *fp = (struct db_full_path *)BU_PTBL_GET(&breps, i);
mat_t m;
struct bu_color c;
MAT_IDN(m);
db_path_to_mat(gedp->dbip, fp, m, 0, &rt_uniresource);
db_full_path_color(&c, fp, gedp->dbip, &rt_uniresource);
db_path_to_mat(gedp->dbip, fp, m, 0);
db_full_path_color(&c, fp, gedp->dbip);
struct directory *dp = DB_FULL_PATH_CUR_DIR(fp);
struct rt_db_internal intern;
if (rt_db_get_internal(&intern, dp, gedp->dbip, m) < 0) {
@@ -758,7 +758,7 @@ _brep_cmd_intersect(void *bs, int argc, const char **argv)
}
}
struct rt_db_internal intern2;
GED_DB_GET_INTERNAL(gedp, &intern2, dp2, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern2, dp2, bn_mat_identity, BRLCAD_ERROR);
RT_CK_DB_INTERNAL(&intern2);
@@ -1086,7 +1086,7 @@ _brep_cmd_selection(void *bs, int argc, const char **argv)
return BRLCAD_ERROR;
}
}
GED_DB_PUT_INTERNAL(gedp, gb->dp, &gb->intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, gb->dp, &gb->intern, BRLCAD_ERROR);
}
return BRLCAD_OK;
}
@@ -1558,7 +1558,7 @@ ged_brep_core(struct ged *gedp, int argc, const char *argv[])
}
}
GED_DB_GET_INTERNAL(gedp, &gb.intern, gb.dp, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &gb.intern, gb.dp, bn_mat_identity, BRLCAD_ERROR);
RT_CK_DB_INTERNAL(&gb.intern);
gb.vbp = bv_vlblock_init(vlfree, 32);
src/libged/brep/tikz.cpp
+1 -1
View File
@@ -150,7 +150,7 @@ brep_tikz(struct _ged_brep_info *gb, const char *outfile)
ON_MinMaxInit(&(bbox.m_min), &(bbox.m_max));
struct bu_ptbl breps = BU_PTBL_INIT_ZERO;
const char *brep_search = "-type brep";
db_update_nref(gedp->dbip, &rt_uniresource);
db_update_nref(gedp->dbip);
(void)db_search(&breps, DB_SEARCH_TREE|DB_SEARCH_RETURN_UNIQ_DP, brep_search, 1, &gb->dp, gedp->dbip, NULL, NULL, NULL);
for(size_t i = 0; i < BU_PTBL_LEN(&breps); i++) {
struct rt_db_internal bintern;
src/libged/cc/cc.c
+1 -1
View File
@@ -73,7 +73,7 @@ ged_cc_core(struct ged *gedp, int argc, const char *argv[])
bu_vls_strcat(&(con_ip->expression), argv[2]);
GED_DB_DIRADD(gedp, dp, argv[1], RT_DIR_PHONY_ADDR, 0, RT_DIR_NON_GEOM , (void *)&internal.idb_type, BRLCAD_ERROR);
GED_DB_PUT_INTERNAL(gedp, dp, &internal, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &internal, BRLCAD_ERROR);
bu_vls_printf(gedp->ged_result_str, "Constraint saved");
return BRLCAD_OK;
src/libged/clone/clone.c
+6 -6
View File
@@ -712,7 +712,7 @@ copy_comb(struct db_i *dbip, struct directory *proto, void *clientData)
* recursively copy a tree of geometry
*/
static struct directory *
copy_tree(struct directory *dp, struct resource *resp, struct ged_clone_state *state)
copy_tree(struct directory *dp, struct ged_clone_state *state)
{
size_t i;
union record *rp = (union record *)NULL;
@@ -748,7 +748,7 @@ copy_tree(struct directory *dp, struct resource *resp, struct ged_clone_state *s
bu_vls_printf(state->gedp->ged_result_str, "WARNING: failed to locate \"%s\"\n", rp[i].M.m_instname);
continue;
}
copy = copy_tree(mdp, resp, state);
copy = copy_tree(mdp, state);
if (!copy) {
errors++;
bu_vls_printf(state->gedp->ged_result_str, "WARNING: unable to fully clone \"%s\"\n", rp[i].M.m_instname);
@@ -796,17 +796,17 @@ done_copy_tree:
* it's a combination/region.
*/
static struct directory *
deep_copy_object(struct resource *resp, struct ged_clone_state *state)
deep_copy_object(struct ged_clone_state *state)
{
struct directory *copy = (struct directory *)NULL;
int i, j;
if (!resp || !state || !state->n_copies) return RT_DIR_NULL;
if (!state || !state->n_copies) return RT_DIR_NULL;
init_list(&obj_list, state->n_copies);
/* do the actual copying */
copy = copy_tree(state->src, resp, state);
copy = copy_tree(state->src, state);
/* make sure it made what we hope/think it made */
if (!copy || !is_in_list(obj_list, state->src->d_namep))
@@ -1011,7 +1011,7 @@ ged_clone_core(struct ged *gedp, int argc, const char *argv[])
bu_vls_init(&state.olist);
if ((copy = deep_copy_object(&rt_uniresource, &state)) != (struct directory *)NULL)
if ((copy = deep_copy_object(&state)) != (struct directory *)NULL)
bu_vls_printf(gedp->ged_result_str, "%s", copy->d_namep);
bu_vls_printf(gedp->ged_result_str, " {%s}", bu_vls_addr(&state.olist));
src/libged/comb/comb.c
+4 -4
View File
@@ -101,7 +101,7 @@ comb_tree_clear(struct ged *gedp, struct directory *dp)
struct rt_db_internal intern;
struct rt_comb_internal *comb;
/* Clear the tree from the original object */
GED_DB_GET_INTERNAL(gedp, &intern, dp, (matp_t)NULL, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp, (matp_t)NULL, BRLCAD_ERROR);
RT_CK_DB_INTERNAL(&intern);
comb = (struct rt_comb_internal *)(&intern)->idb_ptr;
RT_CK_COMB(comb);
@@ -492,7 +492,7 @@ comb_decimate(struct ged *gedp, struct directory *dp)
fastf_t avg_thickness;
fastf_t fs;
struct directory *bot_dp = (struct directory *)BU_PTBL_GET(bot_dps, i);
GED_DB_GET_INTERNAL(gedp, &intern, bot_dp, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, bot_dp, bn_mat_identity, BRLCAD_ERROR);
bot = (struct rt_bot_internal *)intern.idb_ptr;
RT_BOT_CK_MAGIC(bot);
rt_obj_bounds(gedp->ged_result_str, gedp->dbip, 1, (const char **)&bot_dp->d_namep, 0, obj_min, obj_max);
@@ -660,7 +660,7 @@ ged_comb_core(struct ged *gedp, int argc, const char *argv[])
/* Update references once before we start all of this - db_search
* needs nref to be current to work correctly. */
db_update_nref(gedp->dbip, &rt_uniresource);
db_update_nref(gedp->dbip);
/* Do decimation, if that's enabled */
if (do_decimation) {
@@ -771,7 +771,7 @@ ged_comb_core(struct ged *gedp, int argc, const char *argv[])
}
/* Done changing stuff - update nref. */
db_update_nref(gedp->dbip, &rt_uniresource);
db_update_nref(gedp->dbip);
return BRLCAD_OK;
}
src/libged/comb_color/comb_color.c
+2 -2
View File
@@ -56,7 +56,7 @@ ged_comb_color_core(struct ged *gedp, int argc, const char *argv[])
GED_DB_LOOKUP(gedp, dp, argv[1], LOOKUP_NOISY, BRLCAD_ERROR);
GED_CHECK_COMB(gedp, dp, BRLCAD_ERROR);
GED_DB_GET_INTERNAL(gedp, &intern, dp, (fastf_t *)NULL, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp, (fastf_t *)NULL, BRLCAD_ERROR);
comb = (struct rt_comb_internal *)intern.idb_ptr;
RT_CK_COMB(comb);
@@ -71,7 +71,7 @@ ged_comb_color_core(struct ged *gedp, int argc, const char *argv[])
}
comb->rgb_valid = 1;
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &intern, BRLCAD_ERROR);
return BRLCAD_OK;
}
src/libged/comb_std/comb_std.c
+3 -3
View File
@@ -500,7 +500,7 @@ ged_comb_std_core(struct ged *gedp, int argc, const char *argv[])
return BRLCAD_ERROR;
}
GED_DB_GET_INTERNAL(gedp, &intern, dp, (fastf_t *)NULL, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp, (fastf_t *)NULL, BRLCAD_ERROR);
comb = (struct rt_comb_internal *)intern.idb_ptr;
RT_CK_COMB(comb);
@@ -517,7 +517,7 @@ ged_comb_std_core(struct ged *gedp, int argc, const char *argv[])
} else
comb->region_flag = 0;
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &intern, BRLCAD_ERROR);
return BRLCAD_OK;
}
@@ -649,7 +649,7 @@ ged_comb_std_core(struct ged *gedp, int argc, const char *argv[])
intern.idb_ptr = (void *)comb;
GED_DB_DIRADD(gedp, dp, comb_name, RT_DIR_PHONY_ADDR, 0, flags, (void *)&intern.idb_type, BRLCAD_ERROR);
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &intern, BRLCAD_ERROR);
}
return BRLCAD_OK;
src/libged/concat/concat.cpp
+2 -2
View File
@@ -331,7 +331,7 @@ copy_object(struct ged *gedp,
bu_vls_printf(gedp->ged_result_str, "an error occurred while deleting %s\n", owrite_backup.c_str());
return BRLCAD_ERROR;
}
db_update_nref(gedp->dbip, &rt_uniresource);
db_update_nref(gedp->dbip);
cc_data->overwritten++;
}
@@ -495,7 +495,7 @@ ged_concat_core(struct ged *gedp, int argc, const char *argv[])
db_sync(cc_data.target_dbip);
/* Update references. */
db_update_nref(gedp->dbip, &rt_uniresource);
db_update_nref(gedp->dbip);
return BRLCAD_OK;
}
src/libged/copyeval/copyeval.c
+1 -1
View File
@@ -95,7 +95,7 @@ ged_copyeval_core(struct ged *gedp, int argc, const char *argv[])
gtd.gtd_objpos = endpos - 1;
GED_DB_GET_INTERNAL(gedp, &internal, gtd.gtd_obj[endpos - 1], bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &internal, gtd.gtd_obj[endpos - 1], bn_mat_identity, BRLCAD_ERROR);
if (endpos > 1) {
/* Make sure that final component in path is a solid */
src/libged/copymat/copymat.c
-1
View File
@@ -86,7 +86,6 @@ ged_copymat_core(struct ged *gedp, int argc, const char *argv[])
ts = wdbp->wdb_initial_tree_state; /* struct copy */
ts.ts_dbip = gedp->dbip;
ts.ts_resp = &rt_uniresource;
MAT_IDN(ts.ts_mat);
db_full_path_init(&anp.an_path);
if (child == NULL
src/libged/dbi_state.cpp
+3 -4
View File
@@ -1299,7 +1299,7 @@ DbiState::get_bbox(point_t *bbmin, point_t *bbmax, matp_t curr_mat, unsigned lon
struct bn_tol tol = BN_TOL_INIT_TOL;
mat_t m;
MAT_IDN(m);
int bret = rt_bound_instance(&bmin, &bmax, dp, dbip, &ttol, &tol, &m, res);
int bret = rt_bound_instance(&bmin, &bmax, dp, dbip, &ttol, &tol, &m);
if (bret != -1) {
have_bbox = true;
@@ -1489,7 +1489,7 @@ DbiState::tops(bool show_cyclic)
std::vector<unsigned long long> ret;
// First, get the standard tops results
struct directory **all_paths = NULL;
db_update_nref(gedp->dbip, &rt_uniresource);
db_update_nref(gedp->dbip);
int tops_cnt = db_ls(gedp->dbip, DB_LS_TOPS, NULL, &all_paths);
if (all_paths) {
bu_sort(all_paths, tops_cnt, sizeof(struct directory *), alphanum_sort, NULL);
@@ -1539,7 +1539,7 @@ DbiState::update()
std::unordered_set<struct directory *>::iterator g_it;
if (need_update_nref) {
db_update_nref(dbip, res);
db_update_nref(dbip);
need_update_nref = false;
}
@@ -2317,7 +2317,6 @@ BViewState::scene_obj(
ud->dbip = dbis->gedp->dbip;
ud->tol = &wdbp->wdb_tol;
ud->ttol = &wdbp->wdb_ttol;
ud->res = &rt_uniresource; // TODO - at some point this may be from the app or view... local_res is temporary, don't use it here
ud->mesh_c = dbis->gedp->ged_lod;
sp->dp = dp;
sp->s_i_data = (void *)ud;
src/libged/draw.cpp
-5
View File
@@ -180,7 +180,6 @@ csg_wireframe_update(struct bv_scene_obj *vo, struct bview *v, int flag)
struct ged_full_detail_clbk_data {
struct db_i *dbip;
struct directory *dp;
struct resource *res;
struct rt_db_internal *intern;
};
@@ -358,7 +357,6 @@ bot_adaptive_plot(struct bv_scene_obj *s, struct bview *v)
BU_GET(cbd, ged_full_detail_clbk_data);
cbd->dbip = dbip;
cbd->dp = dp;
cbd->res = &rt_uniresource;
cbd->intern = NULL;
bv_mesh_lod_detail_setup_clbk(lod, &bot_mesh_info_clbk, (void *)cbd);
bv_mesh_lod_detail_clear_clbk(lod, &bot_mesh_info_clear_clbk);
@@ -509,7 +507,6 @@ brep_adaptive_plot(struct bv_scene_obj *s, struct bview *v)
BU_GET(cbd, ged_full_detail_clbk_data);
cbd->dbip = dbip;
cbd->dp = dp;
cbd->res = &rt_uniresource;
cbd->intern = NULL;
bv_mesh_lod_detail_setup_clbk(lod, &bot_mesh_info_clbk, (void *)cbd);
bv_mesh_lod_detail_clear_clbk(lod, &bot_mesh_info_clear_clbk);
@@ -571,7 +568,6 @@ wireframe_plot(struct bv_scene_obj *s, struct bview *v, struct rt_db_internal *i
ld->tol = d->tol;
ld->ttol = d->ttol;
ld->mesh_c = d->mesh_c;
ld->res = d->res;
vo->s_i_data= (void *)ld;
// We're adaptive - have to plot when the view changes. Set the
@@ -1033,7 +1029,6 @@ draw_gather_paths(struct db_full_path *path, mat_t *curr_mat, void *client_data)
ud->tol = dd->tol;
ud->ttol = dd->ttol;
ud->mesh_c = dd->mesh_c;
ud->res = &rt_uniresource; // TODO - at some point this may be from the app or view. dd->res is temporary, so we don't use it here
s->s_i_data = (void *)ud;
s->s_free_callback = &draw_free_data;
src/libged/draw/draw.c
-4
View File
@@ -250,7 +250,6 @@ append_solid_to_display_list(
RT_CK_DB_INTERNAL(ip);
BG_CK_TESS_TOL(tsp->ts_ttol);
BN_CK_TOL(tsp->ts_tol);
RT_CK_RESOURCE(tsp->ts_resp);
VSETALL(min, INFINITY);
VSETALL(max, -INFINITY);
@@ -563,7 +562,6 @@ get_path_and_state(
struct rt_wdb *wdbp = wdb_dbopen(gedp->dbip, RT_WDB_TYPE_DB_DEFAULT);
*tsp = wdbp->wdb_initial_tree_state;
tsp->ts_dbip = gedp->dbip;
tsp->ts_resp = &rt_uniresource;
return db_follow_path_for_state(tsp, pathp, path_name, LOOKUP_QUIET);
}
@@ -683,7 +681,6 @@ draw_nmg_region_start(struct db_tree_state *tsp, const struct db_full_path *path
}
RT_CK_DBI(tsp->ts_dbip);
RT_CK_RESOURCE(tsp->ts_resp);
BU_LIST_INIT(&vhead);
@@ -849,7 +846,6 @@ draw_nmg_region_end(struct db_tree_state *tsp, const struct db_full_path *pathp,
BG_CK_TESS_TOL(tsp->ts_ttol);
BN_CK_TOL(tsp->ts_tol);
NMG_CK_MODEL(*tsp->ts_m);
RT_CK_RESOURCE(tsp->ts_resp);
BU_LIST_INIT(&vhead);
src/libged/dsp/dsp.c
+2 -2
View File
@@ -67,7 +67,7 @@ ged_dsp_core(struct ged *gedp, int argc, const char *argv[])
/* get dsp */
primitive = argv[1];
GED_DB_LOOKUP(gedp, dsp_dp, primitive, LOOKUP_NOISY, BRLCAD_ERROR & GED_QUIET);
GED_DB_GET_INTERNAL(gedp, &intern, dsp_dp, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dsp_dp, bn_mat_identity, BRLCAD_ERROR);
if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD || intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_DSP) {
bu_vls_printf(gedp->ged_result_str, "%s: %s is not a DSP solid!", cmd, primitive);
@@ -107,7 +107,7 @@ ged_dsp_core(struct ged *gedp, int argc, const char *argv[])
return BRLCAD_ERROR;
}
GED_DB_LOOKUP(gedp, dsp_dp2, argv[3], LOOKUP_NOISY, BRLCAD_ERROR & GED_QUIET);
GED_DB_GET_INTERNAL(gedp, &intern2, dsp_dp2, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern2, dsp_dp2, bn_mat_identity, BRLCAD_ERROR);
if (intern2.idb_major_type != DB5_MAJORTYPE_BRLCAD || intern2.idb_minor_type != DB5_MINORTYPE_BRLCAD_DSP) {
bu_vls_printf(gedp->ged_result_str, "%s: %s is not a DSP solid!", cmd, argv[3]);
src/libged/edcomb/edcomb.c
+2 -2
View File
@@ -73,7 +73,7 @@ ged_edcomb_core(struct ged *gedp, int argc, const char *argv[])
return BRLCAD_ERROR;
}
GED_DB_GET_INTERNAL(gedp, &intern, dp, (fastf_t *)NULL, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp, (fastf_t *)NULL, BRLCAD_ERROR);
comb = (struct rt_comb_internal *)intern.idb_ptr;
RT_CK_COMB(comb);
@@ -86,7 +86,7 @@ ged_edcomb_core(struct ged *gedp, int argc, const char *argv[])
comb->aircode = air;
comb->los = los;
comb->GIFTmater = mat;
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &intern, BRLCAD_ERROR);
return BRLCAD_OK;
}
src/libged/edit/edarb.c
+8 -8
View File
@@ -94,7 +94,7 @@ edarb_extrude(void *data, int argc, const char *argv[])
}
GED_DB_LOOKUP(gedp, dp, (char *)argv[2], LOOKUP_QUIET, BRLCAD_ERROR);
GED_DB_GET_INTERNAL(gedp, &intern, dp, (matp_t)NULL, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp, (matp_t)NULL, BRLCAD_ERROR);
if (intern.idb_type != ID_ARB8) {
bu_vls_printf(gedp->ged_result_str, "%s %s: solid type must be ARB\n", argv[0], argv[1]);
@@ -126,7 +126,7 @@ edarb_extrude(void *data, int argc, const char *argv[])
return BRLCAD_ERROR;
}
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &intern, BRLCAD_ERROR);
rt_db_free_internal(&intern);
return BRLCAD_OK;
@@ -159,7 +159,7 @@ edarb_mirface(void *data, int argc, const char *argv[])
}
GED_DB_LOOKUP(gedp, dp, (char *)argv[2], LOOKUP_QUIET, BRLCAD_ERROR);
GED_DB_GET_INTERNAL(gedp, &intern, dp, (matp_t)NULL, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp, (matp_t)NULL, BRLCAD_ERROR);
if (intern.idb_type != ID_ARB8) {
bu_vls_printf(gedp->ged_result_str, "%s %s: solid type must be ARB\n", argv[0], argv[1]);
@@ -178,7 +178,7 @@ edarb_mirface(void *data, int argc, const char *argv[])
return BRLCAD_ERROR;
}
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &intern, BRLCAD_ERROR);
rt_db_free_internal(&intern);
return BRLCAD_OK;
@@ -222,7 +222,7 @@ edarb_edgedir(void *data, int argc, const char *argv[])
edge -= 1;
GED_DB_LOOKUP(gedp, dp, (char *)argv[2], LOOKUP_QUIET, BRLCAD_ERROR);
GED_DB_GET_INTERNAL(gedp, &intern, dp, (matp_t)NULL, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp, (matp_t)NULL, BRLCAD_ERROR);
if (intern.idb_type != ID_ARB8) {
bu_vls_printf(gedp->ged_result_str, "%s %s: solid type must be ARB\n", argv[0], argv[1]);
@@ -259,7 +259,7 @@ edarb_edgedir(void *data, int argc, const char *argv[])
ret = editarb(gedp, arb, type, edge, slope, 1);
if (ret == BRLCAD_OK) {
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &intern, BRLCAD_ERROR);
}
rt_db_free_internal(&intern);
@@ -306,7 +306,7 @@ edarb_permute(void *data, int argc, const char *argv[])
}
GED_DB_LOOKUP(gedp, dp, (char *)argv[2], LOOKUP_QUIET, BRLCAD_ERROR);
GED_DB_GET_INTERNAL(gedp, &intern, dp, (matp_t)NULL, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp, (matp_t)NULL, BRLCAD_ERROR);
if (intern.idb_type != ID_ARB8) {
bu_vls_printf(gedp->ged_result_str, "%s %s: solid type must be ARB\n", argv[0], argv[1]);
@@ -323,7 +323,7 @@ edarb_permute(void *data, int argc, const char *argv[])
return BRLCAD_ERROR;
}
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &intern, BRLCAD_ERROR);
rt_db_free_internal(&intern);
return BRLCAD_OK;
src/libged/edit/edit.c
+9 -9
View File
@@ -798,8 +798,8 @@ edit_arg_to_apparent_coord(struct ged *gedp, const struct edit_arg *const arg,
BU_ASSERT(d->d_flags & (RT_DIR_COMB | RT_DIR_REGION));
/* sum transformation matrices */
GED_DB_GET_INTERNAL(gedp, &intern, d, (fastf_t *)NULL,
&rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, d, (fastf_t *)NULL,
BRLCAD_ERROR);
comb_i = (struct rt_comb_internal *)intern.idb_ptr;
leaf = db_find_named_leaf(comb_i->tree, d_next->d_namep);
BU_ASSERT(leaf != TREE_NULL); /* path is validated */
@@ -832,8 +832,8 @@ edit_arg_to_apparent_coord(struct ged *gedp, const struct edit_arg *const arg,
return BRLCAD_ERROR;
}
GED_DB_GET_INTERNAL(gedp, &intern, d, (fastf_t *)NULL,
&rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, d, (fastf_t *)NULL,
BRLCAD_ERROR);
if (_ged_get_solid_keypoint(gedp, leaf_deltas, &intern, (const fastf_t *)gtd.gtd_xform) == BRLCAD_ERROR) {
bu_vls_printf(gedp->ged_result_str, "\nunable to get natural origin"
" of \"%s\"", d->d_namep);
@@ -1378,8 +1378,8 @@ edit_translate(struct ged *gedp, const vect_t *from,
union tree *leaf_to_modify;
d_to_modify = DB_FULL_PATH_GET(path, path->fp_len - (size_t)2);
GED_DB_GET_INTERNAL(gedp, &intern, d_to_modify, (fastf_t *)NULL,
&rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, d_to_modify, (fastf_t *)NULL,
BRLCAD_ERROR);
comb = (struct rt_comb_internal *)intern.idb_ptr;
leaf_to_modify = db_find_named_leaf(comb->tree, d_obj->d_namep);
@@ -1419,12 +1419,12 @@ edit_translate(struct ged *gedp, const vect_t *from,
bn_mat_mul(tmpMat, invXform, dmat);
bn_mat_mul(emat, tmpMat, gtd.gtd_xform);
GED_DB_GET_INTERNAL(gedp, &intern, d_to_modify, emat,
&rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, d_to_modify, emat,
BRLCAD_ERROR);
}
RT_CK_DB_INTERNAL(&intern);
GED_DB_PUT_INTERNAL(gedp, d_to_modify, &intern, &rt_uniresource,
GED_DB_PUT_INTERN(gedp, d_to_modify, &intern,
BRLCAD_ERROR);
rt_db_free_internal(&intern);
return BRLCAD_OK;
src/libged/edit/facedef.c
+2 -2
View File
@@ -191,7 +191,7 @@ edarb_facedef(void *data, int argc, const char *argv[])
}
GED_DB_LOOKUP(gedp, dp, (char *)argv[2], LOOKUP_QUIET, BRLCAD_ERROR);
GED_DB_GET_INTERNAL(gedp, &intern, dp, (matp_t)NULL, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp, (matp_t)NULL, BRLCAD_ERROR);
struct rt_wdb *wdbp = wdb_dbopen(gedp->dbip, RT_WDB_TYPE_DB_DEFAULT);
if (intern.idb_type != ID_ARB8) {
@@ -372,7 +372,7 @@ Enter form of new face definition: ");
return BRLCAD_ERROR;
}
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &intern, BRLCAD_ERROR);
rt_db_free_internal(&intern);
return BRLCAD_OK;
src/libged/edit/protate.c
+2 -2
View File
@@ -85,7 +85,7 @@ ged_protate_core(struct ged *gedp, int argc, const char *argv[])
return BRLCAD_ERROR;
}
GED_DB_GET_INTERNAL(gedp, &intern, dp, (matp_t)NULL, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp, (matp_t)NULL, BRLCAD_ERROR);
RT_CK_DB_INTERNAL(&intern);
if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD) {
@@ -118,7 +118,7 @@ ged_protate_core(struct ged *gedp, int argc, const char *argv[])
}
if (ret == BRLCAD_OK) {
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &intern, BRLCAD_ERROR);
} else if (ret & BRLCAD_ERROR) {
rt_db_free_internal(&intern);
}
src/libged/edit/pscale.c
+2 -2
View File
@@ -98,7 +98,7 @@ ged_pscale_core(struct ged *gedp, int argc, const char *argv[])
return BRLCAD_ERROR;
}
GED_DB_GET_INTERNAL(gedp, &intern, dp, (matp_t)NULL, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp, (matp_t)NULL, BRLCAD_ERROR);
RT_CK_DB_INTERNAL(&intern);
if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD) {
@@ -160,7 +160,7 @@ ged_pscale_core(struct ged *gedp, int argc, const char *argv[])
}
if (ret == BRLCAD_OK) {
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &intern, BRLCAD_ERROR);
} else if (ret & BRLCAD_ERROR) {
rt_db_free_internal(&intern);
}
src/libged/edit/ptranslate.c
+2 -2
View File
@@ -98,7 +98,7 @@ ged_ptranslate_core(struct ged *gedp, int argc, const char *argv[])
return BRLCAD_ERROR;
}
GED_DB_GET_INTERNAL(gedp, &intern, dp, (matp_t)NULL, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp, (matp_t)NULL, BRLCAD_ERROR);
RT_CK_DB_INTERNAL(&intern);
if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD) {
@@ -123,7 +123,7 @@ ged_ptranslate_core(struct ged *gedp, int argc, const char *argv[])
}
if (ret == BRLCAD_OK) {
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &intern, BRLCAD_ERROR);
} else if (ret & BRLCAD_ERROR) {
rt_db_free_internal(&intern);
}
src/libged/facetize/brep.cpp
+1 -1
View File
@@ -131,7 +131,7 @@ _nonovlp_brep_facetize(struct _ged_facetize_state *s, int argc, const char **arg
for (d_it = brep_objs.begin(); d_it != brep_objs.end(); ++d_it) {
struct rt_db_internal intern;
struct rt_brep_internal* bi;
GED_DB_GET_INTERNAL(wgedp, &intern, *d_it, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(wgedp, &intern, *d_it, bn_mat_identity, BRLCAD_ERROR);
RT_CK_DB_INTERNAL(&intern);
bi = (struct rt_brep_internal*)intern.idb_ptr;
if (!RT_BREP_TEST_MAGIC(bi)) {
src/libged/facetize/old_facetize.cpp
+8 -8
View File
@@ -452,7 +452,7 @@ _ged_facetize_solid_objs(struct ged *gedp, int argc, struct directory **dpa, str
struct rt_bot_internal *bot;
int not_solid;
struct directory *bot_dp = (struct directory *)BU_PTBL_GET(bot_dps, i);
GED_DB_GET_INTERNAL(gedp, &intern, bot_dp, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, bot_dp, bn_mat_identity, BRLCAD_ERROR);
bot = (struct rt_bot_internal *)intern.idb_ptr;
RT_BOT_CK_MAGIC(bot);
if (bot->mode != RT_BOT_PLATE && bot->mode != RT_BOT_PLATE_NOCOS) {
@@ -1073,7 +1073,7 @@ _ged_check_plate_mode(struct ged *gedp, struct directory *dp)
struct rt_db_internal intern;
struct rt_bot_internal *bot;
struct directory *bot_dp = (struct directory *)BU_PTBL_GET(bot_dps, i);
GED_DB_GET_INTERNAL(gedp, &intern, bot_dp, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, bot_dp, bn_mat_identity, BRLCAD_ERROR);
bot = (struct rt_bot_internal *)intern.idb_ptr;
RT_BOT_CK_MAGIC(bot);
if (bot->mode == RT_BOT_PLATE || bot->mode == RT_BOT_PLATE_NOCOS) {
@@ -1818,7 +1818,7 @@ _try_manifold_facetize(struct ged *gedp, int argc, const char **argv, struct bu_
}
if (facetize_tree) {
ftree = rt_booltree_evaluate(facetize_tree, vlfree, &wdbp->wdb_tol, &rt_uniresource, &_manifold_do_bool, 0, (void *)o);
ftree = rt_booltree_eval(facetize_tree, vlfree, &wdbp->wdb_tol, &_manifold_do_bool, 0, (void *)o);
if (!ftree) {
_old_ged_facetize_log_default(o);
return NULL;
@@ -2128,7 +2128,7 @@ _ged_facetize_cpcomb(struct ged *gedp, const char *o, struct _old_ged_facetize_o
comb->GIFTmater = ocomb->GIFTmater;
comb->los = ocomb->los;
comb->inherit = ocomb->inherit;
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, 0);
GED_DB_PUT_INTERN(gedp, dp, &intern, 0);
/* apply attributes to new comb */
db5_update_attributes(dp, &avs, dbip);
@@ -2564,7 +2564,7 @@ _ged_facetize_regions_resume(struct ged *gedp, int argc, const char **argv, stru
ged_facetize_regions_resume_memfree:
/* Done changing stuff - update nref. */
db_update_nref(gedp->dbip, &rt_uniresource);
db_update_nref(gedp->dbip);
if (bu_vls_strlen(opts->nmg_log) && opts->method_flags & FACETIZE_NMGBOOL && opts->verbosity > 1) {
bu_vls_printf(gedp->ged_result_str, "%s", bu_vls_addr(opts->nmg_log));
@@ -3008,7 +3008,7 @@ _ged_facetize_regions(struct ged *gedp, int argc, const char **argv, struct bu_l
ged_facetize_regions_memfree:
/* Done changing stuff - update nref. */
db_update_nref(gedp->dbip, &rt_uniresource);
db_update_nref(gedp->dbip);
if (bu_vls_strlen(opts->nmg_log) && opts->method_flags & FACETIZE_NMGBOOL && opts->verbosity > 1) {
bu_vls_printf(gedp->ged_result_str, "%s", bu_vls_addr(opts->nmg_log));
@@ -3215,7 +3215,7 @@ _nonovlp_brep_facetize(struct ged *gedp, int argc, const char **argv, struct _ol
for (d_it = brep_objs.begin(); d_it != brep_objs.end(); d_it++) {
struct rt_db_internal intern;
struct rt_brep_internal* bi;
GED_DB_GET_INTERNAL(gedp, &intern, *d_it, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, *d_it, bn_mat_identity, BRLCAD_ERROR);
RT_CK_DB_INTERNAL(&intern);
bi = (struct rt_brep_internal*)intern.idb_ptr;
if (!RT_BREP_TEST_MAGIC(bi)) {
@@ -3296,7 +3296,7 @@ _nonovlp_brep_facetize(struct ged *gedp, int argc, const char **argv, struct _ol
}
/* Done changing stuff - update nref. */
db_update_nref(gedp->dbip, &rt_uniresource);
db_update_nref(gedp->dbip);
for (size_t i = 0; i < ss_cdt.size(); i++) {
ON_Brep_CDT_Destroy(ss_cdt[i]);
src/libged/facetize/regions.cpp
+6 -6
View File
@@ -271,7 +271,7 @@ _ged_facetize_regions(struct _ged_facetize_state *s, int argc, const char **argv
char *obj_name = bu_strdup(idp->d_namep);
struct db_i *wdbip = db_open(bu_vls_cstr(s->wfile), DB_OPEN_READWRITE);
db_dirbuild(wdbip);
db_update_nref(wdbip, &rt_uniresource);
db_update_nref(wdbip);
nmg_wstate.dbip = wdbip;
int nret = _ged_facetize_nmgeval(s, 1, (const char **)&obj_name, obj_name);
if (nret != BRLCAD_OK) {
@@ -311,7 +311,7 @@ _ged_facetize_regions(struct _ged_facetize_state *s, int argc, const char **argv
struct db_i *wdbip = db_open(bu_vls_cstr(s->wfile), DB_OPEN_READWRITE);
wdbip->dbi_read_only = 1;
db_dirbuild(wdbip);
db_update_nref(wdbip, &rt_uniresource);
db_update_nref(wdbip);
struct directory *dcheck = db_lookup(wdbip, bu_vls_cstr(&bname), LOOKUP_QUIET);
if (dcheck != RT_DIR_NULL)
bu_vls_incr(&bname, NULL, NULL, &_db_uniq_test, (void *)wdbip);
@@ -346,7 +346,7 @@ _ged_facetize_regions(struct _ged_facetize_state *s, int argc, const char **argv
// Replace the region's comb tree with the new solid
wdbip = db_open(bu_vls_cstr(s->wfile), DB_OPEN_READWRITE);
db_dirbuild(wdbip);
db_update_nref(wdbip, &rt_uniresource);
db_update_nref(wdbip);
struct directory *wdp = db_lookup(wdbip, dpw[0]->d_namep, LOOKUP_QUIET);
struct rt_db_internal intern;
struct rt_comb_internal *comb;
@@ -367,7 +367,7 @@ _ged_facetize_regions(struct _ged_facetize_state *s, int argc, const char **argv
comb->tree = (union tree *)db_mkgift_tree(tree_list, 1);
struct rt_wdb *wwdbp = wdb_dbopen(wdbip, RT_WDB_TYPE_DB_DEFAULT);
wdb_put_internal(wwdbp, wdp->d_namep, &intern, 1.0);
db_update_nref(wdbip, &rt_uniresource);
db_update_nref(wdbip);
db_close(wdbip);
}
bu_vls_free(&bname);
@@ -442,7 +442,7 @@ _ged_facetize_regions(struct _ged_facetize_state *s, int argc, const char **argv
bu_vls_free(&suffix_str);
/* Done importing stuff - update nref. */
db_update_nref(dbip, &rt_uniresource);
db_update_nref(dbip);
/* Capture the new tops list. */
@@ -497,7 +497,7 @@ _ged_facetize_regions(struct _ged_facetize_state *s, int argc, const char **argv
mk_lcomb(cwdbp, oname, &wcomb, 0, NULL, NULL, NULL, 0);
/* Done importing stuff - update nref. */
db_update_nref(dbip, &rt_uniresource);
db_update_nref(dbip);
bu_ptbl_free(ar);
bu_free(ar, "ar table");
src/libged/facetize/tri.cpp
+3 -4
View File
@@ -165,7 +165,6 @@ _booltree_leaf_tess(struct db_tree_state *tsp, const struct db_full_path *pathp,
NMG_CK_MODEL(*tsp->ts_m);
BN_CK_TOL(tsp->ts_tol);
BG_CK_TESS_TOL(tsp->ts_ttol);
RT_CK_RESOURCE(tsp->ts_resp);
BU_GET(curtree, union tree);
RT_TREE_INIT(curtree);
@@ -923,7 +922,7 @@ _ged_facetize_leaves_tri(struct _ged_facetize_state *s, struct db_i *dbip, struc
struct db_i *cdbip = db_open(bu_vls_cstr(s->wfile), DB_OPEN_READWRITE);
if (cdbip) {
db_dirbuild(cdbip);
db_update_nref(cdbip, &rt_uniresource);
db_update_nref(cdbip);
for (size_t i = 0; i < failed_dps.size(); i++) {
struct directory *dp = db_lookup(cdbip, failed_dps[i].c_str(), LOOKUP_QUIET);
if (!dp)
@@ -1046,7 +1045,7 @@ _ged_facetize_booleval_tri(struct _ged_facetize_state *s, struct db_i *dbip, str
}
// Third stage is to execute the boolean operations
ftree = rt_booltree_evaluate(s->facetize_tree, vlfree, &wdbp->wdb_tol, &rt_uniresource, &manifold_do_bool, 0, (void *)s);
ftree = rt_booltree_eval(s->facetize_tree, vlfree, &wdbp->wdb_tol, &manifold_do_bool, 0, (void *)s);
if (!ftree) {
return BRLCAD_ERROR;
}
@@ -1172,7 +1171,7 @@ _ged_facetize_booleval(struct _ged_facetize_state *s, int argc, struct directory
if (db_dirbuild(wdbip) < 0)
return BRLCAD_ERROR;
db_update_nref(wdbip, &rt_uniresource);
db_update_nref(wdbip);
// Need wdbp in the next two stages for tolerances
wwdbp = wdb_dbopen(wdbip, RT_WDB_TYPE_DB_DEFAULT);
src/libged/facetize/util.cpp
+1 -1
View File
@@ -483,7 +483,7 @@ facetize_primitives_summary(struct _ged_facetize_state *s)
struct db_i *cdbip = db_open(bu_vls_cstr(s->wfile), DB_OPEN_READONLY);
if (cdbip) {
db_dirbuild(cdbip);
db_update_nref(cdbip, &rt_uniresource);
db_update_nref(cdbip);
method_scan(&method_sets, cdbip);
for (m_it = method_sets.begin(); m_it != method_sets.end(); ++m_it) {
if (m_it->first == std::string("REPAIR")) {
src/libged/garbage_collect/garbage_collect.cpp
+2 -2
View File
@@ -143,7 +143,7 @@ ged_garbage_collect_core(struct ged *gedp, int argc, const char *argv[])
bu_vls_sprintf(&fpath, "%s", gedp->dbip->dbi_filename);
/* For validation purposes, save the list of tops object names */
db_update_nref(gedp->dbip, &rt_uniresource);
db_update_nref(gedp->dbip);
path_cnt = db_ls(gedp->dbip, DB_LS_TOPS, NULL, &paths);
for (int i = 0; i < path_cnt; i++) {
old_top_objs.insert(std::string(paths[i]->d_namep));
@@ -244,7 +244,7 @@ ged_garbage_collect_core(struct ged *gedp, int argc, const char *argv[])
}
// See what we've got for tops objects in the new file
db_update_nref(gedp->dbip, &rt_uniresource);
db_update_nref(gedp->dbip);
path_cnt = db_ls(gedp->dbip, DB_LS_TOPS, NULL, &paths);
for (int i = 0; i < path_cnt; i++) {
new_top_objs.insert(std::string(paths[i]->d_namep));
src/libged/ged.cpp
+1 -1
View File
@@ -334,7 +334,7 @@ ged_open(const char *dbtype, const char *filename, int existing_only)
gedp = ged_create();
gedp->dbip = wdbp->dbip;
db_update_nref(gedp->dbip, &rt_uniresource);
db_update_nref(gedp->dbip);
gedp->ged_lod = NULL;
src/libged/ged_private.h
-1
View File
@@ -211,7 +211,6 @@ struct draw_data_t {
struct bu_color c;
int color_inherit;
int bool_op;
struct resource *res;
struct bv_mesh_lod_context *mesh_c;
/* To avoid the need for multiple subtree walking
src/libged/ged_track.c
+1 -1
View File
@@ -124,7 +124,7 @@ track_mk_freemembers(struct bu_list *headp)
* Add some nodes to a new or existing combination's tree,
* with GIFT precedence and semantics.
*
* NON-PARALLEL due to rt_uniresource
* NON-PARALLEL due to rt_uniresource (TODO - is this still true?)
*
* Returns -
* -1 ERROR
src/libged/ged_util.cpp
+4 -4
View File
@@ -2144,7 +2144,7 @@ _ged_combadd(struct ged *gedp,
return RT_DIR_NULL;
/* Done changing stuff - update nref. */
db_update_nref(gedp->dbip, &rt_uniresource);
db_update_nref(gedp->dbip);
return db_lookup(gedp->dbip, combname, LOOKUP_QUIET);
}
@@ -2230,7 +2230,7 @@ _ged_combadd2(struct ged *gedp,
}
/* combination exists, add a new member */
GED_DB_GET_INTERNAL(gedp, &intern, dp, (fastf_t *)NULL, &rt_uniresource, 0);
GED_DB_GET_INTERN(gedp, &intern, dp, (fastf_t *)NULL, 0);
comb = (struct rt_comb_internal *)intern.idb_ptr;
RT_CK_COMB(comb);
@@ -2307,12 +2307,12 @@ addmembers:
comb->tree = (union tree *)db_mkgift_tree(tree_list, node_count);
/* and finally, write it out */
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, 0);
GED_DB_PUT_INTERN(gedp, dp, &intern, 0);
bu_free((char *)tree_list, "combadd: tree_list");
/* Done changing stuff - update nref. */
db_update_nref(gedp->dbip, &rt_uniresource);
db_update_nref(gedp->dbip);
return BRLCAD_OK;
}
src/libged/get_obj_bounds.c
+1 -1
View File
@@ -134,7 +134,7 @@ _ged_get_obj_bounds2(struct ged *gedp,
return BRLCAD_ERROR;
dp = gtdp->gtd_obj[gtdp->gtd_objpos-1];
GED_DB_GET_INTERNAL(gedp, &intern, dp, gtdp->gtd_xform, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp, gtdp->gtd_xform, BRLCAD_ERROR);
/* Make a new rt_i instance from the existing db_i structure */
rtip = rt_new_rti(gedp->dbip);
src/libged/heal/heal.c
+1 -1
View File
@@ -66,7 +66,7 @@ ged_heal_core(struct ged *gedp, int argc, const char *argv[])
/* get bot */
GED_DB_LOOKUP(gedp, bot_dp, primitive, LOOKUP_NOISY, BRLCAD_ERROR & GED_QUIET);
GED_DB_GET_INTERNAL(gedp, &intern, bot_dp, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, bot_dp, bn_mat_identity, BRLCAD_ERROR);
if (intern.idb_major_type != DB5_MAJORTYPE_BRLCAD || intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) {
bu_vls_printf(gedp->ged_result_str, "%s: %s is not a BOT solid!", cmd, primitive);
src/libged/item/item.c
+2 -2
View File
@@ -85,7 +85,7 @@ ged_item_core(struct ged *gedp, int argc, const char *argv[])
los_set = 1;
}
GED_DB_GET_INTERNAL(gedp, &intern, dp, (fastf_t *)NULL, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, dp, (fastf_t *)NULL, BRLCAD_ERROR);
comb = (struct rt_comb_internal *)intern.idb_ptr;
RT_CK_COMB(comb);
@@ -100,7 +100,7 @@ ged_item_core(struct ged *gedp, int argc, const char *argv[])
comb->los = los;
}
GED_DB_PUT_INTERNAL(gedp, dp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, dp, &intern, BRLCAD_ERROR);
return status;
}
src/libged/joint/joint.c
+3 -4
View File
@@ -233,7 +233,6 @@ static struct db_tree_state mesh_initial_tree_state = {
NULL, /* ts_tol */
NULL, /* ts_m */
NULL, /* ts_rtip */
NULL /* ts_resp */
};
@@ -527,7 +526,7 @@ hold_point_location(struct ged *gedp, fastf_t *loc, struct hold_point *hp)
return 1;
case ID_GRIP:
if (hp->flag & HOLD_PT_GOOD) {
db_path_to_mat(gedp->dbip, &hp->path, mat, hp->path.fp_len-2, &rt_uniresource);
db_path_to_mat(gedp->dbip, &hp->path, mat, hp->path.fp_len-2);
MAT4X3PNT(loc, mat, hp->point);
return 1;
}
@@ -546,11 +545,11 @@ hold_point_location(struct ged *gedp, fastf_t *loc, struct hold_point *hp)
hp->flag |= HOLD_PT_GOOD;
rt_db_free_internal(&intern);
db_path_to_mat(gedp->dbip, &hp->path, mat, hp->path.fp_len-2, &rt_uniresource);
db_path_to_mat(gedp->dbip, &hp->path, mat, hp->path.fp_len-2);
MAT4X3PNT(loc, mat, hp->point);
return 1;
case ID_JOINT:
db_path_to_mat(gedp->dbip, &hp->path, mat, hp->path.fp_len-3, &rt_uniresource);
db_path_to_mat(gedp->dbip, &hp->path, mat, hp->path.fp_len-3);
if (hp->flag & HOLD_PT_GOOD) {
MAT4X3VEC(loc, mat, hp->point);
return 1;
src/libged/joint2/joint2.c
+2 -2
View File
@@ -212,7 +212,7 @@ ged_joint2_core(struct ged *gedp, int argc, const char *argv[])
return BRLCAD_ERROR;
}
GED_DB_GET_INTERNAL(gedp, &intern, ndp, bn_mat_identity, &rt_uniresource, BRLCAD_ERROR);
GED_DB_GET_INTERN(gedp, &intern, ndp, bn_mat_identity, BRLCAD_ERROR);
RT_CK_DB_INTERNAL(&intern);
@@ -229,7 +229,7 @@ ged_joint2_core(struct ged *gedp, int argc, const char *argv[])
if (BU_STR_EQUAL(argv[2], "selection")) {
int ret = joint_selection(gedp, &intern, argc, argv);
if (BU_STR_EQUAL(argv[3], "translate") && ret == 0) {
GED_DB_PUT_INTERNAL(gedp, ndp, &intern, &rt_uniresource, BRLCAD_ERROR);
GED_DB_PUT_INTERN(gedp, ndp, &intern, BRLCAD_ERROR);
}
rt_db_free_internal(&intern);
return ret;
src/libged/kill/kill.c
+1 -1
View File
@@ -121,7 +121,7 @@ ged_kill_core(struct ged *gedp, int argc, const char *argv[])
}
/* Update references. */
db_update_nref(gedp->dbip, &rt_uniresource);
db_update_nref(gedp->dbip);
return BRLCAD_OK;
}
src/libged/killrefs/killrefs.c
+1 -1
View File
@@ -113,7 +113,7 @@ ged_killrefs_core(struct ged *gedp, int argc, const char *argv[])
} FOR_ALL_DIRECTORY_END;
/* Update references. */
db_update_nref(gedp->dbip, &rt_uniresource);
db_update_nref(gedp->dbip);
return ret;
}
src/libged/killtree/killtree.c
+2 -2
View File
@@ -204,7 +204,7 @@ ged_killtree_core(struct ged *gedp, int argc, const char *argv[])
/* Update references once before we start all of this - db_search
* needs nref to be current to work correctly. */
db_update_nref(gedp->dbip, &rt_uniresource);
db_update_nref(gedp->dbip);
/* Objects that would be killed are in the first sublist */
if (gktd.print)
@@ -251,7 +251,7 @@ ged_killtree_core(struct ged *gedp, int argc, const char *argv[])
gktd.av = NULL;
/* Done removing stuff - update references. */
db_update_nref(gedp->dbip, &rt_uniresource);
db_update_nref(gedp->dbip);
return BRLCAD_OK;
}
Loaded 100 of 182 files, more files were not shown because too many files have changed in this diff. Show more