Revision: 76654
http://sourceforge.net/p/brlcad/code/76654
Author: starseeker
Date: 2020-08-03 18:16:00 +0000 (Mon, 03 Aug 2020)
Log Message:
-----------
Merge changes from trunk through r76653
Modified Paths:
--------------
brlcad/branches/bioh/src/libtclcad/tclcad_obj.c
brlcad/branches/bioh/src/mged/mged.c
Property Changed:
----------------
brlcad/branches/bioh/
brlcad/branches/bioh/NEWS
brlcad/branches/bioh/doc/
brlcad/branches/bioh/include/
brlcad/branches/bioh/regress/
brlcad/branches/bioh/regress/solids/solids.dsp.dat
brlcad/branches/bioh/src/libged/polyclip.cpp
Index: brlcad/branches/bioh
===================================================================
--- brlcad/branches/bioh 2020-08-03 17:56:27 UTC (rev 76653)
+++ brlcad/branches/bioh 2020-08-03 18:16:00 UTC (rev 76654)
Property changes on: brlcad/branches/bioh
___________________________________________________________________
Modified: svn:mergeinfo
## -9,4 +9,4 ##
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
/brlcad/branches/tcltk86:68300-75257
-/brlcad/trunk:75720-76157,76160-76365,76386-76640
\ No newline at end of property
+/brlcad/trunk:75720-76157,76160-76365,76386-76653
\ No newline at end of property
Index: brlcad/branches/bioh/NEWS
===================================================================
--- brlcad/branches/bioh/NEWS 2020-08-03 17:56:27 UTC (rev 76653)
+++ brlcad/branches/bioh/NEWS 2020-08-03 18:16:00 UTC (rev 76654)
Property changes on: brlcad/branches/bioh/NEWS
___________________________________________________________________
Modified: svn:mergeinfo
## -8,4 +8,4 ##
/brlcad/branches/osg/NEWS:62110-62113
/brlcad/branches/prep-cache/NEWS:68236-68933
/brlcad/branches/tcltk86/NEWS:68300-75257
-/brlcad/trunk/NEWS:75728-75834,75934-76085,76134-76146,76148-76154,76160-76351,76386-76505,76569-76640
\ No newline at end of property
+/brlcad/trunk/NEWS:75728-75834,75934-76085,76134-76146,76148-76154,76160-76351,76386-76505,76569-76653
\ No newline at end of property
Index: brlcad/branches/bioh/doc
===================================================================
--- brlcad/branches/bioh/doc 2020-08-03 17:56:27 UTC (rev 76653)
+++ brlcad/branches/bioh/doc 2020-08-03 18:16:00 UTC (rev 76654)
Property changes on: brlcad/branches/bioh/doc
___________________________________________________________________
Modified: svn:mergeinfo
## -8,4 +8,4 ##
/brlcad/branches/osg/doc:62110-62113
/brlcad/branches/prep-cache/doc:68236-68933
/brlcad/branches/tcltk86/doc:68300-75257
-/brlcad/trunk/doc:75728-75834,75934-76134,76148-76154,76160-76351,76386-76505
\ No newline at end of property
+/brlcad/trunk/doc:75728-75834,75934-76134,76148-76154,76160-76351,76386-76505,76641-76653
\ No newline at end of property
Index: brlcad/branches/bioh/include
===================================================================
--- brlcad/branches/bioh/include 2020-08-03 17:56:27 UTC (rev 76653)
+++ brlcad/branches/bioh/include 2020-08-03 18:16:00 UTC (rev 76654)
Property changes on: brlcad/branches/bioh/include
___________________________________________________________________
Modified: svn:mergeinfo
## -9,4 +9,4 ##
/brlcad/branches/osg/include:62110-62113
/brlcad/branches/prep-cache/include:68236-68933
/brlcad/branches/tcltk86/include:68300-75257
-/brlcad/trunk/include:75728-75834,75891-75926,75986-76146,76148-76154,76160-76351,76386-76505
\ No newline at end of property
+/brlcad/trunk/include:75728-75834,75891-75926,75986-76146,76148-76154,76160-76351,76386-76505,76641-76653
\ No newline at end of property
Index: brlcad/branches/bioh/regress
===================================================================
--- brlcad/branches/bioh/regress 2020-08-03 17:56:27 UTC (rev 76653)
+++ brlcad/branches/bioh/regress 2020-08-03 18:16:00 UTC (rev 76654)
Property changes on: brlcad/branches/bioh/regress
___________________________________________________________________
Modified: svn:mergeinfo
## -9,4 +9,4 ##
/brlcad/branches/osg/regress:62110-62113
/brlcad/branches/prep-cache/regress:68236-68933
/brlcad/branches/tcltk86/regress:68300-75257
-/brlcad/trunk/regress:75728-75871,75891-75926,75934-76134,76148-76157,76160-76351,76386-76505,76569-76640
\ No newline at end of property
+/brlcad/trunk/regress:75728-75871,75891-75926,75934-76134,76148-76157,76160-76351,76386-76505,76569-76653
\ No newline at end of property
Index: brlcad/branches/bioh/regress/solids/solids.dsp.dat
===================================================================
--- brlcad/branches/bioh/regress/solids/solids.dsp.dat 2020-08-03 17:56:27 UTC
(rev 76653)
+++ brlcad/branches/bioh/regress/solids/solids.dsp.dat 2020-08-03 18:16:00 UTC
(rev 76654)
Property changes on: brlcad/branches/bioh/regress/solids/solids.dsp.dat
___________________________________________________________________
Modified: svn:mime-type
## -1 +1 ##
-application/x-ns-proxy-autoconfig
\ No newline at end of property
+application/octet-stream
\ No newline at end of property
Index: brlcad/branches/bioh/src/libged/polyclip.cpp
===================================================================
--- brlcad/branches/bioh/src/libged/polyclip.cpp 2020-08-03 17:56:27 UTC
(rev 76653)
+++ brlcad/branches/bioh/src/libged/polyclip.cpp 2020-08-03 18:16:00 UTC
(rev 76654)
Property changes on: brlcad/branches/bioh/src/libged/polyclip.cpp
___________________________________________________________________
Modified: svn:mergeinfo
## -1,7 +1,7 ##
/brlcad/branches/RELEASE/src/libged/polyclip/polyclip.cpp:57439,57447-57860,69901-69913,70323-70333,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140,75372-75685
/brlcad/branches/RELEASE/src/libged/polyclip.cpp:57439,57447-57860,69901-69913,70323-70333,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140,75372-75685,76001-76451
-/brlcad/branches/bioh/src/libged/polyclip/polyclip.cpp:75720-75736,75740-75742,75860-75891,75894-75986,76088-76153,76360-76365
-/brlcad/branches/bioh/src/libged/polyclip.cpp:75720-75736,75740-75742,75860-75891,75894-75986,76088-76153,76355-76365,76368-76376
+/brlcad/branches/bioh/src/libged/polyclip/polyclip.cpp:75720-75736,75740-75742,75860-75891,75894-75986,76088-76153
+/brlcad/branches/bioh/src/libged/polyclip.cpp:76360-76365,76368-76376
/brlcad/branches/brep-debug/src/libged/polyclip/polyclip.cpp:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69168,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100
/brlcad/branches/brep-debug/src/libged/polyclip.cpp:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69168,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100
/brlcad/branches/bullet/src/libged/polyclip/polyclip.cpp:62518
## -12,7 +12,7 ##
/brlcad/branches/dm-fb-merge/src/libged/polyclip.cpp:75426-76198
/brlcad/branches/gct/src/libged/polyclip/polyclip.cpp:62423-62425
/brlcad/branches/gct/src/libged/polyclip.cpp:62423-62425
-/brlcad/branches/gedplugins/src/libged/polyclip.cpp:76384-76465
+/brlcad/branches/gedplugins/src/libged/polyclip.cpp:76384-76387
/brlcad/branches/opencl/src/libged/polyclip/polyclip.cpp:65867-66137
/brlcad/branches/opencl/src/libged/polyclip.cpp:65867-66137
/brlcad/branches/osg/src/libged/polyclip/polyclip.cpp:62110-62113
## -21,4 +21,4 ##
/brlcad/branches/prep-cache/src/libged/polyclip.cpp:68236-68933
/brlcad/branches/tcltk86/src/libged/polyclip/polyclip.cpp:68300-75257
/brlcad/branches/tcltk86/src/libged/polyclip.cpp:68300-75257
-/brlcad/trunk/src/libged/polyclip.cpp:75720-76157,76160-76365,76466-76505
\ No newline at end of property
+/brlcad/trunk/src/libged/polyclip.cpp:75720-76157,76160-76365,76466-76505,76641-76653
\ No newline at end of property
Modified: brlcad/branches/bioh/src/libtclcad/tclcad_obj.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/tclcad_obj.c 2020-08-03 17:56:27 UTC
(rev 76653)
+++ brlcad/branches/bioh/src/libtclcad/tclcad_obj.c 2020-08-03 18:16:00 UTC
(rev 76654)
@@ -51,6 +51,7 @@
#include "bn.h"
#include "bu/cmd.h"
#include "bu/path.h"
+#include "bu/process.h"
#include "bu/units.h"
#include "vmath.h"
#include "rt/db4.h"
@@ -1205,7 +1206,7 @@
#else
void
-tclcad_create_io_handler(struct ged_subprocess *p, int fd,
ged_io_handler_callback_t callback, void *data)
+tclcad_create_io_handler(struct ged_subprocess *p, int fd, ged_io_func_t
callback, void *data)
{
if (!p || !p->p || !p->gedp || !p->gedp->ged_io_data)
return;
@@ -1212,8 +1213,8 @@
struct tclcad_io_data *t_iod = (struct tclcad_io_data
*)p->gedp->ged_io_data;
HANDLE *fdp = (HANDLE *)bu_process_fd(p->p, fd);
if (fdp) {
- (*t_iod->chan) = (void *)Tcl_MakeFileChannel(*fdp, t_iod->io_mode);
- Tcl_CreateChannelHandler(*t_iod->chan, t_iod->io_mode, callback,
(ClientData)data);
+ t_iod->chan = Tcl_MakeFileChannel(*fdp, t_iod->io_mode);
+ Tcl_CreateChannelHandler(t_iod->chan, t_iod->io_mode, callback,
(ClientData)data);
}
}
@@ -1220,11 +1221,11 @@
void
tclcad_delete_io_handler(struct ged_subprocess *p, int fd)
{
- if (!p || !p->p || !p->p->gedp || !p->p->gedp->ged_io_data)
+ if (!p || !p->p || !p->gedp || !p->gedp->ged_io_data)
return;
struct tclcad_io_data *t_iod = (struct tclcad_io_data
*)p->gedp->ged_io_data;
- Tcl_DeleteChannelHandler(t_oid->chan, NULL, (ClientData)NULL);
- Tcl_Close(t_oid->interp, t_oid->chan);
+ Tcl_DeleteChannelHandler(t_iod->chan, NULL, (ClientData)NULL);
+ Tcl_Close(t_iod->interp, t_iod->chan);
}
#endif
Modified: brlcad/branches/bioh/src/mged/mged.c
===================================================================
--- brlcad/branches/bioh/src/mged/mged.c 2020-08-03 17:56:27 UTC (rev
76653)
+++ brlcad/branches/bioh/src/mged/mged.c 2020-08-03 18:16:00 UTC (rev
76654)
@@ -2936,6 +2936,23 @@
ged_close(GEDP);
BU_PUT(GEDP, struct ged);
+ // initialize a new blank ged structure
+ BU_GET(GEDP, struct ged);
+ ged_init(GEDP);
+ GEDP->ged_output_handler = mged_output_handler;
+ GEDP->ged_refresh_handler = mged_refresh_handler;
+ GEDP->ged_create_vlist_solid_callback = createDListSolid;
+ GEDP->ged_create_vlist_display_list_callback = createDListAll;
+ GEDP->ged_destroy_vlist_callback = freeDListsAll;
+ GEDP->ged_create_io_handler = &tclcad_create_io_handler;
+ GEDP->ged_delete_io_handler = &tclcad_delete_io_handler;
+ struct tclcad_io_data *t_iod;
+ BU_GET(t_iod, struct tclcad_io_data);
+ t_iod->io_mode = TCL_READABLE;
+ t_iod->interp = interpreter;
+ GEDP->ged_io_data = t_iod;
+
+
WDBP = RT_WDB_NULL;
DBIP = DBI_NULL;
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
