Revision: 65592
http://sourceforge.net/p/brlcad/code/65592
Author: starseeker
Date: 2015-07-12 02:08:41 +0000 (Sun, 12 Jul 2015)
Log Message:
-----------
Push Tcl out of librt, except for the Tcl_Interp pointer in the rt_wdb data
structure. Move the rt tcl specific functions and interface to libtclcad, push
brlcad_interp up to libged. Not 100% percent sure this is really minimally
impacting - if it has to be reverted, at least this commit will document the
changes. libged is next, but it looks like it's using Tcl for portable
inter-application communication for rt/rtcheck on Windows and view_obj appears
to use it extensively - those could be tricky to handle.
Modified Paths:
--------------
brlcad/trunk/include/ged.h
brlcad/trunk/include/raytrace.h
brlcad/trunk/include/rt/CMakeLists.txt
brlcad/trunk/include/rt/global.h
brlcad/trunk/include/rt/misc.h
brlcad/trunk/include/tclcad.h
brlcad/trunk/src/conv/CMakeLists.txt
brlcad/trunk/src/libged/CMakeLists.txt
brlcad/trunk/src/librt/CMakeLists.txt
brlcad/trunk/src/librt/globals.c
brlcad/trunk/src/librtserver/CMakeLists.txt
brlcad/trunk/src/libtclcad/CMakeLists.txt
brlcad/trunk/src/libtclcad/tclcad.c
Added Paths:
-----------
brlcad/trunk/src/conv/asc/CMakeLists.txt
brlcad/trunk/src/libged/globals.c
Removed Paths:
-------------
brlcad/trunk/include/rt/rt_tcl.h
brlcad/trunk/src/librt/tcl.c
Modified: brlcad/trunk/include/ged.h
===================================================================
--- brlcad/trunk/include/ged.h 2015-07-12 01:30:26 UTC (rev 65591)
+++ brlcad/trunk/include/ged.h 2015-07-12 02:08:41 UTC (rev 65592)
@@ -250,6 +250,9 @@
return (_flags); \
}
+/* FIXME Temporary global interp. Remove me. */
+RT_EXPORT extern Tcl_Interp *brlcad_interp;
+
/* From include/dm.h */
#define GED_MAX 2047.0
#define GED_MIN -2048.0
Modified: brlcad/trunk/include/raytrace.h
===================================================================
--- brlcad/trunk/include/raytrace.h 2015-07-12 01:30:26 UTC (rev 65591)
+++ brlcad/trunk/include/raytrace.h 2015-07-12 02:08:41 UTC (rev 65592)
@@ -43,7 +43,6 @@
#include "common.h"
/* interface headers */
-#include "tcl.h"
#include "bu/avs.h"
#include "bu/bitv.h"
#include "bu/file.h"
@@ -172,8 +171,6 @@
#include "./rt/htbl.h"
-#include "./rt/rt_tcl.h"
-
#include "./rt/dspline.h"
#include "./rt/db_attr.h"
Modified: brlcad/trunk/include/rt/CMakeLists.txt
===================================================================
--- brlcad/trunk/include/rt/CMakeLists.txt 2015-07-12 01:30:26 UTC (rev
65591)
+++ brlcad/trunk/include/rt/CMakeLists.txt 2015-07-12 02:08:41 UTC (rev
65592)
@@ -44,7 +44,6 @@
region.h
resource.h
rt_instance.h
- rt_tcl.h
search.h
seg.h
shoot.h
Modified: brlcad/trunk/include/rt/global.h
===================================================================
--- brlcad/trunk/include/rt/global.h 2015-07-12 01:30:26 UTC (rev 65591)
+++ brlcad/trunk/include/rt/global.h 2015-07-12 02:08:41 UTC (rev 65592)
@@ -26,16 +26,11 @@
#include "common.h"
-#include "tcl.h" /* Included for Tcl_Interp definition */
-
#include "vmath.h"
#include "rt/defines.h"
__BEGIN_DECLS
-/* FIXME Temporary global interp. Remove me. */
-RT_EXPORT extern Tcl_Interp *brlcad_interp;
-
/**
* Definitions for librt.a which are global to the library regardless
* of how many different models are being worked on
Modified: brlcad/trunk/include/rt/misc.h
===================================================================
--- brlcad/trunk/include/rt/misc.h 2015-07-12 01:30:26 UTC (rev 65591)
+++ brlcad/trunk/include/rt/misc.h 2015-07-12 02:08:41 UTC (rev 65592)
@@ -67,6 +67,8 @@
struct db_i *dbip, const char *obj, fastf_t
delta);
+RT_EXPORT extern void rt_generic_make(const struct rt_functab *ftp, struct
rt_db_internal *intern);
+
__END_DECLS
#endif /* RT_MISC_H */
Deleted: brlcad/trunk/include/rt/rt_tcl.h
===================================================================
--- brlcad/trunk/include/rt/rt_tcl.h 2015-07-12 01:30:26 UTC (rev 65591)
+++ brlcad/trunk/include/rt/rt_tcl.h 2015-07-12 02:08:41 UTC (rev 65592)
@@ -1,226 +0,0 @@
-/* R T _ T C L . H
- * BRL-CAD
- *
- * Copyright (c) 1993-2015 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.
- */
-/** @addtogroup librt
- *
- * @brief
- * Tcl interfaces to LIBRT routines.
- *
- * LIBRT routines are not for casual command-line use; as a result,
- * the Tcl name for the function should be exactly the same as the C
- * name for the underlying function. Typing "rt_" is no hardship when
- * writing Tcl procs, and clarifies the origin of the routine.
- *
- */
-/** @{ */
-/** @file rt_tcl.h */
-
-#ifndef RT_RT_TCL_H
-#define RT_RT_TCL_H
-
-#include "common.h"
-#include "tcl.h" /* for Tcl_Interp */
-#include "vmath.h"
-#include "rt/defines.h"
-
-__BEGIN_DECLS
-
-
-/**
- * Allow specification of a ray to trace, in two convenient formats.
- *
- * Examples -
- * {0 0 0} dir {0 0 -1}
- * {20 -13.5 20} at {10 .5 3}
- */
-RT_EXPORT extern int rt_tcl_parse_ray(Tcl_Interp *interp,
- struct xray *rp,
- const char *const*argv);
-
-
-/**
- * Format a "union cutter" structure in a TCL-friendly format. Useful
- * for debugging space partitioning
- *
- * Examples -
- * type cutnode
- * type boxnode
- * type nugridnode
- */
-RT_EXPORT extern void rt_tcl_pr_cutter(Tcl_Interp *interp,
- const union cutter *cutp);
-RT_EXPORT extern int rt_tcl_cutter(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- const char *const*argv);
-
-
-/**
- * Format a hit in a TCL-friendly format.
- *
- * It is possible that a solid may have been removed from the
- * directory after this database was prepped, so check pointers
- * carefully.
- *
- * It might be beneficial to use some format other than %g to give the
- * user more precision.
- */
-RT_EXPORT extern void rt_tcl_pr_hit(Tcl_Interp *interp, struct hit *hitp,
const struct seg *segp, int flipflag);
-
-
-/**
- * Generic interface for the LIBRT_class manipulation routines.
- *
- * Usage:
- * procname dbCmdName ?args?
- * Returns: result of cmdName LIBRT operation.
- *
- * Objects of type 'procname' must have been previously created by the
- * 'rt_gettrees' operation performed on a database object.
- *
- * Example -
- * .inmem rt_gettrees .rt all.g
- * .rt shootray {0 0 0} dir {0 0 -1}
- */
-RT_EXPORT extern int rt_tcl_rt(ClientData clientData,
- Tcl_Interp *interp,
- int argc,
- const char **argv);
-
-/************************************************************************************************
- *
*
- * Tcl interface to the Database
*
- *
*
-
************************************************************************************************/
-
-/**
- * Given the name of a database object or a full path to a leaf
- * object, obtain the internal form of that leaf. Packaged separately
- * mainly to make available nice Tcl error handling.
- *
- * Returns -
- * TCL_OK
- * TCL_ERROR
- */
-RT_EXPORT extern int rt_tcl_import_from_path(Tcl_Interp *interp,
- struct rt_db_internal *ip,
- const char *path,
- struct rt_wdb *wdb);
-RT_EXPORT extern void rt_generic_make(const struct rt_functab *ftp, struct
rt_db_internal *intern);
-
-
-/**
- * Add all the supported Tcl interfaces to LIBRT routines to the list
- * of commands known by the given interpreter.
- *
- * wdb_open creates database "objects" which appear as Tcl procs,
- * which respond to many operations.
- *
- * The "db rt_gettrees" operation in turn creates a ray-traceable
- * object as yet another Tcl proc, which responds to additional
- * operations.
- *
- * Note that the MGED mainline C code automatically runs "wdb_open db"
- * and "wdb_open .inmem" on behalf of the MGED user, which exposes all
- * of this power.
- */
-RT_EXPORT extern void rt_tcl_setup(Tcl_Interp *interp);
-RT_EXPORT extern int Sysv_Init(Tcl_Interp *interp);
-
-
-/**
- * Allows LIBRT to be dynamically loaded to a vanilla tclsh/wish with
- * "load /usr/brlcad/lib/libbu.so"
- * "load /usr/brlcad/lib/libbn.so"
- * "load /usr/brlcad/lib/librt.so"
- */
-RT_EXPORT extern int Rt_Init(Tcl_Interp *interp);
-
-
-/**
- * Take a db_full_path and append it to the TCL result string.
- *
- * NOT moving to db_fullpath.h because it is evil Tcl_Interp api
- */
-RT_EXPORT extern void db_full_path_appendresult(Tcl_Interp *interp,
- const struct db_full_path *pp);
-
-
-/**
- * Expects the Tcl_obj argument (list) to be a Tcl list and extracts
- * list elements, converts them to int, and stores them in the passed
- * in array. If the array_len argument is zero, a new array of
- * appropriate length is allocated. The return value is the number of
- * elements converted.
- */
-RT_EXPORT extern int tcl_obj_to_int_array(Tcl_Interp *interp,
- Tcl_Obj *list,
- int **array,
- int *array_len);
-
-/**
- * Expects the Tcl_obj argument (list) to be a Tcl list and extracts
- * list elements, converts them to fastf_t, and stores them in the
- * passed in array. If the array_len argument is zero, a new array of
- * appropriate length is allocated. The return value is the number of
- * elements converted.
- */
-RT_EXPORT extern int tcl_obj_to_fastf_array(Tcl_Interp *interp,
- Tcl_Obj *list,
- fastf_t **array,
- int *array_len);
-
-
-/**
- * interface to above tcl_obj_to_int_array() routine. This routine
- * expects a character string instead of a Tcl_Obj.
- *
- * Returns the number of elements converted.
- */
-RT_EXPORT extern int tcl_list_to_int_array(Tcl_Interp *interp,
- char *char_list,
- int **array,
- int *array_len);
-
-
-/**
- * interface to above tcl_obj_to_fastf_array() routine. This routine
- * expects a character string instead of a Tcl_Obj.
- *
- * returns the number of elements converted.
- */
-RT_EXPORT extern int tcl_list_to_fastf_array(Tcl_Interp *interp,
- const char *char_list,
- fastf_t **array,
- int *array_len);
-
-
-__END_DECLS
-
-#endif /* RT_RT_TCL_H */
-
-/*
- * Local Variables:
- * tab-width: 8
- * mode: C
- * indent-tabs-mode: t
- * c-file-style: "stroustrup"
- * End:
- * ex: shiftwidth=4 tabstop=8
- */
Modified: brlcad/trunk/include/tclcad.h
===================================================================
--- brlcad/trunk/include/tclcad.h 2015-07-12 01:30:26 UTC (rev 65591)
+++ brlcad/trunk/include/tclcad.h 2015-07-12 02:08:41 UTC (rev 65592)
@@ -132,6 +132,177 @@
TCLCAD_EXPORT extern void bn_tcl_setup(Tcl_Interp *interp);
TCLCAD_EXPORT extern int Bn_Init(Tcl_Interp *interp);
TCLCAD_EXPORT extern void bn_tcl_mat_print(Tcl_Interp *interp, const char
*title, const mat_t m);
+
+
+/**
+ * Allow specification of a ray to trace, in two convenient formats.
+ *
+ * Examples -
+ * {0 0 0} dir {0 0 -1}
+ * {20 -13.5 20} at {10 .5 3}
+ */
+TCLCAD_EXPORT extern int rt_tcl_parse_ray(Tcl_Interp *interp,
+ struct xray *rp,
+ const char *const*argv);
+
+
+/**
+ * Format a "union cutter" structure in a TCL-friendly format. Useful
+ * for debugging space partitioning
+ *
+ * Examples -
+ * type cutnode
+ * type boxnode
+ * type nugridnode
+ */
+TCLCAD_EXPORT extern void rt_tcl_pr_cutter(Tcl_Interp *interp,
+ const union cutter *cutp);
+TCLCAD_EXPORT extern int rt_tcl_cutter(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ const char *const*argv);
+
+
+/**
+ * Format a hit in a TCL-friendly format.
+ *
+ * It is possible that a solid may have been removed from the
+ * directory after this database was prepped, so check pointers
+ * carefully.
+ *
+ * It might be beneficial to use some format other than %g to give the
+ * user more precision.
+ */
+TCLCAD_EXPORT extern void rt_tcl_pr_hit(Tcl_Interp *interp, struct hit *hitp,
const struct seg *segp, int flipflag);
+
+
+/**
+ * Generic interface for the LIBRT_class manipulation routines.
+ *
+ * Usage:
+ * procname dbCmdName ?args?
+ * Returns: result of cmdName LIBRT operation.
+ *
+ * Objects of type 'procname' must have been previously created by the
+ * 'rt_gettrees' operation performed on a database object.
+ *
+ * Example -
+ * .inmem rt_gettrees .rt all.g
+ * .rt shootray {0 0 0} dir {0 0 -1}
+ */
+TCLCAD_EXPORT extern int rt_tcl_rt(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ const char **argv);
+
+/************************************************************************************************
+ *
*
+ * Tcl interface to the Database
*
+ *
*
+
************************************************************************************************/
+
+/**
+ * Given the name of a database object or a full path to a leaf
+ * object, obtain the internal form of that leaf. Packaged separately
+ * mainly to make available nice Tcl error handling.
+ *
+ * Returns -
+ * TCL_OK
+ * TCL_ERROR
+ */
+TCLCAD_EXPORT extern int rt_tcl_import_from_path(Tcl_Interp *interp,
+ struct rt_db_internal *ip,
+ const char *path,
+ struct rt_wdb *wdb);
+
+/**
+ * Add all the supported Tcl interfaces to LIBRT routines to the list
+ * of commands known by the given interpreter.
+ *
+ * wdb_open creates database "objects" which appear as Tcl procs,
+ * which respond to many operations.
+ *
+ * The "db rt_gettrees" operation in turn creates a ray-traceable
+ * object as yet another Tcl proc, which responds to additional
+ * operations.
+ *
+ * Note that the MGED mainline C code automatically runs "wdb_open db"
+ * and "wdb_open .inmem" on behalf of the MGED user, which exposes all
+ * of this power.
+ */
+TCLCAD_EXPORT extern void rt_tcl_setup(Tcl_Interp *interp);
+TCLCAD_EXPORT extern int Sysv_Init(Tcl_Interp *interp);
+
+
+/**
+ * Allows LIBRT to be dynamically loaded to a vanilla tclsh/wish with
+ * "load /usr/brlcad/lib/libbu.so"
+ * "load /usr/brlcad/lib/libbn.so"
+ * "load /usr/brlcad/lib/librt.so"
+ */
+TCLCAD_EXPORT extern int Rt_Init(Tcl_Interp *interp);
+
+
+/**
+ * Take a db_full_path and append it to the TCL result string.
+ *
+ * NOT moving to db_fullpath.h because it is evil Tcl_Interp api
+ */
+TCLCAD_EXPORT extern void db_full_path_appendresult(Tcl_Interp *interp,
+ const struct db_full_path *pp);
+
+
+/**
+ * Expects the Tcl_obj argument (list) to be a Tcl list and extracts
+ * list elements, converts them to int, and stores them in the passed
+ * in array. If the array_len argument is zero, a new array of
+ * appropriate length is allocated. The return value is the number of
+ * elements converted.
+ */
+TCLCAD_EXPORT extern int tcl_obj_to_int_array(Tcl_Interp *interp,
+ Tcl_Obj *list,
+ int **array,
+ int *array_len);
+
+/**
+ * Expects the Tcl_obj argument (list) to be a Tcl list and extracts
+ * list elements, converts them to fastf_t, and stores them in the
+ * passed in array. If the array_len argument is zero, a new array of
+ * appropriate length is allocated. The return value is the number of
+ * elements converted.
+ */
+TCLCAD_EXPORT extern int tcl_obj_to_fastf_array(Tcl_Interp *interp,
+ Tcl_Obj *list,
+ fastf_t **array,
+ int *array_len);
+
+
+/**
+ * interface to above tcl_obj_to_int_array() routine. This routine
+ * expects a character string instead of a Tcl_Obj.
+ *
+ * Returns the number of elements converted.
+ */
+TCLCAD_EXPORT extern int tcl_list_to_int_array(Tcl_Interp *interp,
+ char *char_list,
+ int **array,
+ int *array_len);
+
+
+/**
+ * interface to above tcl_obj_to_fastf_array() routine. This routine
+ * expects a character string instead of a Tcl_Obj.
+ *
+ * returns the number of elements converted.
+ */
+TCLCAD_EXPORT extern int tcl_list_to_fastf_array(Tcl_Interp *interp,
+ const char *char_list,
+ fastf_t **array,
+ int *array_len);
+
+
+
+
TCLCAD_EXPORT extern int Tclcad_Init(Tcl_Interp *interp);
/* defined in tclcad_obj.c */
Modified: brlcad/trunk/src/conv/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/CMakeLists.txt 2015-07-12 01:30:26 UTC (rev
65591)
+++ brlcad/trunk/src/conv/CMakeLists.txt 2015-07-12 02:08:41 UTC (rev
65592)
@@ -10,6 +10,7 @@
)
add_subdirectory(3dm)
+add_subdirectory(asc)
add_subdirectory(gcv)
add_subdirectory(step)
add_subdirectory(csg)
@@ -33,18 +34,8 @@
)
BRLCAD_INCLUDE_DIRS(CONV_INCLUDE_DIRS)
-BRLCAD_ADDEXEC(asc2dsp asc/asc2dsp.c libbu)
-
-BRLCAD_ADDEXEC(asc2g asc/asc2g.c
"libtclcad;libged;libwdb;librt;libbu;${WINSOCK_LIB};${M_LIBRARY}")
-
-BRLCAD_ADDEXEC(asc2pix asc/asc2pix.c libbu)
-
-BRLCAD_ADDEXEC(pix2asc asc/pix2asc.c libbu)
-
BRLCAD_ADDEXEC(asc-nmg nmg/asc-nmg.c "libwdb;${M_LIBRARY}")
-BRLCAD_ADDEXEC(g2asc asc/g2asc.c "librt;libbu;${WINSOCK_LIB}")
-
BRLCAD_ADDEXEC(bot-bldxf dxf/bot-bldxf.c "librt;libbu;${M_LIBRARY}")
BRLCAD_ADDEXEC(bot_dump bot_dump.c "libged;librt")
Added: brlcad/trunk/src/conv/asc/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/asc/CMakeLists.txt (rev 0)
+++ brlcad/trunk/src/conv/asc/CMakeLists.txt 2015-07-12 02:08:41 UTC (rev
65592)
@@ -0,0 +1,40 @@
+if(MSVC)
+ add_definitions(
+ -DON_DLL_IMPORTS
+ )
+endif(MSVC)
+
+add_definitions(
+ -D_CONSOLE
+ -DBRLCAD_DLL
+ )
+
+set(ASC_CONV_INCLUDE_DIRS
+ ${BU_INCLUDE_DIRS}
+ ${BN_INCLUDE_DIRS}
+ ${RT_INCLUDE_DIRS}
+ ${GED_INCLUDE_DIRS}
+ ${GCV_INCLUDE_DIRS}
+ ${SYSV_INCLUDE_DIRS}
+ ${WDB_INCLUDE_DIRS}
+ ${TCLCAD_INCLUDE_DIRS}
+ ${REGEX_INCLUDE_DIR}
+ )
+BRLCAD_INCLUDE_DIRS(ASC_CONV_INCLUDE_DIRS)
+
+BRLCAD_ADDEXEC(asc2dsp asc2dsp.c libbu)
+
+BRLCAD_ADDEXEC(asc2g asc2g.c
"libtclcad;libged;libwdb;librt;libbu;${WINSOCK_LIB};${M_LIBRARY}")
+
+BRLCAD_ADDEXEC(asc2pix asc2pix.c libbu)
+
+BRLCAD_ADDEXEC(pix2asc pix2asc.c libbu)
+
+BRLCAD_ADDEXEC(g2asc g2asc.c "libtclcad;librt;libbu;${WINSOCK_LIB}")
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
Property changes on: brlcad/trunk/src/conv/asc/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt 2015-07-12 01:30:26 UTC (rev
65591)
+++ brlcad/trunk/src/libged/CMakeLists.txt 2015-07-12 02:08:41 UTC (rev
65592)
@@ -115,6 +115,7 @@
get_solid_kp.c
get_type.c
glob.c
+ globals.c
gdiff.c
gqa.c
grid.c
Added: brlcad/trunk/src/libged/globals.c
===================================================================
--- brlcad/trunk/src/libged/globals.c (rev 0)
+++ brlcad/trunk/src/libged/globals.c 2015-07-12 02:08:41 UTC (rev 65592)
@@ -0,0 +1,49 @@
+/* G L O B A L S . C
+ * BRL-CAD
+ *
+ * Copyright (c) 2004-2014 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.
+ */
+/** @addtogroup libged */
+/** @{ */
+/** @file libged/globals.c
+ *
+ * Global variables in LIBGED.
+ *
+ * New global variables are discouraged and refactoring in ways that
+ * eliminates existing global variables without reducing functionality
+ * is always encouraged.
+ *
+ */
+/** @} */
+
+#include "common.h"
+
+#include "tcl.h"
+
+/*XXX Temporary global interp */
+Tcl_Interp *brlcad_interp = (Tcl_Interp *)0;
+
+
+/*
+ * Local Variables:
+ * mode: C
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * c-file-style: "stroustrup"
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */
Property changes on: brlcad/trunk/src/libged/globals.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: brlcad/trunk/src/librt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/librt/CMakeLists.txt 2015-07-12 01:30:26 UTC (rev
65591)
+++ brlcad/trunk/src/librt/CMakeLists.txt 2015-07-12 02:08:41 UTC (rev
65592)
@@ -268,7 +268,6 @@
search.c
shoot.c
spectrum.c
- tcl.c
tol.c
transform.c
tree.c
@@ -324,7 +323,7 @@
set(OPENCL_LIBS ${OPENCL_LIBRARIES})
endif(BRLCAD_ENABLE_OPENCL)
-BRLCAD_ADDLIB(librt "${LIBRT_SOURCES}"
"${OPENCL_LIBS};${GDIAM_LIBRARY};${VDS_LIBRARY};libbrep;libbg;libbn;libbu;${OPENNURBS_LIBRARY};${P2T_LIBRARY};libSPR;${TCL_LIBRARY};${REGEX_LIBRARY};${ZLIB_LIBRARY};${WINSOCK_LIB};${RPCRT_LIB};${STDCXX_LIBRARIES}"
NO_STRICT_CXX)
+BRLCAD_ADDLIB(librt "${LIBRT_SOURCES}"
"${OPENCL_LIBS};${GDIAM_LIBRARY};${VDS_LIBRARY};libbrep;libbg;libbn;libbu;${OPENNURBS_LIBRARY};${P2T_LIBRARY};libSPR;${REGEX_LIBRARY};${ZLIB_LIBRARY};${WINSOCK_LIB};${RPCRT_LIB};${STDCXX_LIBRARIES}"
NO_STRICT_CXX)
SET_TARGET_PROPERTIES(librt PROPERTIES VERSION 20.0.1 SOVERSION 20)
if(CPP_DLL_DEFINES)
Modified: brlcad/trunk/src/librt/globals.c
===================================================================
--- brlcad/trunk/src/librt/globals.c 2015-07-12 01:30:26 UTC (rev 65591)
+++ brlcad/trunk/src/librt/globals.c 2015-07-12 02:08:41 UTC (rev 65592)
@@ -32,14 +32,9 @@
#include "common.h"
-#include "tcl.h"
-
#include "raytrace.h"
#include "rt/db4.h"
-/*XXX Temporary global interp */
-Tcl_Interp *brlcad_interp = (Tcl_Interp *)0;
-
struct rt_g RTG = RT_G_INIT_ZERO;
struct resource rt_uniresource = RT_RESOURCE_INIT_ZERO;
Deleted: brlcad/trunk/src/librt/tcl.c
===================================================================
--- brlcad/trunk/src/librt/tcl.c 2015-07-12 01:30:26 UTC (rev 65591)
+++ brlcad/trunk/src/librt/tcl.c 2015-07-12 02:08:41 UTC (rev 65592)
@@ -1,853 +0,0 @@
-/* T C L . C
- * BRL-CAD
- *
- * Copyright (c) 1997-2014 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.
- */
-
-
-#include "common.h"
-
-#include <stdlib.h>
-#include <ctype.h>
-#include <math.h>
-#include <string.h>
-#include "bio.h"
-
-#include "tcl.h"
-
-
-#include "bu/parallel.h"
-#include "vmath.h"
-#include "bn.h"
-#include "rt/geom.h"
-#include "raytrace.h"
-
-/* private headers */
-#include "brlcad_version.h"
-
-#define RT_FUNC_TCL_CAST(_func) ((int (*)(ClientData clientData, Tcl_Interp
*interp, int argc, const char *const *argv))_func)
-
-static int rt_tcl_rt_shootray(ClientData clientData, Tcl_Interp *interp, int
argc, const char *const *argv);
-static int rt_tcl_rt_onehit(ClientData clientData, Tcl_Interp *interp, int
argc, const char *const *argv);
-static int rt_tcl_rt_no_bool(ClientData clientData, Tcl_Interp *interp, int
argc, const char *const *argv);
-static int rt_tcl_rt_check(ClientData clientData, Tcl_Interp *interp, int
argc, const char *const *argv);
-static int rt_tcl_rt_prep(ClientData clientData, Tcl_Interp *interp, int argc,
const char *const *argv);
-static int rt_tcl_rt_cutter(ClientData clientData, Tcl_Interp *interp, int
argc, const char *const*argv);
-static int rt_tcl_rt_set(ClientData clientData, Tcl_Interp *interp, int argc,
const char *const*argv);
-
-
-/************************************************************************
- * *
- * Tcl interface to Ray-tracing *
- * *
- ************************************************************************/
-
-struct dbcmdstruct {
- char *cmdname;
- int (*cmdfunc)(ClientData clientData, Tcl_Interp *interp, int argc, const
char *const *argv);
-};
-
-
-static struct dbcmdstruct rt_tcl_rt_cmds[] = {
- {"shootray", RT_FUNC_TCL_CAST(rt_tcl_rt_shootray)},
- {"onehit", RT_FUNC_TCL_CAST(rt_tcl_rt_onehit)},
- {"no_bool", RT_FUNC_TCL_CAST(rt_tcl_rt_no_bool)},
- {"check", RT_FUNC_TCL_CAST(rt_tcl_rt_check)},
- {"prep", RT_FUNC_TCL_CAST(rt_tcl_rt_prep)},
- {"cutter", RT_FUNC_TCL_CAST(rt_tcl_rt_cutter)},
- {"set", RT_FUNC_TCL_CAST(rt_tcl_rt_set)},
- {(char *)0, RT_FUNC_TCL_CAST(0)}
-};
-
-
-int
-rt_tcl_parse_ray(Tcl_Interp *interp, struct xray *rp, const char *const*argv)
-{
- if (bn_decode_vect(rp->r_pt, argv[0]) != 3) {
- Tcl_AppendResult(interp,
- "badly formatted point: ", argv[0], (char *)NULL);
- return TCL_ERROR;
- }
- if (bn_decode_vect(rp->r_dir, argv[2]) != 3) {
- Tcl_AppendResult(interp,
- "badly formatted vector: ", argv[2], (char *)NULL);
- return TCL_ERROR;
- }
- switch (argv[1][0]) {
- case 'd':
- /* [2] is direction vector */
- break;
- case 'a':
- /* [2] is target point, build a vector from start pt */
- VSUB2(rp->r_dir, rp->r_dir, rp->r_pt);
- break;
- default:
- Tcl_AppendResult(interp,
- "wrong ray keyword: '", argv[1],
- "', should be one of 'dir' or 'at'",
- (char *)NULL);
- return TCL_ERROR;
- }
- VUNITIZE(rp->r_dir);
- return TCL_OK;
-}
-
-
-void
-rt_tcl_pr_cutter(Tcl_Interp *interp, const union cutter *cutp)
-{
- static const char xyz[4] = "XYZ";
- struct bu_vls str = BU_VLS_INIT_ZERO;
- size_t i;
-
- switch (cutp->cut_type) {
- case CUT_CUTNODE:
- bu_vls_printf(&str,
- "type cutnode axis %c point %.25G",
- xyz[cutp->cn.cn_axis], cutp->cn.cn_point);
- break;
- case CUT_BOXNODE:
- bu_vls_printf(&str,
- "type boxnode min {%.25G %.25G %.25G}",
- V3ARGS(cutp->bn.bn_min));
- bu_vls_printf(&str,
- " max {%.25G %.25G %.25G}",
- V3ARGS(cutp->bn.bn_max));
- bu_vls_printf(&str, " solids {");
- for (i=0; i < cutp->bn.bn_len; i++) {
- bu_vls_strcat(&str, cutp->bn.bn_list[i]->st_name);
- bu_vls_putc(&str, ' ');
- }
- bu_vls_printf(&str, "} pieces {");
- for (i = 0; i < cutp->bn.bn_piecelen; i++) {
- struct rt_piecelist *plp = &cutp->bn.bn_piecelist[i];
- size_t j;
- RT_CK_PIECELIST(plp);
- /* These can be taken by user positionally */
- bu_vls_printf(&str, "{%s {", plp->stp->st_name);
- for (j=0; j < plp->npieces; j++) {
- bu_vls_printf(&str, "%ld ", plp->pieces[j]);
- }
- bu_vls_strcat(&str, "} } ");
- }
- bu_vls_strcat(&str, "}");
- break;
- case CUT_NUGRIDNODE:
- bu_vls_printf(&str, "type nugridnode");
- for (i = 0; i < 3; i++) {
- bu_vls_printf(&str, " %c {", xyz[i]);
- bu_vls_printf(&str, "spos %.25G epos %.25G width %.25g",
- cutp->nugn.nu_axis[i]->nu_spos,
- cutp->nugn.nu_axis[i]->nu_epos,
- cutp->nugn.nu_axis[i]->nu_width);
- bu_vls_printf(&str, " cells_per_axis %d",
- cutp->nugn.nu_cells_per_axis[i]);
- bu_vls_printf(&str, " stepsize %d}",
- cutp->nugn.nu_stepsize[i]);
- }
- break;
- default:
- bu_vls_printf(&str, "rt_tcl_pr_cutter() bad pointer cutp=%p",
- (void *)cutp);
- break;
- }
- Tcl_AppendResult(interp, bu_vls_addr(&str), (char *)NULL);
- bu_vls_free(&str);
-}
-
-
-/**
- * Obtain the 'n'th space partitioning cell along the given ray, and
- * return that to the user.
- *
- * Example -
- * .rt cutter 7 {0 0 0} dir {0 0 -1}
- */
-static int
-rt_tcl_rt_cutter(ClientData clientData, Tcl_Interp *interp, int argc, const
char *const*argv)
-{
- struct application *ap = (struct application *)clientData;
- struct rt_i *rtip;
- const union cutter *cutp;
- int n;
-
- if (argc != 6) {
- Tcl_AppendResult(interp,
- "wrong # args: should be \"",
- argv[0], " ", argv[1], "cutnum {P} dir|at {V}\"",
- (char *)NULL);
- return TCL_ERROR;
- }
-
- RT_CK_APPLICATION(ap);
- rtip = ap->a_rt_i;
- RT_CK_RTI(rtip);
-
- n = atoi(argv[2]);
- if (rt_tcl_parse_ray(interp, &ap->a_ray, &argv[3]) == TCL_ERROR)
- return TCL_ERROR;
-
- cutp = rt_cell_n_on_ray(ap, n);
- if (cutp == CUTTER_NULL) {
- Tcl_AppendResult(interp, "rt_cell_n_on_ray() failed to find cell ",
argv[2], (char *)NULL);
- return TCL_ERROR;
- }
- rt_tcl_pr_cutter(interp, cutp);
- return TCL_OK;
-}
-
-
-void
-rt_tcl_pr_hit(Tcl_Interp *interp, struct hit *hitp, const struct seg *segp,
int flipflag)
-{
- struct bu_vls str = BU_VLS_INIT_ZERO;
- vect_t norm;
- struct soltab *stp;
- const struct directory *dp;
- struct curvature crv = {{0.0, 0.0, 0.0}, 0.0, 0.0};
-
- RT_CK_SEG(segp);
- stp = segp->seg_stp;
- RT_CK_SOLTAB(stp);
- dp = stp->st_dp;
- RT_CK_DIR(dp);
-
- RT_HIT_NORMAL(norm, hitp, stp, rayp, flipflag);
- RT_CURVATURE(&crv, hitp, flipflag, stp);
-
- bu_vls_printf(&str, " {dist %g point {", hitp->hit_dist);
- bn_encode_vect(&str, hitp->hit_point);
- bu_vls_printf(&str, "} normal {");
- bn_encode_vect(&str, norm);
- bu_vls_printf(&str, "} c1 %g c2 %g pdir {",
- crv.crv_c1, crv.crv_c2);
- bn_encode_vect(&str, crv.crv_pdir);
- bu_vls_printf(&str, "} surfno %d", hitp->hit_surfno);
- if (stp->st_path.magic == DB_FULL_PATH_MAGIC) {
- /* Magic is left 0 if the path is not filled in. */
- char *sofar = db_path_to_string(&stp->st_path);
- bu_vls_printf(&str, " path ");
- bu_vls_strcat(&str, sofar);
- bu_free((void *)sofar, "path string");
- }
- bu_vls_printf(&str, " solid %s}", dp->d_namep);
-
- Tcl_AppendResult(interp, bu_vls_addr(&str), (char *)NULL);
- bu_vls_free(&str);
-}
-
-
-int
-rt_tcl_a_hit(struct application *ap,
- struct partition *PartHeadp,
- struct seg *UNUSED(segHeadp))
-{
- Tcl_Interp *interp = (Tcl_Interp *)ap->a_uptr;
- register struct partition *pp;
-
- RT_CK_PT_HD(PartHeadp);
-
- for (pp=PartHeadp->pt_forw; pp != PartHeadp; pp = pp->pt_forw) {
- RT_CK_PT(pp);
- Tcl_AppendResult(interp, "{in", (char *)NULL);
- rt_tcl_pr_hit(interp, pp->pt_inhit, pp->pt_inseg, pp->pt_inflip);
- Tcl_AppendResult(interp, "\nout", (char *)NULL);
- rt_tcl_pr_hit(interp, pp->pt_outhit, pp->pt_outseg, pp->pt_outflip);
- Tcl_AppendResult(interp,
- "\nregion ",
- pp->pt_regionp->reg_name,
- (char *)NULL);
- Tcl_AppendResult(interp, "}\n", (char *)NULL);
- }
-
- return 1;
-}
-
-
-int
-rt_tcl_a_miss(struct application *ap)
-{
- if (ap) RT_CK_APPLICATION(ap);
- return 0;
-}
-
-
-/**
- * Usage -
- * procname shootray [-R] {P} dir|at {V}
- * -R option specifies no overlap reporting
- *
- * Example -
- * set glob_compat_mode 0
- * .inmem rt_gettrees .rt all.g
- * .rt shootray -R {0 0 0} dir {0 0 -1}
- *
- * set tgt [bu_get_value_by_keyword V [concat type [.inmem get LIGHT]]]
- * .rt shootray {20 -13.5 20} at $tgt
- *
- *
- * Returns -
- * This "shootray" operation returns a nested set of lists. It
- * returns a list of zero or more partitions. Inside each
- * partition is a list containing an in, out, and region keyword,
- * each with an associated value. The associated value for each
- * "inhit" and "outhit" is itself a list containing a dist,
- * point, normal, surfno, and solid keyword, each with an
- * associated value.
- */
-static int
-rt_tcl_rt_shootray(ClientData clientData, Tcl_Interp *interp, int argc, const
char *const *argv)
-{
- struct application *ap = (struct application *)clientData;
- struct rt_i *rtip;
- int idx;
-
- if ((argc != 5 && argc != 6) || (argc == 6 && !BU_STR_EQUAL(argv[2],
"-R"))) {
- Tcl_AppendResult(interp,
- "wrong # args: should be \"",
- argv[0], " ", argv[1], " [-R] {P} dir|at {V}\"",
- (char *)NULL);
- return TCL_ERROR;
- }
-
- if (argc == 6) {
- ap->a_logoverlap = rt_silent_logoverlap;
- idx = 3;
- } else {
- idx = 2;
- }
-
- RT_CK_APPLICATION(ap);
- rtip = ap->a_rt_i;
- RT_CK_RTI(rtip);
-
- if (rt_tcl_parse_ray(interp, &ap->a_ray, &argv[idx]) == TCL_ERROR)
- return TCL_ERROR;
- ap->a_hit = rt_tcl_a_hit;
- ap->a_miss = rt_tcl_a_miss;
- ap->a_uptr = (void *)interp;
-
- (void)rt_shootray(ap);
-
- return TCL_OK;
-}
-
-
-/**
- * Usage -
- * procname onehit
- * procname onehit #
- */
-static int
-rt_tcl_rt_onehit(ClientData clientData, Tcl_Interp *interp, int argc, const
char *const *argv)
-{
- struct application *ap = (struct application *)clientData;
- struct rt_i *rtip;
- char buf[64];
-
- if (argc < 2 || argc > 3) {
- Tcl_AppendResult(interp,
- "wrong # args: should be \"",
- argv[0], " ", argv[1], " [#]\"",
- (char *)NULL);
- return TCL_ERROR;
- }
-
- RT_CK_APPLICATION(ap);
- rtip = ap->a_rt_i;
- RT_CK_RTI(rtip);
-
- if (argc == 3) {
- ap->a_onehit = atoi(argv[2]);
- }
- sprintf(buf, "%d", ap->a_onehit);
- Tcl_AppendResult(interp, buf, (char *)NULL);
- return TCL_OK;
-}
-
-
-/**
- * Usage -
- * procname no_bool
- * procname no_bool #
- */
-int
-rt_tcl_rt_no_bool(ClientData clientData, Tcl_Interp *interp, int argc, const
char *const *argv)
-{
- struct application *ap = (struct application *)clientData;
- struct rt_i *rtip;
- char buf[64];
-
- if (argc < 2 || argc > 3) {
- Tcl_AppendResult(interp,
- "wrong # args: should be \"",
- argv[0], " ", argv[1], " [#]\"",
- (char *)NULL);
- return TCL_ERROR;
- }
-
- RT_CK_APPLICATION(ap);
- rtip = ap->a_rt_i;
- RT_CK_RTI(rtip);
-
- if (argc == 3) {
- ap->a_no_booleans = atoi(argv[2]);
- }
- sprintf(buf, "%d", ap->a_no_booleans);
- Tcl_AppendResult(interp, buf, (char *)NULL);
- return TCL_OK;
-}
-
-
-/**
- * Run some of the internal consistency checkers over the data
- * structures.
- *
- * Usage -
- * procname check
- */
-int
-rt_tcl_rt_check(ClientData clientData, Tcl_Interp *interp, int argc, const
char *const *argv)
-{
- struct application *ap = (struct application *)clientData;
- struct rt_i *rtip;
-
- if (argc != 2) {
- Tcl_AppendResult(interp,
- "wrong # args: should be \"",
- argv[0], " ", argv[1], "\"",
- (char *)NULL);
- return TCL_ERROR;
- }
-
- RT_CK_APPLICATION(ap);
- rtip = ap->a_rt_i;
- RT_CK_RTI(rtip);
-
- rt_ck(rtip);
-
- return TCL_OK;
-}
-
-
-/**
- * When run with no args, just prints current status of prepping.
- *
- * Usage -
- * procname prep
- * procname prep use_air [hasty_prep]
- */
-int
-rt_tcl_rt_prep(ClientData clientData, Tcl_Interp *interp, int argc, const char
*const *argv)
-{
- struct application *ap = (struct application *)clientData;
- struct rt_i *rtip;
- struct bu_vls str = BU_VLS_INIT_ZERO;
-
- if (argc < 2 || argc > 4) {
- Tcl_AppendResult(interp,
- "wrong # args: should be \"",
- argv[0], " ", argv[1],
- " [hasty_prep]\"",
- (char *)NULL);
- return TCL_ERROR;
- }
-
- RT_CK_APPLICATION(ap);
- rtip = ap->a_rt_i;
- RT_CK_RTI(rtip);
-
- if (argc >= 3 && !rtip->needprep) {
- Tcl_AppendResult(interp,
- argv[0], " ", argv[1],
- " invoked when model has already been prepped.\n",
- (char *)NULL);
- return TCL_ERROR;
- }
-
- if (argc == 4) rtip->rti_hasty_prep = atoi(argv[3]);
-
- /* If args were given, prep now. */
- if (argc >= 3) rt_prep_parallel(rtip, 1);
-
- /* Now, describe the current state */
- bu_vls_printf(&str, "hasty_prep %d dont_instance %d useair %d needprep %d",
- rtip->rti_hasty_prep,
- rtip->rti_dont_instance,
- rtip->useair,
- rtip->needprep
- );
-
- bu_vls_printf(&str, " space_partition_type %s n_nugridnode %d n_cutnode %d
n_boxnode %d n_empty %ld",
- rtip->rti_space_partition == RT_PART_NUGRID ?
- "NUGrid" : "NUBSP",
- rtip->rti_ncut_by_type[CUT_NUGRIDNODE],
- rtip->rti_ncut_by_type[CUT_CUTNODE],
- rtip->rti_ncut_by_type[CUT_BOXNODE],
- rtip->nempty_cells);
- bu_vls_printf(&str, " maxdepth %d maxlen %d",
- rtip->rti_cut_maxdepth,
- rtip->rti_cut_maxlen);
- if (rtip->rti_ncut_by_type[CUT_BOXNODE]) bu_vls_printf(&str, " avglen %g",
-
((double)rtip->rti_cut_totobj) /
-
rtip->rti_ncut_by_type[CUT_BOXNODE]);
-
- Tcl_AppendResult(interp, bu_vls_addr(&str), (char *)NULL);
- bu_vls_free(&str);
- return TCL_OK;
-}
-
-
-/**
- * Set/get the rt object's settable variables.
- *
- * This replaces onehit and no_bool.
- *
- * Usage -
- * procname set
- * procname set vname
- * procname set vname val
- */
-int
-rt_tcl_rt_set(ClientData clientData, Tcl_Interp *interp, int argc, const char
*const *argv)
-{
- struct application *ap = (struct application *)clientData;
- struct rt_i *rtip;
- struct bu_vls str = BU_VLS_INIT_ZERO;
- int val;
- const char *usage = "[vname [val]]";
-
- if (argc < 2 || argc > 4) {
- bu_vls_printf(&str, "%s %s: %s", argv[0], argv[1], usage);
- Tcl_AppendResult(interp, bu_vls_addr(&str), (char *)NULL);
- bu_vls_free(&str);
-
- return TCL_ERROR;
- }
-
- RT_CK_APPLICATION(ap);
- rtip = ap->a_rt_i;
- RT_CK_RTI(rtip);
-
- /* Return a list of the settable variables and their values */
- if (argc == 2) {
- bu_vls_printf(&str, "{onehit %d} ", ap->a_onehit);
- bu_vls_printf(&str, "{no_bool %d} ", ap->a_no_booleans);
- bu_vls_printf(&str, "{bot_reverse_normal_disabled %d}",
ap->a_bot_reverse_normal_disabled);
- Tcl_AppendResult(interp, bu_vls_addr(&str), (char *)NULL);
- bu_vls_free(&str);
-
- return TCL_OK;
- }
-
- if (argc == 4 && sscanf(argv[3], "%d", &val) != 1) {
- bu_vls_printf(&str, "%s %s: bad val - %s, must be an integer", argv[0],
argv[1], argv[3]);
- Tcl_AppendResult(interp, bu_vls_addr(&str), (char *)NULL);
- bu_vls_free(&str);
-
- return TCL_ERROR;
- }
-
- if (argv[2][0] == 'o' && !bu_strncmp(argv[2], "onehit", 6)) {
- if (argc == 3)
- val = ap->a_onehit;
- else
- ap->a_onehit = val;
- } else if (argv[2][0] == 'n' && !bu_strncmp(argv[2], "no_bool", 7)) {
- if (argc == 3)
- val = ap->a_no_booleans;
- else
- ap->a_no_booleans = val;
- } else if (argv[2][0] == 'b' && !bu_strncmp(argv[2],
"bot_reverse_normal_disabled", 27)) {
- if (argc == 3)
- val = ap->a_bot_reverse_normal_disabled;
- else
- ap->a_bot_reverse_normal_disabled = val;
- } else {
- bu_vls_printf(&str, "%s %s: bad val - %s, must be one of the following:
onehit, no_bool, or bot_reverse_normal_disabled",
- argv[0], argv[1], argv[2]);
- Tcl_AppendResult(interp, bu_vls_addr(&str), (char *)NULL);
- bu_vls_free(&str);
-
- return TCL_ERROR;
- }
-
- bu_vls_printf(&str, "%d", val);
- Tcl_AppendResult(interp, bu_vls_addr(&str), (char *)NULL);
- bu_vls_free(&str);
- return TCL_OK;
-}
-
-
-int
-rt_tcl_rt(ClientData clientData, Tcl_Interp *interp, int argc, const char
**argv)
-{
- struct dbcmdstruct *dbcmd;
-
- if (argc < 2) {
- Tcl_AppendResult(interp,
- "wrong # args: should be \"", argv[0],
- " command [args...]\"",
- (char *)NULL);
- return TCL_ERROR;
- }
-
- for (dbcmd = rt_tcl_rt_cmds; dbcmd->cmdname != NULL; dbcmd++) {
- if (BU_STR_EQUAL(dbcmd->cmdname, argv[1])) {
- /* need proper cmd func pointer for actual call */
- int (*_cmdfunc)(void*, Tcl_Interp*, int, const char* const*);
- /* cast to the actual caller */
- _cmdfunc = (int (*)(void*, Tcl_Interp*, int, const char*
const*))(*dbcmd->cmdfunc);
- return _cmdfunc(clientData, interp, argc, argv);
- }
- }
-
-
- Tcl_AppendResult(interp, "unknown LIBRT command '",
- argv[1], "'; must be one of:",
- (char *)NULL);
- for (dbcmd = rt_tcl_rt_cmds; dbcmd->cmdname != NULL; dbcmd++) {
- Tcl_AppendResult(interp, " ", dbcmd->cmdname, (char *)NULL);
- }
- return TCL_ERROR;
-}
-
-
-/************************************************************************
- * *
- * Tcl interface to Combination management *
- * *
- ************************************************************************/
-
-int
-rt_tcl_import_from_path(Tcl_Interp *interp, struct rt_db_internal *ip, const
char *path, struct rt_wdb *wdb)
-{
- struct db_i *dbip;
- int status;
-
- /* Can't run RT_CK_DB_INTERNAL(ip), it hasn't been filled in yet */
- RT_CK_WDB(wdb);
- dbip = wdb->dbip;
- RT_CK_DBI(dbip);
-
- if (strchr(path, '/')) {
- /* This is a path */
- struct db_tree_state ts;
- struct db_full_path old_path;
- struct db_full_path new_path;
- struct directory *dp_curr;
- int ret;
-
- db_init_db_tree_state(&ts, dbip, &rt_uniresource);
- db_full_path_init(&old_path);
- db_full_path_init(&new_path);
-
- if (db_string_to_path(&new_path, dbip, path) < 0) {
- Tcl_AppendResult(interp, "rt_tcl_import_from_path: '",
- path, "' contains unknown object names\n", (char
*)NULL);
- return TCL_ERROR;
- }
-
- dp_curr = DB_FULL_PATH_CUR_DIR(&new_path);
- if (!dp_curr)
- return TCL_ERROR;
-
- ret = db_follow_path(&ts, &old_path, &new_path, LOOKUP_NOISY, 0);
- db_free_full_path(&old_path);
- db_free_full_path(&new_path);
-
- if (ret < 0) {
- Tcl_AppendResult(interp, "rt_tcl_import_from_path: '",
- path, "' is a bad path\n", (char *)NULL);
- return TCL_ERROR;
- }
-
- status = wdb_import(wdb, ip, dp_curr->d_namep, ts.ts_mat);
- if (status == -4) {
- Tcl_AppendResult(interp, dp_curr->d_namep,
- " not found in path ", path, "\n",
- (char *)NULL);
- return TCL_ERROR;
- }
- if (status < 0) {
- Tcl_AppendResult(interp, "wdb_import failure: ",
- dp_curr->d_namep, (char *)NULL);
- return TCL_ERROR;
- }
- } else {
- status = wdb_import(wdb, ip, path, (matp_t)NULL);
- if (status == -4) {
- Tcl_AppendResult(interp, path, ": not found\n",
- (char *)NULL);
- return TCL_ERROR;
- }
- if (status < 0) {
- Tcl_AppendResult(interp, "wdb_import failure: ",
- path, (char *)NULL);
- return TCL_ERROR;
- }
- }
- return TCL_OK;
-}
-
-
-void
-rt_tcl_setup(Tcl_Interp *interp)
-{
- Tcl_LinkVar(interp, "rt_bot_minpieces", (char *)&rt_bot_minpieces,
TCL_LINK_WIDE_INT);
-
- Tcl_LinkVar(interp, "rt_bot_tri_per_piece",
- (char *)&rt_bot_tri_per_piece, TCL_LINK_WIDE_INT);
-
- /*XXX Use of brlcad_interp is temporary */
- brlcad_interp = interp;
-}
-
-
-int
-Rt_Init(Tcl_Interp *interp)
-{
- /*XXX how much will this break? */
- if (!BU_LIST_IS_INITIALIZED(&RTG.rtg_vlfree)) {
- if (bu_avail_cpus() > 1) {
- RTG.rtg_parallel = 1;
- }
-
- /* initialize RT's global state */
- BU_LIST_INIT(&RTG.rtg_vlfree);
- BU_LIST_INIT(&RTG.rtg_headwdb.l);
- if (rt_uniresource.re_magic != RESOURCE_MAGIC) {
- rt_init_resource(&rt_uniresource, 0, NULL);
- }
- }
-
- rt_tcl_setup(interp);
-
- Tcl_PkgProvide(interp, "Rt", brlcad_version());
-
- return TCL_OK;
-}
-
-
-/* ====================================================================== */
-
-/* TCL-oriented C support for LIBRT */
-
-
-void
-db_full_path_appendresult(Tcl_Interp *interp, const struct db_full_path *pp)
-{
- size_t i;
-
- RT_CK_FULL_PATH(pp);
-
- for (i=0; i<pp->fp_len; i++) {
- Tcl_AppendResult(interp, "/", pp->fp_names[i]->d_namep, (char *)NULL);
- }
-}
-
-
-int
-tcl_obj_to_int_array(Tcl_Interp *interp, Tcl_Obj *list, int **array, int
*array_len)
-{
- Tcl_Obj **obj_array;
- int len, i;
-
- if (Tcl_ListObjGetElements(interp, list, &len, &obj_array) != TCL_OK)
- return 0;
-
- if (len < 1)
- return 0;
-
- if (*array_len < 1) {
- *array = (int *)bu_calloc(len, sizeof(int), "array");
- *array_len = len;
- }
-
- for (i=0; i<len && i<*array_len; i++) {
- (*array)[i] = atoi(Tcl_GetStringFromObj(obj_array[i], NULL));
- Tcl_DecrRefCount(obj_array[i]);
- }
-
- return len < *array_len ? len : *array_len;
-}
-
-
-int
-tcl_list_to_int_array(Tcl_Interp *interp, char *char_list, int **array, int
*array_len)
-{
- Tcl_Obj *obj;
- int ret;
-
- obj = Tcl_NewStringObj(char_list, -1);
-
- ret = tcl_obj_to_int_array(interp, obj, array, array_len);
-
- return ret;
-}
-
-
-int
-tcl_obj_to_fastf_array(Tcl_Interp *interp, Tcl_Obj *list, fastf_t **array, int
*array_len)
-{
- Tcl_Obj **obj_array;
- int len, i;
- int ret;
-
- if ((ret=Tcl_ListObjGetElements(interp, list, &len, &obj_array)) != TCL_OK)
- return ret;
-
- if (len < 1)
- return 0;
-
- if (*array_len < 1) {
- *array = (fastf_t *)bu_calloc(len, sizeof(fastf_t), "array");
- *array_len = len;
- }
-
- for (i=0; i<len && i<*array_len; i++) {
- (*array)[i] = atof(Tcl_GetStringFromObj(obj_array[i], NULL));
- Tcl_DecrRefCount(obj_array[i]);
- }
-
- return len < *array_len ? len : *array_len;
-}
-
-
-int
-tcl_list_to_fastf_array(Tcl_Interp *interp, const char *char_list, fastf_t
**array, int *array_len)
-{
- Tcl_Obj *obj;
- int ret;
-
- obj = Tcl_NewStringObj(char_list, -1);
-
- ret = tcl_obj_to_fastf_array(interp, obj, array, array_len);
-
- return ret;
-}
-
-
-/*
- * Local Variables:
- * mode: C
- * tab-width: 8
- * indent-tabs-mode: t
- * c-file-style: "stroustrup"
- * End:
- * ex: shiftwidth=4 tabstop=8
- */
Modified: brlcad/trunk/src/librtserver/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/librtserver/CMakeLists.txt 2015-07-12 01:30:26 UTC (rev
65591)
+++ brlcad/trunk/src/librtserver/CMakeLists.txt 2015-07-12 02:08:41 UTC (rev
65592)
@@ -7,11 +7,12 @@
${BU_INCLUDE_DIRS}
${BN_INCLUDE_DIRS}
${RT_INCLUDE_DIRS}
+ ${TCLCAD_INCLUDE_DIRS}
${JNI_INCLUDE_DIRS}
)
BRLCAD_LIB_INCLUDE_DIRS(rtserver RTSERVER_INCLUDE_DIRS "")
- BRLCAD_ADDLIB(rtserver rtserver.c
"librt;libbn;libbu;${WINSOCK_LIB};${ZLIB_LIBRARY}")
+ BRLCAD_ADDLIB(rtserver rtserver.c
"libtclcad;librt;libbn;libbu;${WINSOCK_LIB};${ZLIB_LIBRARY}")
set_target_properties(rtserver PROPERTIES VERSION 20.0.1 SOVERSION 20)
set_target_properties(rtserver PROPERTIES SUFFIX ".jnilib")
Modified: brlcad/trunk/src/libtclcad/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libtclcad/CMakeLists.txt 2015-07-12 01:30:26 UTC (rev
65591)
+++ brlcad/trunk/src/libtclcad/CMakeLists.txt 2015-07-12 02:08:41 UTC (rev
65592)
@@ -4,6 +4,7 @@
${BRLCAD_SOURCE_DIR}/include
${DM_INCLUDE_DIRS}
${GED_INCLUDE_DIRS}
+ ${TCL_INCLUDE_DIR}
)
# Include directories only needed by the implementation
@@ -26,7 +27,7 @@
cmdhist_obj.c
)
set_property(SOURCE tclcad_obj.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
-BRLCAD_ADDLIB(libtclcad "${LIBTCLCAD_SRCS}" "libged;libdm;${TCLCAD_XLIBS}")
+BRLCAD_ADDLIB(libtclcad "${LIBTCLCAD_SRCS}"
"libged;libdm;${TCL_LIBRARY};${TCLCAD_XLIBS}")
SET_TARGET_PROPERTIES(libtclcad PROPERTIES VERSION 20.0.1 SOVERSION 20)
set(tclcad_ignore_files tclcad_private.h)
CMAKEFILES(${tclcad_ignore_files})
Modified: brlcad/trunk/src/libtclcad/tclcad.c
===================================================================
--- brlcad/trunk/src/libtclcad/tclcad.c 2015-07-12 01:30:26 UTC (rev 65591)
+++ brlcad/trunk/src/libtclcad/tclcad.c 2015-07-12 02:08:41 UTC (rev 65592)
@@ -32,6 +32,8 @@
# include <tk.h>
#endif
+#include "string.h" /* for strchr */
+
#include "vmath.h"
#include "dm.h"
#include "fb.h"
@@ -1382,7 +1384,816 @@
}
+
+#define RT_FUNC_TCL_CAST(_func) ((int (*)(ClientData clientData, Tcl_Interp
*interp, int argc, const char *const *argv))_func)
+
+static int rt_tcl_rt_shootray(ClientData clientData, Tcl_Interp *interp, int
argc, const char *const *argv);
+static int rt_tcl_rt_onehit(ClientData clientData, Tcl_Interp *interp, int
argc, const char *const *argv);
+static int rt_tcl_rt_no_bool(ClientData clientData, Tcl_Interp *interp, int
argc, const char *const *argv);
+static int rt_tcl_rt_check(ClientData clientData, Tcl_Interp *interp, int
argc, const char *const *argv);
+static int rt_tcl_rt_prep(ClientData clientData, Tcl_Interp *interp, int argc,
const char *const *argv);
+static int rt_tcl_rt_cutter(ClientData clientData, Tcl_Interp *interp, int
argc, const char *const*argv);
+static int rt_tcl_rt_set(ClientData clientData, Tcl_Interp *interp, int argc,
const char *const*argv);
+
+
+/************************************************************************
+ * *
+ * Tcl interface to Ray-tracing *
+ * *
+ ************************************************************************/
+
+struct dbcmdstruct {
+ char *cmdname;
+ int (*cmdfunc)(ClientData clientData, Tcl_Interp *interp, int argc, const
char *const *argv);
+};
+
+
+static struct dbcmdstruct rt_tcl_rt_cmds[] = {
+ {"shootray", RT_FUNC_TCL_CAST(rt_tcl_rt_shootray)},
+ {"onehit", RT_FUNC_TCL_CAST(rt_tcl_rt_onehit)},
+ {"no_bool", RT_FUNC_TCL_CAST(rt_tcl_rt_no_bool)},
+ {"check", RT_FUNC_TCL_CAST(rt_tcl_rt_check)},
+ {"prep", RT_FUNC_TCL_CAST(rt_tcl_rt_prep)},
+ {"cutter", RT_FUNC_TCL_CAST(rt_tcl_rt_cutter)},
+ {"set", RT_FUNC_TCL_CAST(rt_tcl_rt_set)},
+ {(char *)0, RT_FUNC_TCL_CAST(0)}
+};
+
+
int
+rt_tcl_parse_ray(Tcl_Interp *interp, struct xray *rp, const char *const*argv)
+{
+ if (bn_decode_vect(rp->r_pt, argv[0]) != 3) {
+ Tcl_AppendResult(interp,
+ "badly formatted point: ", argv[0], (char *)NULL);
+ return TCL_ERROR;
+ }
+ if (bn_decode_vect(rp->r_dir, argv[2]) != 3) {
+ Tcl_AppendResult(interp,
+ "badly formatted vector: ", argv[2], (char *)NULL);
+ return TCL_ERROR;
+ }
+ switch (argv[1][0]) {
+ case 'd':
+ /* [2] is direction vector */
+ break;
+ case 'a':
+ /* [2] is target point, build a vector from start pt */
+ VSUB2(rp->r_dir, rp->r_dir, rp->r_pt);
+ break;
+ default:
+ Tcl_AppendResult(interp,
+ "wrong ray keyword: '", argv[1],
+ "', should be one of 'dir' or 'at'",
+ (char *)NULL);
+ return TCL_ERROR;
+ }
+ VUNITIZE(rp->r_dir);
+ return TCL_OK;
+}
+
+
+void
+rt_tcl_pr_cutter(Tcl_Interp *interp, const union cutter *cutp)
+{
+ static const char xyz[4] = "XYZ";
+ struct bu_vls str = BU_VLS_INIT_ZERO;
+ size_t i;
+
+ switch (cutp->cut_type) {
+ case CUT_CUTNODE:
+ bu_vls_printf(&str,
+ "type cutnode axis %c point %.25G",
+ xyz[cutp->cn.cn_axis], cutp->cn.cn_point);
+ break;
+ case CUT_BOXNODE:
+ bu_vls_printf(&str,
+ "type boxnode min {%.25G %.25G %.25G}",
+ V3ARGS(cutp->bn.bn_min));
+ bu_vls_printf(&str,
+ " max {%.25G %.25G %.25G}",
+ V3ARGS(cutp->bn.bn_max));
+ bu_vls_printf(&str, " solids {");
+ for (i=0; i < cutp->bn.bn_len; i++) {
+ bu_vls_strcat(&str, cutp->bn.bn_list[i]->st_name);
+ bu_vls_putc(&str, ' ');
+ }
+ bu_vls_printf(&str, "} pieces {");
+ for (i = 0; i < cutp->bn.bn_piecelen; i++) {
+ struct rt_piecelist *plp = &cutp->bn.bn_piecelist[i];
+ size_t j;
+ RT_CK_PIECELIST(plp);
+ /* These can be taken by user positionally */
+ bu_vls_printf(&str, "{%s {", plp->stp->st_name);
+ for (j=0; j < plp->npieces; j++) {
+ bu_vls_printf(&str, "%ld ", plp->pieces[j]);
+ }
+ bu_vls_strcat(&str, "} } ");
+ }
+ bu_vls_strcat(&str, "}");
+ break;
+ case CUT_NUGRIDNODE:
+ bu_vls_printf(&str, "type nugridnode");
+ for (i = 0; i < 3; i++) {
+ bu_vls_printf(&str, " %c {", xyz[i]);
+ bu_vls_printf(&str, "spos %.25G epos %.25G width %.25g",
+ cutp->nugn.nu_axis[i]->nu_spos,
+ cutp->nugn.nu_axis[i]->nu_epos,
+ cutp->nugn.nu_axis[i]->nu_width);
+ bu_vls_printf(&str, " cells_per_axis %d",
+ cutp->nugn.nu_cells_per_axis[i]);
+ bu_vls_printf(&str, " stepsize %d}",
+ cutp->nugn.nu_stepsize[i]);
+ }
+ break;
+ default:
+ bu_vls_printf(&str, "rt_tcl_pr_cutter() bad pointer cutp=%p",
+ (void *)cutp);
+ break;
+ }
+ Tcl_AppendResult(interp, bu_vls_addr(&str), (char *)NULL);
+ bu_vls_free(&str);
+}
+
+
+/**
+ * Obtain the 'n'th space partitioning cell along the given ray, and
+ * return that to the user.
+ *
+ * Example -
+ * .rt cutter 7 {0 0 0} dir {0 0 -1}
+ */
+static int
+rt_tcl_rt_cutter(ClientData clientData, Tcl_Interp *interp, int argc, const
char *const*argv)
+{
+ struct application *ap = (struct application *)clientData;
+ struct rt_i *rtip;
+ const union cutter *cutp;
+ int n;
+
+ if (argc != 6) {
+ Tcl_AppendResult(interp,
+ "wrong # args: should be \"",
+ argv[0], " ", argv[1], "cutnum {P} dir|at {V}\"",
+ (char *)NULL);
+ return TCL_ERROR;
+ }
+
+ RT_CK_APPLICATION(ap);
+ rtip = ap->a_rt_i;
+ RT_CK_RTI(rtip);
+
+ n = atoi(argv[2]);
+ if (rt_tcl_parse_ray(interp, &ap->a_ray, &argv[3]) == TCL_ERROR)
+ return TCL_ERROR;
+
+ cutp = rt_cell_n_on_ray(ap, n);
+ if (cutp == CUTTER_NULL) {
+ Tcl_AppendResult(interp, "rt_cell_n_on_ray() failed to find cell ",
argv[2], (char *)NULL);
+ return TCL_ERROR;
+ }
+ rt_tcl_pr_cutter(interp, cutp);
+ return TCL_OK;
+}
+
+
+void
+rt_tcl_pr_hit(Tcl_Interp *interp, struct hit *hitp, const struct seg *segp,
int flipflag)
+{
+ struct bu_vls str = BU_VLS_INIT_ZERO;
+ vect_t norm;
+ struct soltab *stp;
+ const struct directory *dp;
+ struct curvature crv = {{0.0, 0.0, 0.0}, 0.0, 0.0};
+
+ RT_CK_SEG(segp);
+ stp = segp->seg_stp;
+ RT_CK_SOLTAB(stp);
+ dp = stp->st_dp;
+ RT_CK_DIR(dp);
+
+ RT_HIT_NORMAL(norm, hitp, stp, rayp, flipflag);
+ RT_CURVATURE(&crv, hitp, flipflag, stp);
+
+ bu_vls_printf(&str, " {dist %g point {", hitp->hit_dist);
+ bn_encode_vect(&str, hitp->hit_point);
+ bu_vls_printf(&str, "} normal {");
+ bn_encode_vect(&str, norm);
+ bu_vls_printf(&str, "} c1 %g c2 %g pdir {",
+ crv.crv_c1, crv.crv_c2);
+ bn_encode_vect(&str, crv.crv_pdir);
+ bu_vls_printf(&str, "} surfno %d", hitp->hit_surfno);
+ if (stp->st_path.magic == DB_FULL_PATH_MAGIC) {
+ /* Magic is left 0 if the path is not filled in. */
+ char *sofar = db_path_to_string(&stp->st_path);
+ bu_vls_printf(&str, " path ");
+ bu_vls_strcat(&str, sofar);
+ bu_free((void *)sofar, "path string");
+ }
+ bu_vls_printf(&str, " solid %s}", dp->d_namep);
+
+ Tcl_AppendResult(interp, bu_vls_addr(&str), (char *)NULL);
+ bu_vls_free(&str);
+}
+
+
+int
+rt_tcl_a_hit(struct application *ap,
+ struct partition *PartHeadp,
+ struct seg *UNUSED(segHeadp))
+{
+ Tcl_Interp *interp = (Tcl_Interp *)ap->a_uptr;
+ register struct partition *pp;
+
+ RT_CK_PT_HD(PartHeadp);
+
+ for (pp=PartHeadp->pt_forw; pp != PartHeadp; pp = pp->pt_forw) {
+ RT_CK_PT(pp);
+ Tcl_AppendResult(interp, "{in", (char *)NULL);
+ rt_tcl_pr_hit(interp, pp->pt_inhit, pp->pt_inseg, pp->pt_inflip);
+ Tcl_AppendResult(interp, "\nout", (char *)NULL);
+ rt_tcl_pr_hit(interp, pp->pt_outhit, pp->pt_outseg, pp->pt_outflip);
+ Tcl_AppendResult(interp,
+ "\nregion ",
+ pp->pt_regionp->reg_name,
+ (char *)NULL);
+ Tcl_AppendResult(interp, "}\n", (char *)NULL);
+ }
+
+ return 1;
+}
+
+
+int
+rt_tcl_a_miss(struct application *ap)
+{
+ if (ap) RT_CK_APPLICATION(ap);
+ return 0;
+}
+
+
+/**
+ * Usage -
+ * procname shootray [-R] {P} dir|at {V}
+ * -R option specifies no overlap reporting
+ *
+ * Example -
+ * set glob_compat_mode 0
+ * .inmem rt_gettrees .rt all.g
+ * .rt shootray -R {0 0 0} dir {0 0 -1}
+ *
+ * set tgt [bu_get_value_by_keyword V [concat type [.inmem get LIGHT]]]
+ * .rt shootray {20 -13.5 20} at $tgt
+ *
+ *
+ * Returns -
+ * This "shootray" operation returns a nested set of lists. It
+ * returns a list of zero or more partitions. Inside each
+ * partition is a list containing an in, out, and region keyword,
+ * each with an associated value. The associated value for each
+ * "inhit" and "outhit" is itself a list containing a dist,
+ * point, normal, surfno, and solid keyword, each with an
+ * associated value.
+ */
+static int
+rt_tcl_rt_shootray(ClientData clientData, Tcl_Interp *interp, int argc, const
char *const *argv)
+{
+ struct application *ap = (struct application *)clientData;
+ struct rt_i *rtip;
+ int idx;
+
+ if ((argc != 5 && argc != 6) || (argc == 6 && !BU_STR_EQUAL(argv[2],
"-R"))) {
+ Tcl_AppendResult(interp,
+ "wrong # args: should be \"",
+ argv[0], " ", argv[1], " [-R] {P} dir|at {V}\"",
+ (char *)NULL);
+ return TCL_ERROR;
+ }
+
+ if (argc == 6) {
+ ap->a_logoverlap = rt_silent_logoverlap;
+ idx = 3;
+ } else {
+ idx = 2;
+ }
+
+ RT_CK_APPLICATION(ap);
+ rtip = ap->a_rt_i;
+ RT_CK_RTI(rtip);
+
+ if (rt_tcl_parse_ray(interp, &ap->a_ray, &argv[idx]) == TCL_ERROR)
+ return TCL_ERROR;
+ ap->a_hit = rt_tcl_a_hit;
+ ap->a_miss = rt_tcl_a_miss;
+ ap->a_uptr = (void *)interp;
+
+ (void)rt_shootray(ap);
+
+ return TCL_OK;
+}
+
+
+/**
+ * Usage -
+ * procname onehit
+ * procname onehit #
+ */
+static int
+rt_tcl_rt_onehit(ClientData clientData, Tcl_Interp *interp, int argc, const
char *const *argv)
+{
+ struct application *ap = (struct application *)clientData;
+ struct rt_i *rtip;
+ char buf[64];
+
+ if (argc < 2 || argc > 3) {
+ Tcl_AppendResult(interp,
+ "wrong # args: should be \"",
+ argv[0], " ", argv[1], " [#]\"",
+ (char *)NULL);
+ return TCL_ERROR;
+ }
+
+ RT_CK_APPLICATION(ap);
+ rtip = ap->a_rt_i;
+ RT_CK_RTI(rtip);
+
+ if (argc == 3) {
+ ap->a_onehit = atoi(argv[2]);
+ }
+ sprintf(buf, "%d", ap->a_onehit);
+ Tcl_AppendResult(interp, buf, (char *)NULL);
+ return TCL_OK;
+}
+
+
+/**
+ * Usage -
+ * procname no_bool
+ * procname no_bool #
+ */
+int
+rt_tcl_rt_no_bool(ClientData clientData, Tcl_Interp *interp, int argc, const
char *const *argv)
+{
+ struct application *ap = (struct application *)clientData;
+ struct rt_i *rtip;
+ char buf[64];
+
+ if (argc < 2 || argc > 3) {
+ Tcl_AppendResult(interp,
+ "wrong # args: should be \"",
+ argv[0], " ", argv[1], " [#]\"",
+ (char *)NULL);
+ return TCL_ERROR;
+ }
+
+ RT_CK_APPLICATION(ap);
+ rtip = ap->a_rt_i;
+ RT_CK_RTI(rtip);
+
+ if (argc == 3) {
+ ap->a_no_booleans = atoi(argv[2]);
+ }
+ sprintf(buf, "%d", ap->a_no_booleans);
+ Tcl_AppendResult(interp, buf, (char *)NULL);
+ return TCL_OK;
+}
+
+
+/**
+ * Run some of the internal consistency checkers over the data
+ * structures.
+ *
+ * Usage -
+ * procname check
+ */
+int
+rt_tcl_rt_check(ClientData clientData, Tcl_Interp *interp, int argc, const
char *const *argv)
+{
+ struct application *ap = (struct application *)clientData;
+ struct rt_i *rtip;
+
+ if (argc != 2) {
+ Tcl_AppendResult(interp,
+ "wrong # args: should be \"",
+ argv[0], " ", argv[1], "\"",
+ (char *)NULL);
+ return TCL_ERROR;
+ }
+
+ RT_CK_APPLICATION(ap);
+ rtip = ap->a_rt_i;
+ RT_CK_RTI(rtip);
+
+ rt_ck(rtip);
+
+ return TCL_OK;
+}
+
+
+/**
+ * When run with no args, just prints current status of prepping.
+ *
+ * Usage -
+ * procname prep
+ * procname prep use_air [hasty_prep]
+ */
+int
+rt_tcl_rt_prep(ClientData clientData, Tcl_Interp *interp, int argc, const char
*const *argv)
+{
+ struct application *ap = (struct application *)clientData;
+ struct rt_i *rtip;
+ struct bu_vls str = BU_VLS_INIT_ZERO;
+
+ if (argc < 2 || argc > 4) {
+ Tcl_AppendResult(interp,
+ "wrong # args: should be \"",
+ argv[0], " ", argv[1],
+ " [hasty_prep]\"",
+ (char *)NULL);
+ return TCL_ERROR;
+ }
+
+ RT_CK_APPLICATION(ap);
+ rtip = ap->a_rt_i;
+ RT_CK_RTI(rtip);
+
+ if (argc >= 3 && !rtip->needprep) {
+ Tcl_AppendResult(interp,
+ argv[0], " ", argv[1],
+ " invoked when model has already been prepped.\n",
+ (char *)NULL);
+ return TCL_ERROR;
+ }
+
+ if (argc == 4) rtip->rti_hasty_prep = atoi(argv[3]);
+
+ /* If args were given, prep now. */
+ if (argc >= 3) rt_prep_parallel(rtip, 1);
+
+ /* Now, describe the current state */
+ bu_vls_printf(&str, "hasty_prep %d dont_instance %d useair %d needprep %d",
+ rtip->rti_hasty_prep,
+ rtip->rti_dont_instance,
+ rtip->useair,
+ rtip->needprep
+ );
+
+ bu_vls_printf(&str, " space_partition_type %s n_nugridnode %d n_cutnode %d
n_boxnode %d n_empty %ld",
+ rtip->rti_space_partition == RT_PART_NUGRID ?
+ "NUGrid" : "NUBSP",
+ rtip->rti_ncut_by_type[CUT_NUGRIDNODE],
+ rtip->rti_ncut_by_type[CUT_CUTNODE],
+ rtip->rti_ncut_by_type[CUT_BOXNODE],
+ rtip->nempty_cells);
+ bu_vls_printf(&str, " maxdepth %d maxlen %d",
+ rtip->rti_cut_maxdepth,
+ rtip->rti_cut_maxlen);
+ if (rtip->rti_ncut_by_type[CUT_BOXNODE]) bu_vls_printf(&str, " avglen %g",
+
((double)rtip->rti_cut_totobj) /
+
rtip->rti_ncut_by_type[CUT_BOXNODE]);
+
+ Tcl_AppendResult(interp, bu_vls_addr(&str), (char *)NULL);
+ bu_vls_free(&str);
+ return TCL_OK;
+}
+
+
+/**
+ * Set/get the rt object's settable variables.
+ *
+ * This replaces onehit and no_bool.
+ *
+ * Usage -
+ * procname set
+ * procname set vname
+ * procname set vname val
+ */
+int
+rt_tcl_rt_set(ClientData clientData, Tcl_Interp *interp, int argc, const char
*const *argv)
+{
+ struct application *ap = (struct application *)clientData;
+ struct rt_i *rtip;
+ struct bu_vls str = BU_VLS_INIT_ZERO;
+ int val;
+ const char *usage = "[vname [val]]";
+
+ if (argc < 2 || argc > 4) {
+ bu_vls_printf(&str, "%s %s: %s", argv[0], argv[1], usage);
+ Tcl_AppendResult(interp, bu_vls_addr(&str), (char *)NULL);
+ bu_vls_free(&str);
+
+ return TCL_ERROR;
+ }
+
+ RT_CK_APPLICATION(ap);
+ rtip = ap->a_rt_i;
+ RT_CK_RTI(rtip);
+
+ /* Return a list of the settable variables and their values */
+ if (argc == 2) {
+ bu_vls_printf(&str, "{onehit %d} ", ap->a_onehit);
+ bu_vls_printf(&str, "{no_bool %d} ", ap->a_no_booleans);
+ bu_vls_printf(&str, "{bot_reverse_normal_disabled %d}",
ap->a_bot_reverse_normal_disabled);
+ Tcl_AppendResult(interp, bu_vls_addr(&str), (char *)NULL);
+ bu_vls_free(&str);
+
+ return TCL_OK;
+ }
+
+ if (argc == 4 && sscanf(argv[3], "%d", &val) != 1) {
+ bu_vls_printf(&str, "%s %s: bad val - %s, must be an integer", argv[0],
argv[1], argv[3]);
+ Tcl_AppendResult(interp, bu_vls_addr(&str), (char *)NULL);
+ bu_vls_free(&str);
+
+ return TCL_ERROR;
+ }
+
+ if (argv[2][0] == 'o' && !bu_strncmp(argv[2], "onehit", 6)) {
+ if (argc == 3)
+ val = ap->a_onehit;
+ else
+ ap->a_onehit = val;
+ } else if (argv[2][0] == 'n' && !bu_strncmp(argv[2], "no_bool", 7)) {
+ if (argc == 3)
+ val = ap->a_no_booleans;
+ else
+ ap->a_no_booleans = val;
+ } else if (argv[2][0] == 'b' && !bu_strncmp(argv[2],
"bot_reverse_normal_disabled", 27)) {
+ if (argc == 3)
+ val = ap->a_bot_reverse_normal_disabled;
+ else
+ ap->a_bot_reverse_normal_disabled = val;
+ } else {
+ bu_vls_printf(&str, "%s %s: bad val - %s, must be one of the following:
onehit, no_bool, or bot_reverse_normal_disabled",
+ argv[0], argv[1], argv[2]);
+ Tcl_AppendResult(interp, bu_vls_addr(&str), (char *)NULL);
+ bu_vls_free(&str);
+
+ return TCL_ERROR;
+ }
+
+ bu_vls_printf(&str, "%d", val);
+ Tcl_AppendResult(interp, bu_vls_addr(&str), (char *)NULL);
+ bu_vls_free(&str);
+ return TCL_OK;
+}
+
+
+int
+rt_tcl_rt(ClientData clientData, Tcl_Interp *interp, int argc, const char
**argv)
+{
+ struct dbcmdstruct *dbcmd;
+
+ if (argc < 2) {
+ Tcl_AppendResult(interp,
+ "wrong # args: should be \"", argv[0],
+ " command [args...]\"",
+ (char *)NULL);
+ return TCL_ERROR;
+ }
+
+ for (dbcmd = rt_tcl_rt_cmds; dbcmd->cmdname != NULL; dbcmd++) {
+ if (BU_STR_EQUAL(dbcmd->cmdname, argv[1])) {
+ /* need proper cmd func pointer for actual call */
+ int (*_cmdfunc)(void*, Tcl_Interp*, int, const char* const*);
+ /* cast to the actual caller */
+ _cmdfunc = (int (*)(void*, Tcl_Interp*, int, const char*
const*))(*dbcmd->cmdfunc);
+ return _cmdfunc(clientData, interp, argc, argv);
+ }
+ }
+
+
+ Tcl_AppendResult(interp, "unknown LIBRT command '",
+ argv[1], "'; must be one of:",
+ (char *)NULL);
+ for (dbcmd = rt_tcl_rt_cmds; dbcmd->cmdname != NULL; dbcmd++) {
+ Tcl_AppendResult(interp, " ", dbcmd->cmdname, (char *)NULL);
+ }
+ return TCL_ERROR;
+}
+
+
+/************************************************************************
+ * *
+ * Tcl interface to Combination management *
+ * *
+ ************************************************************************/
+
+int
+rt_tcl_import_from_path(Tcl_Interp *interp, struct rt_db_internal *ip, const
char *path, struct rt_wdb *wdb)
+{
+ struct db_i *dbip;
+ int status;
+
+ /* Can't run RT_CK_DB_INTERNAL(ip), it hasn't been filled in yet */
+ RT_CK_WDB(wdb);
+ dbip = wdb->dbip;
+ RT_CK_DBI(dbip);
+
+ if (strchr(path, '/')) {
+ /* This is a path */
+ struct db_tree_state ts;
+ struct db_full_path old_path;
+ struct db_full_path new_path;
+ struct directory *dp_curr;
+ int ret;
+
+ db_init_db_tree_state(&ts, dbip, &rt_uniresource);
+ db_full_path_init(&old_path);
+ db_full_path_init(&new_path);
+
+ if (db_string_to_path(&new_path, dbip, path) < 0) {
+ Tcl_AppendResult(interp, "rt_tcl_import_from_path: '",
+ path, "' contains unknown object names\n", (char
*)NULL);
+ return TCL_ERROR;
+ }
+
+ dp_curr = DB_FULL_PATH_CUR_DIR(&new_path);
+ if (!dp_curr)
+ return TCL_ERROR;
+
+ ret = db_follow_path(&ts, &old_path, &new_path, LOOKUP_NOISY, 0);
+ db_free_full_path(&old_path);
+ db_free_full_path(&new_path);
+
+ if (ret < 0) {
+ Tcl_AppendResult(interp, "rt_tcl_import_from_path: '",
+ path, "' is a bad path\n", (char *)NULL);
+ return TCL_ERROR;
+ }
+
+ status = wdb_import(wdb, ip, dp_curr->d_namep, ts.ts_mat);
+ if (status == -4) {
+ Tcl_AppendResult(interp, dp_curr->d_namep,
+ " not found in path ", path, "\n",
+ (char *)NULL);
+ return TCL_ERROR;
+ }
+ if (status < 0) {
+ Tcl_AppendResult(interp, "wdb_import failure: ",
+ dp_curr->d_namep, (char *)NULL);
+ return TCL_ERROR;
+ }
+ } else {
+ status = wdb_import(wdb, ip, path, (matp_t)NULL);
+ if (status == -4) {
+ Tcl_AppendResult(interp, path, ": not found\n",
+ (char *)NULL);
+ return TCL_ERROR;
+ }
+ if (status < 0) {
+ Tcl_AppendResult(interp, "wdb_import failure: ",
+ path, (char *)NULL);
+ return TCL_ERROR;
+ }
+ }
+ return TCL_OK;
+}
+
+
+void
+rt_tcl_setup(Tcl_Interp *interp)
+{
+ Tcl_LinkVar(interp, "rt_bot_minpieces", (char *)&rt_bot_minpieces,
TCL_LINK_WIDE_INT);
+
+ Tcl_LinkVar(interp, "rt_bot_tri_per_piece",
+ (char *)&rt_bot_tri_per_piece, TCL_LINK_WIDE_INT);
+
+ /*XXX Use of brlcad_interp is temporary */
+ brlcad_interp = interp;
+}
+
+
+int
+Rt_Init(Tcl_Interp *interp)
+{
+ /*XXX how much will this break? */
+ if (!BU_LIST_IS_INITIALIZED(&RTG.rtg_vlfree)) {
+ if (bu_avail_cpus() > 1) {
+ RTG.rtg_parallel = 1;
+ }
+
+ /* initialize RT's global state */
+ BU_LIST_INIT(&RTG.rtg_vlfree);
+ BU_LIST_INIT(&RTG.rtg_headwdb.l);
+ if (rt_uniresource.re_magic != RESOURCE_MAGIC) {
+ rt_init_resource(&rt_uniresource, 0, NULL);
+ }
+ }
+
+ rt_tcl_setup(interp);
+
+ Tcl_PkgProvide(interp, "Rt", brlcad_version());
+
+ return TCL_OK;
+}
+
+
+/* ====================================================================== */
+
+/* TCL-oriented C support for LIBRT */
+
+
+void
+db_full_path_appendresult(Tcl_Interp *interp, const struct db_full_path *pp)
+{
+ size_t i;
+
+ RT_CK_FULL_PATH(pp);
+
+ for (i=0; i<pp->fp_len; i++) {
+ Tcl_AppendResult(interp, "/", pp->fp_names[i]->d_namep, (char *)NULL);
+ }
+}
+
+
+int
+tcl_obj_to_int_array(Tcl_Interp *interp, Tcl_Obj *list, int **array, int
*array_len)
+{
+ Tcl_Obj **obj_array;
+ int len, i;
+
+ if (Tcl_ListObjGetElements(interp, list, &len, &obj_array) != TCL_OK)
+ return 0;
+
+ if (len < 1)
+ return 0;
+
+ if (*array_len < 1) {
+ *array = (int *)bu_calloc(len, sizeof(int), "array");
+ *array_len = len;
+ }
+
+ for (i=0; i<len && i<*array_len; i++) {
+ (*array)[i] = atoi(Tcl_GetStringFromObj(obj_array[i], NULL));
+ Tcl_DecrRefCount(obj_array[i]);
+ }
+
+ return len < *array_len ? len : *array_len;
+}
+
+
+int
+tcl_list_to_int_array(Tcl_Interp *interp, char *char_list, int **array, int
*array_len)
+{
+ Tcl_Obj *obj;
+ int ret;
+
+ obj = Tcl_NewStringObj(char_list, -1);
+
+ ret = tcl_obj_to_int_array(interp, obj, array, array_len);
+
+ return ret;
+}
+
+
+int
+tcl_obj_to_fastf_array(Tcl_Interp *interp, Tcl_Obj *list, fastf_t **array, int
*array_len)
+{
+ Tcl_Obj **obj_array;
+ int len, i;
+ int ret;
+
+ if ((ret=Tcl_ListObjGetElements(interp, list, &len, &obj_array)) != TCL_OK)
+ return ret;
+
+ if (len < 1)
+ return 0;
+
+ if (*array_len < 1) {
+ *array = (fastf_t *)bu_calloc(len, sizeof(fastf_t), "array");
+ *array_len = len;
+ }
+
+ for (i=0; i<len && i<*array_len; i++) {
+ (*array)[i] = atof(Tcl_GetStringFromObj(obj_array[i], NULL));
+ Tcl_DecrRefCount(obj_array[i]);
+ }
+
+ return len < *array_len ? len : *array_len;
+}
+
+
+int
+tcl_list_to_fastf_array(Tcl_Interp *interp, const char *char_list, fastf_t
**array, int *array_len)
+{
+ Tcl_Obj *obj;
+ int ret;
+
+ obj = Tcl_NewStringObj(char_list, -1);
+
+ ret = tcl_obj_to_fastf_array(interp, obj, array, array_len);
+
+ return ret;
+}
+
+
+
+
+
+
+
+int
Tclcad_Init(Tcl_Interp *interp)
{
if (library_initialized(0))
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
