Revision: 57097
http://sourceforge.net/p/brlcad/code/57097
Author: iiizzzaaakkk
Date: 2013-08-23 08:51:24 +0000 (Fri, 23 Aug 2013)
Log Message:
-----------
Removing unused variable polycurve and fixing function declarations in pc
header
Modified Paths:
--------------
brlcad/trunk/include/pc.h
brlcad/trunk/src/libbrep/boolean.cpp
brlcad/trunk/src/librt/primitives/hrt/hrt.c
Modified: brlcad/trunk/include/pc.h
===================================================================
--- brlcad/trunk/include/pc.h 2013-08-23 05:01:02 UTC (rev 57096)
+++ brlcad/trunk/include/pc.h 2013-08-23 08:51:24 UTC (rev 57097)
@@ -112,22 +112,22 @@
PC_EXPORT extern void pc_init_pcset(struct pc_pc_set * pcs);
PC_EXPORT extern void pc_free_pcset(struct pc_pc_set * pcs);
PC_EXPORT extern void pc_free_constraint(struct pc_constrnt * c);
-PC_EXPORT extern void pc_getparameter(struct pc_param ** pint t);
-PC_EXPORT extern void pc_pushparam_expr(struct pc_pc_set * pcs, const char *
nameconst char * str);
-PC_EXPORT extern void pc_pushparam_struct(struct pc_pc_set * pcs, const char *
name, int typevoid * ptr);
+PC_EXPORT extern void pc_getparameter(struct pc_param **p, int t);
+PC_EXPORT extern void pc_pushparam_expr(struct pc_pc_set * pcsp, const char
*name, const char *str);
+PC_EXPORT extern void pc_pushparam_struct(struct pc_pc_set * pcs, const char *
name, int type, void * ptr);
PC_EXPORT extern void pc_getconstraint_expr(struct pc_constrnt ** c);
-PC_EXPORT extern void pc_getconstraint_struct(struct pc_constrnt ** cint
nargs);
-PC_EXPORT extern void pc_pushconstraint_expr(struct pc_pc_set * pcs, const
char * nameconst char * str);
-PC_EXPORT extern void pc_pushconstraint_struct(struct pc_pc_set * pcs, const
char * name, int nargs, int dimension, int (*fp) (double ** args)const char **
args);
-PC_EXPORT extern void pc_pushconstraint_struct1(struct pc_pc_set * pcsstruct
pc_constrnt * c);
-PC_EXPORT extern void pc_pushconstraint(struct pc_pc_set * pcsconst char *
str);
+PC_EXPORT extern void pc_getconstraint_struct(struct pc_constrnt **c, int
nargs);
+PC_EXPORT extern void pc_pushconstraint_expr(struct pc_pc_set * pcsp, const
char * name, const char * str);
+PC_EXPORT extern void pc_pushconstraint_struct(struct pc_pc_set * pcs, const
char * name, int nargs, int dimension, int (*fp) (double ** args), const char
** args);
+PC_EXPORT extern void pc_pushconstraint_struct1(struct pc_pc_set * pcs, struct
pc_constrnt * c);
+PC_EXPORT extern void pc_pushconstraint(struct pc_pc_set * pcs, const char *
str);
/* constraint eval functions defined in pc_constraints.c */
PC_EXPORT extern int pc_isperpendicular(double ** v);
-PC_EXPORT extern void pc_mk_isperpendicular(struct pc_constrnt ** c, const
char * nameconst char **args);
+PC_EXPORT extern void pc_mk_isperpendicular(struct pc_constrnt ** c, const
char * name, const char **args);
PC_EXPORT extern int pc_ismodpositive(double ** v);
-PC_EXPORT extern void pc_mk_ismodpositive(struct pc_constrnt ** c, const char
* nameconst char **args);
+PC_EXPORT extern void pc_mk_ismodpositive(struct pc_constrnt ** c, const char
* name, const char **args);
#ifdef __cplusplus
}
Modified: brlcad/trunk/src/libbrep/boolean.cpp
===================================================================
--- brlcad/trunk/src/libbrep/boolean.cpp 2013-08-23 05:01:02 UTC (rev
57096)
+++ brlcad/trunk/src/libbrep/boolean.cpp 2013-08-23 08:51:24 UTC (rev
57097)
@@ -565,7 +565,6 @@
continue;
if (c1 != NULL && c2 != NULL) {
- ON_PolyCurve* polycurve = new ON_PolyCurve;
LinkedCurve newcurve;
newcurve.Append(*c1);
if (dis > ON_ZERO_TOLERANCE)
Modified: brlcad/trunk/src/librt/primitives/hrt/hrt.c
===================================================================
--- brlcad/trunk/src/librt/primitives/hrt/hrt.c 2013-08-23 05:01:02 UTC (rev
57096)
+++ brlcad/trunk/src/librt/primitives/hrt/hrt.c 2013-08-23 08:51:24 UTC (rev
57097)
@@ -419,7 +419,6 @@
pprime[X] = (hrt->hrt_SoR[0]*trans[X] + hrt->hrt_SoR[1]*trans[Y] +
hrt->hrt_SoR[2]*trans[Z]) * 1.0/(hrt->hrt_SoR[15]);
pprime[Y] = (hrt->hrt_SoR[4]*trans[X] + hrt->hrt_SoR[5]*trans[Y] +
hrt->hrt_SoR[6]*trans[Z]) * 1.0/(hrt->hrt_SoR[15]);
pprime[Z] = (hrt->hrt_SoR[8]*trans[X] + hrt->hrt_SoR[9]*trans[Y] +
hrt->hrt_SoR[10]*trans[Z]) * 1.0/(hrt->hrt_SoR[15]);
-
/* Translate ray direction vector */
MAT4X3VEC(dprime, hrt->hrt_SoR, rp->r_dir);
VUNITIZE(dprime);
@@ -436,7 +435,6 @@
/**
* Generate the sextic equation S(t) = 0 to be passed through the root
finder.
*/
-
S.dgr = 6;
S.cf[0] = 4320.0 * dprime[X] * dprime[X] * dprime[Y] * dprime[Y] *
dprime[Z] * dprime[Z] + 960.0 * dprime[X] * dprime[X] * dprime[Z] * dprime[Z]
* (dprime[X] * dprime[X] + dprime[Z] * dprime[Z]) + 320.0 *
(dprime[X] * dprime[X] * dprime[X] * dprime[X] * dprime[X] * dprime[X]
@@ -525,7 +523,6 @@
+ 2160.0 * (pprime[Y] * pprime[Y] * (1.0 + pprime[X] * pprime[X] *
pprime[X] * pprime[X] + pprime[Z] * pprime[Z] * pprime[Z] * pprime[Z]))
+ 4860.0 * (pprime[Y] * pprime[Y] * pprime[Y] * pprime[Y] *
(pprime[X] * pprime[X] + pprime[Z] * pprime[Z] + 1.0)) + 3645.0 * pprime[Y]
* pprime[Y] * pprime[Y] * pprime[Y] * pprime[Y] * pprime[Y] ;
-
/* It is known that the equation is sextic (of order 6). Therefore, if the
* root finder returns other than 6 roots, return an error.
*/
@@ -555,8 +552,7 @@
for (j=0, i=0; j < 6; j++) {
if (NEAR_ZERO(complex[j].im, ap->a_rt_i->rti_tol.dist))
real[i++] = complex[j].re;
- }
-
+ }
/* Here, 'i' is number of points found */
switch (i) {
case 0:
@@ -615,7 +611,7 @@
}
break;
}
-
+
/* Now, t[0] > t[npts-1] */
/* real[1] is entry point, and real[0] is farthest exit point */
RT_GET_SEG(segp, ap->a_resource);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
