Revision: 76829
http://sourceforge.net/p/brlcad/code/76829
Author: starseeker
Date: 2020-08-18 14:43:01 +0000 (Tue, 18 Aug 2020)
Log Message:
-----------
Stub in a cg LIBGED command - no functionality yet, just a basic command logic
framework.
Modified Paths:
--------------
brlcad/trunk/src/libged/CMakeLists.txt
Added Paths:
-----------
brlcad/trunk/src/libged/cg/
brlcad/trunk/src/libged/cg/CMakeLists.txt
brlcad/trunk/src/libged/cg/cg.cpp
Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt 2020-08-18 14:13:48 UTC (rev
76828)
+++ brlcad/trunk/src/libged/CMakeLists.txt 2020-08-18 14:43:01 UTC (rev
76829)
@@ -147,6 +147,7 @@
add_subdirectory(brep)
add_subdirectory(cat)
add_subdirectory(cc)
+add_subdirectory(cg)
add_subdirectory(check)
add_subdirectory(clone)
add_subdirectory(coil)
Added: brlcad/trunk/src/libged/cg/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/cg/CMakeLists.txt (rev 0)
+++ brlcad/trunk/src/libged/cg/CMakeLists.txt 2020-08-18 14:43:01 UTC (rev
76829)
@@ -0,0 +1,26 @@
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${BU_INCLUDE_DIRS}
+ ${GED_INCLUDE_DIRS}
+ )
+
+add_definitions(-DGED_PLUGIN)
+ged_plugin_library(ged-cg SHARED cg.cpp)
+target_link_libraries(ged-cg libged libbu)
+set_property(TARGET ged-cg APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
+VALIDATE_STYLE(ged-cg cg.cpp)
+PLUGIN_SETUP(ged-cg ged)
+
+CMAKEFILES(
+ CMakeLists.txt
+ cg.cpp
+ )
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
Property changes on: brlcad/trunk/src/libged/cg/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: brlcad/trunk/src/libged/cg/cg.cpp
===================================================================
--- brlcad/trunk/src/libged/cg/cg.cpp (rev 0)
+++ brlcad/trunk/src/libged/cg/cg.cpp 2020-08-18 14:43:01 UTC (rev 76829)
@@ -0,0 +1,247 @@
+/* C G . C P P
+ * BRL-CAD
+ *
+ * Copyright (c) 2020 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+/** @file cg.cpp
+ *
+ * Brief description
+ *
+ */
+
+#include "common.h"
+
+extern "C" {
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.h>
+}
+
+#include <limits>
+
+extern "C" {
+#include "bu/cmd.h"
+#include "bu/opt.h"
+#include "../ged_private.h"
+}
+
+#define HELPFLAG "--print-help"
+#define PURPOSEFLAG "--print-purpose"
+
+struct _ged_cg_info {
+ struct ged *gedp = NULL;
+ const struct bu_cmdtab *cmds = NULL;
+ struct bu_opt_desc *gopts = NULL;
+ int verbosity = 0;
+};
+
+
+static int
+_cg_cmd_msgs(void *cs, int argc, const char **argv, const char *us, const char
*ps)
+{
+ struct _ged_cg_info *gc = (struct _ged_cg_info *)cs;
+ if (argc == 2 && BU_STR_EQUAL(argv[1], HELPFLAG)) {
+ bu_vls_printf(gc->gedp->ged_result_str, "%s\n%s\n", us, ps);
+ return 1;
+ }
+ if (argc == 2 && BU_STR_EQUAL(argv[1], PURPOSEFLAG)) {
+ bu_vls_printf(gc->gedp->ged_result_str, "%s\n", ps);
+ return 1;
+ }
+ return 0;
+}
+
+
+extern "C" int
+_cg_cmd_eval(void *bs, int argc, const char **argv)
+{
+ const char *usage_string = "cg [options] eval \"expr\" output_obj";
+ const char *purpose_string = "Evaluate a CSG boolean to produce a
geometric result";
+ if (_cg_cmd_msgs(bs, argc, argv, usage_string, purpose_string)) {
+ return GED_OK;
+ }
+
+#if 0
+ struct _ged_cg_info *gc = (struct _ged_cg_info *)bs;
+ struct ged *gedp = gc->gedp;
+
+ argc--; argv++;
+#endif
+ return GED_OK;
+}
+
+extern "C" int
+_cg_cmd_help(void *bs, int argc, const char **argv)
+{
+ struct _ged_cg_info *gc = (struct _ged_cg_info *)bs;
+ if (!argc || !argv || BU_STR_EQUAL(argv[0], "help")) {
+ bu_vls_printf(gc->gedp->ged_result_str, "cg [options] subcommand
[args]\n");
+ if (gc->gopts) {
+ char *option_help = bu_opt_describe(gc->gopts, NULL);
+ if (option_help) {
+ bu_vls_printf(gc->gedp->ged_result_str, "Options:\n%s\n",
option_help);
+ bu_free(option_help, "help str");
+ }
+ }
+ bu_vls_printf(gc->gedp->ged_result_str, "Available subcommands:\n");
+ const struct bu_cmdtab *ctp = NULL;
+ int ret;
+ const char *helpflag[2];
+ helpflag[1] = PURPOSEFLAG;
+ size_t maxcmdlen = 0;
+ for (ctp = gc->cmds; ctp->ct_name != (char *)NULL; ctp++) {
+ maxcmdlen = (maxcmdlen > strlen(ctp->ct_name)) ? maxcmdlen :
strlen(ctp->ct_name);
+ }
+ for (ctp = gc->cmds; ctp->ct_name != (char *)NULL; ctp++) {
+ bu_vls_printf(gc->gedp->ged_result_str, " %s%*s", ctp->ct_name,
(int)(maxcmdlen - strlen(ctp->ct_name)) + 2, " ");
+ if (!BU_STR_EQUAL(ctp->ct_name, "help")) {
+ helpflag[0] = ctp->ct_name;
+ bu_cmd(gc->cmds, 2, helpflag, 0, (void *)gc, &ret);
+ } else {
+ bu_vls_printf(gc->gedp->ged_result_str, "print help and
exit\n");
+ }
+ }
+ } else {
+ int ret;
+ const char **helpargv = (const char **)bu_calloc(argc+1, sizeof(char
*), "help argv");
+ helpargv[0] = argv[0];
+ helpargv[1] = HELPFLAG;
+ for (int i = 1; i < argc; i++) {
+ helpargv[i+1] = argv[i];
+ }
+ bu_cmd(gc->cmds, argc+1, helpargv, 0, (void *)gc, &ret);
+ bu_free(helpargv, "help argv");
+ return ret;
+ }
+
+ return GED_OK;
+}
+
+
+const struct bu_cmdtab _cg_cmds[] = {
+ { "eval", _cg_cmd_eval},
+ { (char *)NULL, NULL}
+ };
+
+
+extern "C" int
+ged_cg_core(struct ged *gedp, int argc, const char *argv[])
+{
+ int help = 0;
+ struct _ged_cg_info gc;
+ gc.gedp = gedp;
+ gc.cmds = _cg_cmds;
+ gc.verbosity = 0;
+
+ // Sanity
+ if (UNLIKELY(!gedp || !argc || !argv)) {
+ return GED_ERROR;
+ }
+
+ // Clear results
+ bu_vls_trunc(gedp->ged_result_str, 0);
+
+ // We know we're the brep command - start processing args
+ argc--; argv++;
+
+ // See if we have any high level options set
+ struct bu_opt_desc d[3];
+ BU_OPT(d[0], "h", "help", "", NULL, &help,
"Print help");
+ BU_OPT(d[1], "v", "verbose", "", NULL, &gc.verbosity,
"Verbose output");
+ BU_OPT_NULL(d[2]);
+
+ gc.gopts = d;
+
+ if (!argc) {
+ _cg_cmd_help(&gc, 0, NULL);
+ return GED_OK;
+ }
+
+ // High level options are only defined prior to the subcommand
+ int cmd_pos = -1;
+ for (int i = 0; i < argc; i++) {
+ if (bu_cmd_valid(_cg_cmds, argv[i]) == BRLCAD_OK) {
+ cmd_pos = i;
+ break;
+ }
+ }
+
+ int acnt = (cmd_pos >= 0) ? cmd_pos : argc;
+
+ bu_opt_parse(NULL, acnt, argv, d);
+
+ if (help) {
+ if (cmd_pos >= 0) {
+ argc = argc - cmd_pos;
+ argv = &argv[cmd_pos];
+ _cg_cmd_help(&gc, argc, argv);
+ } else {
+ _cg_cmd_help(&gc, 0, NULL);
+ }
+ return GED_OK;
+ }
+
+ // Must have a subcommand
+ if (cmd_pos == -1) {
+ bu_vls_printf(gedp->ged_result_str, ": no valid subcommand
specified\n");
+ _cg_cmd_help(&gc, 0, NULL);
+ return GED_ERROR;
+ }
+
+
+ // Jump the processing past any options specified
+ argc = argc - cmd_pos;
+ argv = &argv[cmd_pos];
+
+ int ret;
+ if (bu_cmd(_cg_cmds, argc, argv, 0, (void *)&gc, &ret) == BRLCAD_OK) {
+ return ret;
+ } else {
+ bu_vls_printf(gedp->ged_result_str, "subcommand %s not defined",
argv[0]);
+ }
+
+ return GED_ERROR;
+}
+
+// Local Variables:
+
+#ifdef GED_PLUGIN
+#include "../include/plugin.h"
+extern "C" {
+ struct ged_cmd_impl cg_cmd_impl = { "cg", ged_cg_core, GED_CMD_DEFAULT };
+ const struct ged_cmd cg_cmd = { &cg_cmd_impl };
+
+ const struct ged_cmd *cg_cmds[] = { &cg_cmd, NULL };
+
+ static const struct ged_plugin pinfo = { GED_API, cg_cmds, 1 };
+
+ COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
+ {
+ return &pinfo;
+ }
+}
+#endif
+
+// Local Variables:
+// tab-width: 8
+// mode: C++
+// c-basic-offset: 4
+// indent-tabs-mode: t
+// c-file-style: "stroustrup"
+// End:
+// ex: shiftwidth=4 tabstop=8
+
Property changes on: brlcad/trunk/src/libged/cg/cg.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
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
