Revision: 76703
http://sourceforge.net/p/brlcad/code/76703
Author: starseeker
Date: 2020-08-11 13:38:43 +0000 (Tue, 11 Aug 2020)
Log Message:
-----------
A relatively simple pattern match suggests that we've got the ged_<cmd> calls
inside libged adjusted - they now need to provide valid argv[0] values, which
wasn't always the case historically.
Modified Paths:
--------------
brlcad/branches/RELEASE/src/libged/draw/loadview.c
brlcad/branches/RELEASE/src/libged/draw/preview.c
brlcad/branches/RELEASE/src/libged/osg.cpp
brlcad/branches/RELEASE/src/libged/putmat/putmat.c
Modified: brlcad/branches/RELEASE/src/libged/draw/loadview.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/draw/loadview.c 2020-08-11 13:24:56 UTC
(rev 76702)
+++ brlcad/branches/RELEASE/src/libged/draw/loadview.c 2020-08-11 13:38:43 UTC
(rev 76703)
@@ -199,7 +199,8 @@
* TODO: should only zap if the objects to be displayed
* all exist.
*/
- (void)ged_zap(gedp, 1, NULL);
+ const char *Z_cmd = "Z";
+ (void)ged_zap(gedp, 1, &Z_cmd);
/* now get the objects listed */
ret = fscanf(fp, "%10000s", objects);
Modified: brlcad/branches/RELEASE/src/libged/draw/preview.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/draw/preview.c 2020-08-11 13:24:56 UTC
(rev 76702)
+++ brlcad/branches/RELEASE/src/libged/draw/preview.c 2020-08-11 13:38:43 UTC
(rev 76703)
@@ -237,8 +237,8 @@
};
-int
-ged_loadframe(struct ged *gedp, FILE *fp)
+static int
+_loadframe(struct ged *gedp, FILE *fp)
{
char *cmd;
@@ -402,7 +402,7 @@
bu_vls_strcpy(&name, image_name);
}
}
- while (ged_loadframe(gedp, fp) == GED_OK) {
+ while (_loadframe(gedp, fp) == GED_OK) {
if (image_name) {
struct bu_vls fullname = BU_VLS_INIT_ZERO;
const char *screengrab_args[3];
@@ -414,7 +414,6 @@
preview_currentframe, bu_vls_addr(&extension));
screengrab_args[screengrab_argc++] = bu_vls_addr(&fullname);
- /* ged_png(gedp, screengrab_argc, screengrab_args); */
ged_screen_grab(gedp, screengrab_argc, screengrab_args);
bu_vls_free(&fullname);
Modified: brlcad/branches/RELEASE/src/libged/osg.cpp
===================================================================
--- brlcad/branches/RELEASE/src/libged/osg.cpp 2020-08-11 13:24:56 UTC (rev
76702)
+++ brlcad/branches/RELEASE/src/libged/osg.cpp 2020-08-11 13:38:43 UTC (rev
76703)
@@ -42,7 +42,7 @@
__BEGIN_DECLS
-void ged_osgLoadScene(struct bu_list *hdlp, void *osgData);
+void _ged_osgLoadScene(struct bu_list *hdlp, void *osgData);
__END_DECLS
@@ -69,7 +69,7 @@
int begin;
int nverts;
- bu_log("ged_osgLoadSolid: enter\n");
+ bu_log("_ged_osgLoadSolid: enter\n");
@@ -101,7 +101,7 @@
normals->push_back(osg::Vec3(0.0f,-1.0f,0.0f));
begin += nverts;
nverts = 1;
- //bu_log("ged_osgLoadSolid: loaded point - (%lf %lf
%lf)\n", (*pt)[X], (*pt)[Y], (*pt)[Z]);
+ //bu_log("_ged_osgLoadSolid: loaded point - (%lf %lf
%lf)\n", (*pt)[X], (*pt)[Y], (*pt)[Z]);
break;
case BN_VLIST_POLY_START:
normals->push_back(osg::Vec3d((*pt)[X], (*pt)[Y],
(*pt)[Z]));
@@ -115,7 +115,7 @@
vertices->push_back(osg::Vec3d((*pt)[X], (*pt)[Y],
(*pt)[Z]));
++nverts;
- //bu_log("ged_osgLoadSolid: loaded point - (%lf %lf
%lf)\n", (*pt)[X], (*pt)[Y], (*pt)[Z]);
+ //bu_log("_ged_osgLoadSolid: loaded point - (%lf %lf
%lf)\n", (*pt)[X], (*pt)[Y], (*pt)[Z]);
break;
case BN_VLIST_POLY_END:
//vertices->push_back(osg::Vec3d((*pt)[X], (*pt)[Y],
(*pt)[Z]));
@@ -142,12 +142,12 @@
//geode->addDrawable(geom);
}
- bu_log("ged_osgLoadSolid: leave\n");
+ bu_log("_ged_osgLoadSolid: leave\n");
}
void
-ged_osgLoadScene(struct bu_list *hdlp, void *osgData)
+_ged_osgLoadScene(struct bu_list *hdlp, void *osgData)
{
register struct display_list *gdlp;
register struct display_list *next_gdlp;
@@ -154,7 +154,7 @@
struct solid *sp;
struct osg_stuff *osp = (struct osg_stuff *)osgData;
- bu_log("ged_osgLoadScene: part B\n");
+ bu_log("_ged_osgLoadScene: part B\n");
osg::Group* root = new osg::Group();
// create the Geode (Geometry Node) to contain all our osg::Geometry
objects.
@@ -161,7 +161,7 @@
osg::Geode* geode = new osg::Geode();
bu_log("before: max frame rate - %lf\n",
osp->viewer->getRunMaxFrameRate());
- bu_log("ged_osgLoadScene: enter\n");
+ bu_log("_ged_osgLoadScene: enter\n");
gdlp = BU_LIST_NEXT(display_list, hdlp);
while (BU_LIST_NOT_HEAD(gdlp, hdlp)) {
next_gdlp = BU_LIST_PNEXT(display_list, gdlp);
@@ -192,7 +192,7 @@
bu_log("after: max frame rate - %lf\n", osp->viewer->getRunMaxFrameRate());
- bu_log("ged_osgLoadScene: loaded geode\n");
+ bu_log("_ged_osgLoadScene: loaded geode\n");
}
// Local Variables:
Modified: brlcad/branches/RELEASE/src/libged/putmat/putmat.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/putmat/putmat.c 2020-08-11 13:24:56 UTC
(rev 76702)
+++ brlcad/branches/RELEASE/src/libged/putmat/putmat.c 2020-08-11 13:38:43 UTC
(rev 76703)
@@ -32,8 +32,8 @@
#include "../ged_private.h"
-int
-ged_getmat(struct ged *gedp, int argc, const char *argv[])
+static int
+_getmat(struct ged *gedp, int argc, const char *argv[])
{
struct directory *dp;
struct rt_db_internal intern;
@@ -196,7 +196,7 @@
}
if (argc == 2)
- return ged_getmat(gedp, argc, argv);
+ return _getmat(gedp, argc, argv);
if (argc < 3 || 18 < argc) {
bu_vls_printf(gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
