[brlcad-commits] SF.net SVN: brlcad:[70409] brlcad/trunk/doc/docbook/system/man1
Revision: 70409 http://sourceforge.net/p/brlcad/code/70409 Author: brlcad Date: 2017-11-20 20:22:55 + (Mon, 20 Nov 2017) Log Message: --- remove other vestiges of misleading authorship. it's a group effort with individual contributions best credited elsewhere. Modified Paths: -- brlcad/trunk/doc/docbook/system/man1/asc2g.xml brlcad/trunk/doc/docbook/system/man1/benchmark.xml brlcad/trunk/doc/docbook/system/man1/bw-rle.xml brlcad/trunk/doc/docbook/system/man1/comgeom-g.xml brlcad/trunk/doc/docbook/system/man1/cv.xml brlcad/trunk/doc/docbook/system/man1/dbclean.xml brlcad/trunk/doc/docbook/system/man1/fbcbars.xml brlcad/trunk/doc/docbook/system/man1/g2asc.xml brlcad/trunk/doc/docbook/system/man1/iges-g.xml brlcad/trunk/doc/docbook/system/man1/pix-rle.xml brlcad/trunk/doc/docbook/system/man1/pix2asc.xml brlcad/trunk/doc/docbook/system/man1/pixcmp.xml brlcad/trunk/doc/docbook/system/man1/rle-pix.xml brlcad/trunk/doc/docbook/system/man1/rtcheck.xml brlcad/trunk/doc/docbook/system/man1/rtg3.xml brlcad/trunk/doc/docbook/system/man1/rthide.xml brlcad/trunk/doc/docbook/system/man1/rtrange.xml brlcad/trunk/doc/docbook/system/man1/rtregis.xml brlcad/trunk/doc/docbook/system/man1/rtscale.xml Modified: brlcad/trunk/doc/docbook/system/man1/asc2g.xml === --- brlcad/trunk/doc/docbook/system/man1/asc2g.xml 2017-11-20 07:01:07 UTC (rev 70408) +++ brlcad/trunk/doc/docbook/system/man1/asc2g.xml 2017-11-20 20:22:55 UTC (rev 70409) @@ -91,9 +91,7 @@ AUTHOR -Charles Michael Kennedy -Michael John Muuss - +BRL-CAD Team Modified: brlcad/trunk/doc/docbook/system/man1/benchmark.xml === --- brlcad/trunk/doc/docbook/system/man1/benchmark.xml 2017-11-20 07:01:07 UTC (rev 70408) +++ brlcad/trunk/doc/docbook/system/man1/benchmark.xml 2017-11-20 20:22:55 UTC (rev 70409) @@ -195,11 +195,7 @@ AUTHOR -Christopher Sean Morrison , - -Michael John Muuss , - -Susan Muuss +BRL-CAD Team COPYRIGHT Modified: brlcad/trunk/doc/docbook/system/man1/bw-rle.xml === --- brlcad/trunk/doc/docbook/system/man1/bw-rle.xml 2017-11-20 07:01:07 UTC (rev 70408) +++ brlcad/trunk/doc/docbook/system/man1/bw-rle.xml 2017-11-20 20:22:55 UTC (rev 70409) @@ -91,7 +91,7 @@ AUTHOR -Michael John Muuss +BRL-CAD Team COPYRIGHT Modified: brlcad/trunk/doc/docbook/system/man1/comgeom-g.xml === --- brlcad/trunk/doc/docbook/system/man1/comgeom-g.xml 2017-11-20 07:01:07 UTC (rev 70408) +++ brlcad/trunk/doc/docbook/system/man1/comgeom-g.xml 2017-11-20 20:22:55 UTC (rev 70409) @@ -89,8 +89,7 @@ AUTHOR -Michael John Muuss - +BRL-CAD Team COPYRIGHT Modified: brlcad/trunk/doc/docbook/system/man1/cv.xml === --- brlcad/trunk/doc/docbook/system/man1/cv.xml 2017-11-20 07:01:07 UTC (rev 70408) +++ brlcad/trunk/doc/docbook/system/man1/cv.xml 2017-11-20 20:22:55 UTC (rev 70409) @@ -69,8 +69,7 @@ AUTHOR -BRL-CAD Team - +BRL-CAD Team COPYRIGHT Modified: brlcad/trunk/doc/docbook/system/man1/dbclean.xml === --- brlcad/trunk/doc/docbook/system/man1/dbclean.xml2017-11-20 07:01:07 UTC (rev 70408) +++ brlcad/trunk/doc/docbook/system/man1/dbclean.xml2017-11-20 20:22:55 UTC (rev 70409) @@ -76,7 +76,7 @@ AUTHOR -Susanne Muuss, J.D. +BRL-CAD Team COPYRIGHT Modified: brlcad/trunk/doc/docbook/system/man1/fbcbars.xml === --- brlcad/trunk/doc/docbook/system/man1/fbcbars.xml2017-11-20 07:01:07 UTC (rev 70408) +++ brlcad/trunk/doc/docbook/system/man1/fbcbars.xml2017-11-20 20:22:55 UTC (rev 70409) @@ -89,7 +89,7 @@ AUTHOR -Michael John Muuss +BRL-CAD Team COPYRIGHT Modified: brlcad/trunk/doc/docbook/system/man1/g2asc.xml === --- brlcad/trunk/doc/docbook/system/man1/g2asc.xml 2017-11-20 07:01:07 UTC (rev 70408) +++ brlcad/trunk/doc/docbook/system/man1/g2asc.xml 2017-11-20 20:22:55 UTC (rev 70409) @@ -91,9 +91,7 @@ AUTHORS -Charles Michael Kennedy -Michael John Muuss - +BRL-CAD Team Modified: brlcad/trunk/doc/docbook/system/man1/iges-g.xml === --- brlcad/trunk/doc/docbook/system/man1/iges-g.xml 2017-11-20 07:01:07 UTC (rev 70408) +++ brlcad/trunk/doc/docbook/system/man1/iges-g.xml 2017-11-20 20:22:55 UTC (rev 70409) @@ -108,14 +108,7 @@ AUTHORS -John Anderson; - -Susanne Muuss; - -Phil Dykstra; - -Earl Weaver - +BRL-CAD Team COPYRIGHT Modified:
[brlcad-commits] SF.net SVN: brlcad:[70410] brlcad/trunk/BUGS
Revision: 70410
http://sourceforge.net/p/brlcad/code/70410
Author: brlcad
Date: 2017-11-20 20:47:21 + (Mon, 20 Nov 2017)
Log Message:
---
encountered rtedge bug (again). redirection to file is working as is -c set
options (user error before).
Modified Paths:
--
brlcad/trunk/BUGS
Modified: brlcad/trunk/BUGS
===
--- brlcad/trunk/BUGS 2017-11-20 20:22:55 UTC (rev 70409)
+++ brlcad/trunk/BUGS 2017-11-20 20:47:21 UTC (rev 70410)
@@ -15,6 +15,12 @@
Recent Bugs
---
+* rtedge with perspective is wrong. it fills in nearly entire faces,
+ vertically in particular. it's worse on small sized renders, and
+ gets better the larger the render size (indicating there's some
+ neighbor distance coming into play that is not affected by
+ max_dist). eoes not happen in non-perspective ray-traces.
+
* a character is (still) sometimes captured by the cursor box. steps
to reproduce:
1) write a word on the mged command prompt ("e.g. hello")
@@ -261,9 +267,6 @@
sub-1sec fps, Z/B after rotating wireframe but before update
finishes drawing.
-* rtedge help shows redirection to a file working, but it does not
- seem to work (zero-file results).
-
* report of rt aborting randomly on 64-bit with camo shader.
* mged raytrace fails with simple "raytrace failed" message when using
@@ -322,11 +325,6 @@
display manager window. mged classic mode, where there is no
parent window, exhibits the bad rotate behavior immediately.
-* rtedge fills in nearly entire faces of an object when executing on a
- model that is in perspective mode. Effects really bad on small sized
- renders, and gets better the larger the render size. Does not happen
- in non-perspective ray-traces.
-
* infinite light sources close to objects result in unexpected/bad
light behavior. example is a 1m sph light about 5m from a box about
1k x 1k x 1k in size. setting make each light be red, green, and
@@ -491,10 +489,6 @@
* triangulation of some pipe in toyjeep.g fails (rather reliably) on
some given bend. fails in nmg_triangulate model().
-* rtedge is not respecting the -c"set" options. needs to give some
- indication that they were parsed too since it ignores unrecognized
- values apparently.
-
* fbhelp sends some of the output to stdout and some to stderr...
* debugbu 2 immediately reports a bu_vls_free() error.. apparently
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[70411] brlcad/trunk/TODO
Revision: 70411 http://sourceforge.net/p/brlcad/code/70411 Author: brlcad Date: 2017-11-21 00:27:27 + (Tue, 21 Nov 2017) Log Message: --- there was yet another request today to capture gqa/rtcheck's output to a file, which could be quick-hacked with a -o option or wrapped more consistently via libged. Modified Paths: -- brlcad/trunk/TODO Modified: brlcad/trunk/TODO === --- brlcad/trunk/TODO 2017-11-20 20:47:21 UTC (rev 70410) +++ brlcad/trunk/TODO 2017-11-21 00:27:27 UTC (rev 70411) @@ -138,6 +138,12 @@ THESE ARE UNSCHEDULED BACKLOG TASKS --- +* add ability to capture any command's output to a file, ideally with + options for specifying stdout and/or stderr. of priority are the + attr and rtcheck/gqa commands. this should probably be handled by a + libged command wrapper so it's consistent and available to any + command. + * mater command does not validate its arguments - fix that. Also properly document using "." to skip specifying something - not in the man page currently. @@ -1536,8 +1542,6 @@ * See src/libbu/TODO.binary_attributes for more info about bson based binary attribute work. -* attr command option to output to a file - * attr command change to only output non-standard attributes * attr command change to have an optional object argument and to work This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[70413] brlcad/trunk/include
Revision: 70413
http://sourceforge.net/p/brlcad/code/70413
Author: brlcad
Date: 2017-11-21 03:39:46 + (Tue, 21 Nov 2017)
Log Message:
---
restore vmath.h to a stand-alone state dependency-wise, not reliant
upon any other cad header. it needs just a little work to make itself
independent of system headers.
vmath.h should turn into a proper single-header project.
Modified Paths:
--
brlcad/trunk/include/bu/defines.h
brlcad/trunk/include/vmath.h
Modified: brlcad/trunk/include/bu/defines.h
===
--- brlcad/trunk/include/bu/defines.h 2017-11-21 03:01:15 UTC (rev 70412)
+++ brlcad/trunk/include/bu/defines.h 2017-11-21 03:39:46 UTC (rev 70413)
@@ -190,71 +190,6 @@
#endif
-/**
- * fastf_t - Intended to be the fastest floating point data type on
- * the current machine, with at least 64 bits of precision. On 16 and
- * 32 bit machines, this is typically "double", but on 64 bit machines,
- * it is often "float". Virtually all floating point variables (and
- * more complicated data types, like vect_t and mat_t) are defined as
- * fastf_t. The one exception is when a subroutine return is a
- * floating point value; that is always declared as "double".
- *
- * TODO: If used pervasively, it should eventually be possible to make
- * fastf_t a GMP C++ type for fixed-precision computations.
- */
-typedef double fastf_t;
-
-/**
- * Definitions about limits of floating point representation
- * Eventually, should be tied to type of hardware (IEEE, IBM, Cray)
- * used to implement the fastf_t type.
- *
- * MAX_FASTF - Very close to the largest value that can be held by a
- * fastf_t without overflow. Typically specified as an integer power
- * of ten, to make the value easy to spot when printed. TODO: macro
- * function syntax instead of constant (DEPRECATED)
- *
- * SQRT_MAX_FASTF - sqrt(MAX_FASTF), or slightly smaller. Any number
- * larger than this, if squared, can be expected to * produce an
- * overflow. TODO: macro function syntax instead of constant
- * (DEPRECATED)
- *
- * SMALL_FASTF - Very close to the smallest value that can be
- * represented while still being greater than zero. Any number
- * smaller than this (and non-negative) can be considered to be
- * zero; dividing by such a number can be expected to produce a
- * divide-by-zero error. All divisors should be checked against
- * this value before actual division is performed. TODO: macro
- * function syntax instead of constant (DEPRECATED)
- *
- * SQRT_SMALL_FASTF - sqrt(SMALL_FASTF), or slightly larger. The
- * value of this is quite a lot larger than that of SMALL_FASTF. Any
- * number smaller than this, when squared, can be expected to produce
- * a zero result. TODO: macro function syntax instead of constant
- * (DEPRECATED)
- *
- */
-#if defined(vax)
-/* DEC VAX "D" format, the most restrictive */
-# define MAX_FASTF1.0e37 /* Very close to the largest number */
-# define SQRT_MAX_FASTF 1.0e18 /* This squared just avoids overflow */
-# define SMALL_FASTF 1.0e-37 /* Anything smaller is zero */
-# define SQRT_SMALL_FASTF 1.0e-18 /* This squared gives zero */
-#else
-/* IBM format, being the next most restrictive format */
-# define MAX_FASTF1.0e73 /* Very close to the largest number */
-# define SQRT_MAX_FASTF 1.0e36 /* This squared just avoids overflow */
-# define SMALL_FASTF 1.0e-77 /* Anything smaller is zero */
-# if defined(aux)
-#define SQRT_SMALL_FASTF 1.0e-40 /* _doprnt error in libc */
-# else
-#define SQRT_SMALL_FASTF 1.0e-39 /* This squared gives zero */
-# endif
-#endif
-
-/** DEPRECATED, do not use */
-#define SMALL SQRT_SMALL_FASTF
-
/** @} */
#endif /* BU_DEFINES_H */
Modified: brlcad/trunk/include/vmath.h
===
--- brlcad/trunk/include/vmath.h2017-11-21 03:01:15 UTC (rev 70412)
+++ brlcad/trunk/include/vmath.h2017-11-21 03:39:46 UTC (rev 70413)
@@ -102,11 +102,11 @@
/* for floating point tolerances and other math constants */
#include
-/* for fastf_t */
-#include "bu/defines.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
-__BEGIN_DECLS
#ifndef M_
# define M_ XXX /**< all with 36-digits of precision */
@@ -182,6 +182,57 @@
/**
+ * Definitions about limits of floating point representation
+ * Eventually, should be tied to type of hardware (IEEE, IBM, Cray)
+ * used to implement the fastf_t type.
+ *
+ * MAX_FASTF - Very close to the largest value that can be held by a
+ * fastf_t without overflow. Typically specified as an integer power
+ * of ten, to make the value easy to spot when printed. TODO: macro
+ * function syntax instead of constant (DEPRECATED)
+ *
+ * SQRT_MAX_FASTF - sqrt(MAX_FASTF), or slightly smaller. Any number
+ * larger than this, if squared, can be expected to * produce an
+ * overflow. TODO:
[brlcad-commits] SF.net SVN: brlcad:[70412] brlcad/trunk/src/librt/primitives/bot/bot.c
Revision: 70412
http://sourceforge.net/p/brlcad/code/70412
Author: brlcad
Date: 2017-11-21 03:01:15 + (Tue, 21 Nov 2017)
Log Message:
---
this is exactly VINVDIR, so refactor.
Modified Paths:
--
brlcad/trunk/src/librt/primitives/bot/bot.c
Modified: brlcad/trunk/src/librt/primitives/bot/bot.c
===
--- brlcad/trunk/src/librt/primitives/bot/bot.c 2017-11-21 00:27:27 UTC (rev
70411)
+++ brlcad/trunk/src/librt/primitives/bot/bot.c 2017-11-21 03:01:15 UTC (rev
70412)
@@ -4088,31 +4088,8 @@
/* back out to bounding box limits */
- /* Compute the inverse of the direction cosines */
- if (ap.a_ray.r_dir[X] < -SQRT_SMALL_FASTF) {
- inv_dir[X] = 1.0/ap.a_ray.r_dir[X];
- } else if (ap.a_ray.r_dir[X] > SQRT_SMALL_FASTF) {
- inv_dir[X] = 1.0/ap.a_ray.r_dir[X];
- } else {
- ap.a_ray.r_dir[X] = 0.0;
- inv_dir[X] = INFINITY;
- }
- if (ap.a_ray.r_dir[Y] < -SQRT_SMALL_FASTF) {
- inv_dir[Y] = 1.0/ap.a_ray.r_dir[Y];
- } else if (ap.a_ray.r_dir[Y] > SQRT_SMALL_FASTF) {
- inv_dir[Y] = 1.0/ap.a_ray.r_dir[Y];
- } else {
- ap.a_ray.r_dir[Y] = 0.0;
- inv_dir[Y] = INFINITY;
- }
- if (ap.a_ray.r_dir[Z] < -SQRT_SMALL_FASTF) {
- inv_dir[Z]=1.0/ap.a_ray.r_dir[Z];
- } else if (ap.a_ray.r_dir[Z] > SQRT_SMALL_FASTF) {
- inv_dir[Z]=1.0/ap.a_ray.r_dir[Z];
- } else {
- ap.a_ray.r_dir[Z] = 0.0;
- inv_dir[Z] = INFINITY;
- }
+ /* Compute inverse of the direction cosines */
+ VINVDIR(inv_dir, ap.a_ray.r_dir);
if (!rt_in_rpp(_ray, inv_dir, rtip->mdl_min, rtip->mdl_max)) {
/* ray missed!!! */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[70421] brlcad/trunk/src/conv/iges
Revision: 70421
http://sourceforge.net/p/brlcad/code/70421
Author: brlcad
Date: 2017-11-21 06:50:19 + (Tue, 21 Nov 2017)
Log Message:
---
brlabs() isn't used. poof.
Modified Paths:
--
brlcad/trunk/src/conv/iges/CMakeLists.txt
Removed Paths:
-
brlcad/trunk/src/conv/iges/brlabs.c
Modified: brlcad/trunk/src/conv/iges/CMakeLists.txt
===
--- brlcad/trunk/src/conv/iges/CMakeLists.txt 2017-11-21 06:39:34 UTC (rev
70420)
+++ brlcad/trunk/src/conv/iges/CMakeLists.txt 2017-11-21 06:50:19 UTC (rev
70421)
@@ -27,7 +27,6 @@
b-spline.c
block2.c
brep.c
- brlabs.c
check_names.c
cone.c
conv_drawings.c
Deleted: brlcad/trunk/src/conv/iges/brlabs.c
===
--- brlcad/trunk/src/conv/iges/brlabs.c 2017-11-21 06:39:34 UTC (rev 70420)
+++ brlcad/trunk/src/conv/iges/brlabs.c 2017-11-21 06:50:19 UTC (rev 70421)
@@ -1,48 +0,0 @@
-/*B R L A B S . C
- * BRL-CAD
- *
- * Copyright (c) 1990-2016 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This program 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 program 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
-#include "vmath.h"
-
-
-fastf_t brlabs(const fastf_t a)
-{
-fastf_t b;
-
-if (a > 0)
- b = a;
-else
- b = (-a);
-
-return b;
-}
-
-
-/*
- * Local Variables:
- * mode: C
- * tab-width: 8
- * indent-tabs-mode: t
- * c-file-style: "stroustrup"
- * End:
- * ex: shiftwidth=4 tabstop=8
- */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[70415] brlcad/trunk/src/libged/simulate/bullet
Revision: 70415
http://sourceforge.net/p/brlcad/code/70415
Author: brlcad
Date: 2017-11-21 05:35:25 + (Tue, 21 Nov 2017)
Log Message:
---
eep, slew of warnings.. quell a few
Modified Paths:
--
brlcad/trunk/src/libged/simulate/bullet/CMakeLists.txt
brlcad/trunk/src/libged/simulate/bullet/LinearMath/btVector3.h
Modified: brlcad/trunk/src/libged/simulate/bullet/CMakeLists.txt
===
--- brlcad/trunk/src/libged/simulate/bullet/CMakeLists.txt 2017-11-21
03:47:40 UTC (rev 70414)
+++ brlcad/trunk/src/libged/simulate/bullet/CMakeLists.txt 2017-11-21
05:35:25 UTC (rev 70415)
@@ -405,7 +405,7 @@
include(CheckCXXCompilerFlag)
check_cxx_compiler_flag(-Wno-error NOERROR_FLAG_CXX)
- check_cxx_compiler_flag(-W NOWARN_FLAG_CXX)
+ check_cxx_compiler_flag(-w NOWARN_FLAG_CXX)
if(NOERROR_FLAG_CXX AND NOWARN_FLAG_CXX)
foreach(srcfile ${Bullet_SRCS})
set_property(SOURCE ${srcfile} APPEND PROPERTY COMPILE_FLAGS "-w
-Wno-error")
Modified: brlcad/trunk/src/libged/simulate/bullet/LinearMath/btVector3.h
===
--- brlcad/trunk/src/libged/simulate/bullet/LinearMath/btVector3.h
2017-11-21 03:47:40 UTC (rev 70414)
+++ brlcad/trunk/src/libged/simulate/bullet/LinearMath/btVector3.h
2017-11-21 05:35:25 UTC (rev 70415)
@@ -124,9 +124,9 @@
/**@brief Constructor from scalars
- * @param x X value
- * @param y Y value
- * @param z Z value
+ * @param _x X value
+ * @param _y Y value
+ * @param _z Z value
*/
SIMD_FORCE_INLINE btVector3(const btScalar& _x, const btScalar& _y,
const btScalar& _z)
{
@@ -160,7 +160,7 @@
#endif // #if defined (BT_USE_SSE_IN_API) || defined (BT_USE_NEON)
/**@brief Add a vector to this one
- * @param The vector to add to this one */
+ * @param v The vector to add to this one */
SIMD_FORCE_INLINE btVector3& operator+=(const btVector3& v)
{
#if defined(BT_USE_SSE_IN_API) && defined (BT_USE_SSE)
@@ -177,7 +177,7 @@
/**@brief Subtract a vector from this one
- * @param The vector to subtract */
+ * @param v The vector to subtract */
SIMD_FORCE_INLINE btVector3& operator-=(const btVector3& v)
{
#if defined(BT_USE_SSE_IN_API) && defined (BT_USE_SSE)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[70419] brlcad/trunk/src/other
Revision: 70419
http://sourceforge.net/p/brlcad/code/70419
Author: brlcad
Date: 2017-11-21 06:37:24 + (Tue, 21 Nov 2017)
Log Message:
---
FindPROJ4 already sets PROJ4_INCLUDE_DIR so just use it -- needed when system
PROJ4 is found (and it's an included framework on Mac OS X). more problematic
is tiffio.h which is found in the PNG framework on Mac OS X, and it a different
version from what INTERNAL_LIBTIFF assumes. either need to not set that or
(solution being used now) make it a local include.
Modified Paths:
--
brlcad/trunk/src/other/CMakeLists.txt
brlcad/trunk/src/other/gdal/CMakeLists.txt
brlcad/trunk/src/other/gdal/frmts/gtiff/geotiff.cpp
brlcad/trunk/src/other/gdal/frmts/gtiff/gtiff.h
Modified: brlcad/trunk/src/other/CMakeLists.txt
===
--- brlcad/trunk/src/other/CMakeLists.txt 2017-11-21 05:39:01 UTC (rev
70418)
+++ brlcad/trunk/src/other/CMakeLists.txt 2017-11-21 06:37:24 UTC (rev
70419)
@@ -1030,7 +1030,7 @@
THIRD_PARTY(proj-4 PROJ4 proj4 proj4_DESCRIPTION REQUIRED_VARS
"BRLCAD_ENABLE_GDAL;BRLCAD_LEVEL2" ALIASES ENABLE_PROJ4)
if(BRLCAD_PROJ4_BUILD)
set(PROJ4_LIBRARY proj CACHE STRING "libproj" FORCE)
- set(PROJ4_INCLUDE_DIRS
"${CMAKE_CURRENT_BINARY_DIR}/proj-4;${CMAKE_CURRENT_SOURCE_DIR}/proj-4/src"
CACHE STRING "proj-4 includes" FORCE)
+ set(PROJ4_INCLUDE_DIR
"${CMAKE_CURRENT_BINARY_DIR}/proj-4;${CMAKE_CURRENT_SOURCE_DIR}/proj-4/src"
CACHE STRING "proj-4 includes" FORCE)
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/proj-4/proj_config.h")
SetTargetFolder(proj "Third Party Libraries/GDAL")
endif(BRLCAD_PROJ4_BUILD)
Modified: brlcad/trunk/src/other/gdal/CMakeLists.txt
===
--- brlcad/trunk/src/other/gdal/CMakeLists.txt 2017-11-21 05:39:01 UTC (rev
70418)
+++ brlcad/trunk/src/other/gdal/CMakeLists.txt 2017-11-21 06:37:24 UTC (rev
70419)
@@ -49,7 +49,7 @@
${CMAKE_CURRENT_SOURCE_DIR}/ogr/ogrsf_frmts
${CMAKE_CURRENT_SOURCE_DIR}/gnm
${CMAKE_CURRENT_SOURCE_DIR}/apps
- ${PROJ4_INCLUDE_DIRS}
+ ${PROJ4_INCLUDE_DIR}
)
if(NOT LIB_DIR)
Modified: brlcad/trunk/src/other/gdal/frmts/gtiff/geotiff.cpp
===
--- brlcad/trunk/src/other/gdal/frmts/gtiff/geotiff.cpp 2017-11-21 05:39:01 UTC
(rev 70418)
+++ brlcad/trunk/src/other/gdal/frmts/gtiff/geotiff.cpp 2017-11-21 06:37:24 UTC
(rev 70419)
@@ -36,6 +36,7 @@
#endif
#include "cpl_port.h" // Must be first.
+
#include "gtiff.h"
// TODO(schwehr): Move this to cpl_port.h?
@@ -96,11 +97,13 @@
#include "gt_wkt_srs_priv.h"
#include "ogr_spatialref.h"
#include "tiff.h"
-#include "tif_float.h"
-#include "tiffio.h"
#ifdef INTERNAL_LIBTIFF
# include "tiffiop.h"
+# include "../gtiff/libtiff/tiffio.h"
+#else
+# include "tiffio.h"
#endif
+#include "tif_float.h"
#include "tiffvers.h"
#include "tifvsi.h"
#include "xtiffio.h"
Modified: brlcad/trunk/src/other/gdal/frmts/gtiff/gtiff.h
===
--- brlcad/trunk/src/other/gdal/frmts/gtiff/gtiff.h 2017-11-21 05:39:01 UTC
(rev 70418)
+++ brlcad/trunk/src/other/gdal/frmts/gtiff/gtiff.h 2017-11-21 06:37:24 UTC
(rev 70419)
@@ -35,7 +35,11 @@
#include "cpl_string.h"
#include "gdal.h"
-#include "tiffio.h"
+#ifdef INTERNAL_LIBTIFF
+# include "../gtiff/libtiff/tiffio.h"
+#else
+# include "tiffio.h"
+#endif
CPL_C_START
intGTiffOneTimeInit();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[70422] brlcad/trunk/src/librt/primitives/ebm/ebm.c
Revision: 70422
http://sourceforge.net/p/brlcad/code/70422
Author: brlcad
Date: 2017-11-21 07:31:32 + (Tue, 21 Nov 2017)
Log Message:
---
yet another manual vector inverse. this isn't exactly equivalent due to
different near-zero tolerances being used, but should be close enough for ebm.
Modified Paths:
--
brlcad/trunk/src/librt/primitives/ebm/ebm.c
Modified: brlcad/trunk/src/librt/primitives/ebm/ebm.c
===
--- brlcad/trunk/src/librt/primitives/ebm/ebm.c 2017-11-21 06:50:19 UTC (rev
70421)
+++ brlcad/trunk/src/librt/primitives/ebm/ebm.c 2017-11-21 07:31:32 UTC (rev
70422)
@@ -325,25 +325,8 @@
int out_index;
int j;
-/* Compute the inverse of the direction cosines */
-if (!ZERO(rp->r_dir[X])) {
- invdir[X] = 1.0/rp->r_dir[X];
-} else {
- invdir[X] = INFINITY;
- rp->r_dir[X] = 0.0;
-}
-if (!ZERO(rp->r_dir[Y])) {
- invdir[Y] = 1.0/rp->r_dir[Y];
-} else {
- invdir[Y] = INFINITY;
- rp->r_dir[Y] = 0.0;
-}
-if (!ZERO(rp->r_dir[Z])) {
- invdir[Z] = 1.0/rp->r_dir[Z];
-} else {
- invdir[Z] = INFINITY;
- rp->r_dir[Z] = 0.0;
-}
+/* Compute inverse of the direction cosines */
+VINVDIR(invdir, rp->r_dir);
/* intersect ray with ideal grid rpp */
VSETALL(P, 0);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[70416] brlcad/trunk/include/vmath.h
Revision: 70416
http://sourceforge.net/p/brlcad/code/70416
Author: brlcad
Date: 2017-11-21 05:37:11 + (Tue, 21 Nov 2017)
Log Message:
---
clean up the comments a bit and consolidate typedefs together
Modified Paths:
--
brlcad/trunk/include/vmath.h
Modified: brlcad/trunk/include/vmath.h
===
--- brlcad/trunk/include/vmath.h2017-11-21 05:35:25 UTC (rev 70415)
+++ brlcad/trunk/include/vmath.h2017-11-21 05:37:11 UTC (rev 70416)
@@ -21,13 +21,19 @@
/** @{ */
/** @file vmath.h
*
- * @brief vector/matrix math, matrix representation
+ * @brief fundamental vector, matrix, quaternion math macros
*
- * This header file defines many commonly used 3D vector math macros,
- * and operates on vect_t, point_t, mat_t, and quat_t objects.
+ * VMATH defines commonly needed 2D/3D/4D homogenous math macros for:
*
- * 4 x 4 Matrix manipulation functions...
+ * vectors (vect2d_t, vect_t, and hvect_t),
+ * points (point2d_t, point_t, and hpoint_t),
+ * quaternions (quat_t),
+ * planes (plane_t), and
+ * 4x4 matrices (mat_t).
*
+ * All are stored as simple arrays using the fastf_t floating point
+ * type, defined to a fast 64-bit type.
+ *
* Matrix array elements have the following positions in the matrix:
* @code
* | 0 1 2 3 | | 0 |
@@ -367,30 +373,7 @@
/** @brief pointer to a 4x4 matrix */
typedef fastf_t *matp_t;
-/** Vector component names for homogeneous (4-tuple) vectors */
-typedef enum vmath_vector_component_ {
-X = 0,
-Y = 1,
-Z = 2,
-W = 3,
-H = W
-} vmath_vector_component;
-
/**
- * Locations of deltas (MD*) and scaling values (MS*) in a 4x4
- * Homogeneous Transform matrix
- */
-typedef enum vmath_matrix_component_ {
-MSX = 0,
-MDX = 3,
-MSY = 5,
-MDY = 7,
-MSZ = 10,
-MDZ = 11,
-MSA = 15
-} vmath_matrix_component;
-
-/**
* @brief Definition of a plane equation
*
* A plane is defined by a unit-length outward pointing normal vector
@@ -414,7 +397,30 @@
*/
typedef fastf_t plane_t[ELEMENTS_PER_PLANE];
+/** Vector component names for homogeneous (4-tuple) vectors */
+typedef enum vmath_vector_component_ {
+X = 0,
+Y = 1,
+Z = 2,
+W = 3,
+H = W
+} vmath_vector_component;
+
/**
+ * Locations of deltas (MD*) and scaling values (MS*) in a 4x4
+ * Homogeneous Transform matrix
+ */
+typedef enum vmath_matrix_component_ {
+MSX = 0,
+MDX = 3,
+MSY = 5,
+MDY = 7,
+MSZ = 10,
+MDZ = 11,
+MSA = 15
+} vmath_matrix_component;
+
+/**
* Evaluates truthfully whether a number is not within valid range of
* INFINITY to -INFINITY exclusive (open set).
*/
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[70418] brlcad/trunk/src/libbg/chull3d.cpp
Revision: 70418
http://sourceforge.net/p/brlcad/code/70418
Author: brlcad
Date: 2017-11-21 05:39:01 + (Tue, 21 Nov 2017)
Log Message:
---
eliminate undocumented if 0's and other dead code. compiler found unused
functions.
Modified Paths:
--
brlcad/trunk/src/libbg/chull3d.cpp
Modified: brlcad/trunk/src/libbg/chull3d.cpp
===
--- brlcad/trunk/src/libbg/chull3d.cpp 2017-11-21 05:37:39 UTC (rev 70417)
+++ brlcad/trunk/src/libbg/chull3d.cpp 2017-11-21 05:39:01 UTC (rev 70418)
@@ -311,18 +311,7 @@
return sum;
}
-#if 0
HIDDEN Coord
-chull3d_Vec_dot_pdim(struct chull3d_data *cdata, point x, point y)
-{
-int i;
-Coord sum = 0;
-for (i=0;ipdim;i++) sum += x[i] * y[i];
-return sum;
-}
-#endif
-
-HIDDEN Coord
chull3d_Norm2(struct chull3d_data *cdata, point x)
{
int i;
@@ -572,61 +561,8 @@
chull3d_free_Tree_storage(cdata);
}
-HIDDEN void
-chull3d_visit_fg_i(struct chull3d_data *cdata, void (*v_fg)(struct
chull3d_data *,Tree *, int, int),
- Tree *t, int depth, int vn, int boundary)
-{
-intboundaryc = boundary;
-if (!t) return;
-//assert(t->fgs);
-if (t->fgs->mark!=vn) {
- t->fgs->mark = vn;
- if (t->key!=cdata->hull_infinity && !cdata->mo[cdata->site_num((void
*)cdata, t->key)]) boundaryc = 0;
- v_fg(cdata, t,depth, boundaryc);
- chull3d_visit_fg_i(cdata, v_fg, t->fgs->facets,depth+1, vn, boundaryc);
-}
-chull3d_visit_fg_i(cdata, v_fg, t->left,depth,vn, boundary);
-chull3d_visit_fg_i(cdata, v_fg, t->right,depth,vn,boundary);
-}
-
-#if 0
-HIDDEN void
-chull3d_visit_fg(struct chull3d_data *cdata, fg *faces_gr, void (*v_fg)(struct
chull3d_data *, Tree *, int, int))
-{
-chull3d_visit_fg_i(cdata, v_fg, faces_gr->facets, 0, ++(cdata->fg_vn), 1);
-}
-#endif
-
-HIDDEN int
-chull3d_visit_fg_i_far(struct chull3d_data *cdata, void (*v_fg)(struct
chull3d_data *, Tree *, int),
- Tree *t, int depth, int vn)
-{
-int nb = 0;
-
-if (!t) return 0;
-
-//assert(t->fgs);
-if (t->fgs->mark!=vn) {
- t->fgs->mark = vn;
- nb = (t->key==cdata->hull_infinity) || cdata->mo[cdata->site_num((void
*)cdata, t->key)];
- if (!nb && !chull3d_visit_fg_i_far(cdata, v_fg,
t->fgs->facets,depth+1,vn))
- v_fg(cdata, t,depth);
-}
-nb = chull3d_visit_fg_i_far(cdata, v_fg, t->left,depth,vn) || nb;
-nb = chull3d_visit_fg_i_far(cdata, v_fg, t->right,depth,vn) || nb;
-return nb;
-}
-
-#if 0
-HIDDEN void
-chull3d_visit_fg_far(struct chull3d_data *cdata, fg *faces_gr, void
(*v_fg)(struct chull3d_data *, Tree *, int))
-{
-chull3d_visit_fg_i_far(cdata, v_fg,faces_gr->facets, 0, --(cdata->fg_vn));
-}
-#endif
-
/* hull.c : "combinatorial" functions for hull computation */
typedef int chull3d_test_func(struct chull3d_data *, simplex *, int, void *);
@@ -679,44 +615,7 @@
return chull3d_visit_triang_gen(cdata, (struct simplex
*)chull3d_visit_triang(cdata, root, _facet_test), visit, chull3d_hullt);
}
-#if 0
HIDDEN void *
-chull3d_check_simplex(struct chull3d_data *cdata, simplex *s, void
*UNUSED(dum))
-{
-int i,j,k,l;
-neighbor *sn, *snn, *sn2;
-simplex *sns;
-site vn;
-
-for (i=-1,sn=s->neigh-1;i<(cdata->cdim);i++,sn++) {
- sns = sn->simp;
- if (!sns) {
- return s;
- }
- if (!s->peak.vert && sns->peak.vert && i!=-1) {
- exit(1);
- }
- for (j=-1,snn=sns->neigh-1; j<(cdata->cdim) && snn->simp!=s; j++,snn++);
- if (j==(cdata->cdim)) {
- exit(1);
- }
- for (k=-1,snn=sns->neigh-1; k<(cdata->cdim); k++,snn++){
- vn = snn->vert;
- if (k!=j) {
- for (l=-1,sn2 = s->neigh-1;
- l<(cdata->cdim) && sn2->vert != vn;
- l++,sn2++);
- if (l==(cdata->cdim)) {
- exit(1);
- }
- }
- }
-}
-return NULL;
-}
-#endif
-
-HIDDEN void *
chull3d_collect_hull_pnts(struct chull3d_data *cdata, simplex *s, void
*UNUSED(p)) {
point v[MAXDIM];
@@ -800,23 +699,6 @@
return NULL;
}
-#if 0
-HIDDEN Coord
-chull3d_maxdist(int dim, point p1, point p2)
-{
-Coord x = 0;
-Coord y = 0;
-Coord d = 0;
-int i = dim;
-while (i--) {
- x = *p1++;
- y = *p2++;
- d += (x
[brlcad-commits] SF.net SVN: brlcad:[70417] brlcad/trunk/src/other/gdal/port/ cpl_config.h.in
Revision: 70417 http://sourceforge.net/p/brlcad/code/70417 Author: brlcad Date: 2017-11-21 05:37:39 + (Tue, 21 Nov 2017) Log Message: --- missing HAVE_XLOCALE_H for mac Modified Paths: -- brlcad/trunk/src/other/gdal/port/cpl_config.h.in Modified: brlcad/trunk/src/other/gdal/port/cpl_config.h.in === --- brlcad/trunk/src/other/gdal/port/cpl_config.h.in2017-11-21 05:37:11 UTC (rev 70416) +++ brlcad/trunk/src/other/gdal/port/cpl_config.h.in2017-11-21 05:37:39 UTC (rev 70417) @@ -148,6 +148,9 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_LOCALE_H 1 +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_XLOCALE_H 1 + /* Define to 1, if your compiler supports long long data type */ #cmakedefine HAVE_LONG_LONG 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[70414] brlcad/trunk/include/vmath.h
Revision: 70414
http://sourceforge.net/p/brlcad/code/70414
Author: brlcad
Date: 2017-11-21 03:47:40 + (Tue, 21 Nov 2017)
Log Message:
---
triple whammy. remove references to bn and an unused macro with undocumented
tolerance constants.
Modified Paths:
--
brlcad/trunk/include/vmath.h
Modified: brlcad/trunk/include/vmath.h
===
--- brlcad/trunk/include/vmath.h2017-11-21 03:39:46 UTC (rev 70413)
+++ brlcad/trunk/include/vmath.h2017-11-21 03:47:40 UTC (rev 70414)
@@ -284,6 +284,7 @@
# endif
#endif
+
/** @brief number of fastf_t's per vect2d_t */
#define ELEMENTS_PER_VECT2D2
@@ -308,6 +309,7 @@
/** @brief number of fastf_t's per mat_t */
#define ELEMENTS_PER_MAT (ELEMENTS_PER_PLANE*ELEMENTS_PER_PLANE)
+
/*
* Types for matrices and vectors.
*/
@@ -366,19 +368,19 @@
typedef fastf_t *matp_t;
/** Vector component names for homogeneous (4-tuple) vectors */
-typedef enum bn_vector_component_ {
+typedef enum vmath_vector_component_ {
X = 0,
Y = 1,
Z = 2,
W = 3,
H = W
-} bn_vector_component;
+} vmath_vector_component;
/**
* Locations of deltas (MD*) and scaling values (MS*) in a 4x4
* Homogeneous Transform matrix
*/
-typedef enum bn_matrix_component_ {
+typedef enum vmath_matrix_component_ {
MSX = 0,
MDX = 3,
MSY = 5,
@@ -386,7 +388,7 @@
MSZ = 10,
MDZ = 11,
MSA = 15
-} bn_matrix_component;
+} vmath_matrix_component;
/**
* @brief Definition of a plane equation
@@ -1762,10 +1764,6 @@
(o)[Z] = ((i)[X]*(m)[2] + (i)[Y]*(m)[6]) * _f; \
} while (0)
-/** @brief Test a vector for non-unit length. */
-#define BN_VEC_NON_UNIT_LEN(_vec) \
- (fabs(MAGSQ(_vec)) < 0.0001 || fabs(fabs(MAGSQ(_vec))-1) > 0.0001)
-
/**
* @brief Included below are macros to update min and max X, Y, Z
* values to contain a point
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[70420] brlcad/trunk/src/conv/iges/brlabs.c
Revision: 70420
http://sourceforge.net/p/brlcad/code/70420
Author: brlcad
Date: 2017-11-21 06:39:34 + (Tue, 21 Nov 2017)
Log Message:
---
vmath.h instead...but er
Modified Paths:
--
brlcad/trunk/src/conv/iges/brlabs.c
Modified: brlcad/trunk/src/conv/iges/brlabs.c
===
--- brlcad/trunk/src/conv/iges/brlabs.c 2017-11-21 06:37:24 UTC (rev 70419)
+++ brlcad/trunk/src/conv/iges/brlabs.c 2017-11-21 06:39:34 UTC (rev 70420)
@@ -21,8 +21,8 @@
#include "common.h"
#include
+#include "vmath.h"
-#include "bu/defines.h"
fastf_t brlabs(const fastf_t a)
{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[70424] brlcad/trunk
Revision: 70424
http://sourceforge.net/p/brlcad/code/70424
Author: brlcad
Date: 2017-11-21 07:55:25 + (Tue, 21 Nov 2017)
Log Message:
---
vmath.h fixes now that fastf_t is extracted from libbu. it's now treated as a
stand-alone header-only single-header api, so we include it accordingly before
library headers.
Modified Paths:
--
brlcad/trunk/include/bu/color.h
brlcad/trunk/include/bu/hist.h
brlcad/trunk/include/rt/db4.h
brlcad/trunk/src/libbu/color.c
brlcad/trunk/src/libbu/parse.c
brlcad/trunk/src/libbu/scan.c
brlcad/trunk/src/libbu/units.c
brlcad/trunk/src/libdm/color.c
brlcad/trunk/src/liboptical/turb.c
brlcad/trunk/src/librt/primitives/arb8/arb_edit.c
brlcad/trunk/src/librt/search.c
brlcad/trunk/src/proc-db/naca/naca.h
brlcad/trunk/src/util/bwcrop.c
brlcad/trunk/src/util/pixcrop.c
Modified: brlcad/trunk/include/bu/color.h
===
--- brlcad/trunk/include/bu/color.h 2017-11-21 07:51:11 UTC (rev 70423)
+++ brlcad/trunk/include/bu/color.h 2017-11-21 07:55:25 UTC (rev 70424)
@@ -23,6 +23,8 @@
#include "common.h"
+#include "vmath.h"
+
#include "bu/defines.h"
#include "bu/magic.h"
Modified: brlcad/trunk/include/bu/hist.h
===
--- brlcad/trunk/include/bu/hist.h 2017-11-21 07:51:11 UTC (rev 70423)
+++ brlcad/trunk/include/bu/hist.h 2017-11-21 07:55:25 UTC (rev 70424)
@@ -24,6 +24,7 @@
#include "common.h"
#include /* for size_t */
+#include "vmath.h"
#include "bu/defines.h"
#include "bu/magic.h"
Modified: brlcad/trunk/include/rt/db4.h
===
--- brlcad/trunk/include/rt/db4.h 2017-11-21 07:51:11 UTC (rev 70423)
+++ brlcad/trunk/include/rt/db4.h 2017-11-21 07:55:25 UTC (rev 70424)
@@ -66,7 +66,7 @@
#include "common.h"
-#include "bu/defines.h" /* Needed only for the deprecated functions below
using fastf_t */
+#include "vmath.h" /* Needed only for the deprecated functions below using
fastf_t */
__BEGIN_DECLS
Modified: brlcad/trunk/src/libbu/color.c
===
--- brlcad/trunk/src/libbu/color.c 2017-11-21 07:51:11 UTC (rev 70423)
+++ brlcad/trunk/src/libbu/color.c 2017-11-21 07:55:25 UTC (rev 70424)
@@ -45,18 +45,6 @@
#define BLU 2
-/* vmath/libbu routines replicated here to avoid a libbn dependency */
-enum axis {
-X = 0,
-Y = 1,
-Z = 2
-};
-#define VSET(a, b, c, d) { (a)[X] = (b); (a)[Y] = (c); (a)[Z] = (d); }
-#define VSETALL(a, s) { (a)[X] = (a)[Y] = (a)[Z] = (s); }
-#define NEAR_ZERO(val, epsilon)(((val) > -epsilon) && ((val) <
epsilon))
-#define V3ARGS(a) (a)[X], (a)[Y], (a)[Z]
-
-
void
bu_rgb_to_hsv(unsigned char *rgb, fastf_t *hsv)
{
Modified: brlcad/trunk/src/libbu/parse.c
===
--- brlcad/trunk/src/libbu/parse.c 2017-11-21 07:51:11 UTC (rev 70423)
+++ brlcad/trunk/src/libbu/parse.c 2017-11-21 07:55:25 UTC (rev 70424)
@@ -27,6 +27,7 @@
#include
#include
#include
+#include "vmath.h"
#include "bu/cv.h"
#include "bu/log.h"
Modified: brlcad/trunk/src/libbu/scan.c
===
--- brlcad/trunk/src/libbu/scan.c 2017-11-21 07:51:11 UTC (rev 70423)
+++ brlcad/trunk/src/libbu/scan.c 2017-11-21 07:55:25 UTC (rev 70424)
@@ -23,6 +23,7 @@
#include
#include
#include
+#include "vmath.h"
#include "bu/log.h"
#include "bu/malloc.h"
Modified: brlcad/trunk/src/libbu/units.c
===
--- brlcad/trunk/src/libbu/units.c 2017-11-21 07:51:11 UTC (rev 70423)
+++ brlcad/trunk/src/libbu/units.c 2017-11-21 07:55:25 UTC (rev 70424)
@@ -32,6 +32,7 @@
#include
#include
#include
+#include "vmath.h"
#include "bu/log.h"
#include "bu/malloc.h"
@@ -40,11 +41,6 @@
#include "bu/vls.h"
-/* done specifically to avoid a libbn dependency */
-#define NEAR_ZERO(val, epsilon) (((val) > -epsilon) && ((val) < epsilon))
-#define ZERO(val) NEAR_ZERO((val), SMALL_FASTF)
-
-
struct cvt_tab {
double val;
char name[32];
Modified: brlcad/trunk/src/libdm/color.c
===
--- brlcad/trunk/src/libdm/color.c 2017-11-21 07:51:11 UTC (rev 70423)
+++ brlcad/trunk/src/libdm/color.c 2017-11-21 07:55:25 UTC (rev 70424)
@@ -31,6 +31,7 @@
#ifdef HAVE_X11_XLIB_H
# include
#endif
+#include "vmath.h"
#include "bu/malloc.h"
#include "dm/dm_xvars.h"
Modified: brlcad/trunk/src/liboptical/turb.c
===
--- brlcad/trunk/src/liboptical/turb.c 2017-11-21 07:51:11 UTC (rev 70423)
+++ brlcad/trunk/src/liboptical/turb.c 2017-11-21 07:55:25 UTC (rev
[brlcad-commits] SF.net SVN: brlcad:[70425] brlcad/trunk/include/vmath.h
Revision: 70425 http://sourceforge.net/p/brlcad/code/70425 Author: brlcad Date: 2017-11-21 07:56:14 + (Tue, 21 Nov 2017) Log Message: --- clean up the fastf_t mentions Modified Paths: -- brlcad/trunk/include/vmath.h Modified: brlcad/trunk/include/vmath.h === --- brlcad/trunk/include/vmath.h2017-11-21 07:55:25 UTC (rev 70424) +++ brlcad/trunk/include/vmath.h2017-11-21 07:56:14 UTC (rev 70425) @@ -23,16 +23,20 @@ * * @brief fundamental vector, matrix, quaternion math macros * - * VMATH defines commonly needed 2D/3D/4D homogenous math macros for: + * VMATH defines commonly needed macros for 2D/3D/4D math involving: * + * points (point2d_t, point_t, and hpoint_t), * vectors (vect2d_t, vect_t, and hvect_t), - * points (point2d_t, point_t, and hpoint_t), * quaternions (quat_t), * planes (plane_t), and * 4x4 matrices (mat_t). * - * All are stored as simple arrays using the fastf_t floating point - * type, defined to a fast 64-bit type. + * By default, all floating point numbers are stored in arrays using + * the 'fastf_t' type definition. It should be manually typedef'd to + * the "fastest" 64-bit floating point type available on the current + * hardware with at least 64 bits of precision. On 16 and 32 bit + * machines, this is typically "double", but on 64 bit machines, it + * could be "float". * * Matrix array elements have the following positions in the matrix: * @code @@ -45,10 +49,10 @@ * @endcode * * Note that while many people in the computer graphics field use - * post-multiplication with row vectors (i.e., vector * matrix * matrix - * ...) the BRL-CAD system uses the more traditional representation - * of column vectors (i.e., ... matrix * matrix * vector). (The - * matrices in these two representations are the transposes of each + * post-multiplication with row vectors (i.e., vector * matrix * + * matrix ...) VMATH uses the more traditional representation of + * column vectors (i.e., ... matrix * matrix * vector). (The matrices + * in these two representations are the transposes of each * other). Therefore, when transforming a vector by a matrix, * pre-multiplication is used, i.e.: * @@ -79,6 +83,8 @@ * Most of these macros require that the result be in separate * storage, distinct from the input parameters, except where noted. * + * IMPLEMENTOR NOTES + * * When writing macros like this, it is very important that any * variables declared within a macro code blocks start with an * underscore in order to (hopefully) minimize any name conflicts with @@ -317,21 +323,10 @@ /* - * Types for matrices and vectors. + * Fundamental types */ -/** - * fastf_t - Intended to be the fastest floating point data type on - * the current machine, with at least 64 bits of precision. On 16 and - * 32 bit machines, this is typically "double", but on 64 bit machines, - * it is often "float". Virtually all floating point variables (and - * more complicated data types, like vect_t and mat_t) are defined as - * fastf_t. The one exception is when a subroutine return is a - * floating point value; that is always declared as "double". - * - * TODO: If used pervasively, it should eventually be possible to make - * fastf_t a GMP C++ type for fixed-precision computations. - */ +/** @brief fastest 64-bit (or larger) floating point type */ typedef double fastf_t; /** @brief 2-tuple vector */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[70423] brlcad/trunk/src/libged
Revision: 70423
http://sourceforge.net/p/brlcad/code/70423
Author: brlcad
Date: 2017-11-21 07:51:11 + (Tue, 21 Nov 2017)
Log Message:
---
may need work on Windows, but this fixes the Mac build. architecturally, it
should be a subbuild, not bundled into the lib as sources. this way also lets
warnings be trivially disabled with the macro src/other uses.
Modified Paths:
--
brlcad/trunk/src/libged/CMakeLists.txt
brlcad/trunk/src/libged/simulate/bullet/CMakeLists.txt
Modified: brlcad/trunk/src/libged/CMakeLists.txt
===
--- brlcad/trunk/src/libged/CMakeLists.txt 2017-11-21 07:31:32 UTC (rev
70422)
+++ brlcad/trunk/src/libged/CMakeLists.txt 2017-11-21 07:51:11 UTC (rev
70423)
@@ -347,7 +347,11 @@
BRLCAD_LIB_INCLUDE_DIRS(ged GED_INCLUDE_DIRS GED_LOCAL_INCLUDE_DIRS)
-BRLCAD_ADDLIB(libged "${LIBGED_SOURCES}"
"libwdb;librt;libnmg;libfb;libbg;libbn;libbu;libicv;libanalyze;${LIBGED_CMD_LIBS_LIST};${REGEX_LIBRARY};${WINSOCK_LIB};${CLIPPER_LIBRARY};${M_LIBRARY}")
+if(BRLCAD_ENABLE_BULLET)
+ set(CADBULLET_LIBRARY cadbullet)
+endif(BRLCAD_ENABLE_BULLET)
+
+BRLCAD_ADDLIB(libged "${LIBGED_SOURCES}"
"libwdb;librt;libnmg;libfb;libbg;libbn;libbu;libicv;libanalyze;${LIBGED_CMD_LIBS_LIST};${CADBULLET_LIBRARY};${REGEX_LIBRARY};${WINSOCK_LIB};${CLIPPER_LIBRARY};${M_LIBRARY}")
SET_TARGET_PROPERTIES(libged PROPERTIES VERSION 20.0.1 SOVERSION 20)
if(CPP_DLL_DEFINES)
Modified: brlcad/trunk/src/libged/simulate/bullet/CMakeLists.txt
===
--- brlcad/trunk/src/libged/simulate/bullet/CMakeLists.txt 2017-11-21
07:31:32 UTC (rev 70422)
+++ brlcad/trunk/src/libged/simulate/bullet/CMakeLists.txt 2017-11-21
07:51:11 UTC (rev 70423)
@@ -401,16 +401,8 @@
)
if(BRLCAD_ENABLE_BULLET)
- set(LIBGED_SOURCES ${Bullet_SRCS} ${Bullet_HDRS})
-
- include(CheckCXXCompilerFlag)
- check_cxx_compiler_flag(-Wno-error NOERROR_FLAG_CXX)
- check_cxx_compiler_flag(-w NOWARN_FLAG_CXX)
- if(NOERROR_FLAG_CXX AND NOWARN_FLAG_CXX)
-foreach(srcfile ${Bullet_SRCS})
- set_property(SOURCE ${srcfile} APPEND PROPERTY COMPILE_FLAGS "-w
-Wno-error")
-endforeach(srcfile ${Bullet_SRCS})
- endif(NOERROR_FLAG_CXX AND NOWARN_FLAG_CXX)
+ add_library(cadbullet ${Bullet_SRCS} ${Bullet_HDRS})
+ DISABLE_WARNINGS()
else(BRLCAD_ENABLE_BULLET)
CMAKEFILES(${Bullet_SRCS})
CMAKEFILES(${Bullet_HDRS})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
