Revision: 41820
http://brlcad.svn.sourceforge.net/brlcad/?rev=41820&view=rev
Author: erikgreenwald
Date: 2010-12-28 22:01:27 +0000 (Tue, 28 Dec 2010)
Log Message:
-----------
MFC 41816
Modified Paths:
--------------
brlcad/branches/bottie/NEWS
brlcad/branches/bottie/TODO
brlcad/branches/bottie/bench/pixcmp.c
brlcad/branches/bottie/bench/run.sh
brlcad/branches/bottie/configure.ac
brlcad/branches/bottie/include/bn.h
brlcad/branches/bottie/include/brep.h
brlcad/branches/bottie/include/bu.h
brlcad/branches/bottie/include/conf/MINOR
brlcad/branches/bottie/include/conf/PATCH
brlcad/branches/bottie/include/dm.h
brlcad/branches/bottie/include/ged.h
brlcad/branches/bottie/include/opennurbs_ext.h
brlcad/branches/bottie/include/pkg.h
brlcad/branches/bottie/include/raytrace.h
brlcad/branches/bottie/include/vmath.h
brlcad/branches/bottie/misc/win32-msvc/Dll/BrlcadCore.def
brlcad/branches/bottie/misc/win32-msvc8/brlcad/brlcad.sln
brlcad/branches/bottie/misc/win32-msvc8/pixcmp/pixcmp.vcproj
brlcad/branches/bottie/misc/win32-msvc8/tclsh/library/installTree.tcl
Added Paths:
-----------
brlcad/branches/bottie/misc/win32-msvc8/pixcmp/
Property Changed:
----------------
brlcad/branches/bottie/misc/win32-msvc8/pixcmp/pixcmp.vcproj
Modified: brlcad/branches/bottie/NEWS
===================================================================
--- brlcad/branches/bottie/NEWS 2010-12-28 21:58:38 UTC (rev 41819)
+++ brlcad/branches/bottie/NEWS 2010-12-28 22:01:27 UTC (rev 41820)
@@ -10,9 +10,15 @@
changes made. See document footer for additional details.
----------------------------------------------------------------------
---- 2010-09-XX Release 7.18.0 ---
+--- 2010-12-XX Release 7.18.2 ---
----------------------------------------------------------------------
+* removed shell execution ! command from vdeck - Cliff Yapp
+
+----------------------------------------------------------------------
+--- 2010-12-07 Release 7.18.0 ---
+----------------------------------------------------------------------
+
This release includes the initial release of a new Bag of Triangle
(BoT) editing interface for MGED and Archer. Nicholas Reed developed
the new graphical user interface (GUI) in order to consolidate the
@@ -20,6 +26,11 @@
easy-to-use interface. The new GUI grealy simplifies BoT processing
steps and can save modelers considerable time.
+* ported benchmark suite to Windows (requires 'sh') - Erik Greenwald
+* improved NURBS wireframes with interior surface lines - Keith Bowman
+* additional NURBS raytracing robustness improvements - Keith Bowman
+* removed pl-sgi plot tool - Sean Morrison
+* expanded rtarea documentation with examples and detail - Cliff Yapp
* improved support for unlimited object counts in mged - Sean Morrison
* fixed 'erase_all' behavior so 'who' gives correct lists - Bob Parker
* fixed idents, solids, and regions output - Bob Parker
@@ -1935,9 +1946,10 @@
Subversion revision control on Sourceforge.
NEWS items should be formatted to column 70 (default M-q in Emacs),
-use no tabs, and include credits to all significant contributors.
-Multiple contributors may be listed on the following line but the
-summary description itself should never exceed column 70 or one line.
+include credits to all significant contributors, and be descriptively
+succient. NEWS items should be ONE LINE per user-visible change with
+the description not exceeding column 70. Multiple contributors may be
+listed on the same or following line.
// Local Variables:
// mode: Text
Modified: brlcad/branches/bottie/TODO
===================================================================
--- brlcad/branches/bottie/TODO 2010-12-28 21:58:38 UTC (rev 41819)
+++ brlcad/branches/bottie/TODO 2010-12-28 22:01:27 UTC (rev 41820)
@@ -17,16 +17,16 @@
THESE TASKS SHOULD HAPPEN BEFORE THE NEXT RELEASE
-------------------------------------------------
-* make sure 'preview' works, particularly the 'tree' subcommand.
+* conversion.sh using signals for child->parent communication
-* verify 'solids_on_ray' command works ('Ray Pick' menu option)
+* conversion.sh --not and --only options
-* verify rt/benchmark on windows doesn't crash
-
THESE TASKS SHOULD HAPPEN WITHIN TWO RELEASE ITERATIONS
-------------------------------------------------------
+* update g-xxx_facets to use libgcv
+
* rename all the g_* tools sans "_"
* explore the g_qa/plot issue
@@ -46,6 +46,24 @@
THESE ARE UNSCHEDULED BACKLOG TASKS
-----------------------------------
+* investigate why solids.sh fails on three pixels on some 64-bit
+ platforms. it grazingly hits/misses a tgc causing a regression
+ failure.
+
+ havoc.g s.nos5g reliably exhibits the grazing edge bug where only
+ one hit point is being returned. to reproduce:
+ e s.nos5g ; ae 35 25 ; units mm ; center 26912.4 7089.08 7168.96 ; nirt
+
+* deprecate rtg3 and burst
+
+* make sure 'preview' works, particularly the 'tree' subcommand.
+
+* make nreed's new bot cleanup interface update interactively without
+ resorting to calls to Tcl_DoOneEvent() down in librt.
+
+* upgrade source repository back-end to the latest SVN 1.5 so we can
+ benefit from proper merge tracking.
+
* make sure mged/archer behave properly with relative paths to dbopen.
Windows in particular is doing something different in
src/librt/db_open.c that should be a problem as it only records the
@@ -412,6 +430,10 @@
* add support to 'rtxray' for outputting inverted pixel values so that
we have pixel values that are directly related to material thickness
+* gqa semaphore locking on results is very slow and gets worse as the
+ number of cores and speed of cpu increases. resource contention on
+ semaphores slows everything down substantially.
+
* g_qa (gqa in mged) needs to be more informative when it runs -
needs a header letting you know what it's doing, and if possible
a "progress report" for longer runs that provides some notion of
@@ -502,6 +524,11 @@
* implement -param support for 'search' command
+* make "search ." return object lists (no leading "/") but still
+ process hierarchically so things like "search . -maxdepth 0" return
+ a list of the top-level objects. The "." implies returning only
+ unique names (i.e., a list).
+
* make ged command names aware of object arguments for automatic
globbing and regular expression expansion:
attr set t 1 [regex .*\.r]
@@ -587,10 +614,6 @@
* address the TODO items in src/mged/clone.c
-* investigate why solids.sh fails on three pixels on some 64-bit
- platforms. it grazingly hits/misses a tgc causing a regression
- failure.
-
* develop a low-level tool for investigating, reporting statistics on,
and repairing geometry database files. the tool should nominally
perform big/little endian conversions, report number and types of
Modified: brlcad/branches/bottie/bench/pixcmp.c
===================================================================
--- brlcad/branches/bottie/bench/pixcmp.c 2010-12-28 21:58:38 UTC (rev
41819)
+++ brlcad/branches/bottie/bench/pixcmp.c 2010-12-28 22:01:27 UTC (rev
41820)
@@ -152,8 +152,8 @@
exit(OPTS_ERROR);
}
}
- argc -= optind;
- argv += optind;
+ argc -= bu_optind;
+ argv += bu_optind;
/* validate what is left over */
if (argc < 1 || argc > 4) {
@@ -188,7 +188,7 @@
if (strcmp(argv[0], "-") == 0) {
f1 = stdin;
} else if ((f1 = fopen(argv[0], "rb")) == NULL) {
- perror(argv[1]);
+ perror(argv[0]);
exit(FILE_ERROR);
}
if ((argc < 2) || (strcmp(argv[1], "-") == 0)) {
Modified: brlcad/branches/bottie/bench/run.sh
===================================================================
--- brlcad/branches/bottie/bench/run.sh 2010-12-28 21:58:38 UTC (rev 41819)
+++ brlcad/branches/bottie/bench/run.sh 2010-12-28 22:01:27 UTC (rev 41820)
@@ -355,14 +355,14 @@
done
if test "x$CLOBBER" = "x1" ; then
# NEVER automatically delete the summary file, but go ahead with the
rest
- for i in run-[0-9]*-benchmark.log ; do
+ for i in benchmark-[0-9]*-run.log ; do
$ECHO rm -f $i
rm -f $i
done
fi
printed=no
- for i in summary run-[0-9]*-benchmark.log ; do
+ for i in summary benchmark-[0-9]*-run.log ; do
if test -f "$i" ; then
if test "x$printed" = "xno" ; then
$ECHO
@@ -496,6 +496,7 @@
${PATH_TO_THIS}/../src/rt/rt \
${PATH_TO_THIS}/src/rt/rt \
./rt \
+ ../brlcadInstall/bin/rt.exe \
../src/rt/rt
look_for file "a benchmark geometry directory" DB \
@@ -508,6 +509,7 @@
${PATH_TO_THIS}/../db/moss.g \
${PATH_TO_THIS}/db/moss.g \
./db/moss.g \
+ ../brlcadInstall/share/brlcad/*.*.*/db/moss.g \
../db/moss.g
DB=`echo $DB | sed 's,/moss.g$,,'`
@@ -538,6 +540,7 @@
${PATH_TO_THIS}/pixcmp \
${PATH_TO_THIS}/../bin/pixcmp \
${PATH_TO_THIS}/../bench/pixcmp \
+ ../brlcadInstall/bin/pixcmp.exe \
./pixcmp
look_for script "a time elapsed utility" ELP \
@@ -598,7 +601,13 @@
$ECHO "ERROR: RT does not seem to work as expected"
exit 2
fi
-$CMP /dev/null /dev/null >/dev/null 2>&1
+
+# create a temporary file named "null", fopen("/dev/null") does not work on
+# windows (using cygwin), so punt.
+> null
+$CMP null null >/dev/null 2>&1
+rm -f null
+
ret=$?
if test ! "x${ret}" = "x0" ; then
$ECHO
@@ -1146,15 +1155,23 @@
perf_have_dc=no
fi
+ perf_have_bc=yes
+ echo "1 + 1" | bc >/dev/null 2>&1
+ if test ! x$? = x0 ; then
+ perf_have_bc=no
+ fi
+
for perf_ref in $perf_VGRREF ; do
perf_cur=$1
shift
if test "x$perf_have_dc" = "xyes" ; then
perf_RATIO=`echo "2k $perf_cur $perf_ref / p" | dc`
- else
+ elif test "x$perf_have_bc" = "xyes" ; then
# presume bc as an alternate (tsk tsk)
perf_RATIO=`echo "scale=2; $perf_cur / $perf_ref" | bc`
+ else
+ perf_RATIO=`echo $perf_cur $perf_ref | awk '{printf "%.2f", $1/$2}'`
fi
# Note: append new value and a trail TAB to existing list.
perf_RATIO_LIST="${perf_RATIO_LIST}$perf_RATIO "
@@ -1164,7 +1181,7 @@
if test "x$perf_have_dc" = "xyes" ; then
perf_MEAN_ABS=`echo 2k $perf_CURVALS +++++ 6/ p | dc`
perf_MEAN_REL=`echo 2k $perf_RATIO_LIST +++++ 6/ p | dc`
- else
+ elif test "x$perf_have_bc" = "xyes" ; then
perf_expr="scale=2; ( 0"
for perf_val in $perf_CURVALS ; do
perf_expr="$perf_expr + $perf_val"
@@ -1178,6 +1195,9 @@
done
perf_expr="$perf_expr ) / 6"
perf_MEAN_REL=`echo $perf_expr | bc`
+ else
+ perf_MEAN_ABS=`echo $perf_CURVALS | awk '{printf "%.2f",
($1+$2+$3+$4+$5+$6)/6}'`
+ perf_MEAN_REL=`echo $perf_RATIO_LIST | awk '{printf "%.2f",
($1+$2+$3+$4+$5+$6)/6}'`
fi
# Note: Both perf_RATIO_LIST and perf_CURVALS have an extra
Modified: brlcad/branches/bottie/configure.ac
===================================================================
--- brlcad/branches/bottie/configure.ac 2010-12-28 21:58:38 UTC (rev 41819)
+++ brlcad/branches/bottie/configure.ac 2010-12-28 22:01:27 UTC (rev 41820)
@@ -1544,6 +1544,8 @@
# math.h, setjmp.h, signal.h, stdarg.h, stddef.h, stdio.h, stdlib.h,
# string.h, time.h
+# non-C89 headers that seem to be cross-platform safe: fcntl.h
+
# C95 headers: wchar.h, wctype.h, iso646.h
# C99 headers: complex.h, fenv.h, inttypes.h, stdbool.h, stdint.h,
Modified: brlcad/branches/bottie/include/bn.h
===================================================================
--- brlcad/branches/bottie/include/bn.h 2010-12-28 21:58:38 UTC (rev 41819)
+++ brlcad/branches/bottie/include/bn.h 2010-12-28 22:01:27 UTC (rev 41820)
@@ -112,7 +112,8 @@
#define BN_CK_TOL(_p) BU_CKMAG(_p, BN_TOL_MAGIC, "bn_tol")
#define BN_VECT_ARE_PARALLEL(_dot, _tol) \
- (((_dot) < 0) ? ((-(_dot))>=(_tol)->para) : ((_dot) >= (_tol)->para))
+ (((_dot) <= -SMALL_FASTF) ? (NEAR_ZERO((_dot) + 1.0, (_tol)->perp)) :
(NEAR_ZERO((_dot) - 1.0, (_tol)->perp)))
+
#define BN_VECT_ARE_PERP(_dot, _tol) \
(((_dot) < 0) ? ((-(_dot))<=(_tol)->perp) : ((_dot) <= (_tol)->perp))
Modified: brlcad/branches/bottie/include/brep.h
===================================================================
--- brlcad/branches/bottie/include/brep.h 2010-12-28 21:58:38 UTC (rev
41819)
+++ brlcad/branches/bottie/include/brep.h 2010-12-28 22:01:27 UTC (rev
41820)
@@ -58,6 +58,8 @@
#define BREP_MAX_ITERATIONS 100
/** Root finding threshold */
#define BREP_INTERSECTION_ROOT_EPSILON 1e-6
+/* if threshold not reached what will we settle for close enough */
+#define BREP_INTERSECTION_ROOT_SETTLE 1e-2
/** Jungle Gym epsilon */
/* Use vector operations? For debugging */
Modified: brlcad/branches/bottie/include/bu.h
===================================================================
--- brlcad/branches/bottie/include/bu.h 2010-12-28 21:58:38 UTC (rev 41819)
+++ brlcad/branches/bottie/include/bu.h 2010-12-28 22:01:27 UTC (rev 41820)
@@ -3859,6 +3859,23 @@
}
+/** @file libbu/booleanize.c
+ *
+ * @brief routines for parsing boolean values
+ */
+
+/**
+ * B U _ B O O L E A N I Z E
+ *
+ * Returns the boolean value of a given input string.
+ *
+ * Input values that are null, empty, begin with the letter 'n', or
+ * are 0-valued return as false. Any other input value returns as
+ * true.
+ */
+BU_EXPORT BU_EXTERN(int bu_booleanize, (const char *str));
+
+
/** @} */
/** @addtogroup bitv */
/** @{ */
Modified: brlcad/branches/bottie/include/conf/MINOR
===================================================================
--- brlcad/branches/bottie/include/conf/MINOR 2010-12-28 21:58:38 UTC (rev
41819)
+++ brlcad/branches/bottie/include/conf/MINOR 2010-12-28 22:01:27 UTC (rev
41820)
@@ -1 +1 @@
-17
+18
Modified: brlcad/branches/bottie/include/conf/PATCH
===================================================================
--- brlcad/branches/bottie/include/conf/PATCH 2010-12-28 21:58:38 UTC (rev
41819)
+++ brlcad/branches/bottie/include/conf/PATCH 2010-12-28 22:01:27 UTC (rev
41820)
@@ -1 +1 @@
-0
+1
Modified: brlcad/branches/bottie/include/dm.h
===================================================================
--- brlcad/branches/bottie/include/dm.h 2010-12-28 21:58:38 UTC (rev 41819)
+++ brlcad/branches/bottie/include/dm.h 2010-12-28 22:01:27 UTC (rev 41820)
@@ -164,6 +164,28 @@
(_dr) == (_sr) &&\
(_dg) == (_sg) &&\
(_db) == (_sb))
+#if defined(DM_X) || defined(DM_OGL)
+#define DM_REVERSE_COLOR_BYTE_ORDER(_shift, _mask) { \
+ _shift = 24 - _shift; \
+ switch (_shift) { \
+ case 0: \
+ _mask >>= 24; \
+ break; \
+ case 8: \
+ _mask >>= 8; \
+ break; \
+ case 16: \
+ _mask <<= 8; \
+ break; \
+ case 24: \
+ _mask <<= 24; \
+ break; \
+ } \
+ }
+#else
+/* Do nothing */
+#define DM_REVERSE_COLOR_BYTE_ORDER(_shift, _mask)
+#endif
/* Command parameter to dmr_viewchange() */
#define DM_CHGV_REDO 0 /* Display has changed substantially */
@@ -217,6 +239,7 @@
int (*dm_endDList)();
int (*dm_drawDList)();
int (*dm_freeDLists)();
+ int (*dm_getDisplayImage)(struct dm *dmp, unsigned char **image);
unsigned long dm_id; /**< @brief window id */
int dm_displaylist; /**< @brief !0 means device has
displaylist */
int dm_stereo; /**< @brief stereo flag */
@@ -228,6 +251,8 @@
int dm_top; /**< @brief !0 means toplevel window */
int dm_width;
int dm_height;
+ int dm_bytes_per_pixel;
+ int dm_bits_per_channel; /* bits per color channel */
int dm_lineWidth;
int dm_lineStyle;
fastf_t dm_aspect;
@@ -299,6 +324,7 @@
#define DM_ENDDLIST(_dmp) _dmp->dm_endDList(_dmp)
#define DM_DRAWDLIST(_dmp, _list) _dmp->dm_drawDList(_dmp, _list)
#define DM_FREEDLISTS(_dmp, _list, _range) _dmp->dm_freeDLists(_dmp, _list,
_range)
+#define DM_GET_DISPLAY_IMAGE(_dmp, _image) _dmp->dm_getDisplayImage(_dmp,
_image)
DM_EXPORT extern struct dm dm_Null;
@@ -440,7 +466,8 @@
HIDDEN int _dmtype##_beginDList(struct dm *dmp, unsigned int list); \
HIDDEN int _dmtype##_endDList(struct dm *dmp); \
HIDDEN int _dmtype##_drawDList(struct dm *dmp, unsigned int list); \
- HIDDEN int _dmtype##_freeDLists(struct dm *dmp, unsigned int list, int
range);
+ HIDDEN int _dmtype##_freeDLists(struct dm *dmp, unsigned int list, int
range); \
+ HIDDEN int _dmtype##_getDisplayImage(struct dm *dmp, unsigned char **image);
#endif /* __DM_H__ */
Modified: brlcad/branches/bottie/include/ged.h
===================================================================
--- brlcad/branches/bottie/include/ged.h 2010-12-28 21:58:38 UTC (rev
41819)
+++ brlcad/branches/bottie/include/ged.h 2010-12-28 22:01:27 UTC (rev
41820)
@@ -495,6 +495,7 @@
struct ged_drawable *ged_gdp;
struct ged_view *ged_gvp;
+ void *ged_dmp;
void *ged_refresh_clientdata; /**< @brief
client data passed to refresh handler */
void (*ged_refresh_handler)(); /**< @brief
function for handling refresh requests */
void (*ged_output_handler)(); /**< @brief
function for handling output */
@@ -2387,6 +2388,7 @@
* png [-s size] file.png
*/
GED_EXPORT BU_EXTERN(int ged_png, (struct ged *gedp, int argc, const char
*argv[]));
+GED_EXPORT BU_EXTERN(int ged_screen_grab, (struct ged *gedp, int argc, const
char *argv[]));
/**
* Set point of view
Modified: brlcad/branches/bottie/include/opennurbs_ext.h
===================================================================
--- brlcad/branches/bottie/include/opennurbs_ext.h 2010-12-28 21:58:38 UTC
(rev 41819)
+++ brlcad/branches/bottie/include/opennurbs_ext.h 2010-12-28 22:01:27 UTC
(rev 41820)
@@ -77,7 +77,8 @@
#define BREP_MAX_LN_DEPTH 20
#define SIGN(x) ((x) >= 0 ? 1 : -1)
/* Surface flatness parameter, Abert says between 0.8-0.9 */
-#define BREP_SURFACE_FLATNESS 0.95
+#define BREP_SURFACE_FLATNESS 0.85
+#define BREP_SURFACE_STRAIGHTNESS 0.75
/* Max newton iterations when finding closest point */
#define BREP_MAX_FCP_ITERATIONS 50
/* Root finding epsilon */
@@ -1396,7 +1397,7 @@
bool m_removeTrimmed;
public:
- SurfaceTree(ON_BrepFace* face, bool removeTrimmed=true);
+ SurfaceTree(ON_BrepFace* face, bool removeTrimmed=true, int depthLimit =
BREP_MAX_FT_DEPTH);
~SurfaceTree();
CurveTree* ctree;
@@ -1424,9 +1425,13 @@
int depth();
private:
- bool isFlat(const ON_Surface* surf, ON_3dVector normals[], const
ON_Interval& u, const ON_Interval& v);
- BBNode* subdivideSurface(const ON_Interval& u, const ON_Interval& v,
ON_3dPoint corners[], ON_3dVector normals[], int depth);
- BBNode* surfaceBBox(bool leaf, ON_3dPoint corners[], ON_3dVector
normals[], const ON_Interval& u, const ON_Interval& v);
+ bool isFlat(const ON_Surface* surf, ON_Plane frames[], ON_3dVector
normals[], ON_3dPoint corners[], const ON_Interval& u, const ON_Interval& v);
+ bool isStraight(const ON_Surface* surf, ON_Plane frames[], ON_3dVector
normals[], ON_3dPoint corners[], const ON_Interval& u, const ON_Interval& v);
+ fastf_t isFlatU(const ON_Surface* surf, ON_Plane frames[], ON_3dVector
normals[], ON_3dPoint corners[], const ON_Interval& u, const ON_Interval& v);
+ fastf_t isFlatV(const ON_Surface* surf, ON_Plane frames[], ON_3dVector
normals[], ON_3dPoint corners[], const ON_Interval& u, const ON_Interval& v);
+ BBNode* subdivideSurfaceByKnots(const ON_Surface *localsurf, const
ON_Interval& u, const ON_Interval& v, ON_Plane frames[], ON_3dPoint corners[],
ON_3dVector normals[], int depth, int depthLimit);
+ BBNode* subdivideSurface(const ON_Surface *localsurf, const ON_Interval&
u, const ON_Interval& v, ON_Plane frames[], ON_3dPoint corners[], ON_3dVector
normals[], int depth, int depthLimit);
+ BBNode* surfaceBBox(const ON_Surface *localsurf, bool leaf, ON_3dPoint
corners[], ON_3dVector normals[], const ON_Interval& u, const ON_Interval& v);
ON_BrepFace* m_face;
BBNode* m_root;
Modified: brlcad/branches/bottie/include/pkg.h
===================================================================
--- brlcad/branches/bottie/include/pkg.h 2010-12-28 21:58:38 UTC (rev
41819)
+++ brlcad/branches/bottie/include/pkg.h 2010-12-28 22:01:27 UTC (rev
41820)
@@ -66,7 +66,7 @@
struct pkg_switch {
unsigned short pks_type; /**< @brief Type code */
pkg_callback pks_handler; /**< @brief Message Handler */
- char *pks_title; /**< @brief Description of message type */
+ const char *pks_title; /**< @brief Description of message type */
void *pks_user_data; /**< @brief User defined pointer to data */
};
Modified: brlcad/branches/bottie/include/raytrace.h
===================================================================
--- brlcad/branches/bottie/include/raytrace.h 2010-12-28 21:58:38 UTC (rev
41819)
+++ brlcad/branches/bottie/include/raytrace.h 2010-12-28 22:01:27 UTC (rev
41820)
@@ -289,27 +289,10 @@
#define RT_CK_HIT(_p) BU_CKMAG(_p, RT_HIT_MAGIC, "struct hit")
/**
- * Old macro: DEPRECATED, use RT_HIT_NORMAL
+ * Compute normal into (_hitp)->hit_normal. Set flip-flag accordingly
+ * depending on boolean logic, as one hit may be shared between
+ * multiple partitions with different flip status.
*
- * Only the hit_dist field of pt_inhit and pt_outhit are valid when
- * a_hit() is called; to compute both hit_point and hit_normal, use
- * RT_HIT_NORMAL() macro; to compute just hit_point, use
- * VJOIN1(hitp->hit_point, rp->r_pt, hitp->hit_dist, rp->r_dir);
- */
-#define RT_HIT_NORM(_hitp, _stp, _unused) { \
- RT_CK_HIT(_hitp); \
- RT_CK_SOLTAB(_stp); \
- RT_CK_FUNCTAB((_stp)->st_meth); \
- if ((_stp)->st_meth->ft_norm) { \
- (_stp)->st_meth->ft_norm(_hitp, _stp, (_hitp)->hit_rayp); \
- } \
-}
-
-/**
- * New macro: Compute normal into (_hitp)->hit_normal, but leave it
- * un-flipped, as one hit may be shared between multiple partitions
- * with different flip status.
- *
* Example: box.r = box.s - sph.s; sph.r = sph.s
*
* Return the post-boolean normal into caller-provided _normal vector.
@@ -1434,7 +1417,7 @@
struct directory * re_directory_hd;
struct bu_ptbl re_directory_blocks; /**< @brief Table of malloc'ed
blocks */
};
-RT_EXPORT extern struct resource rt_uniresource; /**< @brief default.
Defined in librt/shoot.c */
+RT_EXPORT extern struct resource rt_uniresource; /**< @brief default.
Defined in librt/globals.c */
#define RESOURCE_NULL ((struct resource *)0)
#define RT_CK_RESOURCE(_p) BU_CKMAG(_p, RESOURCE_MAGIC, "struct resource")
@@ -1669,11 +1652,11 @@
* of how many different models are being worked on
*/
struct rt_g {
- int debug; /**< @brief !0 for debug, see
librt/debug.h */
+ uint32_t debug; /**< @brief !0 for debug, see
librt/debug.h */
/* DEPRECATED: rtg_parallel is not used by LIBRT any longer (and will be
removed) */
- int rtg_parallel; /**< @brief !0 = trying to use
multi CPUs */
+ int8_t rtg_parallel; /**< @brief !0 = trying to use multi
CPUs */
struct bu_list rtg_vlfree; /**< @brief head of bn_vlist freelist
*/
- int NMG_debug; /**< @brief debug bits for
NMG's see nmg.h */
+ uint32_t NMG_debug; /**< @brief debug bits for NMG's see
nmg.h */
struct rt_wdb rtg_headwdb; /**< @brief head of database object
list */
};
RT_EXPORT extern struct rt_g rt_g;
Modified: brlcad/branches/bottie/include/vmath.h
===================================================================
--- brlcad/branches/bottie/include/vmath.h 2010-12-28 21:58:38 UTC (rev
41819)
+++ brlcad/branches/bottie/include/vmath.h 2010-12-28 22:01:27 UTC (rev
41820)
@@ -287,11 +287,52 @@
/**
- * return truthfully whether a value is within some epsilon from zero.
+ * Return truthfully whether a value is within a specified epsilon
+ * distance from zero.
*/
#define NEAR_ZERO(val, epsilon) (((val) > -epsilon) && ((val) <
epsilon))
/**
+ * Return truthfully whether all elements of a given vector are within
+ * a specified epsilon distance from zero.
+ */
+#define VNEAR_ZERO(v, tol) \
+ (NEAR_ZERO(v[X], tol) \
+ && NEAR_ZERO(v[Y], tol) \
+ && NEAR_ZERO(v[Z], tol))
+
+/**
+ * Return truthfully whether two values are within a specified epsilon
+ * distance from each other.
+ */
+#define NEAR_EQUAL(_a, _b, _tol) NEAR_ZERO((_a) - (_b), (_tol))
+
+/**
+ * Return truthfully whether two vectors are approximately equal,
+ * within a specified absolute tolerance.
+ */
+#define VNEAR_EQUAL(_a, _b, _tol) \
+ (NEAR_ZERO((_a)[X]-(_b)[X], (_tol)) \
+ && NEAR_ZERO((_a)[Y]-(_b)[Y], (_tol)) \
+ && NEAR_ZERO((_a)[Z]-(_b)[Z], (_tol)))
+
+/**
+ * Return truthfully whether two values are within a minimum
+ * representation tolerance from each other.
+ *
+ * Unspecified unreliable tolerance. Use not recommended.
+ */
+#define EQUAL(_a, _b) NEAR_EQUAL((_a), (_b), SMALL_FASTF)
+
+/**
+ * Return truthfully whether two vectors are equal within a minimum
+ * representation tolerance.
+ *
+ * Unspecified unreliable tolerance. Use not recommended.
+ */
+#define VEQUAL(_a, _b) VNEAR_EQUAL((_a), (_b), SMALL_FASTF)
+
+/**
* clamp a value to a low/high number.
*/
#define CLAMP(_v, _l, _h) if ((_v) < (_l)) _v = _l; else if ((_v) > (_h)) _v =
_h
@@ -1162,27 +1203,6 @@
(fabs(MAGSQ(_vec)) < 0.0001 || fabs(fabs(MAGSQ(_vec))-1) > 0.0001)
/**
- * @brief Compare two vectors for equality within minimum computation
- * tolerance. Use carefully.
- */
-#define VEQUAL(a, b) VAPPROXEQUAL(a, b, SMALL_FASTF)
-
-/**
- * @brief Compare two vectors for approximate equality, within the
- * specified absolute tolerance.
- */
-#define VAPPROXEQUAL(a, b, tol) \
- (NEAR_ZERO((a)[X]-(b)[X], tol) \
- && NEAR_ZERO((a)[Y]-(b)[Y], tol) \
- && NEAR_ZERO((a)[Z]-(b)[Z], tol))
-
-/** @brief Test for all elements of `v' being smaller than `tol'. */
-#define VNEAR_ZERO(v, tol) \
- (NEAR_ZERO(v[X], tol) \
- && NEAR_ZERO(v[Y], tol) \
- && NEAR_ZERO(v[Z], tol))
-
-/**
* @brief Included below are macros to update min and max X, Y, Z
* values to contain a point
*/
Modified: brlcad/branches/bottie/misc/win32-msvc/Dll/BrlcadCore.def
===================================================================
--- brlcad/branches/bottie/misc/win32-msvc/Dll/BrlcadCore.def 2010-12-28
21:58:38 UTC (rev 41819)
+++ brlcad/branches/bottie/misc/win32-msvc/Dll/BrlcadCore.def 2010-12-28
22:01:27 UTC (rev 41820)
@@ -34,6 +34,7 @@
bu_bitv_shift
bu_bitv_to_hex
bu_bomb
+bu_booleanize
bu_brlcad_data
bu_byteorder
bu_calloc
Modified: brlcad/branches/bottie/misc/win32-msvc8/brlcad/brlcad.sln
===================================================================
--- brlcad/branches/bottie/misc/win32-msvc8/brlcad/brlcad.sln 2010-12-28
21:58:38 UTC (rev 41819)
+++ brlcad/branches/bottie/misc/win32-msvc8/brlcad/brlcad.sln 2010-12-28
22:01:27 UTC (rev 41820)
@@ -1872,6 +1872,12 @@
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pixcmp",
"..\pixcmp\pixcmp.vcproj", "{8AAF9606-7C95-4BB1-8EB7-DDD3304D03C1}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Release|Win32 = Release|Win32
@@ -2602,6 +2608,10 @@
{43DF8660-74E7-4371-BEC3-602E2E6481B5}.Release|Win32.Build.0 =
Release|Win32
{43DF8660-74E7-4371-BEC3-602E2E6481B5}.Release|x64.ActiveCfg =
Release|x64
{43DF8660-74E7-4371-BEC3-602E2E6481B5}.Release|x64.Build.0 =
Release|x64
+ {8AAF9606-7C95-4BB1-8EB7-DDD3304D03C1}.Release|Win32.ActiveCfg
= Release|Win32
+ {8AAF9606-7C95-4BB1-8EB7-DDD3304D03C1}.Release|Win32.Build.0 =
Release|Win32
+ {8AAF9606-7C95-4BB1-8EB7-DDD3304D03C1}.Release|x64.ActiveCfg =
Release|x64
+ {8AAF9606-7C95-4BB1-8EB7-DDD3304D03C1}.Release|x64.Build.0 =
Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: brlcad/branches/bottie/misc/win32-msvc8/pixcmp/pixcmp.vcproj
===================================================================
--- brlcad/trunk/misc/win32-msvc8/pixcmp/pixcmp.vcproj 2010-12-28 18:35:30 UTC
(rev 41813)
+++ brlcad/branches/bottie/misc/win32-msvc8/pixcmp/pixcmp.vcproj
2010-12-28 22:01:27 UTC (rev 41820)
@@ -1,243 +1,243 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="pixcmp"
- ProjectGUID="{8AAF9606-7C95-4BB1-8EB7-DDD3304D03C1}"
- RootNamespace="pixcmp"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\$(PlatformName)\$(ConfigurationName)"
-
IntermediateDirectory=".\$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="1"
-
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
-
TypeLibraryName=".\$(PlatformName)\$(ConfigurationName)/pixcmp.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
-
AdditionalIncludeDirectories="../../../include;../../../src/other/tcl/generic"
-
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;_CRT_SECURE_NO_WARNINGS"
- StringPooling="true"
- BasicRuntimeChecks="0"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- TreatWChar_tAsBuiltInType="false"
- UsePrecompiledHeader="0"
-
PrecompiledHeaderFile=".\$(PlatformName)\$(ConfigurationName)/pixcmp.pch"
-
AssemblerListingLocation=".\$(PlatformName)\$(ConfigurationName)/"
-
ObjectFile=".\$(PlatformName)\$(ConfigurationName)/"
-
ProgramDataBaseFileName=".\$(PlatformName)\$(ConfigurationName)/"
- WarningLevel="4"
- SuppressStartupBanner="true"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="0"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="libbu.lib"
-
OutputFile="$(PlatformName)\$(ConfigurationName)/pixcmp.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
-
AdditionalLibraryDirectories="../../../brlcadInstall/lib"
- GenerateDebugInformation="false"
-
ProgramDatabaseFile=".\$(PlatformName)\$(ConfigurationName)/pixcmp.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="copy "$(TargetPath)"
..\..\..\brlcadInstall\bin"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="1"
-
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
-
TypeLibraryName=".\$(PlatformName)\$(ConfigurationName)/pixcmp.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
-
AdditionalIncludeDirectories="../../../include;../../../src/other/tcl/generic"
-
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;_CRT_SECURE_NO_WARNINGS"
- StringPooling="true"
- BasicRuntimeChecks="0"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- TreatWChar_tAsBuiltInType="false"
- UsePrecompiledHeader="0"
-
PrecompiledHeaderFile=".\$(PlatformName)\$(ConfigurationName)/pixcmp.pch"
-
AssemblerListingLocation=".\$(PlatformName)\$(ConfigurationName)/"
-
ObjectFile=".\$(PlatformName)\$(ConfigurationName)/"
-
ProgramDataBaseFileName=".\$(PlatformName)\$(ConfigurationName)/"
- WarningLevel="3"
- SuppressStartupBanner="true"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="0"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="libbu.lib"
-
OutputFile="$(PlatformName)\$(ConfigurationName)/pixcmp.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
-
AdditionalLibraryDirectories="../../../brlcadInstall$(PlatformName)/lib"
- GenerateDebugInformation="false"
-
ProgramDatabaseFile=".\$(PlatformName)\$(ConfigurationName)/pixcmp.pdb"
- SubSystem="1"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="copy "$(TargetPath)"
..\..\..\brlcadInstall$(PlatformName)\bin"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
-
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
- >
- <File
- RelativePath="..\..\..\bench\pixcmp.c"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;fi;fd"
- >
- </Filter>
- <Filter
- Name="Resource Files"
-
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="pixcmp"
+ ProjectGUID="{8AAF9606-7C95-4BB1-8EB7-DDD3304D03C1}"
+ RootNamespace="pixcmp"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\$(PlatformName)\$(ConfigurationName)"
+
IntermediateDirectory=".\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+
TypeLibraryName=".\$(PlatformName)\$(ConfigurationName)/pixcmp.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+
AdditionalIncludeDirectories="../../../include;../../../src/other/tcl/generic"
+
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;_CRT_SECURE_NO_WARNINGS"
+ StringPooling="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ TreatWChar_tAsBuiltInType="false"
+ UsePrecompiledHeader="0"
+
PrecompiledHeaderFile=".\$(PlatformName)\$(ConfigurationName)/pixcmp.pch"
+
AssemblerListingLocation=".\$(PlatformName)\$(ConfigurationName)/"
+
ObjectFile=".\$(PlatformName)\$(ConfigurationName)/"
+
ProgramDataBaseFileName=".\$(PlatformName)\$(ConfigurationName)/"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libbu.lib"
+
OutputFile="$(PlatformName)\$(ConfigurationName)/pixcmp.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+
AdditionalLibraryDirectories="../../../brlcadInstall/lib"
+ GenerateDebugInformation="false"
+
ProgramDatabaseFile=".\$(PlatformName)\$(ConfigurationName)/pixcmp.pdb"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy "$(TargetPath)"
..\..\..\brlcadInstall\bin"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+
TypeLibraryName=".\$(PlatformName)\$(ConfigurationName)/pixcmp.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+
AdditionalIncludeDirectories="../../../include;../../../src/other/tcl/generic"
+
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;_CRT_SECURE_NO_WARNINGS"
+ StringPooling="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ TreatWChar_tAsBuiltInType="false"
+ UsePrecompiledHeader="0"
+
PrecompiledHeaderFile=".\$(PlatformName)\$(ConfigurationName)/pixcmp.pch"
+
AssemblerListingLocation=".\$(PlatformName)\$(ConfigurationName)/"
+
ObjectFile=".\$(PlatformName)\$(ConfigurationName)/"
+
ProgramDataBaseFileName=".\$(PlatformName)\$(ConfigurationName)/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libbu.lib"
+
OutputFile="$(PlatformName)\$(ConfigurationName)/pixcmp.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+
AdditionalLibraryDirectories="../../../brlcadInstall$(PlatformName)/lib"
+ GenerateDebugInformation="false"
+
ProgramDatabaseFile=".\$(PlatformName)\$(ConfigurationName)/pixcmp.pdb"
+ SubSystem="1"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy "$(TargetPath)"
..\..\..\brlcadInstall$(PlatformName)\bin"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
+ >
+ <File
+ RelativePath="..\..\..\bench\pixcmp.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;fi;fd"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Property changes on:
brlcad/branches/bottie/misc/win32-msvc8/pixcmp/pixcmp.vcproj
___________________________________________________________________
Modified: svn:eol-style
- native
+ CRLF
Modified: brlcad/branches/bottie/misc/win32-msvc8/tclsh/library/installTree.tcl
===================================================================
--- brlcad/branches/bottie/misc/win32-msvc8/tclsh/library/installTree.tcl
2010-12-28 21:58:38 UTC (rev 41819)
+++ brlcad/branches/bottie/misc/win32-msvc8/tclsh/library/installTree.tcl
2010-12-28 22:01:27 UTC (rev 41820)
@@ -191,6 +191,7 @@
copy_stuff [file join $rootDir src archer archer] [file join $installDir bin]
copy_stuff [file join $rootDir src mged mged.bat] [file join $installDir bin]
copy_stuff [file join $rootDir src tclscripts rtwizard rtwizard.bat] [file
join $installDir bin]
+ copy_stuff [file join $rootDir src tclscripts rtwizard rtwizard.tcl] [file
join $installDir bin]
}
@@ -303,8 +304,23 @@
puts "\[12 of 15] COPYING REDIST FILES"
catch {
- copy_stuff "C:/Program Files/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.CRT" [file join $installDir bin]
- copy_stuff "C:/Program Files/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.MFC" [file join $installDir bin]
+ if {[info exists "C:/Program Files/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.CRT"]} {
+ if {$platform == "x64"} {
+ copy_stuff "C:/Program Files/Microsoft Visual Studio
8/VC/redist/amd64/Microsoft.VC80.CRT" [file join $installDir bin]
+ copy_stuff "C:/Program Files/Microsoft Visual Studio
8/VC/redist/amd64/Microsoft.VC80.MFC" [file join $installDir bin]
+ } else {
+ copy_stuff "C:/Program Files/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.CRT" [file join $installDir bin]
+ copy_stuff "C:/Program Files/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.MFC" [file join $installDir bin]
+ }
+ } else {
+ if {$platform == "x64"} {
+ copy_stuff "C:/Program Files (x86)/Microsoft Visual Studio
8/VC/redist/amd64/Microsoft.VC80.CRT" [file join $installDir bin]
+ copy_stuff "C:/Program Files (x86)/Microsoft Visual Studio
8/VC/redist/amd64/Microsoft.VC80.MFC" [file join $installDir bin]
+ } else {
+ copy_stuff "C:/Program Files (x86)/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.CRT" [file join $installDir bin]
+ copy_stuff "C:/Program Files (x86)/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.MFC" [file join $installDir bin]
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
