Revision: 76410
http://sourceforge.net/p/brlcad/code/76410
Author: starseeker
Date: 2020-07-22 12:40:10 +0000 (Wed, 22 Jul 2020)
Log Message:
-----------
Add _core suffix to avoid conflicting with the name-specific wrappers to
ged_exec in the main libged library. Eventually we may want to consider
deprecating all of the ged_* specific function calls in favor of just ged_exec,
in which case this won't be an issue, but for now we need to avoid the conflict.
Modified Paths:
--------------
brlcad/branches/gedplugins/src/libged/bot/bot.cpp
brlcad/branches/gedplugins/src/libged/bot/bot_condense.c
brlcad/branches/gedplugins/src/libged/bot/bot_decimate.c
brlcad/branches/gedplugins/src/libged/bot/bot_dump.c
brlcad/branches/gedplugins/src/libged/bot/bot_face_fuse.c
brlcad/branches/gedplugins/src/libged/bot/bot_face_sort.c
brlcad/branches/gedplugins/src/libged/bot/bot_flip.c
brlcad/branches/gedplugins/src/libged/bot/bot_fuse.c
brlcad/branches/gedplugins/src/libged/bot/bot_merge.c
brlcad/branches/gedplugins/src/libged/bot/bot_smooth.c
brlcad/branches/gedplugins/src/libged/bot/bot_split.c
brlcad/branches/gedplugins/src/libged/bot/bot_sync.c
brlcad/branches/gedplugins/src/libged/bot/bot_vertex_fuse.c
brlcad/branches/gedplugins/src/libged/bot/ged_bot.h
Modified: brlcad/branches/gedplugins/src/libged/bot/bot.cpp
===================================================================
--- brlcad/branches/gedplugins/src/libged/bot/bot.cpp 2020-07-22 12:24:19 UTC
(rev 76409)
+++ brlcad/branches/gedplugins/src/libged/bot/bot.cpp 2020-07-22 12:40:10 UTC
(rev 76410)
@@ -326,7 +326,7 @@
}
extern "C" int
-ged_bot(struct ged *gedp, int argc, const char *argv[])
+ged_bot_core(struct ged *gedp, int argc, const char *argv[])
{
int help = 0;
struct _ged_bot_info gb;
@@ -438,43 +438,43 @@
#ifdef GED_PLUGIN
#include "../include/plugin.h"
extern "C" {
- struct ged_cmd_impl bot_cmd_impl = { "bot", ged_bot, GED_CMD_DEFAULT };
+ struct ged_cmd_impl bot_cmd_impl = { "bot", ged_bot_core, GED_CMD_DEFAULT
};
const struct ged_cmd bot_cmd = { &bot_cmd_impl };
- struct ged_cmd_impl bot_condense_cmd_impl = {"bot_condense",
ged_bot_condense, GED_CMD_DEFAULT};
+ struct ged_cmd_impl bot_condense_cmd_impl = {"bot_condense",
ged_bot_condense_core, GED_CMD_DEFAULT};
const struct ged_cmd bot_condense_cmd = { &bot_condense_cmd_impl };
- struct ged_cmd_impl bot_decimate_cmd_impl = {"bot_decimate",
ged_bot_decimate, GED_CMD_DEFAULT};
+ struct ged_cmd_impl bot_decimate_cmd_impl = {"bot_decimate",
ged_bot_decimate_core, GED_CMD_DEFAULT};
const struct ged_cmd bot_decimate_cmd = { &bot_decimate_cmd_impl };
- struct ged_cmd_impl bot_dump_cmd_impl = {"bot_dump", ged_bot_dump,
GED_CMD_DEFAULT};
+ struct ged_cmd_impl bot_dump_cmd_impl = {"bot_dump", ged_bot_dump_core,
GED_CMD_DEFAULT};
const struct ged_cmd bot_dump_cmd = { &bot_dump_cmd_impl };
- struct ged_cmd_impl bot_face_fuse_cmd_impl = {"bot_face_fuse",
ged_bot_face_fuse, GED_CMD_DEFAULT};
+ struct ged_cmd_impl bot_face_fuse_cmd_impl = {"bot_face_fuse",
ged_bot_face_fuse_core, GED_CMD_DEFAULT};
const struct ged_cmd bot_face_fuse_cmd = { &bot_face_fuse_cmd_impl };
- struct ged_cmd_impl bot_face_sort_cmd_impl = {"bot_face_sort",
ged_bot_face_sort, GED_CMD_DEFAULT};
+ struct ged_cmd_impl bot_face_sort_cmd_impl = {"bot_face_sort",
ged_bot_face_sort_core, GED_CMD_DEFAULT};
const struct ged_cmd bot_face_sort_cmd = { &bot_face_sort_cmd_impl };
- struct ged_cmd_impl bot_flip_cmd_impl = {"bot_flip", ged_bot_flip,
GED_CMD_DEFAULT};
+ struct ged_cmd_impl bot_flip_cmd_impl = {"bot_flip", ged_bot_flip_core,
GED_CMD_DEFAULT};
const struct ged_cmd bot_flip_cmd = { &bot_flip_cmd_impl };
- struct ged_cmd_impl bot_fuse_cmd_impl = {"bot_fuse", ged_bot_fuse,
GED_CMD_DEFAULT};
+ struct ged_cmd_impl bot_fuse_cmd_impl = {"bot_fuse", ged_bot_fuse_core,
GED_CMD_DEFAULT};
const struct ged_cmd bot_fuse_cmd = { &bot_fuse_cmd_impl };
- struct ged_cmd_impl bot_merge_cmd_impl = {"bot_merge", ged_bot_merge,
GED_CMD_DEFAULT};
+ struct ged_cmd_impl bot_merge_cmd_impl = {"bot_merge", ged_bot_merge_core,
GED_CMD_DEFAULT};
const struct ged_cmd bot_merge_cmd = { &bot_merge_cmd_impl };
- struct ged_cmd_impl bot_smooth_cmd_impl = {"bot_smooth", ged_bot_smooth,
GED_CMD_DEFAULT};
+ struct ged_cmd_impl bot_smooth_cmd_impl = {"bot_smooth",
ged_bot_smooth_core, GED_CMD_DEFAULT};
const struct ged_cmd bot_smooth_cmd = { &bot_smooth_cmd_impl };
- struct ged_cmd_impl bot_split_cmd_impl = {"bot_split", ged_bot_split,
GED_CMD_DEFAULT};
+ struct ged_cmd_impl bot_split_cmd_impl = {"bot_split", ged_bot_split_core,
GED_CMD_DEFAULT};
const struct ged_cmd bot_split_cmd = { &bot_split_cmd_impl };
- struct ged_cmd_impl bot_sync_cmd_impl = {"bot_sync", ged_bot_sync,
GED_CMD_DEFAULT};
+ struct ged_cmd_impl bot_sync_cmd_impl = {"bot_sync", ged_bot_sync_core,
GED_CMD_DEFAULT};
const struct ged_cmd bot_sync_cmd = { &bot_sync_cmd_impl };
- struct ged_cmd_impl bot_vertex_fuse_cmd_impl = {"bot_vertex_fuse",
ged_bot_vertex_fuse, GED_CMD_DEFAULT};
+ struct ged_cmd_impl bot_vertex_fuse_cmd_impl = {"bot_vertex_fuse",
ged_bot_vertex_fuse_core, GED_CMD_DEFAULT};
const struct ged_cmd bot_vertex_fuse_cmd = { &bot_vertex_fuse_cmd_impl };
const struct ged_cmd *bot_cmds[] = {
Modified: brlcad/branches/gedplugins/src/libged/bot/bot_condense.c
===================================================================
--- brlcad/branches/gedplugins/src/libged/bot/bot_condense.c 2020-07-22
12:24:19 UTC (rev 76409)
+++ brlcad/branches/gedplugins/src/libged/bot/bot_condense.c 2020-07-22
12:40:10 UTC (rev 76410)
@@ -35,7 +35,7 @@
int
-ged_bot_condense(struct ged *gedp, int argc, const char *argv[])
+ged_bot_condense_core(struct ged *gedp, int argc, const char *argv[])
{
struct directory *old_dp, *new_dp;
struct rt_db_internal intern;
Modified: brlcad/branches/gedplugins/src/libged/bot/bot_decimate.c
===================================================================
--- brlcad/branches/gedplugins/src/libged/bot/bot_decimate.c 2020-07-22
12:24:19 UTC (rev 76409)
+++ brlcad/branches/gedplugins/src/libged/bot/bot_decimate.c 2020-07-22
12:40:10 UTC (rev 76410)
@@ -35,7 +35,7 @@
int
-ged_bot_decimate(struct ged *gedp, int argc, const char *argv[])
+ged_bot_decimate_core(struct ged *gedp, int argc, const char *argv[])
{
int c;
struct rt_db_internal intern;
Modified: brlcad/branches/gedplugins/src/libged/bot/bot_dump.c
===================================================================
--- brlcad/branches/gedplugins/src/libged/bot/bot_dump.c 2020-07-22
12:24:19 UTC (rev 76409)
+++ brlcad/branches/gedplugins/src/libged/bot/bot_dump.c 2020-07-22
12:40:10 UTC (rev 76410)
@@ -862,7 +862,7 @@
int
-ged_bot_dump(struct ged *gedp, int argc, const char *argv[])
+ged_bot_dump_core(struct ged *gedp, int argc, const char *argv[])
{
int ret;
struct rt_db_internal intern;
Modified: brlcad/branches/gedplugins/src/libged/bot/bot_face_fuse.c
===================================================================
--- brlcad/branches/gedplugins/src/libged/bot/bot_face_fuse.c 2020-07-22
12:24:19 UTC (rev 76409)
+++ brlcad/branches/gedplugins/src/libged/bot/bot_face_fuse.c 2020-07-22
12:40:10 UTC (rev 76410)
@@ -35,7 +35,7 @@
int
-ged_bot_face_fuse(struct ged *gedp, int argc, const char *argv[])
+ged_bot_face_fuse_core(struct ged *gedp, int argc, const char *argv[])
{
struct directory *old_dp, *new_dp;
struct rt_db_internal intern;
Modified: brlcad/branches/gedplugins/src/libged/bot/bot_face_sort.c
===================================================================
--- brlcad/branches/gedplugins/src/libged/bot/bot_face_sort.c 2020-07-22
12:24:19 UTC (rev 76409)
+++ brlcad/branches/gedplugins/src/libged/bot/bot_face_sort.c 2020-07-22
12:40:10 UTC (rev 76410)
@@ -34,7 +34,7 @@
int
-ged_bot_face_sort(struct ged *gedp, int argc, const char *argv[])
+ged_bot_face_sort_core(struct ged *gedp, int argc, const char *argv[])
{
int i;
int tris_per_piece=0;
Modified: brlcad/branches/gedplugins/src/libged/bot/bot_flip.c
===================================================================
--- brlcad/branches/gedplugins/src/libged/bot/bot_flip.c 2020-07-22
12:24:19 UTC (rev 76409)
+++ brlcad/branches/gedplugins/src/libged/bot/bot_flip.c 2020-07-22
12:40:10 UTC (rev 76410)
@@ -36,7 +36,7 @@
int
-ged_bot_flip(struct ged *gedp, int argc, const char *argv[])
+ged_bot_flip_core(struct ged *gedp, int argc, const char *argv[])
{
int i;
struct directory *dp;
Modified: brlcad/branches/gedplugins/src/libged/bot/bot_fuse.c
===================================================================
--- brlcad/branches/gedplugins/src/libged/bot/bot_fuse.c 2020-07-22
12:24:19 UTC (rev 76409)
+++ brlcad/branches/gedplugins/src/libged/bot/bot_fuse.c 2020-07-22
12:40:10 UTC (rev 76410)
@@ -143,7 +143,7 @@
int
-ged_bot_fuse(struct ged *gedp, int argc, const char **argv)
+ged_bot_fuse_core(struct ged *gedp, int argc, const char **argv)
{
struct directory *old_dp, *new_dp;
struct rt_db_internal intern, intern2;
Modified: brlcad/branches/gedplugins/src/libged/bot/bot_merge.c
===================================================================
--- brlcad/branches/gedplugins/src/libged/bot/bot_merge.c 2020-07-22
12:24:19 UTC (rev 76409)
+++ brlcad/branches/gedplugins/src/libged/bot/bot_merge.c 2020-07-22
12:40:10 UTC (rev 76410)
@@ -35,7 +35,7 @@
int
-ged_bot_merge(struct ged *gedp, int argc, const char *argv[])
+ged_bot_merge_core(struct ged *gedp, int argc, const char *argv[])
{
struct directory *dp, *new_dp;
struct rt_db_internal intern;
Modified: brlcad/branches/gedplugins/src/libged/bot/bot_smooth.c
===================================================================
--- brlcad/branches/gedplugins/src/libged/bot/bot_smooth.c 2020-07-22
12:24:19 UTC (rev 76409)
+++ brlcad/branches/gedplugins/src/libged/bot/bot_smooth.c 2020-07-22
12:40:10 UTC (rev 76410)
@@ -35,7 +35,7 @@
int
-ged_bot_smooth(struct ged *gedp, int argc, const char *argv[])
+ged_bot_smooth_core(struct ged *gedp, int argc, const char *argv[])
{
char *new_bot_name, *old_bot_name;
struct directory *dp_old, *dp_new;
Modified: brlcad/branches/gedplugins/src/libged/bot/bot_split.c
===================================================================
--- brlcad/branches/gedplugins/src/libged/bot/bot_split.c 2020-07-22
12:24:19 UTC (rev 76409)
+++ brlcad/branches/gedplugins/src/libged/bot/bot_split.c 2020-07-22
12:40:10 UTC (rev 76410)
@@ -35,7 +35,7 @@
int
-ged_bot_split(struct ged *gedp, int argc, const char *argv[])
+ged_bot_split_core(struct ged *gedp, int argc, const char *argv[])
{
static const char *usage = "bot [bot2 bot3 ...]";
Modified: brlcad/branches/gedplugins/src/libged/bot/bot_sync.c
===================================================================
--- brlcad/branches/gedplugins/src/libged/bot/bot_sync.c 2020-07-22
12:24:19 UTC (rev 76409)
+++ brlcad/branches/gedplugins/src/libged/bot/bot_sync.c 2020-07-22
12:40:10 UTC (rev 76410)
@@ -36,7 +36,7 @@
int
-ged_bot_sync(struct ged *gedp, int argc, const char *argv[])
+ged_bot_sync_core(struct ged *gedp, int argc, const char *argv[])
{
int i;
struct directory *dp;
Modified: brlcad/branches/gedplugins/src/libged/bot/bot_vertex_fuse.c
===================================================================
--- brlcad/branches/gedplugins/src/libged/bot/bot_vertex_fuse.c 2020-07-22
12:24:19 UTC (rev 76409)
+++ brlcad/branches/gedplugins/src/libged/bot/bot_vertex_fuse.c 2020-07-22
12:40:10 UTC (rev 76410)
@@ -35,7 +35,7 @@
int
-ged_bot_vertex_fuse(struct ged *gedp, int argc, const char *argv[])
+ged_bot_vertex_fuse_core(struct ged *gedp, int argc, const char *argv[])
{
struct directory *old_dp, *new_dp;
struct rt_db_internal intern;
Modified: brlcad/branches/gedplugins/src/libged/bot/ged_bot.h
===================================================================
--- brlcad/branches/gedplugins/src/libged/bot/ged_bot.h 2020-07-22 12:24:19 UTC
(rev 76409)
+++ brlcad/branches/gedplugins/src/libged/bot/ged_bot.h 2020-07-22 12:40:10 UTC
(rev 76410)
@@ -68,6 +68,20 @@
int _bot_cmd_msgs(void *bs, int argc, const char **argv, const char *us, const
char *ps);
+
+GED_EXPORT extern int ged_bot_condense_core(struct ged *gedp, int argc, const
char **argv);
+GED_EXPORT extern int ged_bot_decimate_core(struct ged *gedp, int argc, const
char **argv);
+GED_EXPORT extern int ged_bot_dump_core(struct ged *gedp, int argc, const char
**argv);
+GED_EXPORT extern int ged_bot_face_fuse_core(struct ged *gedp, int argc, const
char **argv);
+GED_EXPORT extern int ged_bot_face_sort_core(struct ged *gedp, int argc, const
char **argv);
+GED_EXPORT extern int ged_bot_flip_core(struct ged *gedp, int argc, const char
**argv);
+GED_EXPORT extern int ged_bot_fuse_core(struct ged *gedp, int argc, const char
**argv);
+GED_EXPORT extern int ged_bot_merge_core(struct ged *gedp, int argc, const
char **argv);
+GED_EXPORT extern int ged_bot_smooth_core(struct ged *gedp, int argc, const
char **argv);
+GED_EXPORT extern int ged_bot_split_core(struct ged *gedp, int argc, const
char **argv);
+GED_EXPORT extern int ged_bot_sync_core(struct ged *gedp, int argc, const char
**argv);
+GED_EXPORT extern int ged_bot_vertex_fuse_core(struct ged *gedp, int argc,
const char **argv);
+
GED_EXPORT extern int _bot_cmd_extrude(void *bs, int argc, const char **argv);
GED_EXPORT extern int _bot_cmd_check(void *bs, 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
