Revision: 76115
http://sourceforge.net/p/brlcad/code/76115
Author: starseeker
Date: 2020-06-11 18:06:57 +0000 (Thu, 11 Jun 2020)
Log Message:
-----------
Comment the assignment that will let us access the global state when processing
application functions.
Modified Paths:
--------------
brlcad/branches/bioh/src/burst2/grid.cpp
Modified: brlcad/branches/bioh/src/burst2/grid.cpp
===================================================================
--- brlcad/branches/bioh/src/burst2/grid.cpp 2020-06-11 18:02:39 UTC (rev
76114)
+++ brlcad/branches/bioh/src/burst2/grid.cpp 2020-06-11 18:06:57 UTC (rev
76115)
@@ -1786,7 +1786,6 @@
ag.a_overlap = s->reportoverlaps ? f_Overlap : f_HushOverlap;
ag.a_logoverlap = rt_silent_logoverlap;
ag.a_rt_i = s->rtip;
- ag.a_uptr = (void *)s;
if (! TSTBIT(s->firemode, FM_BURST)) {
/* set up for shotlines */
ag.a_hit = f_ShotHit;
@@ -1793,10 +1792,17 @@
ag.a_miss = f_ShotMiss;
}
- plotInit(s); /* initialize plot file if appropriate */
+ /* NOTE: this is an important assignment. Because we are now minimizing
+ * globals, the various functions using the application pointer need
+ * another way to access information. We use the user pointer to carry
+ * along the burst_state container pointer, and unpack it as needed. */
+ ag.a_uptr = (void *)s;
+ /* initialize plot file if appropriate */
+ plotInit(s);
+
+ /* initialize frame buffer if appropriate */
if (! imageInit(s)) {
- /* initialize frame buffer if appropriate */
bu_log("Error: problem opening frame buffer.");
return;
}
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
