Revision: 76648
http://sourceforge.net/p/brlcad/code/76648
Author: starseeker
Date: 2020-08-02 20:58:40 +0000 (Sun, 02 Aug 2020)
Log Message:
-----------
Remove rtg_headwdb from RTG in librt
Modified Paths:
--------------
brlcad/branches/bioh/include/rt/global.h
brlcad/branches/bioh/src/conv/asc/asc2g.c
brlcad/branches/bioh/src/libtclcad/rt.c
brlcad/branches/bioh/src/mged/mged.c
brlcad/branches/bioh/src/mged/wdb_obj.c
Modified: brlcad/branches/bioh/include/rt/global.h
===================================================================
--- brlcad/branches/bioh/include/rt/global.h 2020-08-02 20:35:48 UTC (rev
76647)
+++ brlcad/branches/bioh/include/rt/global.h 2020-08-02 20:58:40 UTC (rev
76648)
@@ -38,9 +38,8 @@
*/
struct rt_g {
struct bu_list rtg_vlfree; /**< @brief head of bn_vlist freelist
*/
- struct rt_wdb rtg_headwdb; /**< @brief head of database object
list */
};
-#define RT_G_INIT_ZERO { BU_LIST_INIT_ZERO, RT_WDB_INIT_ZERO }
+#define RT_G_INIT_ZERO { BU_LIST_INIT_ZERO }
/**
* global ray-trace geometry state
Modified: brlcad/branches/bioh/src/conv/asc/asc2g.c
===================================================================
--- brlcad/branches/bioh/src/conv/asc/asc2g.c 2020-08-02 20:35:48 UTC (rev
76647)
+++ brlcad/branches/bioh/src/conv/asc/asc2g.c 2020-08-02 20:58:40 UTC (rev
76648)
@@ -1577,7 +1577,6 @@
rewind(ifp);
bu_vls_trunc(&line, 0);
- BU_LIST_INIT(&RTG.rtg_headwdb.l);
interp = Tcl_CreateInterp();
tclcad_init(interp, 0, NULL);
Modified: brlcad/branches/bioh/src/libtclcad/rt.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/rt.c 2020-08-02 20:35:48 UTC (rev
76647)
+++ brlcad/branches/bioh/src/libtclcad/rt.c 2020-08-02 20:58:40 UTC (rev
76648)
@@ -714,7 +714,6 @@
if (!BU_LIST_IS_INITIALIZED(&RTG.rtg_vlfree)) {
/* initialize RT's global state */
BU_LIST_INIT(&RTG.rtg_vlfree);
- BU_LIST_INIT(&RTG.rtg_headwdb.l);
if (rt_uniresource.re_magic != RESOURCE_MAGIC) {
rt_init_resource(&rt_uniresource, 0, NULL);
}
Modified: brlcad/branches/bioh/src/mged/mged.c
===================================================================
--- brlcad/branches/bioh/src/mged/mged.c 2020-08-02 20:35:48 UTC (rev
76647)
+++ brlcad/branches/bioh/src/mged/mged.c 2020-08-02 20:58:40 UTC (rev
76648)
@@ -88,6 +88,11 @@
#define SPACES "
"
+/* MGED is the only user of rtg_headwdb, and it's sole purpose appears to be to
+ * keep a list of open database objects so wdb_open_tcl may report the list.
+ * Relocated from a LIBRT library global to an MGED application global. */
+struct rt_wdb rtg_headwdb = RT_WDB_INIT_ZERO;
+
extern void draw_e_axes(void);
extern void draw_m_axes(void);
extern void draw_v_axes(void);
@@ -1054,6 +1059,8 @@
bu_setprogname(argv[0]);
+ BU_LIST_INIT(&rtg_headwdb.l);
+
/* Do not run any commands before here.
* Do not use bu_log() or bu_malloc() before here.
*/
@@ -1250,7 +1257,6 @@
/* Set up linked lists */
BU_LIST_INIT(&RTG.rtg_vlfree);
- BU_LIST_INIT(&RTG.rtg_headwdb.l);
memset((void *)&head_cmd_list, 0, sizeof(struct cmd_list));
BU_LIST_INIT(&head_cmd_list.l);
@@ -2811,7 +2817,7 @@
WDBP->wdb_interp = interpreter;
/* append to list of rt_wdb's */
- BU_LIST_APPEND(&RTG.rtg_headwdb.l, &WDBP->l);
+ BU_LIST_APPEND(&rtg_headwdb.l, &WDBP->l);
/* This creates a "db" command object */
Modified: brlcad/branches/bioh/src/mged/wdb_obj.c
===================================================================
--- brlcad/branches/bioh/src/mged/wdb_obj.c 2020-08-02 20:35:48 UTC (rev
76647)
+++ brlcad/branches/bioh/src/mged/wdb_obj.c 2020-08-02 20:58:40 UTC (rev
76648)
@@ -55,6 +55,8 @@
#include "raytrace.h"
#include "tclcad.h"
+extern struct rt_wdb rtg_headwdb;
+
#define WDB_TCL_READ_ERR { \
Tcl_AppendResult((Tcl_Interp *)wdbp->wdb_interp, "Database read error,
aborting.\n", (char *)NULL); \
}
@@ -10440,7 +10442,7 @@
wdbp->wdb_interp = (void *)interp;
/* append to list of rt_wdb's */
- BU_LIST_APPEND(&RTG.rtg_headwdb.l, &wdbp->l);
+ BU_LIST_APPEND(&rtg_headwdb.l, &wdbp->l);
return TCL_OK;
}
@@ -10478,9 +10480,8 @@
if (argc == 1) {
/* get list of database objects */
- for (BU_LIST_FOR (wdbp, rt_wdb, &RTG.rtg_headwdb.l))
+ for (BU_LIST_FOR (wdbp, rt_wdb, &rtg_headwdb.l))
Tcl_AppendResult(interp, bu_vls_addr(&wdbp->wdb_name), " ", (char
*)NULL);
-
return TCL_OK;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
