Revision: 65584
http://sourceforge.net/p/brlcad/code/65584
Author: starseeker
Date: 2015-07-12 00:21:23 +0000 (Sun, 12 Jul 2015)
Log Message:
-----------
remove some more uses of brlcad_interp
Modified Paths:
--------------
brlcad/trunk/src/librt/primitives/arbn/arbn.c
brlcad/trunk/src/librt/primitives/ars/ars.c
brlcad/trunk/src/librt/primitives/cline/cline.c
brlcad/trunk/src/librt/primitives/ebm/ebm.c
brlcad/trunk/src/librt/primitives/extrude/extrude.c
Modified: brlcad/trunk/src/librt/primitives/arbn/arbn.c
===================================================================
--- brlcad/trunk/src/librt/primitives/arbn/arbn.c 2015-07-12 00:15:35 UTC
(rev 65583)
+++ brlcad/trunk/src/librt/primitives/arbn/arbn.c 2015-07-12 00:21:23 UTC
(rev 65584)
@@ -45,6 +45,7 @@
#include "rt/db4.h"
#include "rt/geom.h"
#include "raytrace.h"
+#include "../../librt_private.h"
/**
* Calculate a bounding RPP for an ARBN
@@ -1212,7 +1213,7 @@
c++;
}
len = 0;
- (void)tcl_list_to_fastf_array(brlcad_interp, argv[1], &new_planes,
&len);
+ (void)rt_tcl_list_to_fastf_array(argv[1], &new_planes, &len);
if (len%ELEMENTS_PER_PLANE) {
bu_vls_printf(logstr,
@@ -1247,8 +1248,7 @@
}
len = ELEMENTS_PER_PLANE;
array = (fastf_t *)&arbn->eqn[i];
- if (tcl_list_to_fastf_array(brlcad_interp, argv[1],
- &array, &len) != ELEMENTS_PER_PLANE) {
+ if (rt_tcl_list_to_fastf_array(argv[1], &array, &len) !=
ELEMENTS_PER_PLANE) {
bu_vls_printf(logstr,
"ERROR: incorrect number of coefficients for a
plane\n");
return BRLCAD_ERROR;
Modified: brlcad/trunk/src/librt/primitives/ars/ars.c
===================================================================
--- brlcad/trunk/src/librt/primitives/ars/ars.c 2015-07-12 00:15:35 UTC (rev
65583)
+++ brlcad/trunk/src/librt/primitives/ars/ars.c 2015-07-12 00:21:23 UTC (rev
65584)
@@ -1254,11 +1254,8 @@
j = atoi(ptr+1);
len = 3;
array = &ars->curves[i][j*3];
- if (tcl_list_to_fastf_array(brlcad_interp, argv[1],
- &array,
- &len)!= len) {
- bu_vls_printf(logstr,
- "WARNING: incorrect number of parameters
provided for a point\n");
+ if (rt_tcl_list_to_fastf_array(argv[1], &array, &len)!=
len) {
+ bu_vls_printf(logstr, "WARNING: incorrect number of
parameters provided for a point\n");
}
} else {
char *dupstr;
@@ -1277,7 +1274,7 @@
if (!ars->curves[i]) {
ars->curves[i] = (fastf_t
*)bu_calloc(ars->pts_per_curve * 3, sizeof(fastf_t), "ars->curves[i]");
}
- if (tcl_list_to_fastf_array(brlcad_interp, dupstr,
&ars->curves[i], &len) != len) {
+ if (rt_tcl_list_to_fastf_array(dupstr, &ars->curves[i],
&len) != len) {
bu_vls_printf(logstr, "WARNING: incorrect number of
parameters provided for a curve\n");
}
bu_free(dupstr, "bu_strdup ars curve");
Modified: brlcad/trunk/src/librt/primitives/cline/cline.c
===================================================================
--- brlcad/trunk/src/librt/primitives/cline/cline.c 2015-07-12 00:15:35 UTC
(rev 65583)
+++ brlcad/trunk/src/librt/primitives/cline/cline.c 2015-07-12 00:21:23 UTC
(rev 65584)
@@ -40,6 +40,7 @@
#include "rt/geom.h"
#include "raytrace.h"
#include "wdb.h"
+#include "../../librt_private.h"
/* ray tracing form of solid, including precomputed terms */
@@ -1056,14 +1057,14 @@
if (*argv[0] == 'V') {
newval = cli->v;
- if (tcl_list_to_fastf_array(brlcad_interp, argv[1], &newval,
&array_len) !=
+ if (rt_tcl_list_to_fastf_array(argv[1], &newval, &array_len) !=
array_len) {
bu_vls_printf(logstr, "ERROR: Incorrect number of coordinates
for vector\n");
return BRLCAD_ERROR;
}
} else if (*argv[0] == 'H') {
newval = cli->h;
- if (tcl_list_to_fastf_array(brlcad_interp, argv[1], &newval,
&array_len) !=
+ if (rt_tcl_list_to_fastf_array(argv[1], &newval, &array_len) !=
array_len) {
bu_vls_printf(logstr, "ERROR: Incorrect number of coordinates
for point\n");
return BRLCAD_ERROR;
Modified: brlcad/trunk/src/librt/primitives/ebm/ebm.c
===================================================================
--- brlcad/trunk/src/librt/primitives/ebm/ebm.c 2015-07-12 00:15:35 UTC (rev
65583)
+++ brlcad/trunk/src/librt/primitives/ebm/ebm.c 2015-07-12 00:21:23 UTC (rev
65584)
@@ -44,6 +44,7 @@
#include "rt/geom.h"
#include "raytrace.h"
#include "../fixpt.h"
+#include "../../librt_private.h"
struct rt_ebm_specific {
@@ -1636,11 +1637,8 @@
int len = 16;
fastf_t array[16];
fastf_t *ar_ptr;
-
- /*XXX needs list_to_fastf_array function */
ar_ptr = array;
-
- if (tcl_list_to_fastf_array(brlcad_interp, argv[1], &ar_ptr, &len)
!= len) {
+ if (rt_tcl_list_to_fastf_array(argv[1], &ar_ptr, &len) != len) {
bu_vls_printf(logstr, "ERROR: incorrect number of coefficients
for matrix\n");
return BRLCAD_ERROR;
}
Modified: brlcad/trunk/src/librt/primitives/extrude/extrude.c
===================================================================
--- brlcad/trunk/src/librt/primitives/extrude/extrude.c 2015-07-12 00:15:35 UTC
(rev 65583)
+++ brlcad/trunk/src/librt/primitives/extrude/extrude.c 2015-07-12 00:21:23 UTC
(rev 65584)
@@ -2779,20 +2779,20 @@
if (*argv[0] == 'V') {
newval = extr->V;
- if (tcl_list_to_fastf_array(brlcad_interp, argv[1], &newval,
&array_len) != array_len) {
+ if (rt_tcl_list_to_fastf_array(argv[1], &newval, &array_len) !=
array_len) {
bu_vls_printf(logstr, "ERROR: incorrect number of coordinates
for vertex\n");
return BRLCAD_ERROR;
}
} else if (*argv[0] == 'H') {
newval = extr->h;
- if (tcl_list_to_fastf_array(brlcad_interp, argv[1], &newval,
&array_len) !=
+ if (rt_tcl_list_to_fastf_array(argv[1], &newval, &array_len) !=
array_len) {
bu_vls_printf(logstr, "ERROR: incorrect number of coordinates
for vector\n");
return BRLCAD_ERROR;
}
} else if (*argv[0] == 'A') {
newval = extr->u_vec;
- if (tcl_list_to_fastf_array(brlcad_interp, argv[1], &newval,
&array_len) !=
+ if (rt_tcl_list_to_fastf_array(argv[1], &newval, &array_len) !=
array_len) {
bu_vls_printf(logstr, "ERROR: incorrect number of coordinates
for vector\n");
return BRLCAD_ERROR;
@@ -2804,7 +2804,7 @@
VSCALE(extr->v_vec, extr->v_vec, len);
} else if (*argv[0] == 'B') {
newval = extr->v_vec;
- if (tcl_list_to_fastf_array(brlcad_interp, argv[1], &newval,
&array_len) != array_len) {
+ if (rt_tcl_list_to_fastf_array(argv[1], &newval, &array_len) !=
array_len) {
bu_vls_printf(logstr, "ERROR: incorrect number of coordinates
for vector\n");
return BRLCAD_ERROR;
}
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
