Revision: 76025
http://sourceforge.net/p/brlcad/code/76025
Author: starseeker
Date: 2020-06-04 17:50:20 +0000 (Thu, 04 Jun 2020)
Log Message:
-----------
dm-X and dm-tk are referencing vectorThreshold - put the variable back into
libdm
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c
brlcad/branches/dm-fb-merge/src/libdm/dm-generic.c
brlcad/branches/dm-fb-merge/src/libdm/include/private.h
brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c
brlcad/branches/dm-fb-merge/src/libtclcad/dm_tcl.c
Modified: brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c 2020-06-04 16:58:41 UTC
(rev 76024)
+++ brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c 2020-06-04 17:50:20 UTC
(rev 76025)
@@ -856,7 +856,7 @@
HIDDEN int
X_drawVList(struct dm *dmp, struct bn_vlist *vp)
{
- extern int vectorThreshold; /* defined in libdm/tcl.c */
+ extern int vectorThreshold; /* defined in libdm/dm-generic.c */
static vect_t spnt, lpnt, pnt;
struct bn_vlist *tvp;
Modified: brlcad/branches/dm-fb-merge/src/libdm/dm-generic.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/dm-generic.c 2020-06-04 16:58:41 UTC
(rev 76024)
+++ brlcad/branches/dm-fb-merge/src/libdm/dm-generic.c 2020-06-04 17:50:20 UTC
(rev 76025)
@@ -33,6 +33,13 @@
#include "./include/private.h"
#include "./null/dm-Null.h"
+/*
+ * TODO - figure out if anything in Tcl land is actually using the libtclcad
+ * DM_Init LinkVar linkage to manipulate this, or if any user features are
+ * actually depending on the vectorThreshold - this needs to go.
+ */
+int vectorThreshold = 100000;
+
void *
dm_interp(struct dm *dmp)
{
Modified: brlcad/branches/dm-fb-merge/src/libdm/include/private.h
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/include/private.h 2020-06-04
16:58:41 UTC (rev 76024)
+++ brlcad/branches/dm-fb-merge/src/libdm/include/private.h 2020-06-04
17:50:20 UTC (rev 76025)
@@ -228,6 +228,9 @@
DM_EXPORT extern int fb_sim_writerect(struct fb *ifp, int xmin, int ymin, int
_width, int _height, const unsigned char *pp);
DM_EXPORT extern int fb_sim_bwwriterect(struct fb *ifp, int xmin, int ymin,
int _width, int _height, const unsigned char *pp);
+/* Global, defined in dm-generic.c */
+DM_EXPORT extern int vectorThreshold;
+
__END_DECLS
/************************************************/
Modified: brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c 2020-06-04 16:58:41 UTC
(rev 76024)
+++ brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c 2020-06-04 17:50:20 UTC
(rev 76025)
@@ -67,7 +67,7 @@
static fastf_t min_short = (fastf_t)SHRT_MIN;
static fastf_t max_short = (fastf_t)SHRT_MAX;
-extern int vectorThreshold; /* defined in libdm/tcl.c */
+extern int vectorThreshold; /* defined in libdm/dm-generic.c */
static int tk_close(struct dm *dmp);
static int tk_configureWin_guts(struct dm *dmp, int force);
Modified: brlcad/branches/dm-fb-merge/src/libtclcad/dm_tcl.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libtclcad/dm_tcl.c 2020-06-04 16:58:41 UTC
(rev 76024)
+++ brlcad/branches/dm-fb-merge/src/libtclcad/dm_tcl.c 2020-06-04 17:50:20 UTC
(rev 76025)
@@ -55,10 +55,6 @@
/* from lib./fb_obj.c */
extern int Fbo_Init(Tcl_Interp *interp);
-/* TODO: this doesn't belong in here, move to a globals.c or eliminate */
-int vectorThreshold = 100000;
-
-
HIDDEN int
dm_validXType_tcl(void *clientData, int argc, const char **argv)
{
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
