[brlcad-commits] SF.net SVN: brlcad:[71887] brlcad/trunk/CMakeLists.txt
Revision: 71887
http://sourceforge.net/p/brlcad/code/71887
Author: starseeker
Date: 2018-09-27 12:57:58 + (Thu, 27 Sep 2018)
Log Message:
---
Add a few missing mark_as_advanced tags
Modified Paths:
--
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===
--- brlcad/trunk/CMakeLists.txt 2018-09-27 12:23:40 UTC (rev 71886)
+++ brlcad/trunk/CMakeLists.txt 2018-09-27 12:57:58 UTC (rev 71887)
@@ -281,6 +281,9 @@
set(CMAKE_CURRENT_BUILD_DIR_INSTALL "${CMAKE_BINARY_DIR}")
endif(CMAKE_CONFIGURATION_TYPES)
+# Mark CMAKE_CONFIGURATION_TYPES as advanced - users shouldn't be adjusting
this
+# directly.
+mark_as_advanced(CMAKE_CONFIGURATION_TYPES)
#-
# Set up include paths for generated header files. For multi-config
@@ -862,9 +865,11 @@
if(NOT "${CMAKE_C_FLAGS}" STREQUAL "" AND NOT DEFINED CMAKE_C_FLAGS_DEFAULT)
set(CMAKE_C_FLAGS_DEFAULT "${CMAKE_C_FLAGS}" CACHE STRING "Default C flags"
FORCE)
endif(NOT "${CMAKE_C_FLAGS}" STREQUAL "" AND NOT DEFINED CMAKE_C_FLAGS_DEFAULT)
+mark_as_advanced(CMAKE_C_FLAGS_DEFAULT)
if(NOT "${CMAKE_CXX_FLAGS}" STREQUAL "" AND NOT DEFINED
CMAKE_CXX_FLAGS_DEFAULT)
set(CMAKE_CXX_FLAGS_DEFAULT "${CMAKE_CXX_FLAGS}" CACHE STRING "Default CXX
flags" FORCE)
endif(NOT "${CMAKE_CXX_FLAGS}" STREQUAL "" AND NOT DEFINED
CMAKE_CXX_FLAGS_DEFAULT)
+mark_as_advanced(CMAKE_CXX_FLAGS_DEFAULT)
# C
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71889] brlcad/trunk/src/libbu/CMakeLists.txt
Revision: 71889 http://sourceforge.net/p/brlcad/code/71889 Author: starseeker Date: 2018-09-27 14:14:50 + (Thu, 27 Sep 2018) Log Message: --- Make sure the build system knows about dir_macosx.m Modified Paths: -- brlcad/trunk/src/libbu/CMakeLists.txt Modified: brlcad/trunk/src/libbu/CMakeLists.txt === --- brlcad/trunk/src/libbu/CMakeLists.txt 2018-09-27 13:00:43 UTC (rev 71888) +++ brlcad/trunk/src/libbu/CMakeLists.txt 2018-09-27 14:14:50 UTC (rev 71889) @@ -45,6 +45,8 @@ if(Foundation_FRAMEWORKS) set(DIR_MACOSX_M dir_macosx.m) +else(Foundation_FRAMEWORKS) + CMAKEFILES(dir_macosx.m) endif(Foundation_FRAMEWORKS) set(LIBBU_SOURCES This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71890] brlcad/trunk/CMakeLists.txt
Revision: 71890 http://sourceforge.net/p/brlcad/code/71890 Author: starseeker Date: 2018-09-27 21:31:12 + (Thu, 27 Sep 2018) Log Message: --- fix comment Modified Paths: -- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt === --- brlcad/trunk/CMakeLists.txt 2018-09-27 14:14:50 UTC (rev 71889) +++ brlcad/trunk/CMakeLists.txt 2018-09-27 21:31:12 UTC (rev 71890) @@ -3461,19 +3461,13 @@ # been documented. Make an updated copy of the "INSTALL" file and see whether # anything has changed. # -# Although the general principle of this build is to leave the src dir -# pristine after configuration and compilation, the INSTALL and configure files -# represent one of two cases where the default behavior is to alter the files -# if changes have occurred. (The other is cached generated outputs from tools -# such as re2c and lemon.) For the purposes of this project, a given -# option's documentation is defined in the CMakeLists.txt source file with -# the option definition logic - the text in INSTALL is simply an output from -# that, and is never the correct place for manual changes. -# -# As with generated outputs, this auto-updating behavior can be overridden -# by setting the CMake variable LOCKED_SOURCE_DIR to ON - in that case, a -# warning about out-of-sync files is printed but no automatic updating takes -# place in the source tree. +# Although the CMake configure process should leave the src dir pristine, the +# INSTALL and configure files present a problem in that they *do* need to be +# updated in the source tree. As a compromise, what will happen when versions +# of these files are produced that are different from those found in the source +# tree the configure process will fail, with a message indicating that the user +# needs to move the newly generated version of the file(s) into the correct +# locations in the source tree. set(CONFIG_FATAL_ERROR 0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71891] brlcad/trunk/src/libbu/dir.c
Revision: 71891
http://sourceforge.net/p/brlcad/code/71891
Author: starseeker
Date: 2018-09-27 21:54:59 + (Thu, 27 Sep 2018)
Log Message:
---
Fix libbu build on Windows
Modified Paths:
--
brlcad/trunk/src/libbu/dir.c
Modified: brlcad/trunk/src/libbu/dir.c
===
--- brlcad/trunk/src/libbu/dir.c2018-09-27 21:31:12 UTC (rev 71890)
+++ brlcad/trunk/src/libbu/dir.c2018-09-27 21:54:59 UTC (rev 71891)
@@ -38,6 +38,9 @@
# include
#endif
#include "bio.h"
+#ifdef HAVE_WINDOWS_H
+# include
+#endif
#include "bu/app.h"
#include "bu/vls.h"
@@ -156,9 +159,9 @@
#ifdef HAVE_WINDOWS_H
if (BU_STR_EMPTY(path)) {
PWSTR wpath;
- if (SHGetKnownFolderPath(FOLDERID_Profile, 0, NULL, &wpath) == S_OK) {
- wcscpy_s(path, MAXPATHLEN, wpath);
- CoTaskMemFree(wpath);
+ if (SHGetKnownFolderPath(&FOLDERID_Profile, 0, NULL, &wpath) == S_OK) {
+ wcstombs(path, wpath, MAXPATHLEN);
+ CoTaskMemFree(wpath);
}
}
#endif
@@ -204,8 +207,8 @@
#ifdef HAVE_WINDOWS_H
if (BU_STR_EMPTY(path)) {
PWSTR wpath;
- if (SHGetKnownFolderPath(FOLDERID_RoamingAppData, 0, NULL, &wpath) ==
S_OK) {
- wcscpy_s(path, MAXPATHLEN, wpath);
+ if (SHGetKnownFolderPath(&FOLDERID_RoamingAppData, 0, NULL, &wpath) ==
S_OK) {
+ wcstombs(path, wpath, MAXPATHLEN);
CoTaskMemFree(wpath);
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71892] brlcad/trunk
Revision: 71892
http://sourceforge.net/p/brlcad/code/71892
Author: starseeker
Date: 2018-09-27 23:06:14 + (Thu, 27 Sep 2018)
Log Message:
---
There is now an -exec option for MGED's search command, thanks to GSoC 2018
work by Peter Pronai
Modified Paths:
--
brlcad/trunk/NEWS
brlcad/trunk/doc/docbook/system/mann/search.xml
Modified: brlcad/trunk/NEWS
===
--- brlcad/trunk/NEWS 2018-09-27 21:54:59 UTC (rev 71891)
+++ brlcad/trunk/NEWS 2018-09-27 23:06:14 UTC (rev 71892)
@@ -21,6 +21,7 @@
overlap tool
facetize improvements
+* added -exec option to MGED's search command - Peter Pronai
* added new MGED 'lint' command for finding bad geometry - Cliff Yapp
* improved lingering framebuffer CPU utilization - Sean Morrison
* updated 'draw -S' option to work with shaded objects - Bob Parker
Modified: brlcad/trunk/doc/docbook/system/mann/search.xml
===
--- brlcad/trunk/doc/docbook/system/mann/search.xml 2018-09-27 21:54:59 UTC
(rev 71891)
+++ brlcad/trunk/doc/docbook/system/mann/search.xml 2018-09-27 23:06:14 UTC
(rev 71892)
@@ -210,33 +210,6 @@
When using multiple -exec filters, keep in mind that filters are
evaluated lazily, so if you have two -execs and the first one returns false for
one node, the second one will not run at all.
-
-
- Examples
-
-
-
- Bad
- Good
-
-
-
-
- -exec foo ;
- -exec foo {;} -exec bar ";"
-
-
- -exec foo {} ";"
- -exec foo {{}} "{}" ";"
-
-
- -exec foo "{}"bar ";"
- -exec foo "{}bar" -exec foo "bar{}baz{}bang"
";"
-
-
-
-
-
@@ -932,33 +905,45 @@
-Using search Results
+Operating on Sets of search
Results
- search supports a find command
style
- exec option, that lets you do custom filtering and
execute arbitrary commands on the objects.
- To illustrate, load the M35 example model and search for all regions
below subtractions or intersections:
+ There are two available methods for working with sets of
search results. The first is the
+ exec option, which is used in the following example to
search for all regions below subtractions
+ or intersections in the m35.g example model in BRL-CAD and draw the
objects' wireframes in the display manager:
mged>search all.g -type region -and
( -below -bool - -or -below -bool + ) -exec draw "{}" ";"
+ mged>autoview
- The above command finds all regions below the all.g
- object that are also below subtraction or intersection operators and
draws those regions in the MGED
- display manager window.
- Another common operation to apply to a set of results is to set
- their colors to random RGB values (here we use random numbers and avoid
any value less than 30 to keep objects more visible):
+ Another possibility, especially useful for doing multiple sequential
operations which would be awkward to write out
+ in a single search line, is to assign the results of a search command
to a Tcl variable. To illustrate, let's
+ randomize the colors of all regions in the "cab" assembly of the m35.g
example model and then assign
+ a glass shader with transparency as a follow-on step.
+
+
+ First, we collect the set of search results into a Tcl variable:
mged> set glob_compat_mode
0
- mged> search -exec eval {attr set {}
color [expr {int(rand()*225)+30}]/[expr {int(rand()*225)+30}]/[expr
{int(rand()*225)+30}]} ";"
+ mged> set search_results [search cab
-type region]
- This approach uses Tcl's random number generator to generate different
RGB strings to use for each object in the results list.
- If we also want to add transparency to the resulting model, an
additional foreach line on the same results set can do the job:
+
+
+ Next we randomize the colors using Tcl's functionality (here we use
random numbers and avoid any value less than 30 to keep objects more visible):
+ mged> foreach i $search_results
{attr set $i color [expr {int(rand()*225)+30}]/[expr
{int(rand()*225)+30}]/[expr {int(rand()*225)+30}]}
+
+
+
+
+ Finally, we add transparency to the same regions:
+
+
mged> foreac
[brlcad-commits] SF.net SVN: brlcad:[71893] brlcad/trunk/NEWS
Revision: 71893 http://sourceforge.net/p/brlcad/code/71893 Author: starseeker Date: 2018-09-27 23:08:34 + (Thu, 27 Sep 2018) Log Message: --- Improved the help output for the ls command Modified Paths: -- brlcad/trunk/NEWS Modified: brlcad/trunk/NEWS === --- brlcad/trunk/NEWS 2018-09-27 23:06:14 UTC (rev 71892) +++ brlcad/trunk/NEWS 2018-09-27 23:08:34 UTC (rev 71893) @@ -21,6 +21,7 @@ overlap tool facetize improvements +* improved MGED ls command's help message - Cliff Yapp * added -exec option to MGED's search command - Peter Pronai * added new MGED 'lint' command for finding bad geometry - Cliff Yapp * improved lingering framebuffer CPU utilization - Sean Morrison This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71894] brlcad/trunk/include/bu/CMakeLists.txt
Revision: 71894
http://sourceforge.net/p/brlcad/code/71894
Author: starseeker
Date: 2018-09-27 23:21:57 + (Thu, 27 Sep 2018)
Log Message:
---
Stash column.h
Modified Paths:
--
brlcad/trunk/include/bu/CMakeLists.txt
Modified: brlcad/trunk/include/bu/CMakeLists.txt
===
--- brlcad/trunk/include/bu/CMakeLists.txt 2018-09-27 23:08:34 UTC (rev
71893)
+++ brlcad/trunk/include/bu/CMakeLists.txt 2018-09-27 23:21:57 UTC (rev
71894)
@@ -4,7 +4,6 @@
bitv.h
cmd.h
color.h
- column.h
cv.h
debug.h
defines.h
@@ -47,6 +46,7 @@
)
BRLCAD_MANAGE_FILES(bu_headers ${INCLUDE_DIR}/brlcad/bu)
CMAKEFILES(CMakeLists.txt)
+CMAKEFILES(column.h)
# Local Variables:
# tab-width: 8
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71895] brlcad/trunk/NEWS
Revision: 71895 http://sourceforge.net/p/brlcad/code/71895 Author: starseeker Date: 2018-09-27 23:32:04 + (Thu, 27 Sep 2018) Log Message: --- r71348 is user visible - fixed a crash when mixing flat and full path searches in the same search call, reported by Peter Pronai. Modified Paths: -- brlcad/trunk/NEWS Modified: brlcad/trunk/NEWS === --- brlcad/trunk/NEWS 2018-09-27 23:21:57 UTC (rev 71894) +++ brlcad/trunk/NEWS 2018-09-27 23:32:04 UTC (rev 71895) @@ -21,6 +21,7 @@ overlap tool facetize improvements +* fixed crash mixing flat and full path MGED searches - Cliff Yapp * improved MGED ls command's help message - Cliff Yapp * added -exec option to MGED's search command - Peter Pronai * added new MGED 'lint' command for finding bad geometry - Cliff Yapp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71896] brlcad/trunk/NEWS
Revision: 71896 http://sourceforge.net/p/brlcad/code/71896 Author: starseeker Date: 2018-09-28 18:43:23 + (Fri, 28 Sep 2018) Log Message: --- Make an initial stab at NEWS release text Modified Paths: -- brlcad/trunk/NEWS Modified: brlcad/trunk/NEWS === --- brlcad/trunk/NEWS 2018-09-27 23:32:04 UTC (rev 71895) +++ brlcad/trunk/NEWS 2018-09-28 18:43:23 UTC (rev 71896) @@ -13,14 +13,26 @@ --- 201X-XX-XX Release 7.28.0 --- -- -Major features of release to hit in commentary paragraph(s): +This major release of BRL-CAD incorporates a new feature for caching +of raytrace acceleration structures used when working with explicit +boundary representation (BREP) Non-uniform Rational Basis Spline +(NURBS) solids. This will result in significant improvements to +run times when repeatedly raytracing BREP solids. -prep cache -GDAL based terrain import via gcv -search -exec -overlap tool -facetize improvements +Support for terrain import has been significantly expanded with the +addition of a new Geospatial Data Abstraction Library (GDAL) based +importer to the gcv conversion tool. +Also new in this release are a greatly improved graphical geometry +overlap resolving tool and support in the MGED search command for +an "exec" option which will allow users to execute MGED commands +on search results. + +The MGED facetize command for generating polygonal geometry from +BRL-CAD objects has received significant attention, including the +incorporation of a "per-region" conversion mode, new conversion +methodologies and usability enhancements. + * fixed crash mixing flat and full path MGED searches - Cliff Yapp * improved MGED ls command's help message - Cliff Yapp * added -exec option to MGED's search command - Peter Pronai This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71897] brlcad/trunk/NEWS
Revision: 71897 http://sourceforge.net/p/brlcad/code/71897 Author: starseeker Date: 2018-09-28 18:47:24 + (Fri, 28 Sep 2018) Log Message: --- gcv now supports data import for a significant number of terrain data file formats via the GDAL library. Modified Paths: -- brlcad/trunk/NEWS Modified: brlcad/trunk/NEWS === --- brlcad/trunk/NEWS 2018-09-28 18:43:23 UTC (rev 71896) +++ brlcad/trunk/NEWS 2018-09-28 18:47:24 UTC (rev 71897) @@ -63,6 +63,7 @@ * improved triangle mesh error detection for "bot check" command - Nick Reed, Cliff Yapp, Jon Engbert * fixed graphical mode initial page loading in brlman - Cliff Yapp +* added GDAL terrain import support to gcv - Cliff Yapp * added 'bot_dump' command to MGED - Nick Reed * ported MGED 'screengrab' command to Windows - Nick Reed * removed spectral tracing: libmultispectral & rttherm - Cliff Yapp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71898] brlcad/trunk/NEWS
Revision: 71898 http://sourceforge.net/p/brlcad/code/71898 Author: starseeker Date: 2018-09-28 18:50:03 + (Fri, 28 Sep 2018) Log Message: --- GDAL supports a large number of formats - worth noting Modified Paths: -- brlcad/trunk/NEWS Modified: brlcad/trunk/NEWS === --- brlcad/trunk/NEWS 2018-09-28 18:47:24 UTC (rev 71897) +++ brlcad/trunk/NEWS 2018-09-28 18:50:03 UTC (rev 71898) @@ -21,7 +21,8 @@ Support for terrain import has been significantly expanded with the addition of a new Geospatial Data Abstraction Library (GDAL) based -importer to the gcv conversion tool. +importer to the gcv conversion tool. GDAL brings with it support for +dozens of different terrain data formats. Also new in this release are a greatly improved graphical geometry overlap resolving tool and support in the MGED search command for This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71902] brlcad/trunk/regress/gcv/dem
Revision: 71902
http://sourceforge.net/p/brlcad/code/71902
Author: starseeker
Date: 2018-09-28 19:19:34 + (Fri, 28 Sep 2018)
Log Message:
---
Use gcv+GDAL for dem conversion regression testing, rather than dem-g
Modified Paths:
--
brlcad/trunk/regress/gcv/dem/CMakeLists.txt
brlcad/trunk/regress/gcv/dem/regress-dem.cmake.in
Modified: brlcad/trunk/regress/gcv/dem/CMakeLists.txt
===
--- brlcad/trunk/regress/gcv/dem/CMakeLists.txt 2018-09-28 19:13:15 UTC (rev
71901)
+++ brlcad/trunk/regress/gcv/dem/CMakeLists.txt 2018-09-28 19:19:34 UTC (rev
71902)
@@ -3,7 +3,7 @@
add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/dem.done"
COMMAND "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/regress-dem.cmake"
- DEPENDS dem-g "${CMAKE_CURRENT_SOURCE_DIR}/hawaii-c.tar.bz2"
+ DEPENDS gcv "${CMAKE_CURRENT_SOURCE_DIR}/hawaii-c.tar.bz2"
)
add_test(NAME regress-gcv-dem COMMAND "${CMAKE_COMMAND}" -P
"${CMAKE_CURRENT_BINARY_DIR}/regress-dem.cmake")
@@ -10,7 +10,7 @@
add_custom_target(regress-gcv-dem DEPENDS dem-g
"${CMAKE_CURRENT_BINARY_DIR}/dem.done")
set_target_properties(regress-gcv-dem PROPERTIES FOLDER "BRL-CAD Regression
Tests")
set_target_properties(regress-gcv-dem PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
-Add_Regression_Test(gcv-dem "dem-g")
+Add_Regression_Test(gcv-dem "gcv;libgcv_gdal")
add_dependencies(regress-gcv regress-gcv-dem)
DISTCLEAN(
@@ -17,9 +17,7 @@
"${CMAKE_CURRENT_BINARY_DIR}/dem.done"
"${CMAKE_CURRENT_BINARY_DIR}/regress-dem.log"
"${CMAKE_CURRENT_BINARY_DIR}/hawaii-c"
- "${CMAKE_CURRENT_BINARY_DIR}/hawaii-c.dsp"
"${CMAKE_CURRENT_BINARY_DIR}/hawaii-c.g"
- "${CMAKE_CURRENT_BINARY_DIR}/hawaii-c.tmp"
)
CMAKEFILES(
Modified: brlcad/trunk/regress/gcv/dem/regress-dem.cmake.in
===
--- brlcad/trunk/regress/gcv/dem/regress-dem.cmake.in 2018-09-28 19:13:15 UTC
(rev 71901)
+++ brlcad/trunk/regress/gcv/dem/regress-dem.cmake.in 2018-09-28 19:19:34 UTC
(rev 71902)
@@ -15,21 +15,21 @@
endif(EXISTS "@CMAKE_BINARY_DIR@/CMakeTmp/CURRENT_PATH/Release")
get_filename_component(EXE "@CMAKE_COMMAND@" EXT)
-set(DEMG "${BDIR}/dem-g${EXE}")
+set(DEMG "${BDIR}/gcv${EXE}")
# Unpack
execute_process(COMMAND "@CMAKE_COMMAND@" -E tar xjf
"${CSDIR}/hawaii-c.tar.bz2" WORKING_DIRECTORY "${CBDIR}")
# Run the converter
-execute_process(COMMAND "${DEMG}" "${CBDIR}/hawaii-c" OUTPUT_VARIABLE
dem_g_log ERROR_VARIABLE dem_g_log)
+execute_process(COMMAND "${DEMG}" "${CBDIR}/hawaii-c" "${CBDIR}/hawaii-c.g"
OUTPUT_VARIABLE dem_g_log ERROR_VARIABLE dem_g_log)
file(WRITE "${CBDIR}/regress-dem.log" "${dem_g_log}")
# Known "good" md5sum of output for comparison
-set(EXPECTED_MD5 "cf87c3b174840f18f5653c677af1f433")
+set(EXPECTED_MD5 "80f98f409514586e0be12884e2118230")
# get and clean up md5sum from generated output
-execute_process(COMMAND "@CMAKE_COMMAND@" -E md5sum "${CBDIR}/hawaii-c.dsp"
OUTPUT_VARIABLE genmd5)
-string(REPLACE " ${CBDIR}/hawaii-c.dsp" "" genmd5 "${genmd5}")
+execute_process(COMMAND "@CMAKE_COMMAND@" -E md5sum "${CBDIR}/hawaii-c.g"
OUTPUT_VARIABLE genmd5)
+string(REPLACE " ${CBDIR}/hawaii-c.g" "" genmd5 "${genmd5}")
string(STRIP "${genmd5}" genmd5)
# Check md5sum for a match
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71903] brlcad/trunk/TODO
Revision: 71903 http://sourceforge.net/p/brlcad/code/71903 Author: starseeker Date: 2018-09-28 19:22:33 + (Fri, 28 Sep 2018) Log Message: --- gcv+GDAL replaces dem-g Modified Paths: -- brlcad/trunk/TODO Modified: brlcad/trunk/TODO === --- brlcad/trunk/TODO 2018-09-28 19:19:34 UTC (rev 71902) +++ brlcad/trunk/TODO 2018-09-28 19:22:33 UTC (rev 71903) @@ -273,12 +273,6 @@ * moodycamel as libbu queue/list/ptbl implementation -* update dem-g to not use full paths for dsp primitive data locations - - should default to embedding the data in the .g file as a binary object, - with an option for a relative path if the user explicitly requests - it. Full paths make for non-portable .g files and should only exist - if the user explicitly manipulates the dsp to create such a path. - * define geometry URL and VFS behavior * change _mged_ command prefix to a simple '.' prefix to hide/protect @@ -2425,7 +2419,6 @@ * these eventually get put into gcv (hopefully not needing docs): 3dm-g -dem-g g-dot g-jack g-off This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71905] brlcad/trunk
Revision: 71905
http://sourceforge.net/p/brlcad/code/71905
Author: starseeker
Date: 2018-09-28 19:25:55 + (Fri, 28 Sep 2018)
Log Message:
---
dem-g usability was always a bit iffy (don't actually know if it ever really
worked for dem files other than the USGS test examples) and gcv+GDAL should
fully cover this use case now - remove.
Modified Paths:
--
brlcad/trunk/CHANGES
brlcad/trunk/src/conv/CMakeLists.txt
Removed Paths:
-
brlcad/trunk/src/conv/dem-g.c
Modified: brlcad/trunk/CHANGES
===
--- brlcad/trunk/CHANGES2018-09-28 19:22:55 UTC (rev 71904)
+++ brlcad/trunk/CHANGES2018-09-28 19:25:55 UTC (rev 71905)
@@ -395,6 +395,8 @@
removed, broken tool [minimally impacting]
libmultispectral, rttherm, ssamp-bw, ssampview, ssampview.tcl
removed, broken tools [minimally impacting]
+dem-g
+ removed, superseded by gcv+GDAL [minimally impacting]
7.26.0
--
Modified: brlcad/trunk/src/conv/CMakeLists.txt
===
--- brlcad/trunk/src/conv/CMakeLists.txt2018-09-28 19:22:55 UTC (rev
71904)
+++ brlcad/trunk/src/conv/CMakeLists.txt2018-09-28 19:25:55 UTC (rev
71905)
@@ -54,8 +54,6 @@
BRLCAD_ADDEXEC(dbupgrade dbupgrade.c "libwdb;librt;libbu")
-BRLCAD_ADDEXEC(dem-g dem-g.c "libwdb;${M_LIBRARY}")
-
BRLCAD_ADDEXEC(k-g k-g.cpp "libwdb;librt;libbu;${M_LIBRARY}")
BRLCAD_ADDEXEC(dxf-g dxf/dxf-g.c
"libwdb;librt;libnmg;libbn;libbu;${M_LIBRARY}")
Deleted: brlcad/trunk/src/conv/dem-g.c
===
--- brlcad/trunk/src/conv/dem-g.c 2018-09-28 19:22:55 UTC (rev 71904)
+++ brlcad/trunk/src/conv/dem-g.c 2018-09-28 19:25:55 UTC (rev 71905)
@@ -1,2175 +0,0 @@
-/*D E M - G . C
- * BRL-CAD
- *
- * Copyright (c) 2008-2018 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-/** @file conv/dem-g.c
- *
- * USGS ASCII DEM file to dsp primitive converter
- *
- * There are several global element arrays that contain information
- * about the structure of the DEM-G file, record types 'A', 'B' and
- * 'C'. Data is loaded into these arrays during main().
- *
- * An 'element' is a 'data element' as defined in the DEM-G file
- * specification.
- *
- * A 'sub-element' is a field of data within an 'element'.
- *
- * An 'element' will contain at least one 'sub-element'. The '?'
- * within these array descriptions can be replaced with 'a', 'b' or
- * 'c' to indicate a specific array which corresponds to a specific
- * record type.
- *
- * ARRAY DESCRIPTION: record_?_element_size[index1][index2][index3]
- * index1 = element number
- * index2 = sub-element number within element
- * index3 = value number
- * Three values are stored for each sub-element...
- *
- * when index3=1, value = start character of sub-element within DEM-G
- * file 1024 character A/B/C record.
- *
- * when index3=2, value = number of characters in sub-element.
- *
- * when index3=3, value = datatype of sub-element (1=alpha, 2=signed
- * long integer, 3=double precision float).
- *
- * ARRAY DESCRIPTION: record_?_sub_elements[index]
- * index = element number
- * value = number of sub-elements per element
- *
- * This information allows the code to loop through the contents of
- * the array 'record_?_element_size' since each element can contain a
- * different number of sub-elements.
- *
- * No values are stored with an index of zero within these arrays,
- * therefore the size of each dimension is increased by one to
- * accommodate this.
- *
- */
-
-#include "common.h"
-
-#include
-#include
-#include
-#include
-#include "bio.h"
-
-#include "bu/app.h"
-#include "bn.h"
-#include "vmath.h"
-#include "raytrace.h"
-#include "rt/geom.h"
-#include "wdb.h"
-#include "rt/db4.h"
-
-
-const char *progname ="dem-g";
-
-#define DSP_MAX_RAW_ELEVATION 65535
-
-const char record_type_names[4][24] = {
-"",
-"logical record type 'A'",
-"logical record type 'B'",
-"logical record type 'C'"
-};
-
-
-typedef enum _lrt {
-type_a=1,
-type_b=2,
-type_c=3
-} logical_record_type;
-
-typedef enum _sed {
-type_alpha=1,
-type_integer=2,
-type_double=3
-} sub_element_datatyp
[brlcad-commits] SF.net SVN: brlcad:[71907] brlcad/trunk/CHANGES
Revision: 71907 http://sourceforge.net/p/brlcad/code/71907 Author: starseeker Date: 2018-09-28 20:15:46 + (Fri, 28 Sep 2018) Log Message: --- Let's make the eventual intent to remove libtermio/libcursor as public APIs explicit - we need to get away from code that uses these low level terminal features. Windows is a first class support platform now and its interactive user interface paradigms aren't built along these lines. Commands that are non-deprecated and still using libtermio in our code: btclsh, bwish, fbzoom, fbcolor, fbpoint and pp-fb Modified Paths: -- brlcad/trunk/CHANGES Modified: brlcad/trunk/CHANGES === --- brlcad/trunk/CHANGES2018-09-28 20:01:34 UTC (rev 71906) +++ brlcad/trunk/CHANGES2018-09-28 20:15:46 UTC (rev 71907) @@ -147,6 +147,11 @@ savekey, shaded_mode, sync Removed as part of distillation effort [deprecated 7.28] +libtermio, libcursor + Public API scope reduction - any client code that needs + to interact with the terminal at these levels should handle + what is needed locally. + 7.26 ray tracing tools This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71908] brlcad/trunk/NEWS
Revision: 71908 http://sourceforge.net/p/brlcad/code/71908 Author: starseeker Date: 2018-09-28 20:26:41 + (Fri, 28 Sep 2018) Log Message: --- gcv now supports data import for a significant number of terrain data file formats via the GDAL library (reframe) Modified Paths: -- brlcad/trunk/NEWS Modified: brlcad/trunk/NEWS === --- brlcad/trunk/NEWS 2018-09-28 20:15:46 UTC (rev 71907) +++ brlcad/trunk/NEWS 2018-09-28 20:26:41 UTC (rev 71908) @@ -64,7 +64,7 @@ * improved triangle mesh error detection for "bot check" command - Nick Reed, Cliff Yapp, Jon Engbert * fixed graphical mode initial page loading in brlman - Cliff Yapp -* added GDAL terrain import support to gcv - Cliff Yapp +* added gcv import support for 20+ terrain formats - Cliff Yapp * added 'bot_dump' command to MGED - Nick Reed * ported MGED 'screengrab' command to Windows - Nick Reed * removed spectral tracing: libmultispectral & rttherm - Cliff Yapp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71911] brlcad/trunk/doc
Revision: 71911 http://sourceforge.net/p/brlcad/code/71911 Author: starseeker Date: 2018-09-28 23:30:31 + (Fri, 28 Sep 2018) Log Message: --- remove doc dem-g references Modified Paths: -- brlcad/trunk/doc/tool_categories.txt brlcad/trunk/doc/trunk_hierarchy.org Modified: brlcad/trunk/doc/tool_categories.txt === --- brlcad/trunk/doc/tool_categories.txt2018-09-28 20:37:05 UTC (rev 71910) +++ brlcad/trunk/doc/tool_categories.txt2018-09-28 23:30:31 UTC (rev 71911) @@ -37,7 +37,6 @@ bot_shell-vtk comgeom-g cy-g -dem-g dxf-g enf-g euclid-g Modified: brlcad/trunk/doc/trunk_hierarchy.org === --- brlcad/trunk/doc/trunk_hierarchy.org2018-09-28 20:37:05 UTC (rev 71910) +++ brlcad/trunk/doc/trunk_hierarchy.org2018-09-28 23:30:31 UTC (rev 71911) @@ -2582,7 +2582,6 @@ * [[file:../src/conv/shp/shapelib/shapefil.h][shapefil.h]] * [[file:../src/conv/shp/shapelib/license.html][license.html]] * [[file:../src/conv/shp/shapelib/safileio.c][safileio.c]] -*** [[file:../src/conv/dem-g.c][dem-g.c]] *** [[file:../src/conv/g-egg.c][g-egg.c]] *** [[file:../src/conv/ply][ply]] [[file:../src/conv/ply/g-ply.c][g-ply.c]] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71912] brlcad/trunk/HACKING
Revision: 71912 http://sourceforge.net/p/brlcad/code/71912 Author: starseeker Date: 2018-10-01 01:23:42 + (Mon, 01 Oct 2018) Log Message: --- svn protocol isn't suitable for committing back changes Modified Paths: -- brlcad/trunk/HACKING Modified: brlcad/trunk/HACKING === --- brlcad/trunk/HACKING2018-09-28 23:30:31 UTC (rev 71911) +++ brlcad/trunk/HACKING2018-10-01 01:23:42 UTC (rev 71912) @@ -1265,7 +1265,7 @@ PREV=[[last_trunk_rev]] echo "PREV=$PREV" -svn co svn://svn.code.sf.net/p/brlcad/code/brlcad/branches/RELEASE brlcad.RELEASE +svn co https://svn.code.sf.net/p/brlcad/code/brlcad/branches/RELEASE brlcad.RELEASE cd brlcad.RELEASE svn merge https://svn.code.sf.net/p/brlcad/code/brlcad/trunk@$PREV https://svn.code.sf.net/p/brlcad/code/brlcad/trunk@HEAD . This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71915] brlcad/branches/RELEASE/TODO
Revision: 71915 http://sourceforge.net/p/brlcad/code/71915 Author: starseeker Date: 2018-10-01 03:02:38 + (Mon, 01 Oct 2018) Log Message: --- bu_dir work is still in progress, bump down to next release Modified Paths: -- brlcad/branches/RELEASE/TODO Modified: brlcad/branches/RELEASE/TODO === --- brlcad/branches/RELEASE/TODO2018-10-01 02:41:46 UTC (rev 71914) +++ brlcad/branches/RELEASE/TODO2018-10-01 03:02:38 UTC (rev 71915) @@ -18,6 +18,10 @@ THESE TASKS SHOULD HAPPEN BEFORE THE NEXT RELEASE - + +THESE TASKS SHOULD HAPPEN WITHIN TWO RELEASE ITERATIONS +--- + * prep caching ** implement a function to consolidate bu_brlcad_root, bu_brlcad_data, and bu_brlcad_dir. Pass in a bu_locate_t enum, @@ -48,9 +52,6 @@ directory after initialization, for example. -THESE TASKS SHOULD HAPPEN WITHIN TWO RELEASE ITERATIONS - * tree command shouldn't infinite loop when encountering a cyclic path - need to print a warning and stop walking. Requries full path awareness in tree command walk. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71916] brlcad/branches/RELEASE
Revision: 71916 http://sourceforge.net/p/brlcad/code/71916 Author: starseeker Date: 2018-10-01 03:06:39 + (Mon, 01 Oct 2018) Log Message: --- Update version numbers and release data Modified Paths: -- brlcad/branches/RELEASE/NEWS brlcad/branches/RELEASE/include/conf/MINOR brlcad/branches/RELEASE/misc/debian/changelog brlcad/branches/RELEASE/misc/macosx/Resources/ReadMe.rtfd/TXT.rtf brlcad/branches/RELEASE/misc/macosx/Resources/Welcome.rtfd/TXT.rtf Modified: brlcad/branches/RELEASE/NEWS === --- brlcad/branches/RELEASE/NEWS2018-10-01 03:02:38 UTC (rev 71915) +++ brlcad/branches/RELEASE/NEWS2018-10-01 03:06:39 UTC (rev 71916) @@ -10,7 +10,7 @@ changes made. See document footer for additional details. -- 201X-XX-XX Release 7.28.0 --- +--- 2018-09-30 Release 7.28.0 --- -- This major release of BRL-CAD incorporates a new feature for caching Modified: brlcad/branches/RELEASE/include/conf/MINOR === --- brlcad/branches/RELEASE/include/conf/MINOR 2018-10-01 03:02:38 UTC (rev 71915) +++ brlcad/branches/RELEASE/include/conf/MINOR 2018-10-01 03:06:39 UTC (rev 71916) @@ -1 +1 @@ -27 +28 Modified: brlcad/branches/RELEASE/misc/debian/changelog === --- brlcad/branches/RELEASE/misc/debian/changelog 2018-10-01 03:02:38 UTC (rev 71915) +++ brlcad/branches/RELEASE/misc/debian/changelog 2018-10-01 03:06:39 UTC (rev 71916) @@ -1,3 +1,9 @@ +brlcad (7.28.0-0) unstable; urgency=low + + * update brlcad version + + -- Cliff Yapp Thu, 30 Sep 2010 23:05:54 -0400 + brlcad (7.26.4-0) unstable; urgency=low * update brlcad version Modified: brlcad/branches/RELEASE/misc/macosx/Resources/ReadMe.rtfd/TXT.rtf === --- brlcad/branches/RELEASE/misc/macosx/Resources/ReadMe.rtfd/TXT.rtf 2018-10-01 03:02:38 UTC (rev 71915) +++ brlcad/branches/RELEASE/misc/macosx/Resources/ReadMe.rtfd/TXT.rtf 2018-10-01 03:06:39 UTC (rev 71916) @@ -11,7 +11,7 @@ \f0\i\b\fs72 \cf0 README \fs36 \ -\f1\i0\b0\fs28 This is BRL-CAD 7.26.4 for Mac OS X. Please send any bugs, comments, questions, or suggestions to the project website.\ +\f1\i0\b0\fs28 This is BRL-CAD 7.28.0 for Mac OS X. Please send any bugs, comments, questions, or suggestions to the project website.\ \fs22 \ Modified: brlcad/branches/RELEASE/misc/macosx/Resources/Welcome.rtfd/TXT.rtf === --- brlcad/branches/RELEASE/misc/macosx/Resources/Welcome.rtfd/TXT.rtf 2018-10-01 03:02:38 UTC (rev 71915) +++ brlcad/branches/RELEASE/misc/macosx/Resources/Welcome.rtfd/TXT.rtf 2018-10-01 03:06:39 UTC (rev 71916) @@ -4,7 +4,7 @@ \margl1440\margr1440\vieww8020\viewh6280\viewkind0 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural -\f0\fs22 \cf0 This installer will guide you through the installation of BRL-CAD 7.26.4 for Mac OS X and Darwin.\ +\f0\fs22 \cf0 This installer will guide you through the installation of BRL-CAD 7.28.0 for Mac OS X and Darwin.\ \ This distribution of BRL-CAD requires approximately 500 MB of available disk space and does not include source code.\ \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71917] brlcad/branches/RELEASE/ChangeLog
Revision: 71917 http://sourceforge.net/p/brlcad/code/71917 Author: starseeker Date: 2018-10-01 03:11:11 + (Mon, 01 Oct 2018) Log Message: --- update ChangeLog Modified Paths: -- brlcad/branches/RELEASE/ChangeLog Modified: brlcad/branches/RELEASE/ChangeLog === --- brlcad/branches/RELEASE/ChangeLog 2018-10-01 03:06:39 UTC (rev 71916) +++ brlcad/branches/RELEASE/ChangeLog 2018-10-01 03:11:11 UTC (rev 71917) @@ -1,3513 +1,11098 @@ -2017-09-22 18:35 starseeker +2018-10-01 03:06 starseeker - * [r70328] include/rt/functab.h, src/librt/cut.c, - src/librt/primitives/arb8/arb8.c, src/librt/primitives/table.cpp: - Removal of arb8 classification is causing some change - commit a - minimal re-insertion to RELEASE branch to document what may be - needed here... + * [r71916] NEWS, include/conf/MINOR, misc/debian/changelog, + misc/macosx/Resources/ReadMe.rtfd/TXT.rtf, + misc/macosx/Resources/Welcome.rtfd/TXT.rtf: + Update version numbers and release data -2017-09-21 15:17 starseeker +2018-10-01 03:02 starseeker - * [r70321] src/other/libutahrle/CMakeLists.txt: - forgot MSVC guard + * [r71915] TODO: + bu_dir work is still in progress, bump down to next release -2017-09-21 15:12 starseeker - * [r70320] src/libged/CMakeLists.txt: - define target, then set property +2018-10-01 01:23 starseeker -2017-09-21 14:24 starseeker + * [r71912] HACKING: + svn protocol isn't suitable for committing back changes - * [r70319] src/libged/CMakeLists.txt, src/other/CMakeLists.txt, - src/other/clipper/CMakeLists.txt, - src/other/libgdiam/CMakeLists.txt, - src/other/libnetpbm/CMakeLists.txt, - src/other/libpng/CMakeLists.txt, - src/other/libregex/CMakeLists.txt, - src/other/libutahrle/CMakeLists.txt, - src/other/libvds/CMakeLists.txt, src/other/libz/CMakeLists.txt, - src/other/lz4/CMakeLists.txt, src/other/openNURBS/CMakeLists.txt, - src/other/poly2tri/CMakeLists.txt, src/other/rply/CMakeLists.txt, - src/other/tinycthread/CMakeLists.txt: - Add a slew of 3rd party build logic fixes and improvements from - Keith. +2018-09-28 23:30 starseeker -2017-09-21 02:27 starseeker + * [r71911] doc/tool_categories.txt, doc/trunk_hierarchy.org: + remove doc dem-g references - * [r70318] TODO: - bump the timer rework to the head of the list. +2018-09-28 20:37 brlcad -2017-09-20 23:06 brlcad + * [r71910] src/librt/pr.c, src/librt/prep.c: + doxygen comments - * [r70317] CMakeLists.txt: - our tests pass with Ofast, but lets not push changes downstream - just yet until others sort out better testing methodology. update - comments. +2018-09-28 20:33 brlcad -2017-09-20 15:33 starseeker + * [r71909] src/librt/bool.c, src/librt/cache.c, + src/librt/db_diff.c, src/librt/memalloc.c, src/librt/pr.c, + src/librt/prep.c, src/librt/search.c, src/librt/tree.c, + src/librt/vlist.c: + ws - * [r70316] src/conv/CMakeLists.txt, src/conv/asc/CMakeLists.txt, - src/conv/iges/CMakeLists.txt, src/conv/intaval/CMakeLists.txt, - src/conv/raw/CMakeLists.txt, src/conv/step/step-g/CMakeLists.txt, - src/libbrep/CMakeLists.txt, src/libwdb/CMakeLists.txt: - More DLL defines cleanup +2018-09-28 20:26 starseeker -2017-09-19 23:48 starseeker + * [r71908] NEWS: + gcv now supports data import for a significant number of terrain + data file formats via the GDAL library (reframe) - * [r70315] TODO: - These can wait until after the patch release +2018-09-28 20:15 starseeker -2017-09-19 23:29 starseeker + * [r71907] CHANGES: + Let's make the eventual intent to remove libtermio/libcursor as + public APIs explicit - we need to get away from code that uses + these low level terminal features. Windows is a first class + support platform now and its interactive user interface paradigms + aren't built along these lines. Commands that are non-deprecated + and still using libtermio in our code: btclsh, bwish, fbzoom, + fbcolor, fbpoint and pp-fb - * [r70314] misc/CMake/BRLCAD_Targets.cmake: - Don't need the short-circuit define anymore +2018-09-28 20:01 brlcad -2017-09-19 23:27 starseeker + * [r71906] src/librt/cache.h: + document the API - * [r70313] CMakeLists.txt, src/other/CMakeLists.txt: - Turn off Bullet and GDAL features by default - not ready yet. +2018-09-28 19:25 starseeker -2017-09-19 23:22 starseeker + * [r71905] CHANGES, src/conv/CMakeLists.txt, src/conv/dem-g.c: + dem-g usability was always a bit iffy (do
[brlcad-commits] SF.net SVN: brlcad:[71925] brlcad/tags/rel-7-28-0/
Revision: 71925 http://sourceforge.net/p/brlcad/code/71925 Author: starseeker Date: 2018-10-01 04:18:25 + (Mon, 01 Oct 2018) Log Message: --- Tagging rel-7-28-0 Added Paths: --- brlcad/tags/rel-7-28-0/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71926] brlcad/trunk/src/libged/facetize.c
Revision: 71926
http://sourceforge.net/p/brlcad/code/71926
Author: starseeker
Date: 2018-10-01 13:05:01 + (Mon, 01 Oct 2018)
Log Message:
---
Fix/quell printf warnings
Modified Paths:
--
brlcad/trunk/src/libged/facetize.c
Modified: brlcad/trunk/src/libged/facetize.c
===
--- brlcad/trunk/src/libged/facetize.c 2018-10-01 04:18:25 UTC (rev 71925)
+++ brlcad/trunk/src/libged/facetize.c 2018-10-01 13:05:01 UTC (rev 71926)
@@ -935,7 +935,7 @@
free_pnts = 1;
if (opts->verbosity) {
- bu_log("SPSR: generating %d points from %s\n", objname);
+ bu_log("SPSR: generating %d points from %s\n", max_pnts, objname);
}
if (analyze_obj_to_pnts(pnts, &avg_thickness, gedp->ged_wdbp->dbip,
objname, &btol, flags, max_pnts, opts->max_time, opts->verbosity)) {
@@ -1015,7 +1015,7 @@
if (bot->faces) bu_free(bot->faces, "verts");
ret = GED_FACETIZE_FAILURE;
if (!opts->quiet) {
- bu_log("SPSR: facetization failed, final BoT was not solid\n",
bot->num_faces);
+ bu_log("SPSR: facetization failed, final BoT was not solid\n");
}
goto ged_facetize_spsr_memfree;
}
@@ -1087,7 +1087,7 @@
}
if (decimation_succeeded && !opts->quiet) {
- bu_log("SPSR: decimation succeeded, final BoT has %d faces\n",
bot->num_faces);
+ bu_log("SPSR: decimation succeeded, final BoT has %d faces\n",
(int)bot->num_faces);
}
if (!opts->make_nmg) {
@@ -1378,9 +1378,9 @@
feature_size = successful_feature_size;
if (!opts->quiet && bot->faces) {
if (opts->feature_size <= 0) {
- bu_log("CM: unable to polygonize at target size (%g), using
last successful BoT with %d faces, feature size %g\n", target_feature_size,
bot->num_faces, successful_feature_size);
+ bu_log("CM: unable to polygonize at target size (%g), using
last successful BoT with %d faces, feature size %g\n", target_feature_size,
(int)bot->num_faces, successful_feature_size);
} else {
- bu_log("CM: successfully created %d faces, feature size
%g\n", bot->num_faces, successful_feature_size);
+ bu_log("CM: successfully created %d faces, feature size
%g\n", (int)bot->num_faces, successful_feature_size);
}
}
} else {
@@ -1400,7 +1400,7 @@
}
if (bot->num_faces && feature_size < target_feature_size && !opts->quiet) {
- bu_log("CM: successfully polygonized BoT with %d faces at feature size
%g\n", bot->num_faces, feature_size);
+ bu_log("CM: successfully polygonized BoT with %d faces at feature size
%g\n", (int)bot->num_faces, feature_size);
}
if (!bot->faces) {
@@ -1480,7 +1480,7 @@
if (bot->faces) bu_free(bot->faces, "verts");
ret = GED_FACETIZE_FAILURE;
if (!opts->quiet) {
- bu_log("CM: facetization failed, final BoT was not solid\n",
bot->num_faces);
+ bu_log("CM: facetization failed, final BoT was not solid\n");
}
goto ged_facetize_continuation_memfree;
}
@@ -1487,7 +1487,7 @@
}
if (decimation_succeeded && !opts->quiet) {
- bu_log("CM: decimation succeeded, final BoT has %d faces\n",
bot->num_faces);
+ bu_log("CM: decimation succeeded, final BoT has %d faces\n",
(int)bot->num_faces);
}
if (!opts->make_nmg) {
@@ -1665,7 +1665,7 @@
if (flags & GED_FACETIZE_NMGBOOL) {
opts->nmg_log_print_header = 1;
if (argc == 1) {
- bu_vls_sprintf(opts->nmg_log_header, "NMG: tessellating
%s...\n", argv[0], tol->abs, tol->rel, tol->norm);
+ bu_vls_sprintf(opts->nmg_log_header, "NMG: tessellating
%s...\n", argv[0]);
} else {
bu_vls_sprintf(opts->nmg_log_header, "NMG: tessellating %d
objects with tolerances a=%g, r=%g, n=%g\n", argc, tol->abs, tol->rel,
tol->norm);
}
@@ -1906,7 +1906,7 @@
bu_log("Error adding attribute %s to comb %s", attrav[3], rcname);
}
attrav[3] = "facetize:spsr_depth";
- bu_vls_sprintf(&anum, "%g", opts->s_opts.depth);
+ bu_vls_sprintf(&anum, "%d", opts->s_opts.depth);
attrav[4] = bu_vls_addr(&anum);
if (ged_attr(gedp, 5, (const char **)&attrav) != GED_OK &&
opts->verbosity) {
bu_log("Error adding attribute %s to comb %s", attrav[3], rcname);
@@ -2196,9 +2196,9 @@
}
/* Final report */
-bu_vls_printf(gedp->ged_result_str, "Objects successfully converted: %d of
%d\n", to_convert - BU_PTBL_LEN(ar2), to_convert);
+bu_vls_printf(gedp->ged_result_str, "Objects successfully converted: %d of
%d\n", (int)(to_convert - BU_PTBL_LEN(ar2)), to_convert);
if (BU_PTBL_LEN(ar2)) {
- bu_vls_printf
[brlcad-commits] SF.net SVN: brlcad:[71927] brlcad/branches/RELEASE
Revision: 71927 http://sourceforge.net/p/brlcad/code/71927 Author: starseeker Date: 2018-10-01 14:02:33 + (Mon, 01 Oct 2018) Log Message: --- merge of trunk to RELEASE branch, r71911 through r71926 Modified Paths: -- brlcad/branches/RELEASE/TODO brlcad/branches/RELEASE/include/bu/file.h brlcad/branches/RELEASE/src/libbu/dir.c brlcad/branches/RELEASE/src/libged/facetize.c brlcad/branches/RELEASE/src/librt/cache.c Property Changed: brlcad/branches/RELEASE/ brlcad/branches/RELEASE/CHANGES brlcad/branches/RELEASE/NEWS brlcad/branches/RELEASE/bench/ brlcad/branches/RELEASE/db/ brlcad/branches/RELEASE/doc/ brlcad/branches/RELEASE/doc/STRATEGY brlcad/branches/RELEASE/doc/docbook/articles/ brlcad/branches/RELEASE/doc/docbook/books/ brlcad/branches/RELEASE/doc/docbook/lessons/ brlcad/branches/RELEASE/include/ brlcad/branches/RELEASE/regress/ brlcad/branches/RELEASE/regress/repository.sh brlcad/branches/RELEASE/src/libged/polyclip.cpp brlcad/branches/RELEASE/src/other/ Index: brlcad/branches/RELEASE === --- brlcad/branches/RELEASE 2018-10-01 13:05:01 UTC (rev 71926) +++ brlcad/branches/RELEASE 2018-10-01 14:02:33 UTC (rev 71927) Property changes on: brlcad/branches/RELEASE ___ Modified: svn:mergeinfo ## -6,4 +6,4 ## /brlcad/branches/opencl:65867-66137 /brlcad/branches/osg:62110-62113 /brlcad/branches/prep-cache:68236-68933 -/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-71913 \ No newline at end of property +/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-71926 \ No newline at end of property Index: brlcad/branches/RELEASE/CHANGES === --- brlcad/branches/RELEASE/CHANGES 2018-10-01 13:05:01 UTC (rev 71926) +++ brlcad/branches/RELEASE/CHANGES 2018-10-01 14:02:33 UTC (rev 71927) Property changes on: brlcad/branches/RELEASE/CHANGES ___ Modified: svn:mergeinfo ## -6,4 +6,4 ## /brlcad/branches/opencl/CHANGES:65867-66137 /brlcad/branches/osg/CHANGES:62110-62113 /brlcad/branches/prep-cache/CHANGES:68236-68933 -/brlcad/trunk/CHANGES:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-71913 \ No newline at end of property +/brlcad/trunk/CHANGES:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-71926 \ No newline at end of property Index: brlcad/branches/RELEASE/NEWS === --- brlcad/branches/RELEASE/NEWS2018-10-01 13:05:01 UTC (rev 71926) +++ brlcad/branches/RELEASE/NEWS2018-10-01 14:02:33 UTC (rev 71927) Property changes on: brlcad/branches/RELEASE/NEWS ___ Modified: svn:mergeinfo ## -7,4 +7,4 ## /brlcad/branches/osg/NEWS:62110-62113 /brlcad/branches/prep-cache/NEWS:68236-68933 /brlcad/trunk:68170-68252 -/brlcad/trunk/NEWS:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-71913 \ No newline at end of property +/brlcad/trunk/NEWS:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-71926 \ No newline at end of property Modified: brlcad/branches/RELEASE/TODO === --- brlcad/branches/RELEASE/TODO2018-10-01 13:05:01 UTC (rev 71926) +++ brlcad/branches/RELEASE/TODO2018-10-01 14:02:33 UTC (rev 71927) @@ -22,36 +22,18 @@ THESE TASKS SHOULD HAPPEN WITHIN TWO RELEASE ITERATIONS --- -* prep caching - ** implement a function to consolidate bu_brlcad_root, -bu_brlcad_data, and bu_brlcad_dir. Pass in a bu_locate_t enum, -the relative path, and the log/no-log flag. Intent is to support -flexibility implied by presence of BIN_DIR, LIB_DIR, etc. build -settings. Will need great care to ensure correct behavior is -preserved - bu_brlcad_root and bu_brlcad_data will need verbose -deprecation process, once bu_locate is implemented. Also will -need matching tcl function. +* finish implementation and testing of bu_dir. bu_brlcad_root and + bu_brlcad_data will need verbose deprecation process. Also need + need matching tcl function. -const char * -bu_dir(const char *path, int (log*)(const char *, ...)); +*
[brlcad-commits] SF.net SVN: brlcad:[71928] brlcad/tags/rel-7-28-0/
Revision: 71928 http://sourceforge.net/p/brlcad/code/71928 Author: starseeker Date: 2018-10-01 14:51:19 + (Mon, 01 Oct 2018) Log Message: --- Yank tag - seeing a regression with v4 .g reading Removed Paths: - brlcad/tags/rel-7-28-0/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71929] brlcad/trunk/src/librt/tree.c
Revision: 71929
http://sourceforge.net/p/brlcad/code/71929
Author: starseeker
Date: 2018-10-01 15:25:08 + (Mon, 01 Oct 2018)
Log Message:
---
cache_generate_name is cracking the disk header, which doesn't work with v4
databases. fall back to rt_obj_prep unless we're dbi_version > 4
Modified Paths:
--
brlcad/trunk/src/librt/tree.c
Modified: brlcad/trunk/src/librt/tree.c
===
--- brlcad/trunk/src/librt/tree.c 2018-10-01 14:51:19 UTC (rev 71928)
+++ brlcad/trunk/src/librt/tree.c 2018-10-01 15:25:08 UTC (rev 71929)
@@ -521,7 +521,11 @@
* long as idb_ptr is set to null. Note that the prep routine may
* have changed st_id.
*/
-ret = rt_cache_prep(data->cache, stp, ip);
+if (rtip->rti_dbip->dbi_version > 4) {
+ ret = rt_cache_prep(data->cache, stp, ip);
+} else {
+ ret = rt_obj_prep(stp, ip, stp->st_rtip);
+}
if (ret) {
int hash;
/* Error, solid no good */
@@ -772,7 +776,9 @@
}
data.tbl = tbl;
- data.cache = rt_cache_open();
+ if (rtip->rti_dbip->dbi_version > 4) {
+ data.cache = rt_cache_open();
+ }
i = db_walk_tree(rtip->rti_dbip, argc, argv, ncpus,
&tree_state,
@@ -781,7 +787,9 @@
_rt_gettree_leaf, (void *)&data);
bu_avs_free(&tree_state.ts_attrs);
- rt_cache_close(data.cache);
+ if (rtip->rti_dbip->dbi_version > 4) {
+ rt_cache_close(data.cache);
+ }
}
/* DEBUG: Ensure that all region trees are valid */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71930] brlcad/branches/RELEASE
Revision: 71930 http://sourceforge.net/p/brlcad/code/71930 Author: starseeker Date: 2018-10-01 15:28:27 + (Mon, 01 Oct 2018) Log Message: --- merge of trunk to RELEASE branch, r71926 through r71929 Modified Paths: -- brlcad/branches/RELEASE/src/librt/tree.c Property Changed: brlcad/branches/RELEASE/ brlcad/branches/RELEASE/CHANGES brlcad/branches/RELEASE/NEWS brlcad/branches/RELEASE/bench/ brlcad/branches/RELEASE/db/ brlcad/branches/RELEASE/doc/ brlcad/branches/RELEASE/doc/STRATEGY brlcad/branches/RELEASE/doc/docbook/articles/ brlcad/branches/RELEASE/doc/docbook/books/ brlcad/branches/RELEASE/doc/docbook/lessons/ brlcad/branches/RELEASE/include/ brlcad/branches/RELEASE/regress/ brlcad/branches/RELEASE/regress/repository.sh brlcad/branches/RELEASE/src/libged/polyclip.cpp brlcad/branches/RELEASE/src/other/ Index: brlcad/branches/RELEASE === --- brlcad/branches/RELEASE 2018-10-01 15:25:08 UTC (rev 71929) +++ brlcad/branches/RELEASE 2018-10-01 15:28:27 UTC (rev 71930) Property changes on: brlcad/branches/RELEASE ___ Modified: svn:mergeinfo ## -6,4 +6,4 ## /brlcad/branches/opencl:65867-66137 /brlcad/branches/osg:62110-62113 /brlcad/branches/prep-cache:68236-68933 -/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-71926 \ No newline at end of property +/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-71929 \ No newline at end of property Index: brlcad/branches/RELEASE/CHANGES === --- brlcad/branches/RELEASE/CHANGES 2018-10-01 15:25:08 UTC (rev 71929) +++ brlcad/branches/RELEASE/CHANGES 2018-10-01 15:28:27 UTC (rev 71930) Property changes on: brlcad/branches/RELEASE/CHANGES ___ Modified: svn:mergeinfo ## -6,4 +6,4 ## /brlcad/branches/opencl/CHANGES:65867-66137 /brlcad/branches/osg/CHANGES:62110-62113 /brlcad/branches/prep-cache/CHANGES:68236-68933 -/brlcad/trunk/CHANGES:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-71926 \ No newline at end of property +/brlcad/trunk/CHANGES:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-71929 \ No newline at end of property Index: brlcad/branches/RELEASE/NEWS === --- brlcad/branches/RELEASE/NEWS2018-10-01 15:25:08 UTC (rev 71929) +++ brlcad/branches/RELEASE/NEWS2018-10-01 15:28:27 UTC (rev 71930) Property changes on: brlcad/branches/RELEASE/NEWS ___ Modified: svn:mergeinfo ## -7,4 +7,4 ## /brlcad/branches/osg/NEWS:62110-62113 /brlcad/branches/prep-cache/NEWS:68236-68933 /brlcad/trunk:68170-68252 -/brlcad/trunk/NEWS:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-71926 \ No newline at end of property +/brlcad/trunk/NEWS:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-71929 \ No newline at end of property Index: brlcad/branches/RELEASE/bench === --- brlcad/branches/RELEASE/bench 2018-10-01 15:25:08 UTC (rev 71929) +++ brlcad/branches/RELEASE/bench 2018-10-01 15:28:27 UTC (rev 71930) Property changes on: brlcad/branches/RELEASE/bench ___ Modified: svn:mergeinfo ## -6,4 +6,4 ## /brlcad/branches/opencl/bench:65867-66137 /brlcad/branches/osg/bench:62110-62113 /brlcad/branches/prep-cache/bench:68236-68933 -/brlcad/trunk/bench:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-71926 \ No newline at end of property +/brlcad/trunk/bench:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-71929 \ No newline at end of property Index: brlcad/branches/RELEASE/db === --- brlcad/branches/RELEASE/db 2018-10-01 15:25:08 UTC (rev 71929) +++ brlcad/branches/RELEASE/db 2018-10-01 15:28:27 UTC (rev 71930) Property changes on: brlcad/branches/RELEASE/db ___ Modified: svn:mergeinfo ## -6,4 +6,4 ## /brlcad/branc
[brlcad-commits] SF.net SVN: brlcad:[71931] brlcad/branches/STABLE
Revision: 71931 http://sourceforge.net/p/brlcad/code/71931 Author: starseeker Date: 2018-10-01 15:43:16 + (Mon, 01 Oct 2018) Log Message: --- merging RELEASE branch to STABLE branch, r71918 through r71930 Modified Paths: -- brlcad/branches/STABLE/TODO brlcad/branches/STABLE/include/bu/file.h brlcad/branches/STABLE/src/libbu/dir.c brlcad/branches/STABLE/src/libged/facetize.c brlcad/branches/STABLE/src/librt/cache.c brlcad/branches/STABLE/src/librt/tree.c Property Changed: brlcad/branches/STABLE/ brlcad/branches/STABLE/CHANGES brlcad/branches/STABLE/NEWS brlcad/branches/STABLE/bench/ brlcad/branches/STABLE/db/ brlcad/branches/STABLE/doc/ brlcad/branches/STABLE/doc/STRATEGY brlcad/branches/STABLE/doc/docbook/articles/ brlcad/branches/STABLE/doc/docbook/books/ brlcad/branches/STABLE/doc/docbook/lessons/ brlcad/branches/STABLE/include/ brlcad/branches/STABLE/regress/ brlcad/branches/STABLE/regress/repository.sh brlcad/branches/STABLE/src/libged/polyclip.cpp brlcad/branches/STABLE/src/other/ Index: brlcad/branches/STABLE === --- brlcad/branches/STABLE 2018-10-01 15:28:27 UTC (rev 71930) +++ brlcad/branches/STABLE 2018-10-01 15:43:16 UTC (rev 71931) Property changes on: brlcad/branches/STABLE ___ Modified: svn:mergeinfo ## -1,4 +1,4 ## -/brlcad/branches/RELEASE:60491,61063,61075-66129,66135,66164,66169-68615,68617-71918 +/brlcad/branches/RELEASE:60491,61063,61075-66129,66135,66164,66169-68615,68617-71930 /brlcad/branches/STABLE:66164 /brlcad/branches/brep-debug:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69168,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100 /brlcad/branches/bullet:62518 ## -7,4 +7,4 ## /brlcad/branches/opencl:65867-66137 /brlcad/branches/osg:62110-62113 /brlcad/branches/prep-cache:68236-68933 -/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-66123,66128-66132,66134-68122,68125-71913 \ No newline at end of property +/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-66123,66128-66132,66134-68122,68125-71929 \ No newline at end of property Index: brlcad/branches/STABLE/CHANGES === --- brlcad/branches/STABLE/CHANGES 2018-10-01 15:28:27 UTC (rev 71930) +++ brlcad/branches/STABLE/CHANGES 2018-10-01 15:43:16 UTC (rev 71931) Property changes on: brlcad/branches/STABLE/CHANGES ___ Modified: svn:mergeinfo ## -1,4 +1,4 ## -/brlcad/branches/RELEASE/CHANGES:60491,60626-60628,61063,61076-66129,66164,66169-68615,68617-71918 +/brlcad/branches/RELEASE/CHANGES:60491,60626-60628,61063,61076-66129,66164,66169-68615,68617-71930 /brlcad/branches/STABLE/CHANGES:66164 /brlcad/branches/brep-debug/CHANGES:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69168,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100 /brlcad/branches/bullet/CHANGES:62518 ## -7,4 +7,4 ## /brlcad/branches/opencl/CHANGES:65867-66137 /brlcad/branches/osg/CHANGES:62110-62113 /brlcad/branches/prep-cache/CHANGES:68236-68933 -/brlcad/trunk/CHANGES:36844-37285,37571-38764,38777-3
[brlcad-commits] SF.net SVN: brlcad:[71932] brlcad/branches/RELEASE/NEWS
Revision: 71932 http://sourceforge.net/p/brlcad/code/71932 Author: starseeker Date: 2018-10-01 22:50:47 + (Mon, 01 Oct 2018) Log Message: --- Update release date Modified Paths: -- brlcad/branches/RELEASE/NEWS Modified: brlcad/branches/RELEASE/NEWS === --- brlcad/branches/RELEASE/NEWS2018-10-01 15:43:16 UTC (rev 71931) +++ brlcad/branches/RELEASE/NEWS2018-10-01 22:50:47 UTC (rev 71932) @@ -10,7 +10,7 @@ changes made. See document footer for additional details. -- 2018-09-30 Release 7.28.0 --- +--- 2018-10-01 Release 7.28.0 --- -- This major release of BRL-CAD incorporates a new feature for caching This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71933] brlcad/branches/STABLE
Revision: 71933 http://sourceforge.net/p/brlcad/code/71933 Author: starseeker Date: 2018-10-01 22:52:58 + (Mon, 01 Oct 2018) Log Message: --- merging RELEASE branch to STABLE branch, r71930 through r71932 Modified Paths: -- brlcad/branches/STABLE/NEWS Property Changed: brlcad/branches/STABLE/ brlcad/branches/STABLE/CHANGES brlcad/branches/STABLE/NEWS brlcad/branches/STABLE/bench/ brlcad/branches/STABLE/db/ brlcad/branches/STABLE/doc/ brlcad/branches/STABLE/doc/STRATEGY brlcad/branches/STABLE/doc/docbook/articles/ brlcad/branches/STABLE/doc/docbook/books/ brlcad/branches/STABLE/doc/docbook/lessons/ brlcad/branches/STABLE/include/ brlcad/branches/STABLE/regress/ brlcad/branches/STABLE/regress/repository.sh brlcad/branches/STABLE/src/libged/polyclip.cpp brlcad/branches/STABLE/src/other/ Index: brlcad/branches/STABLE === --- brlcad/branches/STABLE 2018-10-01 22:50:47 UTC (rev 71932) +++ brlcad/branches/STABLE 2018-10-01 22:52:58 UTC (rev 71933) Property changes on: brlcad/branches/STABLE ___ Modified: svn:mergeinfo ## -1,4 +1,4 ## -/brlcad/branches/RELEASE:60491,61063,61075-66129,66135,66164,66169-68615,68617-71930 +/brlcad/branches/RELEASE:60491,61063,61075-66129,66135,66164,66169-68615,68617-71932 /brlcad/branches/STABLE:66164 /brlcad/branches/brep-debug:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69168,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100 /brlcad/branches/bullet:62518 Index: brlcad/branches/STABLE/CHANGES === --- brlcad/branches/STABLE/CHANGES 2018-10-01 22:50:47 UTC (rev 71932) +++ brlcad/branches/STABLE/CHANGES 2018-10-01 22:52:58 UTC (rev 71933) Property changes on: brlcad/branches/STABLE/CHANGES ___ Modified: svn:mergeinfo ## -1,4 +1,4 ## -/brlcad/branches/RELEASE/CHANGES:60491,60626-60628,61063,61076-66129,66164,66169-68615,68617-71930 +/brlcad/branches/RELEASE/CHANGES:60491,60626-60628,61063,61076-66129,66164,66169-68615,68617-71932 /brlcad/branches/STABLE/CHANGES:66164 /brlcad/branches/brep-debug/CHANGES:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69168,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100 /brlcad/branches/bullet/CHANGES:62518 Modified: brlcad/branches/STABLE/NEWS === --- brlcad/branches/STABLE/NEWS 2018-10-01 22:50:47 UTC (rev 71932) +++ brlcad/branches/STABLE/NEWS 2018-10-01 22:52:58 UTC (rev 71933) @@ -10,7 +10,7 @@ changes made. See document footer for additional details. -- 2018-09-30 Release 7.28.0 --- +--- 2018-10-01 Release 7.28.0 --- -- This major release of BRL-CAD incorporates a new feature for caching Property changes on: brlcad/branches/STABLE/NEWS ___ Modified: svn:mergeinfo ## -1,4 +1,4 ## -/brlcad/branches/RELEASE/NEWS:60491,61063,61075-66129,66164,66169-68615,68617-71930 +/brlcad/branches/RELEASE/NEWS:60491,61063,61075-661
[brlcad-commits] SF.net SVN: brlcad:[71934] brlcad/tags/rel-7-28-0/
Revision: 71934 http://sourceforge.net/p/brlcad/code/71934 Author: starseeker Date: 2018-10-01 22:54:11 + (Mon, 01 Oct 2018) Log Message: --- Tagging rel-7-28-0 Added Paths: --- brlcad/tags/rel-7-28-0/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71935] brlcad/trunk/include/conf/PATCH
Revision: 71935 http://sourceforge.net/p/brlcad/code/71935 Author: starseeker Date: 2018-10-01 22:57:24 + (Mon, 01 Oct 2018) Log Message: --- bump to next development revision after tagging the 7.28.0 release Modified Paths: -- brlcad/trunk/include/conf/PATCH Modified: brlcad/trunk/include/conf/PATCH === --- brlcad/trunk/include/conf/PATCH 2018-10-01 22:54:11 UTC (rev 71934) +++ brlcad/trunk/include/conf/PATCH 2018-10-01 22:57:24 UTC (rev 71935) @@ -1 +1 @@ -0 +1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71936] brlcad/trunk
Revision: 71936 http://sourceforge.net/p/brlcad/code/71936 Author: starseeker Date: 2018-10-01 23:02:21 + (Mon, 01 Oct 2018) Log Message: --- Sync RELEASE changes r71914 through r71935 to trunk Modified Paths: -- brlcad/trunk/ChangeLog brlcad/trunk/NEWS brlcad/trunk/README brlcad/trunk/TODO brlcad/trunk/include/conf/MINOR brlcad/trunk/misc/debian/changelog brlcad/trunk/misc/macosx/Resources/ReadMe.rtfd/TXT.rtf brlcad/trunk/misc/macosx/Resources/Welcome.rtfd/TXT.rtf Property Changed: brlcad/trunk/ brlcad/trunk/CHANGES brlcad/trunk/NEWS brlcad/trunk/bench/ brlcad/trunk/db/ brlcad/trunk/doc/ brlcad/trunk/doc/STRATEGY brlcad/trunk/doc/docbook/articles/ brlcad/trunk/doc/docbook/books/ brlcad/trunk/doc/docbook/lessons/ brlcad/trunk/include/ brlcad/trunk/regress/ brlcad/trunk/regress/repository.sh brlcad/trunk/src/libbu/ brlcad/trunk/src/libged/polyclip.cpp brlcad/trunk/src/other/ brlcad/trunk/src/tclscripts/archer/ Index: brlcad/trunk === --- brlcad/trunk2018-10-01 22:57:24 UTC (rev 71935) +++ brlcad/trunk2018-10-01 23:02:21 UTC (rev 71936) Property changes on: brlcad/trunk ___ Modified: svn:mergeinfo ## -1,4 +1,4 ## -/brlcad/branches/RELEASE:57439,57447-57860,69901-69913,70323-70333 +/brlcad/branches/RELEASE:57439,57447-57860,69901-69913,70323-70333,71915-71935 /brlcad/branches/brep-debug:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69168,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100 /brlcad/branches/bullet:62518 /brlcad/branches/cmake:43219 Index: brlcad/trunk/CHANGES === --- brlcad/trunk/CHANGES2018-10-01 22:57:24 UTC (rev 71935) +++ brlcad/trunk/CHANGES2018-10-01 23:02:21 UTC (rev 71936) Property changes on: brlcad/trunk/CHANGES ___ Modified: svn:mergeinfo ## -1,2 +1,2 ## -/brlcad/branches/RELEASE/CHANGES:70323-70333 +/brlcad/branches/RELEASE/CHANGES:70323-70333,71915-71935 /brlcad/branches/brep-debug/CHANGES:69168,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100 \ No newline at end of property Modified: brlcad/trunk/ChangeLog === --- brlcad/trunk/ChangeLog 2018-10-01 22:57:24 UTC (rev 71935) +++ brlcad/trunk/ChangeLog 2018-10-01 23:02:21 UTC (rev 71936) @@ -1,3513 +1,11098 @@ -2017-09-22 18:35 starseeker +2018-10-01 03:06 starseeker - * [r70328] include/rt/functab.h, src/librt/cut.c, - src/librt/primitives/arb8/arb8.c, src/librt/primitives/table.cpp: - Removal of arb8 classification is causing some change - commit a - minimal re-insertion to RELEASE branch to document what may be - needed here... + * [r71916] NEWS, include/conf/MINOR, misc/debian/changelog, + misc/macosx/Resources/ReadMe.rtfd/TXT.rtf, + misc/macosx/Resources/Welcome.rtfd/TXT.rtf: + Update version numbers and release data -2017-09-21 15:17 starseeker +2018-10-01 03:02 starseeker - * [r70321] src/other/libutahrle/CMakeLists.txt: - forgot MSVC guard + * [r71915] TODO: + bu_dir work is still in progress, bump down to next release -2017-09-21 15:12 starseeker - * [r70320] src/libged/CMakeLists.txt: - define target, then set property +2018-10-01 01:23 starseeker -2017-09-21 14:24 starseeker + * [r71912] HACKING: + svn protocol isn't suitable for committing back changes - * [r70319] src/libged/CMakeLists.txt, src/other/CMakeLists.txt, - src/other/clipper/CMakeLists.txt, - src/other/libgdiam/CMakeLists.txt, - src/other/libnetpbm/CMakeLists.txt, - src/other/libpng/CMakeLists.txt, - src/other/libregex/CMakeLists.txt, - src/other/libutahrle/CMakeLists.txt, - src/other/libvds/CMakeLists.txt, src/other/libz/CMakeLists.tx
[brlcad-commits] SF.net SVN: brlcad:[71937] brlcad/trunk/NEWS
Revision: 71937 http://sourceforge.net/p/brlcad/code/71937 Author: starseeker Date: 2018-10-01 23:03:24 + (Mon, 01 Oct 2018) Log Message: --- Add new NEWS release banner Modified Paths: -- brlcad/trunk/NEWS Modified: brlcad/trunk/NEWS === --- brlcad/trunk/NEWS 2018-10-01 23:02:21 UTC (rev 71936) +++ brlcad/trunk/NEWS 2018-10-01 23:03:24 UTC (rev 71937) @@ -10,6 +10,11 @@ changes made. See document footer for additional details. -- +--- 201X-XX-XX Release 7.28.2 --- +-- + + +-- --- 2018-10-01 Release 7.28.0 --- -- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71939] brlcad/trunk
Revision: 71939 http://sourceforge.net/p/brlcad/code/71939 Author: starseeker Date: 2018-10-03 13:29:52 + (Wed, 03 Oct 2018) Log Message: --- Discussed with Sean - intent is to move to newer C/C++ standards, and that change merits a minor bump rather than a patch release. Modified Paths: -- brlcad/trunk/NEWS brlcad/trunk/README brlcad/trunk/include/conf/MINOR brlcad/trunk/include/conf/PATCH brlcad/trunk/misc/macosx/Resources/ReadMe.rtfd/TXT.rtf brlcad/trunk/misc/macosx/Resources/Welcome.rtfd/TXT.rtf Modified: brlcad/trunk/NEWS === --- brlcad/trunk/NEWS 2018-10-02 23:19:17 UTC (rev 71938) +++ brlcad/trunk/NEWS 2018-10-03 13:29:52 UTC (rev 71939) @@ -10,7 +10,7 @@ changes made. See document footer for additional details. -- 201X-XX-XX Release 7.28.2 --- +--- 201X-XX-XX Release 7.30.0 --- -- Modified: brlcad/trunk/README === --- brlcad/trunk/README 2018-10-02 23:19:17 UTC (rev 71938) +++ brlcad/trunk/README 2018-10-03 13:29:52 UTC (rev 71939) @@ -1,5 +1,5 @@ BRL-CAD -Release 7.28.2 +Release 7.30.0 http://brlcad.org/ BRL-CAD is a powerful cross-platform open source combinatorial Modified: brlcad/trunk/include/conf/MINOR === --- brlcad/trunk/include/conf/MINOR 2018-10-02 23:19:17 UTC (rev 71938) +++ brlcad/trunk/include/conf/MINOR 2018-10-03 13:29:52 UTC (rev 71939) @@ -1 +1 @@ -28 +29 Modified: brlcad/trunk/include/conf/PATCH === --- brlcad/trunk/include/conf/PATCH 2018-10-02 23:19:17 UTC (rev 71938) +++ brlcad/trunk/include/conf/PATCH 2018-10-03 13:29:52 UTC (rev 71939) @@ -1 +1 @@ -1 +0 Modified: brlcad/trunk/misc/macosx/Resources/ReadMe.rtfd/TXT.rtf === --- brlcad/trunk/misc/macosx/Resources/ReadMe.rtfd/TXT.rtf 2018-10-02 23:19:17 UTC (rev 71938) +++ brlcad/trunk/misc/macosx/Resources/ReadMe.rtfd/TXT.rtf 2018-10-03 13:29:52 UTC (rev 71939) @@ -11,7 +11,7 @@ \f0\i\b\fs72 \cf0 README \fs36 \ -\f1\i0\b0\fs28 This is BRL-CAD 7.28.0 for Mac OS X. Please send any bugs, comments, questions, or suggestions to the project website.\ +\f1\i0\b0\fs28 This is BRL-CAD 7.30.0 for Mac OS X. Please send any bugs, comments, questions, or suggestions to the project website.\ \fs22 \ Modified: brlcad/trunk/misc/macosx/Resources/Welcome.rtfd/TXT.rtf === --- brlcad/trunk/misc/macosx/Resources/Welcome.rtfd/TXT.rtf 2018-10-02 23:19:17 UTC (rev 71938) +++ brlcad/trunk/misc/macosx/Resources/Welcome.rtfd/TXT.rtf 2018-10-03 13:29:52 UTC (rev 71939) @@ -4,7 +4,7 @@ \margl1440\margr1440\vieww8020\viewh6280\viewkind0 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural -\f0\fs22 \cf0 This installer will guide you through the installation of BRL-CAD 7.28.0 for Mac OS X and Darwin.\ +\f0\fs22 \cf0 This installer will guide you through the installation of BRL-CAD 7.30.0 for Mac OS X and Darwin.\ \ This distribution of BRL-CAD requires approximately 500 MB of available disk space and does not include source code.\ \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71940] brlcad/trunk/CMakeLists.txt
Revision: 71940
http://sourceforge.net/p/brlcad/code/71940
Author: starseeker
Date: 2018-10-03 13:53:28 + (Wed, 03 Oct 2018)
Log Message:
---
Bump the required standards to C99 and C++11, eliminating the build-type
dependent switching behavior for C.
Modified Paths:
--
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===
--- brlcad/trunk/CMakeLists.txt 2018-10-03 13:29:52 UTC (rev 71939)
+++ brlcad/trunk/CMakeLists.txt 2018-10-03 13:53:28 UTC (rev 71940)
@@ -836,16 +836,6 @@
# (i.e., -std=xxx flags) and API (i.e., -D_POSIX_C_SOURCE defines) to
# permit and utilize respectively. Common profiles:
#
-# 1989-1998: C90 & C++98 (target: 1990)
-# ISO/IEC 9899:1990 __STDC__
-# ISO/IEC 14882:1998 __cplusplus==199711L
-# ISO/IEC 9945-1:1990 -D_POSIX_C_SOURCE=199009L (or =1)
-# X/Open Portability Guide 3 (1989) -D_XOPEN_SOURCE=3
-# 1999-2010: C99 & C++98 (skippable, target: 2000)
-# ISO/IEC 9899:1999 __STDC_VERSION__==199901L
-# ISO/IEC 14882:2011 __cplusplus==201103L
-# IEEE 1003.1-2001 -D_POSIX_C_SOURCE=200112L
-# X/Open Single UNIX Specification, Version 2 (1998) -D_XOPEN_SOURCE=500
# 2011-2016: C11 & C++11 (ignoring C++14, target: 2013)
# ISO/IEC 9899:2011 __STDC_VERSION__==201112L
# ISO/IEC 14882:2011 __cplusplus==201103L
@@ -859,7 +849,6 @@
#
# Sources: https://sourceforge.net/p/predef/wiki/Standards/
-
# For certain platforms (in particular Visual C++) we want to keep some
pre-defined
# flags that are commonly used in the build logic.
if(NOT "${CMAKE_C_FLAGS}" STREQUAL "" AND NOT DEFINED CMAKE_C_FLAGS_DEFAULT)
@@ -875,32 +864,17 @@
unset(C_STANDARD_FLAGS)
set(CMAKE_C_EXTENSIONS OFF)
-# Punt for now on multiconfig tools like Visual Studio and XCode, and just go
-# with the more modern standard in all cases. After the next (last) C90
-# release, we will be using a uniform standard for all build types and that
-# means it's not worth trying to manage per-build-config standards.
-if("${CMAKE_BUILD_TYPE}" STREQUAL "Release" OR CMAKE_CONFIGURATION_TYPES)
- set(CMAKE_C_STANDARD 99)
- set(CMAKE_C_STANDARD_REQUIRED ON)
- set(API_FLAGS "-D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=500")
- if(CMAKE_C_EXTENSIONS)
-set(C_STANDARD_FLAGS
"${CMAKE_C${CMAKE_C_STANDARD}_EXTENSION_COMPILE_OPTION}")
- else()
-set(C_STANDARD_FLAGS
"${CMAKE_C${CMAKE_C_STANDARD}_STANDARD_COMPILE_OPTION} ${API_FLAGS}")
- endif(CMAKE_C_EXTENSIONS)
- if("${C_STANDARD_FLAGS}" STREQUAL "")
-message(FATAL_ERROR "C standard specification failure: compiler does not
support the C${CMAKE_C_STANDARD} standard:\n${CMAKE_C_COMPILE_FEATURES}")
- endif("${C_STANDARD_FLAGS}" STREQUAL "")
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_C_STANDARD_REQUIRED ON)
+set(API_FLAGS "-D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=500")
+if(CMAKE_C_EXTENSIONS)
+ set(C_STANDARD_FLAGS
"${CMAKE_C${CMAKE_C_STANDARD}_EXTENSION_COMPILE_OPTION}")
else()
- set(CMAKE_C_STANDARD 90)
- set(CMAKE_C_STANDARD_REQUIRED ON)
- set(API_FLAGS "-D_POSIX_C_SOURCE=199009L -D_XOPEN_SOURCE=3")
- if(CMAKE_C_EXTENSIONS)
-set(C_STANDARD_FLAGS
"${CMAKE_C${CMAKE_C_STANDARD}_EXTENSION_COMPILE_OPTION}")
- else()
-set(C_STANDARD_FLAGS
"${CMAKE_C${CMAKE_C_STANDARD}_STANDARD_COMPILE_OPTION} ${API_FLAGS}")
- endif(CMAKE_C_EXTENSIONS)
-endif("${CMAKE_BUILD_TYPE}" STREQUAL "Release" OR CMAKE_CONFIGURATION_TYPES)
+ set(C_STANDARD_FLAGS "${CMAKE_C${CMAKE_C_STANDARD}_STANDARD_COMPILE_OPTION}
${API_FLAGS}")
+endif(CMAKE_C_EXTENSIONS)
+if("${C_STANDARD_FLAGS}" STREQUAL "")
+ message(FATAL_ERROR "C standard specification failure: compiler does not
support the C${CMAKE_C_STANDARD} standard:\n${CMAKE_C_COMPILE_FEATURES}")
+endif("${C_STANDARD_FLAGS}" STREQUAL "")
set(C_STANDARD_FLAGS "${CMAKE_C_FLAGS_DEFAULT} ${C_STANDARD_FLAGS}")
string(STRIP "${C_STANDARD_FLAGS}" C_STANDARD_FLAGS)
@@ -908,7 +882,7 @@
unset(CXX_STANDARD_FLAGS)
set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_CXX_STANDARD 98)
+set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
if(CMAKE_CXX_EXTENSIONS)
set(CXX_STANDARD_FLAGS
"${CMAKE_CXX${CMAKE_CXX_STANDARD}_EXTENSION_COMPILE_OPTION}")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71941] brlcad/trunk
Revision: 71941
http://sourceforge.net/p/brlcad/code/71941
Author: starseeker
Date: 2018-10-03 22:13:09 + (Wed, 03 Oct 2018)
Log Message:
---
Replace the Clarkson convex hull code with Antti Kuukka's C++11 implementation
of quickhull from https://github.com/akuukka/quickhull - a timing comparison
with the Stanford lucy model reported 2.5 seconds with the new method vs. 11
minutes 45.5 seconds with the old method. (Part of the time increase for the
old method was due to the overhead of swap space usage - memory requirements
also appear to be *much* lower for the new code.)
Modified Paths:
--
brlcad/trunk/CMakeLists.txt
brlcad/trunk/doc/legal/embedded/chull3d.txt
brlcad/trunk/misc/CMake/CMakeLists.txt
brlcad/trunk/src/libbg/CMakeLists.txt
Added Paths:
---
brlcad/trunk/misc/CMake/CheckCXX11Features/
brlcad/trunk/misc/CMake/CheckCXX11Features/cxx11-test-nullptr.cpp
brlcad/trunk/misc/CMake/CheckCXX11Features/cxx11-test-nullptr_fail_compile.cpp
brlcad/trunk/misc/CMake/CheckCXX11Features.cmake
brlcad/trunk/src/libbg/QuickHull.cxx
brlcad/trunk/src/libbg/QuickHull.hpp
brlcad/trunk/src/libbg/chull3d.cxx
Removed Paths:
-
brlcad/trunk/src/libbg/chull3d.cpp
Modified: brlcad/trunk/CMakeLists.txt
===
--- brlcad/trunk/CMakeLists.txt 2018-10-03 13:53:28 UTC (rev 71940)
+++ brlcad/trunk/CMakeLists.txt 2018-10-03 22:13:09 UTC (rev 71941)
@@ -2583,6 +2583,13 @@
endif (HAVE___THREAD)
endif (HAVE_THREAD_LOCAL)
+# Test for C++11 features that we need - CMake will sometimes assert that a
+# C++11 compiler flag exists, but the actual compiler support for C++11
language
+# ends up lacking in practice.
+include(CheckCXX11Features)
+cxx11_check_feature("nullptr" HAS_CXX11_NULLPTR)
+
+
# see if the compiler supports %z as a size_t print width specifier
BRLCAD_CHECK_PERCENT_Z()
@@ -2589,7 +2596,10 @@
# see if the compiler supports [static] array hints
BRLCAD_CHECK_STATIC_ARRAYS()
+# see if we have a TLS intrinsic, first check C++11 compliance
+check_cxx_source_compiles("static thread_local int i = 0; int main() { return
i; }" HAVE_THREAD_LOCAL)
+
# ***
if(BRLCAD_PRINT_MSGS)
message("***")
Modified: brlcad/trunk/doc/legal/embedded/chull3d.txt
===
--- brlcad/trunk/doc/legal/embedded/chull3d.txt 2018-10-03 13:53:28 UTC (rev
71940)
+++ brlcad/trunk/doc/legal/embedded/chull3d.txt 2018-10-03 22:13:09 UTC (rev
71941)
@@ -1,13 +1,10 @@
-http://www.netlib.org/voronoi/hull.html
+https://github.com/akuukka/quickhull
-Ken Clarkson wrote this. Copyright (c) 1995 by AT&T..
-Permission to use, copy, modify, and distribute this software for any
-purpose without fee is hereby granted, provided that this entire notice
-is included in all copies of any software which is or includes a copy
-or modification of this software and in all copies of the supporting
-documentation for such software.
-THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
-WARRANTY. IN PARTICULAR, NEITHER THE AUTHORS NOR AT&T MAKE ANY
-REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
-OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
+Implementation of the 3D QuickHull algorithm by Antti Kuukka
+Per README.md:
+
+This implementation is 100% Public Domain.
+
+Feel free to use.
+
Modified: brlcad/trunk/misc/CMake/CMakeLists.txt
===
--- brlcad/trunk/misc/CMake/CMakeLists.txt 2018-10-03 13:53:28 UTC (rev
71940)
+++ brlcad/trunk/misc/CMake/CMakeLists.txt 2018-10-03 22:13:09 UTC (rev
71941)
@@ -9,6 +9,9 @@
CMakeLists.txt
CheckCInline.cmake
CheckCSourceRuns.cmake
+ CheckCXX11Features.cmake
+ CheckCXX11Features/cxx11-test-nullptr.cpp
+ CheckCXX11Features/cxx11-test-nullptr_fail_compile.cpp
CompilerFlags.cmake
Distcheck.cmake
DocBook.cmake
Added: brlcad/trunk/misc/CMake/CheckCXX11Features/cxx11-test-nullptr.cpp
===
--- brlcad/trunk/misc/CMake/CheckCXX11Features/cxx11-test-nullptr.cpp
(rev 0)
+++ brlcad/trunk/misc/CMake/CheckCXX11Features/cxx11-test-nullptr.cpp
2018-10-03 22:13:09 UTC (rev 71941)
@@ -0,0 +1,6 @@
+int main(void)
+{
+ void *v = nullptr;
+
+ return v ? 1 : 0;
+}
Property changes on:
brlcad/trunk/misc/CMake/CheckCXX11Features/cxx11-test-nullptr.cpp
___
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added:
brlcad/trunk/misc/CMake/CheckCXX11Features/cxx11-test-nullptr_
[brlcad-commits] SF.net SVN: brlcad:[71942] brlcad/trunk/src/libbg/trimesh.c
Revision: 71942
http://sourceforge.net/p/brlcad/code/71942
Author: starseeker
Date: 2018-10-04 19:09:58 + (Thu, 04 Oct 2018)
Log Message:
---
This needs to be static (or not inline) consistently - triggering an undefined
reference error when linking libbg.so in Debug mode.
Modified Paths:
--
brlcad/trunk/src/libbg/trimesh.c
Modified: brlcad/trunk/src/libbg/trimesh.c
===
--- brlcad/trunk/src/libbg/trimesh.c2018-10-03 22:13:09 UTC (rev 71941)
+++ brlcad/trunk/src/libbg/trimesh.c2018-10-04 19:09:58 UTC (rev 71942)
@@ -29,7 +29,7 @@
#define TRIMESH_EDGE_EQUAL(e1, e2) ((e1).va == (e2).va && (e1).vb == (e2).vb)
-HIDDEN inline void
+static inline void
_trimesh_set_edge(struct bg_trimesh_halfedge *edge, int va, int vb)
{
if (va < vb) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71943] brlcad/trunk/src/other/CMakeLists.txt
Revision: 71943
http://sourceforge.net/p/brlcad/code/71943
Author: starseeker
Date: 2018-10-04 20:18:40 + (Thu, 04 Oct 2018)
Log Message:
---
Forgot quotes, was causing strange install dirs in both build and install
directories.
Modified Paths:
--
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===
--- brlcad/trunk/src/other/CMakeLists.txt 2018-10-04 19:09:58 UTC (rev
71942)
+++ brlcad/trunk/src/other/CMakeLists.txt 2018-10-04 20:18:40 UTC (rev
71943)
@@ -924,7 +924,7 @@
get_filename_component(scf ${scfile} NAME)
set(sc_headers ${sc_headers} ${src_dir}/${scf})
endforeach(scfile ${sc_headers_orig})
- BRLCAD_MANAGE_FILES(${sc_headers} ${target_dir} FOLDER stepcode)
+ BRLCAD_MANAGE_FILES("${sc_headers}" "${target_dir}" FOLDER stepcode)
endfunction(SC_MANAGE_HDRS)
function(SC_MANAGE_HDRS2 src_dir src_var target_dir)
@@ -933,7 +933,7 @@
foreach(scfile ${sc_headers_orig})
set(sc_headers ${sc_headers} ${src_dir}/${scfile})
endforeach(scfile ${sc_headers_orig})
- BRLCAD_MANAGE_FILES(${sc_headers} ${target_dir} FOLDER stepcode)
+ BRLCAD_MANAGE_FILES("${sc_headers}" "${target_dir}" FOLDER stepcode)
endfunction(SC_MANAGE_HDRS2)
set(sc_ALIASES ENABLE_SCL ENABLE_STEP ENABLE_STEP_CLASS_LIBRARIES)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71944] brlcad/trunk/src/tclscripts/checker
Revision: 71944
http://sourceforge.net/p/brlcad/code/71944
Author: starseeker
Date: 2018-10-04 22:19:11 + (Thu, 04 Oct 2018)
Log Message:
---
It looks like update calls in the Tcl OverlapsTool code were leading to locking
in some situations (http://wiki.tcl.tk/1255) This removal pass may be a bit
too draconian, but it does ultimately produce an overlaps file so it's at least
a starting point.
Modified Paths:
--
brlcad/trunk/src/tclscripts/checker/OverlapFileTool.tcl
brlcad/trunk/src/tclscripts/checker/check.tcl
brlcad/trunk/src/tclscripts/checker/menu.tcl
Modified: brlcad/trunk/src/tclscripts/checker/OverlapFileTool.tcl
===
--- brlcad/trunk/src/tclscripts/checker/OverlapFileTool.tcl 2018-10-04
20:18:40 UTC (rev 71943)
+++ brlcad/trunk/src/tclscripts/checker/OverlapFileTool.tcl 2018-10-04
22:19:11 UTC (rev 71944)
@@ -198,7 +198,6 @@
$itk_component(buttonGo) configure -state disabled
$itk_component(objectsEntry) configure -state disabled
$this configure -cursor watch
-update
# run checkoverlaps for all the specified objects
if { [string length $_objs] > 0 } {
@@ -214,7 +213,6 @@
$this configure -cursor ""
set _progressValue 0
set _statusText "Ready"
- update
return
}
@@ -237,7 +235,7 @@
# write the overlaps file
set fp [open $filename w+]
foreach pair [lsort -decreasing -real -index 2 $overlapsList] {
- puts $pair
+ #puts $pair
puts $fp $pair
}
close $fp
@@ -491,7 +489,6 @@
#
body OverlapFileTool::rmDupPairs { } {
set _statusText "Removing duplicates from overlaps list"
-update
set new_list {}
#take first pair
@@ -514,7 +511,6 @@
}
set _progressValue 100
set _statusText "Done"
-update
#take last pairlist
$this addToList $new_list
@@ -528,7 +524,6 @@
body OverlapFileTool::sortPairs { } {
set _progressValue 95
set _statusText "Sorting overlaps list"
-update
set pairsList [lsort $pairsList]
}
@@ -540,7 +535,6 @@
body OverlapFileTool::runCheckOverlapsTriple { obj } {
set cmd "check overlaps -g1mm,1mm -q $obj"
set _statusText "Running $cmd"
-update
if [ catch {set check_list [eval $cmd]} ] {
set check_list {}
}
@@ -561,7 +555,6 @@
unset full
}
set _progressValue 90
-update
}
# runCheckOverlapsAE
@@ -576,7 +569,6 @@
set cmd "check overlaps -G1024 -a$az -e$el -q $obj"
set _statusText "Running $cmd"
incr _progressValue 4
- update
if [catch {set check_list [eval $cmd]}] {
set check_list {}
}
Modified: brlcad/trunk/src/tclscripts/checker/check.tcl
===
--- brlcad/trunk/src/tclscripts/checker/check.tcl 2018-10-04 20:18:40 UTC
(rev 71943)
+++ brlcad/trunk/src/tclscripts/checker/check.tcl 2018-10-04 22:19:11 UTC
(rev 71944)
@@ -135,7 +135,6 @@
set _progressButtonInvoked true
while {$_commandText != "Stopped."} {
- update
set _commandText "Stopped."
lappend _afterCommands [after 500 "[code set [scope _commandText]
"Stopped."]"]
}
@@ -358,7 +357,6 @@
# resolve vwait
set _commandText ""
-update
}
::itcl::body GeometryChecker::destructor {} {
@@ -402,7 +400,6 @@
set _ol_dir [file dirname $filename]
puts "Loading from $filename"
-update
set ovfile [open $filename "r"]
fconfigure "$ovfile" -encoding utf-8
@@ -466,7 +463,6 @@
$_ck insert {} end -id $count -text $count -values [list $count $left
$right [format %.2f $size]] -tags "$tag"
if {$count % 500 == 0} {
puts "."
- update
}
}
set _count $count
@@ -810,7 +806,6 @@
}
incr count
set _progressValue [expr $count / [expr $total + 1.0] * 100]
- update
}
}
set _commandText ""
Modified: brlcad/trunk/src/tclscripts/checker/menu.tcl
===
--- brlcad/trunk/src/tclscripts/checker/menu.tcl2018-10-04 20:18:40 UTC
(rev 71943)
+++ brlcad/trunk/src/tclscripts/checker/menu.tcl2018-10-04 22:19:11 UTC
(rev 71944)
@@ -139,7 +139,6 @@
if {[catch {$checker loadOverlaps $ovfile} result]} {
wm withdraw $checkerWindow
- update
destroy $checkerWindow
return -code error $result
}
@@ -157,7 +156,6 @@
pack $checker -expand true -fill both
# ensure window isn't too narrow
-update
set geom [split [wm geometry $checkerWindow] "=x+-"]
if {[lindex $geom 0] > [lindex $geom 1]} {
lreplace $geom 1 1 [lindex $geom 0]
@@ -229,7 +227,6 @@
} else {
set _hintText $text
}
-update
}
# valida
[brlcad-commits] SF.net SVN: brlcad:[71946] brlcad/trunk/src/libbg/QuickHull.cxx
Revision: 71946
http://sourceforge.net/p/brlcad/code/71946
Author: starseeker
Date: 2018-10-05 17:20:47 + (Fri, 05 Oct 2018)
Log Message:
---
Mark UNUSED parameters
Modified Paths:
--
brlcad/trunk/src/libbg/QuickHull.cxx
Modified: brlcad/trunk/src/libbg/QuickHull.cxx
===
--- brlcad/trunk/src/libbg/QuickHull.cxx2018-10-05 01:08:37 UTC (rev
71945)
+++ brlcad/trunk/src/libbg/QuickHull.cxx2018-10-05 17:20:47 UTC (rev
71946)
@@ -60,7 +60,7 @@
}
template
- void QuickHull::buildMesh(const VertexDataSource& pointCloud,
bool CCW, bool useOriginalIndices, T epsilon) {
+ void QuickHull::buildMesh(const VertexDataSource& pointCloud,
bool UNUSED(CCW), bool UNUSED(useOriginalIndices), T epsilon) {
if (pointCloud.size()==0) {
m_mesh = MeshBuilder();
return;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71947] brlcad/trunk/src/libnmg/alloc.cpp
Revision: 71947
http://sourceforge.net/p/brlcad/code/71947
Author: starseeker
Date: 2018-10-05 17:26:06 + (Fri, 05 Oct 2018)
Log Message:
---
Make inclusion of C headers explicitly C
Modified Paths:
--
brlcad/trunk/src/libnmg/alloc.cpp
Modified: brlcad/trunk/src/libnmg/alloc.cpp
===
--- brlcad/trunk/src/libnmg/alloc.cpp 2018-10-05 17:20:47 UTC (rev 71946)
+++ brlcad/trunk/src/libnmg/alloc.cpp 2018-10-05 17:26:06 UTC (rev 71947)
@@ -27,9 +27,11 @@
#include
+extern "C" {
#include "bu/malloc.h"
#include "bu/ptbl.h"
#include "nmg.h"
+}
/* A naive version, until the correct one is working */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71948] brlcad/trunk
Revision: 71948
http://sourceforge.net/p/brlcad/code/71948
Author: starseeker
Date: 2018-10-05 17:26:53 + (Fri, 05 Oct 2018)
Log Message:
---
clang reports 'register' storage class specifier is deprecated and incompatible
with C++17
Modified Paths:
--
brlcad/trunk/include/nmg.h
brlcad/trunk/src/libnmg/inter.c
Modified: brlcad/trunk/include/nmg.h
===
--- brlcad/trunk/include/nmg.h 2018-10-05 17:26:06 UTC (rev 71947)
+++ brlcad/trunk/include/nmg.h 2018-10-05 17:26:53 UTC (rev 71948)
@@ -606,7 +606,7 @@
NMG_EXPORT extern int nmg_memtrack;
NMG_EXPORT void *nmg_malloc(size_t s, const char *msg);
NMG_EXPORT void *nmg_calloc(int cnt, size_t s, const char *msg);
-NMG_EXPORT void *nmg_realloc(register void *ptr, size_t s, const char *msg);
+NMG_EXPORT void *nmg_realloc(void *ptr, size_t s, const char *msg);
NMG_EXPORT void nmg_free(void *, const char *str);
NMG_EXPORT void nmg_destroy();
#define NMG_GETSTRUCT(p, str) p = (struct str *)nmg_calloc(1, sizeof(struct
str), "NMG_GETSTRUCT")
@@ -1244,9 +1244,9 @@
int
ray_in_rpp(struct nmg_ray *rp,
- register const fastf_t *invdir, /* inverses of rp->r_dir[] */
- register const fastf_t *min,
- register const fastf_t *max);
+ const fastf_t *invdir, /* inverses of rp->r_dir[] */
+ const fastf_t *min,
+ const fastf_t *max);
/**
* global nmg animation vblock callback
Modified: brlcad/trunk/src/libnmg/inter.c
===
--- brlcad/trunk/src/libnmg/inter.c 2018-10-05 17:26:06 UTC (rev 71947)
+++ brlcad/trunk/src/libnmg/inter.c 2018-10-05 17:26:53 UTC (rev 71948)
@@ -2005,9 +2005,9 @@
/* FIXME: UGH, Bloody hell, another one. */
int
ray_in_rpp(struct nmg_ray *rp,
- register const fastf_t *invdir, /* inverses of rp->r_dir[] */
- register const fastf_t *min,
- register const fastf_t *max)
+ const fastf_t *invdir, /* inverses of rp->r_dir[] */
+ const fastf_t *min,
+ const fastf_t *max)
{
register const fastf_t *pt = &rp->r_pt[0];
register fastf_t sv;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71949] brlcad/trunk
Revision: 71949
http://sourceforge.net/p/brlcad/code/71949
Author: starseeker
Date: 2018-10-05 17:34:23 + (Fri, 05 Oct 2018)
Log Message:
---
Remove more register specifiers for C++17
Modified Paths:
--
brlcad/trunk/include/rt/primitives/arb8.h
brlcad/trunk/include/rt/shoot.h
brlcad/trunk/src/librt/bundle.c
brlcad/trunk/src/librt/db5_size.cpp
brlcad/trunk/src/librt/primitives/arb8/arb8.c
brlcad/trunk/src/librt/primitives/brep/brep.cpp
brlcad/trunk/src/librt/primitives/table.cpp
Modified: brlcad/trunk/include/rt/primitives/arb8.h
===
--- brlcad/trunk/include/rt/primitives/arb8.h 2018-10-05 17:26:53 UTC (rev
71948)
+++ brlcad/trunk/include/rt/primitives/arb8.h 2018-10-05 17:34:23 UTC (rev
71949)
@@ -39,8 +39,8 @@
int *cgtype,
struct rt_arb_internal *arb,
const struct bn_tol *tol,
-register int *uvec, /* array of indexes to unique points in arb->pt[] */
-register int *svec); /* array of indexes to like points in arb->pt[] */
+int *uvec, /* array of indexes to unique points in arb->pt[] */
+int *svec); /* array of indexes to like points in arb->pt[] */
RT_EXPORT extern int rt_arb_std_type(const struct rt_db_internal *ip,
const struct bn_tol *tol);
RT_EXPORT extern void rt_arb_centroid(point_t *cent,
Modified: brlcad/trunk/include/rt/shoot.h
===
--- brlcad/trunk/include/rt/shoot.h 2018-10-05 17:26:53 UTC (rev 71948)
+++ brlcad/trunk/include/rt/shoot.h 2018-10-05 17:34:23 UTC (rev 71949)
@@ -138,7 +138,7 @@
* PRIVATE: this is new API and should be considered private for the
* time being.
*/
-RT_EXPORT extern int rt_shootray_bundle(register struct application *ap,
struct xray *rays, int nrays);
+RT_EXPORT extern int rt_shootray_bundle(struct application *ap, struct xray
*rays, int nrays);
/**
* To be called only in non-parallel mode, to tally up the statistics
Modified: brlcad/trunk/src/librt/bundle.c
===
--- brlcad/trunk/src/librt/bundle.c 2018-10-05 17:26:53 UTC (rev 71948)
+++ brlcad/trunk/src/librt/bundle.c 2018-10-05 17:34:23 UTC (rev 71949)
@@ -71,7 +71,7 @@
* XXX maybe parameter with NORM, UV, CURVE bits?
*/
int
-rt_shootray_bundle(register struct application *ap, struct xray *rays, int
nrays)
+rt_shootray_bundle(struct application *ap, struct xray *rays, int nrays)
{
struct rt_shootray_status ss;
struct seg new_segs; /* from solid intersections */
Modified: brlcad/trunk/src/librt/db5_size.cpp
===
--- brlcad/trunk/src/librt/db5_size.cpp 2018-10-05 17:26:53 UTC (rev 71948)
+++ brlcad/trunk/src/librt/db5_size.cpp 2018-10-05 17:34:23 UTC (rev 71949)
@@ -68,7 +68,7 @@
#define DB5SIZE(_dp) ((struct db5_sizecalc *)_dp->u_data)
HIDDEN int
-db_get_external_reuse(register struct bu_external *ep, const struct directory
*dp, const struct db_i *dbip)
+db_get_external_reuse(struct bu_external *ep, const struct directory *dp,
const struct db_i *dbip)
{
ep->ext_nbytes = dp->d_len;
Modified: brlcad/trunk/src/librt/primitives/arb8/arb8.c
===
--- brlcad/trunk/src/librt/primitives/arb8/arb8.c 2018-10-05 17:26:53 UTC
(rev 71948)
+++ brlcad/trunk/src/librt/primitives/arb8/arb8.c 2018-10-05 17:34:23 UTC
(rev 71949)
@@ -232,8 +232,8 @@
int *cgtype,
struct rt_arb_internal *arb,
const struct bn_tol *tol,
-register int *uvec, /* array of indexes to unique points in arb->pt[] */
-register int *svec) /* array of indexes to like points in arb->pt[] */
+int *uvec, /* array of indexes to unique points in arb->pt[] */
+int *svec) /* array of indexes to like points in arb->pt[] */
{
register int i, j;
int numuvec, unique;
Modified: brlcad/trunk/src/librt/primitives/brep/brep.cpp
===
--- brlcad/trunk/src/librt/primitives/brep/brep.cpp 2018-10-05 17:26:53 UTC
(rev 71948)
+++ brlcad/trunk/src/librt/primitives/brep/brep.cpp 2018-10-05 17:34:23 UTC
(rev 71949)
@@ -76,12 +76,12 @@
#endif
int rt_brep_bbox(struct rt_db_internal* ip, point_t *min, point_t *max, const
struct bn_tol *tol);
int rt_brep_prep(struct soltab *stp, struct rt_db_internal* ip, struct rt_i*
rtip);
-void rt_brep_print(register const struct soltab *stp);
-int rt_brep_shot(struct soltab *stp, register struct xray *rp, struct
application *ap, struct seg *seghead);
-void rt_brep_norm(register struct hit *hitp, struct soltab *stp, register
struct xray *rp);
-void rt_brep_curve(register struct curvature *cvp, register struct hit *hitp,
struct soltab *stp);
-void rt_brep_uv(struct application *ap
[brlcad-commits] SF.net SVN: brlcad:[71950] brlcad/trunk/src/libanalyze/MeshHealing/ MeshConversion_brlcad.cpp
Revision: 71950
http://sourceforge.net/p/brlcad/code/71950
Author: starseeker
Date: 2018-10-05 17:35:47 + (Fri, 05 Oct 2018)
Log Message:
---
unused variable
Modified Paths:
--
brlcad/trunk/src/libanalyze/MeshHealing/MeshConversion_brlcad.cpp
Modified: brlcad/trunk/src/libanalyze/MeshHealing/MeshConversion_brlcad.cpp
===
--- brlcad/trunk/src/libanalyze/MeshHealing/MeshConversion_brlcad.cpp
2018-10-05 17:34:23 UTC (rev 71949)
+++ brlcad/trunk/src/libanalyze/MeshHealing/MeshConversion_brlcad.cpp
2018-10-05 17:35:47 UTC (rev 71950)
@@ -144,7 +144,6 @@
for (unsigned int i = 0; i < num_faces; ++i) {
DCEL_Edge temp;
- std::pair id;
for (unsigned int j = 0; j < VERTICES_PER_FACE; ++j){
v1 = bot->faces[VERTICES_PER_FACE * i + j];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71951] brlcad/trunk/include/common.h
Revision: 71951 http://sourceforge.net/p/brlcad/code/71951 Author: starseeker Date: 2018-10-05 17:44:32 + (Fri, 05 Oct 2018) Log Message: --- Add definition guards in case these are already set Modified Paths: -- brlcad/trunk/include/common.h Modified: brlcad/trunk/include/common.h === --- brlcad/trunk/include/common.h 2018-10-05 17:35:47 UTC (rev 71950) +++ brlcad/trunk/include/common.h 2018-10-05 17:44:32 UTC (rev 71951) @@ -182,8 +182,12 @@ * version (ugh.) */ #include "pstdint.h" # elif defined(__STDC__) || defined(__STRICT_ANSI__) || defined(__SIZE_TYPE__) || defined(HAVE_STDINT_H) -#define __STDC_LIMIT_MACROS 1 -#define __STDC_CONSTANT_MACROS 1 +#if !defined(__STDC_LIMIT_MACROS) +# define __STDC_LIMIT_MACROS 1 +#endif +#if !defined(__STDC_CONSTANT_MACROS) +# define __STDC_CONSTANT_MACROS 1 +#endif #include # else #include "pstdint.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71952] brlcad/trunk/regress/gcv/dem/CMakeLists.txt
Revision: 71952
http://sourceforge.net/p/brlcad/code/71952
Author: starseeker
Date: 2018-10-09 21:10:39 + (Tue, 09 Oct 2018)
Log Message:
---
dem-g is gone
Modified Paths:
--
brlcad/trunk/regress/gcv/dem/CMakeLists.txt
Modified: brlcad/trunk/regress/gcv/dem/CMakeLists.txt
===
--- brlcad/trunk/regress/gcv/dem/CMakeLists.txt 2018-10-05 17:44:32 UTC (rev
71951)
+++ brlcad/trunk/regress/gcv/dem/CMakeLists.txt 2018-10-09 21:10:39 UTC (rev
71952)
@@ -7,7 +7,7 @@
)
add_test(NAME regress-gcv-dem COMMAND "${CMAKE_COMMAND}" -P
"${CMAKE_CURRENT_BINARY_DIR}/regress-dem.cmake")
-add_custom_target(regress-gcv-dem DEPENDS dem-g
"${CMAKE_CURRENT_BINARY_DIR}/dem.done")
+add_custom_target(regress-gcv-dem DEPENDS gcv
"${CMAKE_CURRENT_BINARY_DIR}/dem.done")
set_target_properties(regress-gcv-dem PROPERTIES FOLDER "BRL-CAD Regression
Tests")
set_target_properties(regress-gcv-dem PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
Add_Regression_Test(gcv-dem "gcv;libgcv_gdal")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71953] brlcad/trunk
Revision: 71953 http://sourceforge.net/p/brlcad/code/71953 Author: starseeker Date: 2018-10-09 22:38:00 + (Tue, 09 Oct 2018) Log Message: --- The hardcoding of DB5_MAJORTYPE_BRLCAD in the rt_db_put_internal5 call in rt_db_put_internal was resulting in an incorrect binunif file being copied during a db_concat operation involving a dsp with an in-.g-file data source. The data object was being copied, but librt would attempt to interpret the resulting object as an ARS rather than a binunif. The rt_db_internal should have the correct major type, so just pass that along... not sure why the DB5_MAJORTYPE_BRLCAD type was hardcoded, but it dates back to r20070 in 2001. Modified Paths: -- brlcad/trunk/NEWS brlcad/trunk/src/librt/dir.c Modified: brlcad/trunk/NEWS === --- brlcad/trunk/NEWS 2018-10-09 21:10:39 UTC (rev 71952) +++ brlcad/trunk/NEWS 2018-10-09 22:38:00 UTC (rev 71953) @@ -13,6 +13,7 @@ --- 201X-XX-XX Release 7.30.0 --- -- +* fixed dbconcat behavior for binary database objects - Cliff Yapp -- --- 2018-10-01 Release 7.28.0 --- Modified: brlcad/trunk/src/librt/dir.c === --- brlcad/trunk/src/librt/dir.c2018-10-09 21:10:39 UTC (rev 71952) +++ brlcad/trunk/src/librt/dir.c2018-10-09 22:38:00 UTC (rev 71953) @@ -146,7 +146,7 @@ if (db_version(dbip) > 4) return rt_db_put_internal5(dp, dbip, ip, resp, - DB5_MAJORTYPE_BRLCAD); + ip->idb_major_type); BU_EXTERNAL_INIT(&ext); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71954] brlcad/trunk/src/libbg/QuickHull.hpp
Revision: 71954
http://sourceforge.net/p/brlcad/code/71954
Author: starseeker
Date: 2018-10-10 23:29:46 + (Wed, 10 Oct 2018)
Log Message:
---
MSVC build fixes. I'm not sure shared_ptr instead of unique_ptr is the right
thing here, but it does build and run.
Modified Paths:
--
brlcad/trunk/src/libbg/QuickHull.hpp
Modified: brlcad/trunk/src/libbg/QuickHull.hpp
===
--- brlcad/trunk/src/libbg/QuickHull.hpp2018-10-09 22:38:00 UTC (rev
71953)
+++ brlcad/trunk/src/libbg/QuickHull.hpp2018-10-10 23:29:46 UTC (rev
71954)
@@ -22,6 +22,7 @@
#include "common.h"
#include
+#include
#include
#include
@@ -231,22 +232,22 @@
template
class Pool {
- std::vector> m_data;
+ std::vector> m_data;
public:
void clear() {
m_data.clear();
}
- void reclaim(std::unique_ptr& ptr) {
+ void reclaim(std::shared_ptr& ptr) {
m_data.push_back(std::move(ptr));
}
- std::unique_ptr get() {
+ std::shared_ptr get() {
if (m_data.size()==0) {
- return std::unique_ptr(new T());
+ return std::shared_ptr(new T());
}
auto it = m_data.end()-1;
- std::unique_ptr r = std::move(*it);
+ std::shared_ptr r = std::move(*it);
m_data.erase(it);
return r;
}
@@ -343,7 +344,7 @@
std::uint8_t m_isVisibleFaceOnCurrentIteration : 1;
std::uint8_t m_inFaceStack : 1;
std::uint8_t m_horizonEdgesOnCurrentIteration : 3; // Bit
for each half edge assigned to this face, each being 0 or 1 depending on
whether the edge belongs to horizon edge
- std::unique_ptr>
m_pointsOnPositiveSide;
+ std::shared_ptr>
m_pointsOnPositiveSide;
Face() : m_he(std::numeric_limits::max()),
m_mostDistantPointDist(0),
@@ -399,7 +400,7 @@
}
// Mark a face as disabled and return a pointer to the points
that were on the positive of it.
- std::unique_ptr> disableFace(IndexType
faceIndex) {
+ std::shared_ptr> disableFace(IndexType
faceIndex) {
auto& f = m_faces[faceIndex];
f.disable();
m_disabledFaces.push_back(faceIndex);
@@ -647,7 +648,7 @@
template
class ConvexHull {
- std::unique_ptr>> m_optimizedVertexBuffer;
+ std::shared_ptr>> m_optimizedVertexBuffer;
VertexDataSource m_vertices;
std::vector m_indices;
public:
@@ -833,7 +834,7 @@
// Temporary variables used during iteration process
std::vector m_newFaceIndices;
std::vector m_newHalfEdgeIndices;
- std::vector< std::unique_ptr> >
m_disabledFacePointVectors;
+ std::vector< std::shared_ptr> >
m_disabledFacePointVectors;
// Create a half edge mesh representing the base tetrahedron from
// which the QuickHull iteration proceeds. m_extremeValues must be
@@ -861,8 +862,8 @@
// amount of std::vectors we have to deal with, and impact on
// performance is remarkable.
Pool> m_indexVectorPool;
- inline std::unique_ptr>
getIndexVectorFromPool();
- inline void
reclaimToIndexVectorPool(std::unique_ptr>& ptr);
+ inline std::shared_ptr>
getIndexVectorFromPool();
+ inline void
reclaimToIndexVectorPool(std::shared_ptr>& ptr);
// Associates a point with a face if the point resides on the
// positive side of the plane. Returns true if the points was on
@@ -966,7 +967,7 @@
*/
template
- std::unique_ptr>
QuickHull::getIndexVectorFromPool() {
+ std::shared_ptr>
QuickHull::getIndexVectorFromPool() {
auto r = std::move(m_indexVectorPool.get());
r->clear();
return r;
@@ -973,13 +974,13 @@
}
template
- void
QuickHull::reclaimToIndexVectorPool(std::unique_ptr>&
ptr) {
+ void
QuickHull::reclaimToIndexVectorPool(std::shared_ptr>&
ptr) {
const size_t oldSize = ptr->size();
if ((oldSize+1)*128 < ptr->capacity()) {
// Reduce memory usage! Huge vectors are needed at the
// beginning of iteration when faces have many points on their
// positive side. Later on, smaller vectors will suffice.
- ptr.reset(nullptr);
+ ptr.reset();
return;
}
m_indexVectorPool.reclaim(ptr);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
[brlcad-commits] SF.net SVN: brlcad:[71955] brlcad/trunk/src/libbg
Revision: 71955
http://sourceforge.net/p/brlcad/code/71955
Author: starseeker
Date: 2018-10-10 23:50:25 + (Wed, 10 Oct 2018)
Log Message:
---
remove WafeformOBJ and Diagnostics code
Modified Paths:
--
brlcad/trunk/src/libbg/QuickHull.cxx
brlcad/trunk/src/libbg/QuickHull.hpp
Modified: brlcad/trunk/src/libbg/QuickHull.cxx
===
--- brlcad/trunk/src/libbg/QuickHull.cxx2018-10-10 23:29:46 UTC (rev
71954)
+++ brlcad/trunk/src/libbg/QuickHull.cxx2018-10-10 23:50:25 UTC (rev
71955)
@@ -75,9 +75,6 @@
m_epsilon = epsilon*m_scale;
m_epsilonSquared = m_epsilon*m_epsilon;
- // Reset diagnostics
- m_diagnostics = DiagnosticsData();
-
m_planar = false; // The planar case happens when all the points
appear to lie on a two dimensional subspace of R^3.
createConvexHalfEdgeMesh();
if (m_planar) {
@@ -195,7 +192,6 @@
// Order horizon edges so that they form a loop. This may fail
due to numerical instability in which case we give up trying to solve horizon
edge for this point and accept a minor degeneration in the convex hull.
if (!reorderHorizonEdges(horizonEdges)) {
- m_diagnostics.m_failedHorizonEdges++;
std::cerr << "Failed to solve horizon edge." << std::endl;
auto it =
std::find(tf.m_pointsOnPositiveSide->begin(),tf.m_pointsOnPositiveSide->end(),activePointIndex);
tf.m_pointsOnPositiveSide->erase(it);
Modified: brlcad/trunk/src/libbg/QuickHull.hpp
===
--- brlcad/trunk/src/libbg/QuickHull.hpp2018-10-10 23:29:46 UTC (rev
71954)
+++ brlcad/trunk/src/libbg/QuickHull.hpp2018-10-10 23:50:25 UTC (rev
71955)
@@ -790,33 +790,9 @@
return m_vertices;
}
- // Export the mesh to a Waveform OBJ file
- void writeWaveformOBJ(const std::string& filename, const
std::string& objectName = "quickhull")
- {
- std::ofstream objFile;
- objFile.open (filename);
- objFile << "o " << objectName << "\n";
- for (const auto& v : getVertexBuffer()) {
- objFile << "v " << v.x << " " << v.y << " " << v.z << "\n";
- }
- const auto& indBuf = getIndexBuffer();
- size_t triangleCount = indBuf.size()/3;
- for (size_t i=0;i
class QuickHull {
using vec3 = Vector3;
@@ -829,7 +805,6 @@
VertexDataSource m_vertexData;
MeshBuilder m_mesh;
std::array m_extremeValues;
- DiagnosticsData m_diagnostics;
// Temporary variables used during iteration process
std::vector m_newFaceIndices;
@@ -955,11 +930,6 @@
// Returns:
// Convex hull of the point cloud as a mesh object with half edge
structure.
HalfEdgeMesh getConvexHullAsMesh(const
FloatType* vertexData, size_t vertexCount, bool CCW, FloatType eps = Epsilon);
-
- // Get diagnostics about last generated convex hull
- const DiagnosticsData& getDiagnostics() {
- return m_diagnostics;
- }
};
/*
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71956] brlcad/trunk/src/libbg
Revision: 71956
http://sourceforge.net/p/brlcad/code/71956
Author: starseeker
Date: 2018-10-11 00:20:49 + (Thu, 11 Oct 2018)
Log Message:
---
Add extra braces recommended by clang
Modified Paths:
--
brlcad/trunk/src/libbg/QuickHull.cxx
brlcad/trunk/src/libbg/QuickHull.hpp
Modified: brlcad/trunk/src/libbg/QuickHull.cxx
===
--- brlcad/trunk/src/libbg/QuickHull.cxx2018-10-10 23:50:25 UTC (rev
71955)
+++ brlcad/trunk/src/libbg/QuickHull.cxx2018-10-11 00:20:49 UTC (rev
71956)
@@ -316,7 +316,7 @@
template
std::array QuickHull::getExtremeValues() {
- std::array outIndices{0,0,0,0,0,0};
+ std::array outIndices{{0,0,0,0,0,0}};
T extremeVals[6] =
{m_vertexData[0].x,m_vertexData[0].x,m_vertexData[0].y,m_vertexData[0].y,m_vertexData[0].z,m_vertexData[0].z};
const size_t vCount = m_vertexData.size();
for (size_t i=1;i baseTriangle{selectedPoints.first,
selectedPoints.second, maxI};
+ std::array baseTriangle{{selectedPoints.first,
selectedPoints.second, maxI}};
const Vector3 baseTriangleVertices[]={
m_vertexData[baseTriangle[0]], m_vertexData[baseTriangle[1]],
m_vertexData[baseTriangle[2]] };
// Next step is to find the 4th vertex of the tetrahedron. We
Modified: brlcad/trunk/src/libbg/QuickHull.hpp
===
--- brlcad/trunk/src/libbg/QuickHull.hpp2018-10-10 23:50:25 UTC (rev
71955)
+++ brlcad/trunk/src/libbg/QuickHull.hpp2018-10-11 00:20:49 UTC (rev
71956)
@@ -532,11 +532,11 @@
}
std::array getVertexIndicesOfHalfEdge(const
HalfEdge& he) const {
- return {m_halfEdges[he.m_opp].m_endVertex,he.m_endVertex};
+ return {{m_halfEdges[he.m_opp].m_endVertex,he.m_endVertex}};
}
std::array getHalfEdgeIndicesOfFace(const Face& f)
const {
- return
{f.m_he,m_halfEdges[f.m_he].m_next,m_halfEdges[m_halfEdges[f.m_he].m_next].m_next};
+ return
{{f.m_he,m_halfEdges[f.m_he].m_next,m_halfEdges[m_halfEdges[f.m_he].m_next].m_next}};
}
};
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71957] brlcad/trunk/src
Revision: 71957
http://sourceforge.net/p/brlcad/code/71957
Author: starseeker
Date: 2018-10-11 00:52:25 + (Thu, 11 Oct 2018)
Log Message:
---
return a different error for out of memory.
Modified Paths:
--
brlcad/trunk/src/libanalyze/polygonizer.c
brlcad/trunk/src/libged/facetize.c
Modified: brlcad/trunk/src/libanalyze/polygonizer.c
===
--- brlcad/trunk/src/libanalyze/polygonizer.c 2018-10-11 00:20:49 UTC (rev
71956)
+++ brlcad/trunk/src/libanalyze/polygonizer.c 2018-10-11 00:52:25 UTC (rev
71957)
@@ -860,7 +860,7 @@
avail_mem = bu_avail_mem();
if (avail_mem >= 0 && avail_mem < params->minimum_free_mem) {
/* memory too tight, bail */
- ret = 2;
+ ret = 3;
goto analyze_polygonizer_memfree;
}
}
Modified: brlcad/trunk/src/libged/facetize.c
===
--- brlcad/trunk/src/libged/facetize.c 2018-10-11 00:20:49 UTC (rev 71956)
+++ brlcad/trunk/src/libged/facetize.c 2018-10-11 00:52:25 UTC (rev 71957)
@@ -1340,6 +1340,11 @@
feature_size, pn->v, objname, gedp->ged_wdbp->dbip,
¶ms);
delta = (int)((bu_gettime() - timestamp)/1e6);
if (polygonize_failure || bot->num_faces < successful_bot_count ||
delta < 2) {
+ if (polygonize_failure == 3) {
+ bu_log("CM: Too little available memory to continue,
aborting\n");
+ ret = GED_FACETIZE_FAILURE;
+ goto ged_facetize_continuation_memfree;
+ }
if (polygonize_failure == 2) {
if (!opts->quiet) {
bu_log("CM: timed out after %d seconds with size %g\n",
opts->max_time, feature_size);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71958] brlcad/trunk/src/libbu/tests/opt.c
Revision: 71958
http://sourceforge.net/p/brlcad/code/71958
Author: starseeker
Date: 2018-10-11 01:00:34 + (Thu, 11 Oct 2018)
Log Message:
---
Correct some -Werror=format problems in libbu/tests/opt.c
Modified Paths:
--
brlcad/trunk/src/libbu/tests/opt.c
Modified: brlcad/trunk/src/libbu/tests/opt.c
===
--- brlcad/trunk/src/libbu/tests/opt.c 2018-10-11 00:52:25 UTC (rev 71957)
+++ brlcad/trunk/src/libbu/tests/opt.c 2018-10-11 01:00:34 UTC (rev 71958)
@@ -82,10 +82,10 @@
set_msg_str(&parse_msgs, ac, av); \
ret = bu_opt_parse(&parse_msgs, ac, av, d); \
if (ret || _var != _exp) { \
- bu_vls_printf(&parse_msgs, "\nError - expected value \"%d\" and got
value %d\n", _exp, _var); \
+ bu_vls_printf(&parse_msgs, "\nError - expected value \"%ld\" and got
value %ld\n", (long int)_exp, (long int)_var); \
val_ok = 0; \
} else { \
- bu_vls_printf(&parse_msgs, " \nGot expected value: %s = %d\n", _name,
_var); \
+ bu_vls_printf(&parse_msgs, " \nGot expected value: %s = %ld\n", _name,
(long int)_var); \
} \
}
@@ -816,7 +816,7 @@
av[0] = "-V";
av[1] = "2,10,30";
ret = bu_opt_parse(&parse_msgs, 0, NULL, d);
- EXPECT_SUCCESS_VECT("vect_t", v, 2, 10, 30);
+ EXPECT_SUCCESS_VECT("vect_t", v, 2.0, 10.0, 30.0);
break;
case 1:
ac = 2;
@@ -823,7 +823,7 @@
av[0] = "-V";
av[1] = "2/10/30";
ret = bu_opt_parse(&parse_msgs, 0, NULL, d);
- EXPECT_SUCCESS_VECT("vect_t", v, 2, 10, 30);
+ EXPECT_SUCCESS_VECT("vect_t", v, 2.0, 10.0, 30.0);
break;
case 2:
ac = 2;
@@ -830,7 +830,7 @@
av[0] = "-V";
av[1] = "30.3,2,-10.1";
ret = bu_opt_parse(&parse_msgs, 0, NULL, d);
- EXPECT_SUCCESS_VECT("vect_t", v, 30.3, 2, -10.1);
+ EXPECT_SUCCESS_VECT("vect_t", v, 30.3, 2.0, -10.1);
break;
case 3:
ac = 2;
@@ -837,7 +837,7 @@
av[0] = "-V";
av[1] = "30.3, 2, -10.1";
ret = bu_opt_parse(&parse_msgs, 0, NULL, d);
- EXPECT_SUCCESS_VECT("vect_t", v, 30.3, 2, -10.1);
+ EXPECT_SUCCESS_VECT("vect_t", v, 30.3, 2.0, -10.1);
break;
case 4:
ac = 4;
@@ -846,7 +846,7 @@
av[2] = "2";
av[3] = "-10.1";
ret = bu_opt_parse(&parse_msgs, 0, NULL, d);
- EXPECT_SUCCESS_VECT("vect_t", v, 30.3, 2, -10.1);
+ EXPECT_SUCCESS_VECT("vect_t", v, 30.3, 2.0, -10.1);
break;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71959] brlcad/trunk/src/libbu/tests
Revision: 71959
http://sourceforge.net/p/brlcad/code/71959
Author: starseeker
Date: 2018-10-11 01:03:44 + (Thu, 11 Oct 2018)
Log Message:
---
Clear more printf warnings
Modified Paths:
--
brlcad/trunk/src/libbu/tests/b64.c
brlcad/trunk/src/libbu/tests/basename.c
brlcad/trunk/src/libbu/tests/path_component.c
Modified: brlcad/trunk/src/libbu/tests/b64.c
===
--- brlcad/trunk/src/libbu/tests/b64.c 2018-10-11 01:00:34 UTC (rev 71958)
+++ brlcad/trunk/src/libbu/tests/b64.c 2018-10-11 01:03:44 UTC (rev 71959)
@@ -54,7 +54,7 @@
bu_free(decoded, "free decoded");
if (!passed) {
- bu_exit(1, "");
+ bu_exit(1, "b64 test failed");
}
}
Modified: brlcad/trunk/src/libbu/tests/basename.c
===
--- brlcad/trunk/src/libbu/tests/basename.c 2018-10-11 01:00:34 UTC (rev
71958)
+++ brlcad/trunk/src/libbu/tests/basename.c 2018-10-11 01:03:44 UTC (rev
71959)
@@ -118,7 +118,7 @@
bu_log("%24s -> %24s (should be: %s) [FAIL]\n", input, bu_out, sys_out);
bu_free(bu_out, "bu output");
bu_free(sys_out, "system output");
- bu_exit(EXIT_FAILURE, "");
+ bu_exit(EXIT_FAILURE, "compare_bu_to_system_basename failed");
}
#else
bu_exit(EXIT_FAILURE, "BASENAME not available on this platform\n");
Modified: brlcad/trunk/src/libbu/tests/path_component.c
===
--- brlcad/trunk/src/libbu/tests/path_component.c 2018-10-11 01:00:34 UTC
(rev 71958)
+++ brlcad/trunk/src/libbu/tests/path_component.c 2018-10-11 01:03:44 UTC
(rev 71959)
@@ -36,12 +36,12 @@
if (!expected_str && found) {
bu_log("no result expected, but result found: %s\n",
bu_vls_addr(&component));
bu_vls_free(&component);
- bu_exit(EXIT_FAILURE, "");
+ bu_exit(EXIT_FAILURE, "pc_compare: unexpected result");
}
if (expected_str && !found) {
bu_log("%24s -> %24s (should be: %s) [FAIL]\n", input,
bu_vls_addr(&component), expected_str);
bu_vls_free(&component);
- bu_exit(EXIT_FAILURE, "");
+ bu_exit(EXIT_FAILURE, "pc_compare: FAIL1");
return;
}
if (!expected_str && !found) {
@@ -57,7 +57,7 @@
} else {
bu_log("%24s -> %24s (should be: %s) [FAIL]\n", input,
bu_vls_addr(&component), expected_str);
bu_vls_free(&component);
- bu_exit(EXIT_FAILURE, "");
+ bu_exit(EXIT_FAILURE, "pc_compare: FAIL2");
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71960] brlcad/trunk/src/libbg/QuickHull.hpp
Revision: 71960
http://sourceforge.net/p/brlcad/code/71960
Author: starseeker
Date: 2018-10-11 18:19:49 + (Thu, 11 Oct 2018)
Log Message:
---
This gets unique_ptr building with VS 2013, but it doesn't generate a correct
hull.
Modified Paths:
--
brlcad/trunk/src/libbg/QuickHull.hpp
Modified: brlcad/trunk/src/libbg/QuickHull.hpp
===
--- brlcad/trunk/src/libbg/QuickHull.hpp2018-10-11 01:03:44 UTC (rev
71959)
+++ brlcad/trunk/src/libbg/QuickHull.hpp2018-10-11 18:19:49 UTC (rev
71960)
@@ -232,22 +232,22 @@
template
class Pool {
- std::vector> m_data;
+ std::vector> m_data;
public:
void clear() {
m_data.clear();
}
- void reclaim(std::shared_ptr& ptr) {
+ void reclaim(std::unique_ptr& ptr) {
m_data.push_back(std::move(ptr));
}
- std::shared_ptr get() {
+ std::unique_ptr get() {
if (m_data.size()==0) {
- return std::shared_ptr(new T());
+ return std::unique_ptr(new T());
}
auto it = m_data.end()-1;
- std::shared_ptr r = std::move(*it);
+ std::unique_ptr r = std::move(*it);
m_data.erase(it);
return r;
}
@@ -344,7 +344,7 @@
std::uint8_t m_isVisibleFaceOnCurrentIteration : 1;
std::uint8_t m_inFaceStack : 1;
std::uint8_t m_horizonEdgesOnCurrentIteration : 3; // Bit
for each half edge assigned to this face, each being 0 or 1 depending on
whether the edge belongs to horizon edge
- std::shared_ptr>
m_pointsOnPositiveSide;
+ std::unique_ptr>
m_pointsOnPositiveSide;
Face() : m_he(std::numeric_limits::max()),
m_mostDistantPointDist(0),
@@ -357,6 +357,34 @@
}
+ Face& operator=(const Face& old)
+ {
+ m_he = old.m_he;
+ m_P = old.m_P;
+ m_mostDistantPointDist =
old.m_mostDistantPointDist;
+ m_mostDistantPoint = old.m_mostDistantPoint;
+ m_visibilityCheckedOnIteration =
old.m_visibilityCheckedOnIteration;
+ m_isVisibleFaceOnCurrentIteration =
old.m_isVisibleFaceOnCurrentIteration;
+ m_inFaceStack = old.m_inFaceStack;
+ m_horizonEdgesOnCurrentIteration =
old.m_horizonEdgesOnCurrentIteration;
+ //m_pointsOnPositiveSide =
std::move(getIndexVectorFromPool());
+
//std::copy(old.m_pointsOnPositiveSide->begin(),
old.m_pointsOnPositiveSide->end(), std::back_inserter(*m_pointsOnPositiveSide));
+ //m_pointsOnPositiveSide =
std::move(old.m_pointsOnPositiveSide);
+ return *this;
+ }
+ Face(const Face& old)
+ {
+ m_he = old.m_he;
+ m_P = old.m_P;
+ m_mostDistantPointDist =
old.m_mostDistantPointDist;
+ m_mostDistantPoint = old.m_mostDistantPoint;
+ m_visibilityCheckedOnIteration =
old.m_visibilityCheckedOnIteration;
+ m_isVisibleFaceOnCurrentIteration =
old.m_isVisibleFaceOnCurrentIteration;
+ m_inFaceStack = old.m_inFaceStack;
+ m_horizonEdgesOnCurrentIteration =
old.m_horizonEdgesOnCurrentIteration;
+ //m_pointsOnPositiveSide =
std::move(old.m_pointsOnPositiveSide);
+ }
+
void disable() {
m_he = std::numeric_limits::max();
}
@@ -400,7 +428,7 @@
}
// Mark a face as disabled and return a pointer to the points
that were on the positive of it.
- std::shared_ptr> disableFace(IndexType
faceIndex) {
+ std::unique_ptr> disableFace(IndexType
faceIndex) {
auto& f = m_faces[faceIndex];
f.disable();
m_disabledFaces.push_back(faceIndex);
@@ -648,7 +676,7 @@
template
class ConvexHull {
- std::shared_ptr>> m_optimizedVertexBuffer;
+ std::unique_ptr>> m_optimizedVertexBuffer;
VertexDataSource m_vertices;
std::vector m_indices;
public:
@@ -809,7 +837,7 @@
// Temporary variables used during iteration process
std::vector
[brlcad-commits] SF.net SVN: brlcad:[71962] brlcad/trunk/src/libged/bot.c
Revision: 71962
http://sourceforge.net/p/brlcad/code/71962
Author: starseeker
Date: 2018-10-11 19:26:08 + (Thu, 11 Oct 2018)
Log Message:
---
Free faces and vertices after we're done making the bot
Modified Paths:
--
brlcad/trunk/src/libged/bot.c
Modified: brlcad/trunk/src/libged/bot.c
===
--- brlcad/trunk/src/libged/bot.c 2018-10-11 18:32:19 UTC (rev 71961)
+++ brlcad/trunk/src/libged/bot.c 2018-10-11 19:26:08 UTC (rev 71962)
@@ -612,6 +612,9 @@
retval = mk_bot(gedp->ged_wdbp, argv[2], RT_BOT_SOLID, RT_BOT_CCW, err,
vc, fc, (fastf_t *)vert_array, faces, NULL, NULL);
+ bu_free(faces, "free faces");
+ bu_free(vert_array, "free verts");
+
if (retval) {
rt_db_free_internal(&intern);
return GED_ERROR;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71963] brlcad/trunk/src/libbg/QuickHull.hpp
Revision: 71963
http://sourceforge.net/p/brlcad/code/71963
Author: starseeker
Date: 2018-10-11 19:43:50 + (Thu, 11 Oct 2018)
Log Message:
---
Revert back to the shared_ptr version for now - a valigrind 'bot chull' run of
the lucy model didn't report any lost memory and timing indicated maybe a 2x
increase in run time compared to the unique_ptr.
Modified Paths:
--
brlcad/trunk/src/libbg/QuickHull.hpp
Modified: brlcad/trunk/src/libbg/QuickHull.hpp
===
--- brlcad/trunk/src/libbg/QuickHull.hpp2018-10-11 19:26:08 UTC (rev
71962)
+++ brlcad/trunk/src/libbg/QuickHull.hpp2018-10-11 19:43:50 UTC (rev
71963)
@@ -232,22 +232,22 @@
template
class Pool {
- std::vector> m_data;
+ std::vector> m_data;
public:
void clear() {
m_data.clear();
}
- void reclaim(std::unique_ptr& ptr) {
+ void reclaim(std::shared_ptr& ptr) {
m_data.push_back(std::move(ptr));
}
- std::unique_ptr get() {
+ std::shared_ptr get() {
if (m_data.size()==0) {
- return std::unique_ptr(new T());
+ return std::shared_ptr(new T());
}
auto it = m_data.end()-1;
- std::unique_ptr r = std::move(*it);
+ std::shared_ptr r = std::move(*it);
m_data.erase(it);
return r;
}
@@ -344,7 +344,7 @@
std::uint8_t m_isVisibleFaceOnCurrentIteration : 1;
std::uint8_t m_inFaceStack : 1;
std::uint8_t m_horizonEdgesOnCurrentIteration : 3; // Bit
for each half edge assigned to this face, each being 0 or 1 depending on
whether the edge belongs to horizon edge
- std::unique_ptr>
m_pointsOnPositiveSide;
+ std::shared_ptr>
m_pointsOnPositiveSide;
Face() : m_he(std::numeric_limits::max()),
m_mostDistantPointDist(0),
@@ -357,34 +357,6 @@
}
- Face& operator=(const Face& old)
- {
- m_he = old.m_he;
- m_P = old.m_P;
- m_mostDistantPointDist =
old.m_mostDistantPointDist;
- m_mostDistantPoint = old.m_mostDistantPoint;
- m_visibilityCheckedOnIteration =
old.m_visibilityCheckedOnIteration;
- m_isVisibleFaceOnCurrentIteration =
old.m_isVisibleFaceOnCurrentIteration;
- m_inFaceStack = old.m_inFaceStack;
- m_horizonEdgesOnCurrentIteration =
old.m_horizonEdgesOnCurrentIteration;
- //m_pointsOnPositiveSide =
std::move(getIndexVectorFromPool());
-
//std::copy(old.m_pointsOnPositiveSide->begin(),
old.m_pointsOnPositiveSide->end(), std::back_inserter(*m_pointsOnPositiveSide));
- //m_pointsOnPositiveSide =
std::move(old.m_pointsOnPositiveSide);
- return *this;
- }
- Face(const Face& old)
- {
- m_he = old.m_he;
- m_P = old.m_P;
- m_mostDistantPointDist =
old.m_mostDistantPointDist;
- m_mostDistantPoint = old.m_mostDistantPoint;
- m_visibilityCheckedOnIteration =
old.m_visibilityCheckedOnIteration;
- m_isVisibleFaceOnCurrentIteration =
old.m_isVisibleFaceOnCurrentIteration;
- m_inFaceStack = old.m_inFaceStack;
- m_horizonEdgesOnCurrentIteration =
old.m_horizonEdgesOnCurrentIteration;
- //m_pointsOnPositiveSide =
std::move(old.m_pointsOnPositiveSide);
- }
-
void disable() {
m_he = std::numeric_limits::max();
}
@@ -428,7 +400,7 @@
}
// Mark a face as disabled and return a pointer to the points
that were on the positive of it.
- std::unique_ptr> disableFace(IndexType
faceIndex) {
+ std::shared_ptr> disableFace(IndexType
faceIndex) {
auto& f = m_faces[faceIndex];
f.disable();
m_disabledFaces.push_back(faceIndex);
@@ -676,7 +648,7 @@
template
class ConvexHull {
- std::unique_ptr>> m_optimizedVertexBuffer;
+ std::shared_ptr>> m_optimizedVertexBuffer;
VertexDataSource m_vertices;
std::vector m_indices;
[brlcad-commits] SF.net SVN: brlcad:[71964] brlcad/trunk/src/libbu/tests/sscanf.c
Revision: 71964
http://sourceforge.net/p/brlcad/code/71964
Author: starseeker
Date: 2018-10-12 13:54:58 + (Fri, 12 Oct 2018)
Log Message:
---
Make a stab at cleaning up the printf warnings for libbu's sscanf test - couple
of TODO items.
Modified Paths:
--
brlcad/trunk/src/libbu/tests/sscanf.c
Modified: brlcad/trunk/src/libbu/tests/sscanf.c
===
--- brlcad/trunk/src/libbu/tests/sscanf.c 2018-10-11 19:43:50 UTC (rev
71963)
+++ brlcad/trunk/src/libbu/tests/sscanf.c 2018-10-12 13:54:58 UTC (rev
71964)
@@ -148,27 +148,25 @@
}
}
-#define CHECK_INT_VALS_EQUAL(int_type, pfmt, valp, bu_valp) \
+#define CHECK_INT_VALS_EQUAL(int_type, valp, bu_valp) \
{ \
int_type _val = *(int_type*)(valp); \
int_type _bu_val = *(int_type*)(bu_valp); \
if (_val != _bu_val) { \
bu_exit(1, "\t[FAIL] conversion value mismatch.\n" \
- "\t(sscanf) %" CPP_STR(pfmt) " != " \
- "%" CPP_STR(pfmt) " (bu_sscanf).\n", \
- _val, _bu_val); \
+ "\t(sscanf) %lld != %lld (bu_sscanf).\n", \
+ (long long int)_val, (long long int)_bu_val); \
} \
}
-#define CHECK_FLOAT_VALS_EQUAL(float_type, pfmt, valp, bu_valp) \
+#define CHECK_FLOAT_VALS_EQUAL(float_type, valp, bu_valp) \
{ \
float_type _val = *(float_type*)(valp); \
float_type _bu_val = *(float_type*)(bu_valp); \
if (!NEAR_EQUAL(_val, _bu_val, TS_FLOAT_TOL)) { \
bu_exit(1, "\t[FAIL] conversion value mismatch.\n" \
- "\t(sscanf) %" CPP_STR(pfmt) " != " \
- "%" CPP_STR(pfmt) " (bu_sscanf).\n", \
- _val, _bu_val); \
+ "\t(sscanf) %Le != %Le (bu_sscanf).\n", \
+ (long double)_val, (long double)_bu_val); \
} \
}
@@ -196,43 +194,43 @@
switch (type) {
case SCAN_INT:
SSCANF_TYPE(int);
- CHECK_INT_VALS_EQUAL(int, d, val, bu_val);
+ CHECK_INT_VALS_EQUAL(int, val, bu_val);
break;
case SCAN_UINT:
SSCANF_TYPE(unsigned);
- CHECK_INT_VALS_EQUAL(unsigned, u, val, bu_val);
+ CHECK_INT_VALS_EQUAL(unsigned, val, bu_val);
break;
case SCAN_SHORT:
SSCANF_TYPE(short);
- CHECK_INT_VALS_EQUAL(short, hd, val, bu_val);
+ CHECK_INT_VALS_EQUAL(short, val, bu_val);
break;
case SCAN_USHORT:
SSCANF_TYPE(unsigned short);
- CHECK_INT_VALS_EQUAL(unsigned short, hu, val, bu_val);
+ CHECK_INT_VALS_EQUAL(unsigned short, val, bu_val);
break;
case SCAN_SHORTSHORT:
SSCANF_TYPE(char);
- CHECK_INT_VALS_EQUAL(char, hhd, val, bu_val);
+ CHECK_INT_VALS_EQUAL(char, val, bu_val);
break;
case SCAN_USHORTSHORT:
SSCANF_TYPE(unsigned char);
- CHECK_INT_VALS_EQUAL(unsigned char, hhu, val, bu_val);
+ CHECK_INT_VALS_EQUAL(unsigned char, val, bu_val);
break;
case SCAN_LONG:
SSCANF_TYPE(long);
- CHECK_INT_VALS_EQUAL(long, ld, val, bu_val);
+ CHECK_INT_VALS_EQUAL(long, val, bu_val);
break;
case SCAN_ULONG:
SSCANF_TYPE(unsigned long);
- CHECK_INT_VALS_EQUAL(unsigned long, lu, val, bu_val);
+ CHECK_INT_VALS_EQUAL(unsigned long, val, bu_val);
break;
case SCAN_SIZE:
SSCANF_TYPE(size_t);
- CHECK_INT_VALS_EQUAL(size_t, z, val, bu_val);
+ CHECK_INT_VALS_EQUAL(size_t, val, bu_val);
break;
case SCAN_PTRDIFF:
SSCANF_TYPE(ptrdiff_t);
- CHECK_INT_VALS_EQUAL(ptrdiff_t, t, val, bu_val);
+ CHECK_INT_VALS_EQUAL(ptrdiff_t, val, bu_val);
break;
case SCAN_POINTER:
ret = sscanf(src, fmt, &val);
@@ -250,15 +248,15 @@
break;
case SCAN_FLOAT:
SSCANF_TYPE(float);
- CHECK_FLOAT_VALS_EQUAL(float, e, val, bu_val);
+ CHECK_FLOAT_VALS_EQUAL(float, val, bu_val);
break;
case SCAN_DOUBLE:
SSCANF_TYPE(double);
- CHECK_FLOAT_VALS_EQUAL(double, le, val, bu_val);
+ CHECK_FLOAT_VALS_EQUAL(double, val, bu_val);
break;
case SCAN_LDOUBLE:
SSCANF_TYPE(long double);
- CHECK_FLOAT_VALS_EQUAL(long double, Le, val, bu_val);
+ CHECK_FLOAT_VALS_EQUAL(long double, val, bu_val);
break;
default:
bu_exit(1, "Error: test_sscanf was given an unrecognized pointer
type.\n");
@@ -502,7 +500,8 @@
test_sscanf(SCAN_PTRDIFF, "000", "%ti");
test_sscanf(SCAN_PTRDIFF, "000", "%to");
-test_sscanf(SCAN_PTRDIFF, CPP_XSTR(SIGNED_L_OCT), "%ti");
+//TODO: Test appears to break with newer C/C++ standards
+//test_sscanf(SCAN_PTRDIFF, CPP_XSTR(SIGNED_L_OCT), "%ti");
test_sscanf(SCAN_PTRDIFF, CPP_XSTR(UNSIGNED_L_OCT), "%to");
test_sscanf(SCAN_PTRDIFF, "0x0", "%ti");
@@ -605,32 +604,32 @@
checkReturnVal("sscanf", ret, 3); \
checkReturnsEqual(bu_ret, ret);
-#define TEST_INT_WIDTH(type, pfmt, src
[brlcad-commits] SF.net SVN: brlcad:[71965] brlcad/trunk/src
Revision: 71965
http://sourceforge.net/p/brlcad/code/71965
Author: starseeker
Date: 2018-10-12 14:44:59 + (Fri, 12 Oct 2018)
Log Message:
---
Clear printf warnings
Modified Paths:
--
brlcad/trunk/src/anim/anim_hardtrack.c
brlcad/trunk/src/anim/anim_track.c
brlcad/trunk/src/bwish/input.c
brlcad/trunk/src/conv/euclid/euclid-g.c
brlcad/trunk/src/conv/g-shell-rect.c
brlcad/trunk/src/conv/iges/convassem.c
brlcad/trunk/src/conv/iges/convtree.c
brlcad/trunk/src/conv/iges/do_subfigs.c
brlcad/trunk/src/conv/iges/docolor.c
brlcad/trunk/src/conv/iges/get_att.c
brlcad/trunk/src/conv/iges/get_cnurb_curve.c
brlcad/trunk/src/conv/iges/iges.c
brlcad/trunk/src/conv/k-g.cpp
brlcad/trunk/src/conv/patch/patch-g.c
brlcad/trunk/src/conv/ply/g-ply.c
brlcad/trunk/src/conv/ply/ply-g.c
brlcad/trunk/src/conv/viewpoint-g.c
brlcad/trunk/src/external/Creo/shim.h
brlcad/trunk/src/external/Unigraphics/ug-g.c
brlcad/trunk/src/libanalyze/nirt.cxx
brlcad/trunk/src/libbn/tests/bntester.c
brlcad/trunk/src/libbn/tests/plane_pt.c
brlcad/trunk/src/libdm/dm-tk.c
brlcad/trunk/src/libgcv/plugins/stl/stl_write.c
brlcad/trunk/src/libgcv/plugins/vrml/vrml_write.c
brlcad/trunk/src/libged/comb.c
brlcad/trunk/src/libged/facetize.c
brlcad/trunk/src/libged/pnts.cpp
brlcad/trunk/src/libged/tables.c
brlcad/trunk/src/libicv/tests/size_down.c
brlcad/trunk/src/libnmg/tests/nmg_copy.c
brlcad/trunk/src/librt/db_open.c
brlcad/trunk/src/librt/tests/rt_datum.c
brlcad/trunk/src/libtclcad/tclcad_obj.c
brlcad/trunk/src/mged/mged.c
brlcad/trunk/src/nirt/main.cxx
brlcad/trunk/src/remrt/rtsrv.c
brlcad/trunk/src/rt/do.c
brlcad/trunk/src/rt/usage.cpp
brlcad/trunk/src/rt/viewcell.c
brlcad/trunk/src/rt/viewedge.c
brlcad/trunk/src/rt/viewhide.c
brlcad/trunk/src/rt/viewrange.c
brlcad/trunk/src/rt/worker.c
brlcad/trunk/src/rtwizard/main.c
brlcad/trunk/src/util/pixdiff.c
brlcad/trunk/src/util/plot3-dm.c
Modified: brlcad/trunk/src/anim/anim_hardtrack.c
===
--- brlcad/trunk/src/anim/anim_hardtrack.c 2018-10-12 13:54:58 UTC (rev
71964)
+++ brlcad/trunk/src/anim/anim_hardtrack.c 2018-10-12 14:44:59 UTC (rev
71965)
@@ -208,7 +208,7 @@
print_wheel = 1;
break;
case 'l':
- bu_sscanf(bu_optarg, "%zd", &num_links);
+ bu_sscanf(bu_optarg, "%zu", &num_links);
link_nindex = bu_optind;
bu_optind += 1;
print_link = 1;
Modified: brlcad/trunk/src/anim/anim_track.c
===
--- brlcad/trunk/src/anim/anim_track.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/anim/anim_track.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -231,7 +231,7 @@
one_radius = 1;
break;
case 'p':
- bu_sscanf(bu_optarg, "%zd", &num_links);
+ bu_sscanf(bu_optarg, "%zu", &num_links);
link_nindex = bu_optind;
bu_optind += 1;
print_link = 1;
Modified: brlcad/trunk/src/bwish/input.c
===
--- brlcad/trunk/src/bwish/input.c 2018-10-12 13:54:58 UTC (rev 71964)
+++ brlcad/trunk/src/bwish/input.c 2018-10-12 14:44:59 UTC (rev 71965)
@@ -288,7 +288,7 @@
if (input_str_index == bu_vls_strlen(&input_str))
break;
insert_prompt();
- bu_log("%*V", input_str_index, &input_str);
+ bu_log("%*s", (int)input_str_index, bu_vls_addr(&input_str));
escaped = bracketed = 0;
break;
case CTRL_B: /* Back one character */
@@ -324,7 +324,7 @@
bu_vls_addr(&input_str)[input_str_index - 1];
bu_vls_addr(&input_str)[input_str_index - 1] = ch;
bu_log("\b");
- bu_log("%c%c", bu_vls_addr(&input_str)+input_str_index-1,
bu_vls_addr(&input_str)+input_str_index);
+ bu_log("%c%c", (bu_vls_addr(&input_str)+input_str_index-1)[0],
(bu_vls_addr(&input_str)+input_str_index)[0]);
++input_str_index;
escaped = bracketed = 0;
break;
Modified: brlcad/trunk/src/conv/euclid/euclid-g.c
===
--- brlcad/trunk/src/conv/euclid/euclid-g.c 2018-10-12 13:54:58 UTC (rev
71964)
+++ brlcad/trunk/src/conv/euclid/euclid-g.c 2018-10-12 14:44:59 UTC (rev
71965)
@@ -627,7 +627,7 @@
}
if (debug)
- bu_log("%d vertices out of tolerance after fixing out of tolerance
faces\n", nmg_ck_geometry(m, &RTG.rtg_vlfree, &tol));
+ bu_log("%zu vertices out of tolerance after fixing out of tolerance
faces\n", nmg_ck_geometry(m, &RTG.rtg_vl
[brlcad-commits] SF.net SVN: brlcad:[71966] brlcad/trunk/src/libanalyze/nirt.cxx
Revision: 71966
http://sourceforge.net/p/brlcad/code/71966
Author: starseeker
Date: 2018-10-12 14:56:34 + (Fri, 12 Oct 2018)
Log Message:
---
use an explicit '%s' here
Modified Paths:
--
brlcad/trunk/src/libanalyze/nirt.cxx
Modified: brlcad/trunk/src/libanalyze/nirt.cxx
===
--- brlcad/trunk/src/libanalyze/nirt.cxx2018-10-12 14:44:59 UTC (rev
71965)
+++ brlcad/trunk/src/libanalyze/nirt.cxx2018-10-12 14:56:34 UTC (rev
71966)
@@ -1611,7 +1611,7 @@
{
if (!ostr || !fmt || !r) return;
if (!key || !strlen(key)) {
- bu_vls_printf(ostr, fmt);
+ bu_vls_printf(ostr, "%s", fmt);
return;
}
nirt_print_key("x_orig", r->orig[X] * base2local);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71967] brlcad/trunk/src/brlman/brlman.c
Revision: 71967
http://sourceforge.net/p/brlcad/code/71967
Author: starseeker
Date: 2018-10-12 15:00:05 + (Fri, 12 Oct 2018)
Log Message:
---
another clang catch - use explicit '%s'
Modified Paths:
--
brlcad/trunk/src/brlman/brlman.c
Modified: brlcad/trunk/src/brlman/brlman.c
===
--- brlcad/trunk/src/brlman/brlman.c2018-10-12 14:56:34 UTC (rev 71966)
+++ brlcad/trunk/src/brlman/brlman.c2018-10-12 15:00:05 UTC (rev 71967)
@@ -223,7 +223,7 @@
argv++; argc--;
uac = bu_opt_parse(&optparse_msg, argc, argv, d);
if (uac == -1) {
- bu_exit(EXIT_FAILURE, bu_vls_addr(&optparse_msg));
+ bu_exit(EXIT_FAILURE, "%s", bu_vls_addr(&optparse_msg));
}
bu_vls_free(&optparse_msg);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71968] brlcad/trunk/src
Revision: 71968
http://sourceforge.net/p/brlcad/code/71968
Author: starseeker
Date: 2018-10-12 15:06:25 + (Fri, 12 Oct 2018)
Log Message:
---
Clear more clang printf warnings
Modified Paths:
--
brlcad/trunk/src/conv/k-g.cpp
brlcad/trunk/src/conv/nmg/nmg-rib.c
brlcad/trunk/src/remrt/remrt.c
brlcad/trunk/src/rtwizard/main.c
brlcad/trunk/src/util/admin-db.cpp
Modified: brlcad/trunk/src/conv/k-g.cpp
===
--- brlcad/trunk/src/conv/k-g.cpp 2018-10-12 15:00:05 UTC (rev 71967)
+++ brlcad/trunk/src/conv/k-g.cpp 2018-10-12 15:06:25 UTC (rev 71968)
@@ -597,7 +597,7 @@
uac = bu_opt_parse(&optparse_msg, argc, (const char **)argv, d);
if (uac == -1) {
- bu_exit(EXIT_FAILURE, bu_vls_addr(&optparse_msg));
+ bu_exit(EXIT_FAILURE, "%s", bu_vls_addr(&optparse_msg));
}
bu_vls_free(&optparse_msg);
Modified: brlcad/trunk/src/conv/nmg/nmg-rib.c
===
--- brlcad/trunk/src/conv/nmg/nmg-rib.c 2018-10-12 15:00:05 UTC (rev 71967)
+++ brlcad/trunk/src/conv/nmg/nmg-rib.c 2018-10-12 15:06:25 UTC (rev 71968)
@@ -50,7 +50,7 @@
usage(char *s)
{
if (s) {
- bu_log(s);
+ bu_log("%s", s);
}
(void) bu_exit(1, "Usage: %s [-t] file.g nmg_solid [ nmg_solid ... ]\n",
Modified: brlcad/trunk/src/remrt/remrt.c
===
--- brlcad/trunk/src/remrt/remrt.c 2018-10-12 15:00:05 UTC (rev 71967)
+++ brlcad/trunk/src/remrt/remrt.c 2018-10-12 15:06:25 UTC (rev 71968)
@@ -440,7 +440,7 @@
static void
remrt_log(const char *msg)
{
-bu_log(msg);
+bu_log("%s", msg);
}
Modified: brlcad/trunk/src/rtwizard/main.c
===
--- brlcad/trunk/src/rtwizard/main.c2018-10-12 15:00:05 UTC (rev 71967)
+++ brlcad/trunk/src/rtwizard/main.c2018-10-12 15:06:25 UTC (rev 71968)
@@ -963,7 +963,7 @@
uac = bu_opt_parse(&optparse_msg, argc, (const char **)argv, d);
if (uac == -1) {
- bu_exit(1, bu_vls_addr(&optparse_msg));
+ bu_exit(1, "%s", bu_vls_addr(&optparse_msg));
}
bu_vls_free(&optparse_msg);
Modified: brlcad/trunk/src/util/admin-db.cpp
===
--- brlcad/trunk/src/util/admin-db.cpp 2018-10-12 15:00:05 UTC (rev 71967)
+++ brlcad/trunk/src/util/admin-db.cpp 2018-10-12 15:06:25 UTC (rev 71968)
@@ -69,7 +69,7 @@
arg_err = bu_opt_parse(&str, argc, (const char **)argv, d);
if (arg_err < 0) {
- bu_exit(EXIT_FAILURE, bu_vls_addr(&str));
+ bu_exit(EXIT_FAILURE, "%s", bu_vls_addr(&str));
}
bu_vls_free(&str);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71969] brlcad/trunk/src/nirt/main.cxx
Revision: 71969
http://sourceforge.net/p/brlcad/code/71969
Author: starseeker
Date: 2018-10-12 15:08:46 + (Fri, 12 Oct 2018)
Log Message:
---
Whoops, forgot nirt/main.cxx
Modified Paths:
--
brlcad/trunk/src/nirt/main.cxx
Modified: brlcad/trunk/src/nirt/main.cxx
===
--- brlcad/trunk/src/nirt/main.cxx 2018-10-12 15:06:25 UTC (rev 71968)
+++ brlcad/trunk/src/nirt/main.cxx 2018-10-12 15:08:46 UTC (rev 71969)
@@ -588,7 +588,7 @@
argv++; argc--;
if ((ac = bu_opt_parse(&optparse_msg, argc, (const char **)argv, d)) ==
-1) {
- bu_exit(EXIT_FAILURE, bu_vls_addr(&optparse_msg));
+ bu_exit(EXIT_FAILURE, "%s", bu_vls_addr(&optparse_msg));
}
bu_vls_free(&optparse_msg);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71970] brlcad/trunk
Revision: 71970 http://sourceforge.net/p/brlcad/code/71970 Author: starseeker Date: 2018-10-12 15:10:48 + (Fri, 12 Oct 2018) Log Message: --- Remove the suppression of the printf/scanf attrs in debug mode. We're moving to the newer C/C++ 11 standards, and it should no longer be necessary to suppress these. Modified Paths: -- brlcad/trunk/CMakeLists.txt brlcad/trunk/include/bu/defines.h Modified: brlcad/trunk/CMakeLists.txt === --- brlcad/trunk/CMakeLists.txt 2018-10-12 15:08:46 UTC (rev 71969) +++ brlcad/trunk/CMakeLists.txt 2018-10-12 15:10:48 UTC (rev 71970) @@ -1422,7 +1422,6 @@ DESCRIPTION BRLCAD_ENABLE_STRICT_DESCRIPTION) if(BRLCAD_ENABLE_STRICT) mark_as_advanced(BRLCAD_ENABLE_STRICT) - CONFIG_H_APPEND(BRLCAD "#define STRICT_FLAGS 1\n") endif(BRLCAD_ENABLE_STRICT) # Build with compiler optimization flags. This should normally be on for Modified: brlcad/trunk/include/bu/defines.h === --- brlcad/trunk/include/bu/defines.h 2018-10-12 15:08:46 UTC (rev 71969) +++ brlcad/trunk/include/bu/defines.h 2018-10-12 15:10:48 UTC (rev 71970) @@ -146,22 +146,6 @@ # define _BU_ATTR_ALWAYS_INLINE #endif -/** - * If we're compiling strict, turn off "format string vs arguments" - * checks. As long as we are using C89, the proper printf support - * for size_t is not available in the standard and we will get - * warnings about using extensions. - */ -#if defined(STRICT_FLAGS) -# undef _BU_ATTR_PRINTF12 -# undef _BU_ATTR_PRINTF23 -# undef _BU_ATTR_SCANF23 -# undef _BU_ATTR_NORETURN -# define _BU_ATTR_PRINTF12 -# define _BU_ATTR_PRINTF23 -# define _BU_ATTR_SCANF23 -# define _BU_ATTR_NORETURN -#endif /** * This macro is used to take the 'C' function name, and convert it at This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71971] brlcad/trunk/src
Revision: 71971
http://sourceforge.net/p/brlcad/code/71971
Author: starseeker
Date: 2018-10-12 15:16:40 + (Fri, 12 Oct 2018)
Log Message:
---
C++11 is here, use the correct std constant.
Modified Paths:
--
brlcad/trunk/src/libanalyze/nirt.cxx
brlcad/trunk/src/nirt/main.cxx
Modified: brlcad/trunk/src/libanalyze/nirt.cxx
===
--- brlcad/trunk/src/libanalyze/nirt.cxx2018-10-12 15:10:48 UTC (rev
71970)
+++ brlcad/trunk/src/libanalyze/nirt.cxx2018-10-12 15:16:40 UTC (rev
71971)
@@ -667,8 +667,7 @@
HIDDEN std::string
_nirt_dbl_to_str(double d, size_t p)
{
-// TODO - once we enable C++ 11 switch the precision below to
std::numeric_limits::max_digits10
-size_t prec = (p) ? p : std::numeric_limits::digits10 + 2;
+size_t prec = (p) ? p : std::numeric_limits::max_digits10;
bu_log("prec: %zu\n",prec);
std::ostringstream ss;
ss << std::fixed << std::setprecision(prec) << d;
@@ -681,8 +680,7 @@
_nirt_str_to_dbl(std::string s, size_t p)
{
double d;
-// TODO - once we enable C++ 11 switch the precision below to
std::numeric_limits::max_digits10
-size_t prec = (p) ? p : std::numeric_limits::digits10 + 2;
+size_t prec = (p) ? p : std::numeric_limits::max_digits10;
std::stringstream ss(s);
ss >> std::setprecision(prec) >> std::fixed >> d;
//bu_log("str : %s\ndbl : %.17f\n", s.c_str(), d);
@@ -1336,9 +1334,8 @@
case 'E':
case 'g':
case 'G':
- // TODO - once we enable C++ 11 switch the test below to (p >
std::numeric_limits::max_digits10) and update the nerr msg.
- if (p_num > std::numeric_limits::digits10 + 2) {
- nerr(nss, "Error: precision specification in format
specifier substring \"%s\" of specifier \"%s\" exceeds allowed maximum (%d)\n",
pn.c_str(), fmt_sp.c_str(), std::numeric_limits::digits10 + 2);
+ if (p_num > std::numeric_limits::max_digits10) {
+ nerr(nss, "Error: precision specification in format
specifier substring \"%s\" of specifier \"%s\" exceeds allowed maximum (%d)\n",
pn.c_str(), fmt_sp.c_str(), std::numeric_limits::max_digits10);
return -1;
}
break;
Modified: brlcad/trunk/src/nirt/main.cxx
===
--- brlcad/trunk/src/nirt/main.cxx 2018-10-12 15:10:48 UTC (rev 71970)
+++ brlcad/trunk/src/nirt/main.cxx 2018-10-12 15:16:40 UTC (rev 71971)
@@ -554,7 +554,7 @@
struct bu_vls ncmd = BU_VLS_INIT_ZERO;
struct bu_vls optparse_msg = BU_VLS_INIT_ZERO;
double scan[16] = MAT_INIT_ZERO;
-size_t prec = std::numeric_limits::digits10 + 2; // TODO - once
we enable C++ 11 switch this to (p > std::numeric_limits::max_digits10)
+size_t prec = std::numeric_limits::max_digits10;
char *buf = NULL;
int status = 0x0;
mat_t m;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71972] brlcad/trunk/TODO
Revision: 71972 http://sourceforge.net/p/brlcad/code/71972 Author: starseeker Date: 2018-10-12 17:30:45 + (Fri, 12 Oct 2018) Log Message: --- Nick ported screengrab to Windows Modified Paths: -- brlcad/trunk/TODO Modified: brlcad/trunk/TODO === --- brlcad/trunk/TODO 2018-10-12 15:16:40 UTC (rev 71971) +++ brlcad/trunk/TODO 2018-10-12 17:30:45 UTC (rev 71972) @@ -171,8 +171,6 @@ * add a multiview rt script to regression testing (e.g., see rtwalk output) -* screengrab on windows - * bot overlaps when unoriented, when clearly not overlapping * improve rtweight .density file handling on Windows, can't find it. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71973] brlcad/trunk/src/libged/tests
Revision: 71973
http://sourceforge.net/p/brlcad/code/71973
Author: starseeker
Date: 2018-10-12 17:46:21 + (Fri, 12 Oct 2018)
Log Message:
---
The default arb7 from make, facetized into a BoT, triggers an infinite loop in
the oriented bounding box code (bb -o arb7.bot). Stash this to use for later
testing/debugging - the immediate infinite loop is in the
MinAreaRectangle::find_vertex logic, but why its getting inputs that kick it
into the loop will take more investigation.
Modified Paths:
--
brlcad/trunk/src/libged/tests/CMakeLists.txt
Added Paths:
---
brlcad/trunk/src/libged/tests/obb_tests.g
Modified: brlcad/trunk/src/libged/tests/CMakeLists.txt
===
--- brlcad/trunk/src/libged/tests/CMakeLists.txt2018-10-12 17:30:45 UTC
(rev 71972)
+++ brlcad/trunk/src/libged/tests/CMakeLists.txt2018-10-12 17:46:21 UTC
(rev 71973)
@@ -1,10 +1,12 @@
BRLCAD_ADDEXEC(test_tops test_tops.c libged TEST)
add_test(NAME test_tops_moss COMMAND test_tops
"${CMAKE_CURRENT_SOURCE_DIR}/ged_tests.g")
-# Note the lint tests are kept in a separate file, since its bad input examples
-# stand an excellent chance of breaking commands.
+# Note: it is particularly important that the lint tests in particular are kept
+# in a separate file, since its bad input examples stand an excellent chance of
+# breaking commands.
CMAKEFILES(
lint_tests.g
+ obb_tests.g
ged_tests.g
)
Added: brlcad/trunk/src/libged/tests/obb_tests.g
===
(Binary files differ)
Index: brlcad/trunk/src/libged/tests/obb_tests.g
===
--- brlcad/trunk/src/libged/tests/obb_tests.g 2018-10-12 17:30:45 UTC (rev
71972)
+++ brlcad/trunk/src/libged/tests/obb_tests.g 2018-10-12 17:46:21 UTC (rev
71973)
Property changes on: brlcad/trunk/src/libged/tests/obb_tests.g
___
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71974] brlcad/trunk
Revision: 71974
http://sourceforge.net/p/brlcad/code/71974
Author: starseeker
Date: 2018-10-12 19:02:23 + (Fri, 12 Oct 2018)
Log Message:
---
See if we can simplify the standard setting in the build logic. Make a first
stab at updating the C/C++ language in HACKING.
Modified Paths:
--
brlcad/trunk/CMakeLists.txt
brlcad/trunk/HACKING
Modified: brlcad/trunk/CMakeLists.txt
===
--- brlcad/trunk/CMakeLists.txt 2018-10-12 17:46:21 UTC (rev 71973)
+++ brlcad/trunk/CMakeLists.txt 2018-10-12 19:02:23 UTC (rev 71974)
@@ -860,42 +860,24 @@
endif(NOT "${CMAKE_CXX_FLAGS}" STREQUAL "" AND NOT DEFINED
CMAKE_CXX_FLAGS_DEFAULT)
mark_as_advanced(CMAKE_CXX_FLAGS_DEFAULT)
+set(API_FLAGS "-D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700")
+
# C
-
unset(C_STANDARD_FLAGS)
set(CMAKE_C_EXTENSIONS OFF)
-set(CMAKE_C_STANDARD 99)
+set(CMAKE_C_STANDARD 11)
set(CMAKE_C_STANDARD_REQUIRED ON)
-set(API_FLAGS "-D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=500")
-if(CMAKE_C_EXTENSIONS)
- set(C_STANDARD_FLAGS
"${CMAKE_C${CMAKE_C_STANDARD}_EXTENSION_COMPILE_OPTION}")
-else()
- set(C_STANDARD_FLAGS "${CMAKE_C${CMAKE_C_STANDARD}_STANDARD_COMPILE_OPTION}
${API_FLAGS}")
-endif(CMAKE_C_EXTENSIONS)
-if("${C_STANDARD_FLAGS}" STREQUAL "")
- message(FATAL_ERROR "C standard specification failure: compiler does not
support the C${CMAKE_C_STANDARD} standard:\n${CMAKE_C_COMPILE_FEATURES}")
-endif("${C_STANDARD_FLAGS}" STREQUAL "")
-set(C_STANDARD_FLAGS "${CMAKE_C_FLAGS_DEFAULT} ${C_STANDARD_FLAGS}")
+set(C_STANDARD_FLAGS "${CMAKE_C_FLAGS_DEFAULT}
${CMAKE_C${CMAKE_C_STANDARD}_STANDARD_COMPILE_OPTION} ${API_FLAGS}")
string(STRIP "${C_STANDARD_FLAGS}" C_STANDARD_FLAGS)
# C++
-
unset(CXX_STANDARD_FLAGS)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
-if(CMAKE_CXX_EXTENSIONS)
- set(CXX_STANDARD_FLAGS
"${CMAKE_CXX${CMAKE_CXX_STANDARD}_EXTENSION_COMPILE_OPTION}")
-else()
- set(CXX_STANDARD_FLAGS
"${CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION}")
-endif(CMAKE_CXX_EXTENSIONS)
-set(CXX_STANDARD_FLAGS "${CMAKE_CXX_FLAGS_DEFAULT} ${CXX_STANDARD_FLAGS}")
+set(CXX_STANDARD_FLAGS "${CMAKE_CXX_FLAGS_DEFAULT}
${CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION} ${API_FLAGS}")
string(STRIP "${CXX_STANDARD_FLAGS}" CXX_STANDARD_FLAGS)
-if("${CXX_STANDARD_FLAGS}" STREQUAL "")
- message(FATAL_ERROR "C++ standard specification failure: supported flags not
found for C++${CMAKE_CXX_STANDARD} standard
building:\n${CMAKE_CXX_COMPILE_FEATURES}")
-endif("${CXX_STANDARD_FLAGS}" STREQUAL "")
-
#-
# We will need a brlcad_config.h.in file to hold all the #cmakedefine
# statements, which will in turn be used to generate a brlcad_conf.h
Modified: brlcad/trunk/HACKING
===
--- brlcad/trunk/HACKING2018-10-12 17:46:21 UTC (rev 71973)
+++ brlcad/trunk/HACKING2018-10-12 19:02:23 UTC (rev 71974)
@@ -407,28 +407,25 @@
the CMake build tool. An initial implementation of a BRL-CAD Geometry
Server is written in PHP.
-With release 7.0, BRL-CAD has moved forward and worked toward making
-all of BRL-CAD C code conform strictly with the ANSI/ISO standard for
-C language compilation (ISO/IEC 9899:1990, i.e. c89). Support for
-older compilers and older K&R-based system facilities is being
-migrated to build system declarations, preprocessor defines, or being
-removed outright. It's okay to make modifications that assume
-compiler conformance with the ANSI C standard (c89).
+With release 7.28, BRL-CAD intends to conform strictly with the 2011
+ANSI/ISO standards for C and C++ language compilation
+(ISO/IEC 9899:2011, i.e. C11 and ISO/IEC 14882:2011, i.e. C++11).
+Support for use of necessary non-standard system facilities is
+handled by build system declarations and preprocessor defines driven
+by build configuration tests. The working feature set for normal
+development should be widely supported C++11 features and the subset
+of C11 that is also valid (and widely supported) C++11.
-There is currently no C++ interface to the core BRL-CAD libraries.
-There are a few tools and enhancements to libraries that are
-implemented in C++ (the new BREP object type in librt, for example),
-and C++ is used underneath quite a number of libraries, but there is
-presently no public C++ API in use outside of OpenNURBS.
+C++ is used as an implementation language within libraries, but there
+are no public C++ APIs in use outside of OpenNURBS. For new work,
+public library APIs should expose only C function calls and data
+except in very specific cases (should be discussed with the
+development team ahead of time to get consensus on the necessity.)
-While C++ as an implementation language of new tools and new library
-interfaces is not prohibited, the mixing of C
[brlcad-commits] SF.net SVN: brlcad:[71975] brlcad/trunk
Revision: 71975
http://sourceforge.net/p/brlcad/code/71975
Author: starseeker
Date: 2018-10-12 19:59:12 + (Fri, 12 Oct 2018)
Log Message:
---
Fix build on FreeBSD with new build settings.
Modified Paths:
--
brlcad/trunk/CMakeLists.txt
brlcad/trunk/src/adrt/master/compnet.c
brlcad/trunk/src/adrt/master/tienet_master.c
brlcad/trunk/src/libpkg/pkg.c
brlcad/trunk/src/remrt/ihost.c
Modified: brlcad/trunk/CMakeLists.txt
===
--- brlcad/trunk/CMakeLists.txt 2018-10-12 19:02:23 UTC (rev 71974)
+++ brlcad/trunk/CMakeLists.txt 2018-10-12 19:59:12 UTC (rev 71975)
@@ -2604,6 +2604,8 @@
BRLCAD_FUNCTION_EXISTS(getegid)
BRLCAD_FUNCTION_EXISTS(getenv_s)
BRLCAD_FUNCTION_EXISTS(geteuid)
+BRLCAD_FUNCTION_EXISTS(gethostbyaddr)
+BRLCAD_FUNCTION_EXISTS(gethostbyname)
BRLCAD_FUNCTION_EXISTS(gethostname)
BRLCAD_FUNCTION_EXISTS(getloadavg)
BRLCAD_FUNCTION_EXISTS(getopt_long)
Modified: brlcad/trunk/src/adrt/master/compnet.c
===
--- brlcad/trunk/src/adrt/master/compnet.c 2018-10-12 19:02:23 UTC (rev
71974)
+++ brlcad/trunk/src/adrt/master/compnet.c 2018-10-12 19:59:12 UTC (rev
71975)
@@ -36,6 +36,10 @@
#include "adrt.h"
#include "tienet.h"
+#if defined(HAVE_GETHOSTBYNAME) && !defined(HAVE_DECL_GETHOSTBYNAME) &&
!defined(_WINSOCKAPI_)
+extern struct hostent *gethostbyname(const char *);
+#endif
+
int master_compserv_socket;
int master_compserv_active;
Modified: brlcad/trunk/src/adrt/master/tienet_master.c
===
--- brlcad/trunk/src/adrt/master/tienet_master.c2018-10-12 19:02:23 UTC
(rev 71974)
+++ brlcad/trunk/src/adrt/master/tienet_master.c2018-10-12 19:59:12 UTC
(rev 71975)
@@ -56,6 +56,9 @@
#include "bu/log.h"
#include "master.h"
+#if defined(HAVE_GETHOSTBYNAME) && !defined(HAVE_DECL_GETHOSTBYNAME) &&
!defined(_WINSOCKAPI_)
+extern struct hostent *gethostbyname(const char *);
+#endif
typedef struct tienet_master_data_s {
void *data;
Modified: brlcad/trunk/src/libpkg/pkg.c
===
--- brlcad/trunk/src/libpkg/pkg.c 2018-10-12 19:02:23 UTC (rev 71974)
+++ brlcad/trunk/src/libpkg/pkg.c 2018-10-12 19:59:12 UTC (rev 71975)
@@ -88,6 +88,9 @@
#include
#include "pkg.h"
+#if defined(HAVE_GETHOSTBYNAME) && !defined(HAVE_DECL_GETHOSTBYNAME) &&
!defined(_WINSOCKAPI_)
+extern struct hostent *gethostbyname(const char *);
+#endif
/* compatibility for pedantic bug/limitation in gcc 4.6.2, need to
* mark macros as extensions else they may emit "ISO C forbids
Modified: brlcad/trunk/src/remrt/ihost.c
===
--- brlcad/trunk/src/remrt/ihost.c 2018-10-12 19:02:23 UTC (rev 71974)
+++ brlcad/trunk/src/remrt/ihost.c 2018-10-12 19:59:12 UTC (rev 71975)
@@ -56,6 +56,14 @@
extern int gethostname(char *name, size_t len);
#endif
+#if defined(HAVE_GETHOSTBYNAME) && !defined(HAVE_DECL_GETHOSTBYNAME) &&
!defined(_WINSOCKAPI_)
+extern struct hostent *gethostbyname(const char *);
+#endif
+
+#if defined(HAVE_GETHOSTBYADDR) && !defined(HAVE_DECL_GETHOSTBYADDR) &&
!defined(_WINSOCKAPI_)
+extern struct hostent *gethostbyaddr(const char *, socklen_t, int);
+#endif
+
struct bu_list HostHead;
/*
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71976] brlcad/trunk
Revision: 71976
http://sourceforge.net/p/brlcad/code/71976
Author: starseeker
Date: 2018-10-12 20:45:14 + (Fri, 12 Oct 2018)
Log Message:
---
gethostbyaddr DECL test was falsely failing on Linux. Also exposed a bug in
the HAVE_DECL CMake testing logic when custom sources are defined.
Modified Paths:
--
brlcad/trunk/CMakeLists.txt
brlcad/trunk/misc/CMake/BRLCAD_CheckFunctions.cmake
Modified: brlcad/trunk/CMakeLists.txt
===
--- brlcad/trunk/CMakeLists.txt 2018-10-12 19:59:12 UTC (rev 71975)
+++ brlcad/trunk/CMakeLists.txt 2018-10-12 20:45:14 UTC (rev 71976)
@@ -2604,7 +2604,6 @@
BRLCAD_FUNCTION_EXISTS(getegid)
BRLCAD_FUNCTION_EXISTS(getenv_s)
BRLCAD_FUNCTION_EXISTS(geteuid)
-BRLCAD_FUNCTION_EXISTS(gethostbyaddr)
BRLCAD_FUNCTION_EXISTS(gethostbyname)
BRLCAD_FUNCTION_EXISTS(gethostname)
BRLCAD_FUNCTION_EXISTS(getloadavg)
@@ -2745,6 +2744,10 @@
set(tgamma_test "#include \nint main() {double tga = tgamma(3.14);
return 0;}")
BRLCAD_FUNCTION_EXISTS(tgamma COMPILE_TEST_SRCS tgamma_test REQUIRED_LIBS
${M_LIBRARY})
+# test for gethostbyaddr
+set(gethostbyaddr_test "#include\n#include \nint main()
{(void)gethostbyaddr(NULL, 0, AF_INET); return 0;}")
+BRLCAD_FUNCTION_EXISTS(gethostbyaddr DECL_TEST_SRCS gethostbyaddr_test
REQUIRED_LIBS ${NL_LIBRARY})
+
# Check for logb in C++
check_cxx_source_compiles("#include \nint main() {return logb(3.14);}"
HAVE_CXX_LOGB)
CONFIG_H_APPEND(BRLCAD "#cmakedefine HAVE_CXX_LOGB 1\n")
Modified: brlcad/trunk/misc/CMake/BRLCAD_CheckFunctions.cmake
===
--- brlcad/trunk/misc/CMake/BRLCAD_CheckFunctions.cmake 2018-10-12 19:59:12 UTC
(rev 71975)
+++ brlcad/trunk/misc/CMake/BRLCAD_CheckFunctions.cmake 2018-10-12 20:45:14 UTC
(rev 71976)
@@ -173,7 +173,7 @@
if(NOT DEFINED HAVE_DECL_${var})
if(NOT MSVC)
if(NOT "${${var}_DECL_TEST_SRCS}" STREQUAL "")
- check_c_source_compiles("${${var}_DECL_TEST_SRCS}" HAVE_DECL_${var})
+ check_c_source_compiles("${${${var}_DECL_TEST_SRCS}}"
HAVE_DECL_${var})
else(NOT "${${var}_DECL_TEST_SRCS}" STREQUAL "")
check_c_source_compiles("${standard_header_template}\nint main()
{(void)${function}; return 0;}" HAVE_DECL_${var})
endif(NOT "${${var}_DECL_TEST_SRCS}" STREQUAL "")
@@ -191,7 +191,7 @@
if(NOT "${${var}_COMPILE_TEST_SRCS}" STREQUAL "")
if(NOT DEFINED HAVE_WORKING_${var})
set(HAVE_WORKING_${var} 1)
- foreach(test_src ${${var}_DECL_TEST_SRCS})
+ foreach(test_src ${${var}_COMPILE_TEST_SRCS})
check_c_source_compiles("${${test_src}}" ${var}_${test_src}_COMPILE)
if(NOT ${var}_${test_src}_COMPILE)
set(HAVE_WORKING_${var} 0)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71977] brlcad/trunk/CMakeLists.txt
Revision: 71977
http://sourceforge.net/p/brlcad/code/71977
Author: starseeker
Date: 2018-10-12 20:58:51 + (Fri, 12 Oct 2018)
Log Message:
---
Always set the CMAKE_*_FLAGS_DEFAULT variables, even if empty, to prevent a
second pass populating the 'default' set with our set. In the latter case ends
up doubling the C and CXX flags for the build.
Modified Paths:
--
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===
--- brlcad/trunk/CMakeLists.txt 2018-10-12 20:45:14 UTC (rev 71976)
+++ brlcad/trunk/CMakeLists.txt 2018-10-12 20:58:51 UTC (rev 71977)
@@ -851,13 +851,13 @@
# For certain platforms (in particular Visual C++) we want to keep some
pre-defined
# flags that are commonly used in the build logic.
-if(NOT "${CMAKE_C_FLAGS}" STREQUAL "" AND NOT DEFINED CMAKE_C_FLAGS_DEFAULT)
+if(NOT DEFINED CMAKE_C_FLAGS_DEFAULT)
set(CMAKE_C_FLAGS_DEFAULT "${CMAKE_C_FLAGS}" CACHE STRING "Default C flags"
FORCE)
-endif(NOT "${CMAKE_C_FLAGS}" STREQUAL "" AND NOT DEFINED CMAKE_C_FLAGS_DEFAULT)
+endif(NOT DEFINED CMAKE_C_FLAGS_DEFAULT)
mark_as_advanced(CMAKE_C_FLAGS_DEFAULT)
-if(NOT "${CMAKE_CXX_FLAGS}" STREQUAL "" AND NOT DEFINED
CMAKE_CXX_FLAGS_DEFAULT)
+if(NOT DEFINED CMAKE_CXX_FLAGS_DEFAULT)
set(CMAKE_CXX_FLAGS_DEFAULT "${CMAKE_CXX_FLAGS}" CACHE STRING "Default CXX
flags" FORCE)
-endif(NOT "${CMAKE_CXX_FLAGS}" STREQUAL "" AND NOT DEFINED
CMAKE_CXX_FLAGS_DEFAULT)
+endif(NOT DEFINED CMAKE_CXX_FLAGS_DEFAULT)
mark_as_advanced(CMAKE_CXX_FLAGS_DEFAULT)
set(API_FLAGS "-D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71978] brlcad/trunk/src
Revision: 71978
http://sourceforge.net/p/brlcad/code/71978
Author: starseeker
Date: 2018-10-15 17:32:08 + (Mon, 15 Oct 2018)
Log Message:
---
fixes for Qt files
Modified Paths:
--
brlcad/trunk/src/libdm/dm-qt.cpp
brlcad/trunk/src/libfb/if_qt.cpp
Modified: brlcad/trunk/src/libdm/dm-qt.cpp
===
--- brlcad/trunk/src/libdm/dm-qt.cpp2018-10-12 20:58:51 UTC (rev 71977)
+++ brlcad/trunk/src/libdm/dm-qt.cpp2018-10-15 17:32:08 UTC (rev 71978)
@@ -1215,7 +1215,7 @@
if (event->type() == 6 /* QEvent::KeyPress */) {
QKeyEvent *keyEv = (QKeyEvent *)event;
struct bu_vls str = BU_VLS_INIT_ZERO;
- bu_vls_printf(&str, "", keyEv->text().data());
+ bu_vls_printf(&str, "", keyEv->text().data()->toLatin1());
return bu_vls_addr(&str);
}
return NULL;
@@ -1226,7 +1226,7 @@
if (event->type() == 7 /* QEvent::KeyRelease */) {
QKeyEvent *keyEv = (QKeyEvent *)event;
struct bu_vls str = BU_VLS_INIT_ZERO;
- bu_vls_printf(&str, "", keyEv->text().data());
+ bu_vls_printf(&str, "",
keyEv->text().data()->toLatin1());
return bu_vls_addr(&str);
}
return NULL;
Modified: brlcad/trunk/src/libfb/if_qt.cpp
===
--- brlcad/trunk/src/libfb/if_qt.cpp2018-10-12 20:58:51 UTC (rev 71977)
+++ brlcad/trunk/src/libfb/if_qt.cpp2018-10-15 17:32:08 UTC (rev 71978)
@@ -798,7 +798,7 @@
/* allocate backing store */
size = ifp->if_max_height * ifp->if_max_width * sizeof(RGBpixel) + sizeof
(*qi->qi_rgb_cmap);;
if ((mem = (unsigned char *)malloc(size)) == 0) {
- fb_log("if_qt: Unable to allocate %d bytes of backing \
+ fb_log("if_qt: Unable to allocate %zu bytes of backing \
store\n Run shell command 'limit datasize unlimited' and try
again.\n", size);
return -1;
}
@@ -899,7 +899,7 @@
/* allocate backing store */
size = ifp->if_max_height * ifp->if_max_width * sizeof(RGBpixel) + sizeof
(*qi->qi_rgb_cmap);;
if ((mem = (unsigned char *)malloc(size)) == 0) {
- fb_log("if_qt: Unable to allocate %d bytes of backing \
+ fb_log("if_qt: Unable to allocate %zu bytes of backing \
store\n Run shell command 'limit datasize unlimited' and try
again.\n", size);
return -1;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71980] brlcad/trunk/src/libanalyze/nirt.cxx
Revision: 71980
http://sourceforge.net/p/brlcad/code/71980
Author: starseeker
Date: 2018-10-16 12:48:03 + (Tue, 16 Oct 2018)
Log Message:
---
set but unused warning from clang
Modified Paths:
--
brlcad/trunk/src/libanalyze/nirt.cxx
Modified: brlcad/trunk/src/libanalyze/nirt.cxx
===
--- brlcad/trunk/src/libanalyze/nirt.cxx2018-10-15 23:28:35 UTC (rev
71979)
+++ brlcad/trunk/src/libanalyze/nirt.cxx2018-10-16 12:48:03 UTC (rev
71980)
@@ -812,7 +812,6 @@
} else {
fflush(stdout);
fprintf (stderr, "Error: cos(obliquity) > 1 (%g)\n", cos_obl);
- obliquity = 0;
bu_exit(1, NULL);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71981] brlcad/trunk
Revision: 71981 http://sourceforge.net/p/brlcad/code/71981 Author: starseeker Date: 2018-10-17 12:45:54 + (Wed, 17 Oct 2018) Log Message: --- Clipper is like the new quickhull - actually easier to embed than try to maintain in src/other. Move it to libbg for simplicity Modified Paths: -- brlcad/trunk/doc/legal/embedded/CMakeLists.txt brlcad/trunk/doc/legal/other/CMakeLists.txt brlcad/trunk/include/bg/CMakeLists.txt brlcad/trunk/src/libbg/CMakeLists.txt brlcad/trunk/src/libged/CMakeLists.txt brlcad/trunk/src/libged/polyclip.cpp brlcad/trunk/src/other/CMakeLists.txt Added Paths: --- brlcad/trunk/doc/legal/embedded/clipper.txt brlcad/trunk/include/bg/clipper.hpp brlcad/trunk/src/libbg/clipper.cxx Removed Paths: - brlcad/trunk/doc/legal/other/clipper.txt brlcad/trunk/src/other/clipper/ brlcad/trunk/src/other/clipper.dist Modified: brlcad/trunk/doc/legal/embedded/CMakeLists.txt === --- brlcad/trunk/doc/legal/embedded/CMakeLists.txt 2018-10-16 12:48:03 UTC (rev 71980) +++ brlcad/trunk/doc/legal/embedded/CMakeLists.txt 2018-10-17 12:45:54 UTC (rev 71981) @@ -3,6 +3,7 @@ bullet.txt chull2d.txt chull3d.txt + clipper.txt db_faa-info.txt db_nist-info.txt dehumanize.txt Copied: brlcad/trunk/doc/legal/embedded/clipper.txt (from rev 71980, brlcad/trunk/doc/legal/other/clipper.txt) === --- brlcad/trunk/doc/legal/embedded/clipper.txt (rev 0) +++ brlcad/trunk/doc/legal/embedded/clipper.txt 2018-10-17 12:45:54 UTC (rev 71981) @@ -0,0 +1,31 @@ +http://www.angusj.com/delphi/clipper.php + +The Clipper code library, the "Software" (that includes Delphi, C++ & C# +source code, accompanying samples and documentation), has been released +under the following license, terms and conditions: + +Boost Software License - Version 1.0 - August 17th, 2003 +http://www.boost.org/LICENSE_1_0.txt + +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + Modified: brlcad/trunk/doc/legal/other/CMakeLists.txt === --- brlcad/trunk/doc/legal/other/CMakeLists.txt 2018-10-16 12:48:03 UTC (rev 71980) +++ brlcad/trunk/doc/legal/other/CMakeLists.txt 2018-10-17 12:45:54 UTC (rev 71981) @@ -1,5 +1,4 @@ set(other_licenses - clipper.txt gct.txt gdal.txt incrTcl.txt Deleted: brlcad/trunk/doc/legal/other/clipper.txt === --- brlcad/trunk/doc/legal/other/clipper.txt2018-10-16 12:48:03 UTC (rev 71980) +++ brlcad/trunk/doc/legal/other/clipper.txt2018-10-17 12:45:54 UTC (rev 71981) @@ -1,31 +0,0 @@ -http://www.angusj.com/delphi/clipper.php - -The Clipper code library, the "Software" (that includes Delphi, C++ & C# -source code, accompanying samples and documentation), has been released -under the following license, terms and conditions: - -Boost Software License - Version 1.0 - August 17th, 2003 -http://www.boost.org/LICENSE_1_0.txt - -Permission is hereby granted, free of charge, to any person or organization -obtaining a copy of the software and accompanying documentation covered by -this license (the "Software") to use, reproduce, display, distribute, -execute, and transmit the Software, and to prepare derivative works of the -Software, and to permit third-parties to whom the Software is furnished to -do so, all subject to the following: - -The copyright notices in the Software and this entire statement, including -the above license grant, this restriction and the following disclaimer, -mus
[brlcad-commits] SF.net SVN: brlcad:[71982] brlcad/trunk/src/libbg/chull3d.cxx
Revision: 71982 http://sourceforge.net/p/brlcad/code/71982 Author: starseeker Date: 2018-10-17 13:15:22 + (Wed, 17 Oct 2018) Log Message: --- Fix header and footer for chull3d.cxx Modified Paths: -- brlcad/trunk/src/libbg/chull3d.cxx Modified: brlcad/trunk/src/libbg/chull3d.cxx === --- brlcad/trunk/src/libbg/chull3d.cxx 2018-10-17 12:45:54 UTC (rev 71981) +++ brlcad/trunk/src/libbg/chull3d.cxx 2018-10-17 13:15:22 UTC (rev 71982) @@ -1,3 +1,28 @@ +/* C H U L L 3 D . C X X + * BRL-CAD + * + * Copyright (c) 2018 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + */ +/** @file chull3d.cxx + * + * Interface to the Quickhull algorithm code for creating a convex + * hull from a set of faces and vertices. + */ + #include "common.h" #include @@ -72,13 +97,12 @@ return 3; } -/* - * Local Variables: - * mode: C - * tab-width: 8 - * indent-tabs-mode: t - * c-file-style: "stroustrup" - * End: - * ex: shiftwidth=4 tabstop=8 - */ +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// 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. ___ 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:[71983] brlcad/trunk/include/bg/chull.h
Revision: 71983 http://sourceforge.net/p/brlcad/code/71983 Author: starseeker Date: 2018-10-17 13:35:15 + (Wed, 17 Oct 2018) Log Message: --- fix header comment Modified Paths: -- brlcad/trunk/include/bg/chull.h Modified: brlcad/trunk/include/bg/chull.h === --- brlcad/trunk/include/bg/chull.h 2018-10-17 13:15:22 UTC (rev 71982) +++ brlcad/trunk/include/bg/chull.h 2018-10-17 13:35:15 UTC (rev 71983) @@ -116,9 +116,8 @@ * @param num_input_pnts the number of points in the input set * @return dimension of output (3 is three dimensional faces and hulls, 2 is a polygon hull in a plane, etc.) * - * This routine is based off of Ken Clarkson's hull program from - * http://www.netlib.org/voronoi/hull.html - see the file chull3d.c - * for the full copyright and license statement. + * This routine is based off of Antti Kuukka's implementation of the QuickHull + * algorithm: https://github.com/akuukka/quickhull implementation */ BG_EXPORT int bg_3d_chull(int **faces, int *num_faces, point_t **vertices, int *num_vertices, const point_t *input_points_3d, int num_input_pnts); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71984] brlcad/trunk
Revision: 71984
http://sourceforge.net/p/brlcad/code/71984
Author: starseeker
Date: 2018-10-17 14:59:23 + (Wed, 17 Oct 2018)
Log Message:
---
Strip libvds src/other down to basics, simplify build
Modified Paths:
--
brlcad/trunk/doc/legal/other/libvds.txt
brlcad/trunk/src/other/libvds/CMakeLists.txt
brlcad/trunk/src/other/libvds/COPYING
brlcad/trunk/src/other/libvds/vds.h
brlcad/trunk/src/other/libvds.dist
Added Paths:
---
brlcad/trunk/src/other/libvds/vds.c
Removed Paths:
-
brlcad/trunk/src/other/libvds/build.c
brlcad/trunk/src/other/libvds/cluster.c
brlcad/trunk/src/other/libvds/dynamic.c
brlcad/trunk/src/other/libvds/file.c
brlcad/trunk/src/other/libvds/notes.txt
brlcad/trunk/src/other/libvds/path.h
brlcad/trunk/src/other/libvds/render.c
brlcad/trunk/src/other/libvds/stdfold.c
brlcad/trunk/src/other/libvds/stdvds.c
brlcad/trunk/src/other/libvds/stdvds.h
brlcad/trunk/src/other/libvds/stdvis.c
brlcad/trunk/src/other/libvds/util.c
brlcad/trunk/src/other/libvds/vdsprivate.h
brlcad/trunk/src/other/libvds/vector.h
Modified: brlcad/trunk/doc/legal/other/libvds.txt
===
--- brlcad/trunk/doc/legal/other/libvds.txt 2018-10-17 13:35:15 UTC (rev
71983)
+++ brlcad/trunk/doc/legal/other/libvds.txt 2018-10-17 14:59:23 UTC (rev
71984)
@@ -22,7 +22,7 @@
INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
DOCUMENTATION, EVEN IF THE UNIVERSITY OF VIRGINIA AND/OR THE
- AUTHOR OF THIS SOFTWARE HAVE BEEN ADVISED OF THE POSSIBILITY OF
+ AUTHOR OF THIS SOFTWARE HAVE BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
Note: the polyview example is not included with the BRL-CAD copy of libvds.
Modified: brlcad/trunk/src/other/libvds/CMakeLists.txt
===
--- brlcad/trunk/src/other/libvds/CMakeLists.txt2018-10-17 13:35:15 UTC
(rev 71983)
+++ brlcad/trunk/src/other/libvds/CMakeLists.txt2018-10-17 14:59:23 UTC
(rev 71984)
@@ -1,7 +1,7 @@
##
# Copyright 2011 United States Government as represented by the U.S.
# Army Research Laboratory.
-#
+#
# Copyright 1999 The University of Virginia.
# All Rights Reserved.
#
@@ -11,14 +11,14 @@
# complete text of this comment appear in all copies, and provided that
# the University of Virginia and the original authors are credited in
# any publications arising from the use of this software.
-#
-# IN NO EVENT SHALL THE UNIVERSITY OF VIRGINIA OR ANY AUTHOR OF THIS
-# SOFTWARE BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL,
-# INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
-# ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-# IF THE UNIVERSITY OF VIRGINIA AND/OR THE AUTHOR OF THIS SOFTWARE
+#
+# IN NO EVENT SHALL THE UNIVERSITY OF VIRGINIA OR ANY AUTHOR OF THIS
+# SOFTWARE BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL,
+# INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
+# ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+# IF THE UNIVERSITY OF VIRGINIA AND/OR THE AUTHOR OF THIS SOFTWARE
# HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-#
+#
##
# This file contains the top level CMakeLists.txt logic for the
@@ -29,6 +29,18 @@
# set CMake project name
project(VDS)
+if(NOT BIN_DIR)
+ set(BIN_DIR bin)
+endif(NOT BIN_DIR)
+
+if(NOT INCLUDE_DIR)
+ set(INCLUDE_DIR include)
+endif(NOT INCLUDE_DIR)
+
+if(NOT LIB_DIR)
+ set(LIB_DIR lib)
+endif(NOT LIB_DIR)
+
include(CheckLibraryExists)
CHECK_LIBRARY_EXISTS(m cos "" HAVE_M_LIBRARY)
if(HAVE_M_LIBRARY)
@@ -35,34 +47,7 @@
set(SYS_LIBS ${SYS_LIBS} m)
endif(HAVE_M_LIBRARY)
-set(CORE_SRCS
- build.c
- cluster.c
- dynamic.c
- render.c
- util.c
- file.c
- )
-
-set(STD_SRCS
- stdvds.c
- stdfold.c
- stdvis.c
- )
-
-set(VDS_HDRS
- vds.h
- vdsprivate.h
- path.h
- vector.h
- stdvds.h
- )
-
-## Include -DVDS_DEBUGPRINT for verbose operation.
-## Note that assertions are suppressed when VDS_DEBUGPRINT is not defined
-#add_definitions(-DVDS_DEBUGPRINT)
-
-add_library(libvds SHARED ${CORE_SRCS})
+add_library(libvds SHARED vds.c)
set_target_properties(libvds PROPERTIES VERSION 1.0.1 SOVERSION 1)
if(SYS_LIBS)
target_link_libraries(libvds ${SYS_LIBS})
@@ -75,18 +60,8 @@
LIBRARY DESTINATION ${LIB_DIR}
ARCHIVE DESTINATION ${LIB_DIR})
-add_library(stdvds SHARED ${STD_SRCS})
-set_target_properties(stdvds PROPERTIES VERSION 1.0.1 SOVERSION 1)
-if(SYS_LIBS)
- target_link_libraries(stdvds ${SYS_LIBS})
-endif(SYS_LIBS)
-install(TARGETS stdvds
- RUNTIME DESTINATION ${BIN_DIR}
[brlcad-commits] SF.net SVN: brlcad:[71986] brlcad/trunk
Revision: 71986
http://sourceforge.net/p/brlcad/code/71986
Author: starseeker
Date: 2018-10-17 17:01:19 + (Wed, 17 Oct 2018)
Log Message:
---
keep the clipper header private as a implementation detail - eventually should
wrap in a libbg API.
Modified Paths:
--
brlcad/trunk/include/bg/CMakeLists.txt
brlcad/trunk/src/libbg/CMakeLists.txt
brlcad/trunk/src/libbg/clipper.cxx
brlcad/trunk/src/libged/CMakeLists.txt
brlcad/trunk/src/libged/polyclip.cpp
Added Paths:
---
brlcad/trunk/src/libbg/clipper.hpp
Removed Paths:
-
brlcad/trunk/include/bg/clipper.hpp
Modified: brlcad/trunk/include/bg/CMakeLists.txt
===
--- brlcad/trunk/include/bg/CMakeLists.txt 2018-10-17 15:19:25 UTC (rev
71985)
+++ brlcad/trunk/include/bg/CMakeLists.txt 2018-10-17 17:01:19 UTC (rev
71986)
@@ -1,6 +1,5 @@
set(bg_headers
chull.h
- clipper.hpp
defines.h
obr.h
polygon.h
Deleted: brlcad/trunk/include/bg/clipper.hpp
===
--- brlcad/trunk/include/bg/clipper.hpp 2018-10-17 15:19:25 UTC (rev 71985)
+++ brlcad/trunk/include/bg/clipper.hpp 2018-10-17 17:01:19 UTC (rev 71986)
@@ -1,318 +0,0 @@
-/***
- *
*
- * Author: Angus Johnson
*
- * Version : 4.6
*
- * Date : 29 October 2011
*
- * Website : http://www.angusj.com
*
- * Copyright : Angus Johnson 2010-2011
*
- *
*
- * License:
*
- * Use, modification & distribution is subject to Boost Software License Ver
1. *
- * http://www.boost.org/LICENSE_1_0.txt
*
- *
*
- * Attributions:
*
- * The code in this library is an extension of Bala Vatti's clipping
algorithm: *
- * "A generic solution to polygon clipping"
*
- * Communications of the ACM, Vol 35, Issue 7 (July 1992) pp 56-63.
*
- * http://portal.acm.org/citation.cfm?id=129906
*
- *
*
- * Computer graphics and geometric modeling: implementation and algorithms
*
- * By Max K. Agoston
*
- * Springer; 1 edition (January 4, 2005)
*
- * http://books.google.com/books?q=vatti+clipping+agoston
*
- *
*
- * See also:
*
- * "Polygon Offsetting by Computing Winding Numbers"
*
- * Paper no. DETC2005-85513 pp. 565-575
*
- * ASME 2005 International Design Engineering Technical Conferences
*
- * and Computers and Information in Engineering Conference (IDETC/CIE2005)
*
- * September 24\x9628, 2005 , Long Beach, California, USA
*
- * http://www.me.berkeley.edu/~mcmains/pubs/DAC05OffsetPolygon.pdf
*
- *
*
-
***/
-
-#ifndef clipper_hpp
-#define clipper_hpp
-
-#include "common.h"
-
-extern "C" {
-#include "bg/defines.h"
-}
-
-#include
-#include
-#include
-#include
-#include
-
-
-namespace ClipperLib {
-
-enum ClipType { ctIntersection, ctUnion, ctDifference, ctXor };
-enum PolyType { ptSubject, ptClip };
-//By far the most widely used winding rules for polygon filling are
-//EvenOdd & NonZero (GDI, GDI+, XLib, OpenGL, Cairo, AGG, Quartz, SVG,
Gr32)
-//Others rules include Positive, Negative and ABS_GTR_EQ_TWO (only in
OpenGL)
-//see http://glprogramming.com/red/chapter11.html
-enum PolyFillType { pftEvenOdd, pftNonZero, pftPositive, pftNegative };
-
-typedef signed long long long64;
-typedef unsigned long long ulong64;
-
-struct IntPoint {
- public:
- long64 X;
- long64 Y;
- IntPoint(long64 x = 0, long64 y = 0): X(x), Y(y) {};
- friend std::ostream& operator <<(std::ostream &s, IntPoint &p);
-};
-
-
[brlcad-commits] SF.net SVN: brlcad:[71990] brlcad/trunk
Revision: 71990
http://sourceforge.net/p/brlcad/code/71990
Author: starseeker
Date: 2018-11-05 21:12:10 + (Mon, 05 Nov 2018)
Log Message:
---
Keith fixed a bug where the analyze command was incorrectly calculating the
volume of a BoT
Modified Paths:
--
brlcad/trunk/NEWS
brlcad/trunk/src/librt/primitives/bot/bot.c
Modified: brlcad/trunk/NEWS
===
--- brlcad/trunk/NEWS 2018-10-24 04:37:35 UTC (rev 71989)
+++ brlcad/trunk/NEWS 2018-11-05 21:12:10 UTC (rev 71990)
@@ -13,6 +13,7 @@
--- 201X-XX-XX Release 7.30.0 ---
--
+* fixed analyze command calculation for BoT volumes - Keith Bowman
* fixed dbconcat behavior for binary database objects - Cliff Yapp
--
Modified: brlcad/trunk/src/librt/primitives/bot/bot.c
===
--- brlcad/trunk/src/librt/primitives/bot/bot.c 2018-10-24 04:37:35 UTC (rev
71989)
+++ brlcad/trunk/src/librt/primitives/bot/bot.c 2018-11-05 21:12:10 UTC (rev
71990)
@@ -4783,9 +4783,7 @@
for (face.npts = 0, i = 0; i < bot->num_faces; face.npts = 0, i++) {
int a, b, c;
- vect_t tmp;
-
/* find indices of the 3 vertices that make up this face */
a = bot->faces[i * ELEMENTS_PER_POINT + 0];
b = bot->faces[i * ELEMENTS_PER_POINT + 1];
@@ -4809,17 +4807,14 @@
bg_3d_polygon_sort_ccw(face.npts, face.pts, face.plane_eqn);
bg_3d_polygon_area(&face.area, face.npts, (const point_t *)face.pts);
- /* VOLUME */
- VSCALE(tmp, face.plane_eqn, face.area);
- *volume += fabs(VDOT(face.pts[0], tmp));
if (bot->mode == RT_BOT_PLATE || bot->mode == RT_BOT_PLATE_NOCOS) {
- if (BU_BITTEST(bot->face_mode, i))
- *volume += face.area * bot->thickness[i];
- else
- *volume += face.area * 0.5 * bot->thickness[i];
+ *volume += face.area * bot->thickness[i];
+ } else {
+ /* VOLUME */
+ *volume += VDOT(face.pts[0], face.plane_eqn)*face.area;
}
}
-*volume /= 3.0;
+*volume = fabs(*volume)/3.0;
bu_free((char *)face.pts, "rt_bot_volume: pts");
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71991] brlcad/trunk/CMakeLists.txt
Revision: 71991
http://sourceforge.net/p/brlcad/code/71991
Author: starseeker
Date: 2018-11-08 14:32:14 + (Thu, 08 Nov 2018)
Log Message:
---
Warn if void pointer size is greater than off_t, at least until we have a fix.
Modified Paths:
--
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===
--- brlcad/trunk/CMakeLists.txt 2018-11-05 21:12:10 UTC (rev 71990)
+++ brlcad/trunk/CMakeLists.txt 2018-11-08 14:32:14 UTC (rev 71991)
@@ -2545,6 +2545,13 @@
BRLCAD_TYPE_SIZE("uintptr_t" "")
BRLCAD_TYPE_SIZE("sig_t" "signal.h")
+# If we have an off_t that's too small, we've got a problem
+if (CMAKE_SIZEOF_VOID_P AND HAVE_OFF_T)
+ if (${CMAKE_SIZEOF_VOID_P} GREATER ${HAVE_OFF_T})
+message(WARNING "Platform void pointer size is ${CMAKE_SIZEOF_VOID_P}, but
off_t size is ${HAVE_OFF_T}!")
+ endif (${CMAKE_SIZEOF_VOID_P} GREATER ${HAVE_OFF_T})
+endif (CMAKE_SIZEOF_VOID_P AND HAVE_OFF_T)
+
# see if we have a TLS intrinsic, first check C++11 compliance
check_cxx_source_compiles("static thread_local int i = 0; int main() { return
i; }" HAVE_THREAD_LOCAL)
if (HAVE_THREAD_LOCAL)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71992] brlcad/trunk/src/libgcv/plugins/obj/wfobj
Revision: 71992 http://sourceforge.net/p/brlcad/code/71992 Author: starseeker Date: 2018-11-08 18:47:48 + (Thu, 08 Nov 2018) Log Message: --- Include common.h in the obj files Modified Paths: -- brlcad/trunk/src/libgcv/plugins/obj/wfobj/obj_grammar.yy brlcad/trunk/src/libgcv/plugins/obj/wfobj/obj_parser.h brlcad/trunk/src/libgcv/plugins/obj/wfobj/obj_rules.l Modified: brlcad/trunk/src/libgcv/plugins/obj/wfobj/obj_grammar.yy === --- brlcad/trunk/src/libgcv/plugins/obj/wfobj/obj_grammar.yy2018-11-08 14:32:14 UTC (rev 71991) +++ brlcad/trunk/src/libgcv/plugins/obj/wfobj/obj_grammar.yy2018-11-08 18:47:48 UTC (rev 71992) @@ -38,6 +38,8 @@ * information. */ +#include "common.h" + #include "obj_util.h" #include "obj_parser.h" #include "obj_parser_state.h" Modified: brlcad/trunk/src/libgcv/plugins/obj/wfobj/obj_parser.h === --- brlcad/trunk/src/libgcv/plugins/obj/wfobj/obj_parser.h 2018-11-08 14:32:14 UTC (rev 71991) +++ brlcad/trunk/src/libgcv/plugins/obj/wfobj/obj_parser.h 2018-11-08 18:47:48 UTC (rev 71992) @@ -25,6 +25,8 @@ #ifndef LIBGCV_WFOBJ_OBJ_PARSER_H #define LIBGCV_WFOBJ_OBJ_PARSER_H +#include "common.h" + #include #include #include "obj_util.h" Modified: brlcad/trunk/src/libgcv/plugins/obj/wfobj/obj_rules.l === --- brlcad/trunk/src/libgcv/plugins/obj/wfobj/obj_rules.l 2018-11-08 14:32:14 UTC (rev 71991) +++ brlcad/trunk/src/libgcv/plugins/obj/wfobj/obj_rules.l 2018-11-08 18:47:48 UTC (rev 71992) @@ -16,6 +16,8 @@ * information. */ +#include "common.h" + #include #include #include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[71993] brlcad/trunk
Revision: 71993
http://sourceforge.net/p/brlcad/code/71993
Author: starseeker
Date: 2018-11-08 20:23:59 + (Thu, 08 Nov 2018)
Log Message:
---
Try reversing r71563 and see if we get back large file support in MSVC
Modified Paths:
--
brlcad/trunk/bench/pixcmp.c
brlcad/trunk/include/bu/file.h
brlcad/trunk/src/anim/anim_sort.c
brlcad/trunk/src/conv/asc/asc2g.c
brlcad/trunk/src/conv/dxf/dxf-g.c
brlcad/trunk/src/conv/fast4-g.c
brlcad/trunk/src/conv/g-acad.c
brlcad/trunk/src/conv/iges/findp.c
brlcad/trunk/src/conv/iges/g-iges.c
brlcad/trunk/src/conv/iges/readrec.c
brlcad/trunk/src/conv/iges/recsize.c
brlcad/trunk/src/conv/nastran-g.c
brlcad/trunk/src/conv/vdeck/vdeck.c
brlcad/trunk/src/fbed/char.c
brlcad/trunk/src/lgt/char.c
brlcad/trunk/src/lgt/ir.c
brlcad/trunk/src/lgt/octree.c
brlcad/trunk/src/libbu/file.c
brlcad/trunk/src/libbu/vfont.c
brlcad/trunk/src/libgcv/plugins/fastgen4/fastgen4_read.c
brlcad/trunk/src/libicv/rot.c
brlcad/trunk/src/librt/db5_scan.c
brlcad/trunk/src/librt/db_corrupt.c
brlcad/trunk/src/librt/db_io.c
brlcad/trunk/src/librt/db_scan.c
brlcad/trunk/src/rt/do.c
brlcad/trunk/src/rt/view.c
brlcad/trunk/src/util/ap-pix.c
brlcad/trunk/src/util/bwcrop.c
brlcad/trunk/src/util/bwhisteq.c
brlcad/trunk/src/util/bwrot.c
brlcad/trunk/src/util/bwscale.c
brlcad/trunk/src/util/hex.c
brlcad/trunk/src/util/pixcrop.c
brlcad/trunk/src/util/pixrot.c
brlcad/trunk/src/util/pixscale.c
brlcad/trunk/src/util/plot3rot.c
Modified: brlcad/trunk/bench/pixcmp.c
===
--- brlcad/trunk/bench/pixcmp.c 2018-11-08 18:47:48 UTC (rev 71992)
+++ brlcad/trunk/bench/pixcmp.c 2018-11-08 20:23:59 UTC (rev 71993)
@@ -215,7 +215,7 @@
}
/* skip requested pixels/bytes in FILE1 */
-if (f1_skip && fseek(f1, f1_skip, SEEK_SET)) {
+if (f1_skip && bu_fseek(f1, f1_skip, SEEK_SET)) {
bu_log("ERROR: Unable to seek %zd %s%s in FILE1\n",
f1_skip,
print_bytes?"byte":"pixel",
@@ -225,7 +225,7 @@
}
/* skip requested pixels in FILE2 */
-if (f2_skip && fseek(f2, f2_skip, SEEK_SET)) {
+if (f2_skip && bu_fseek(f2, f2_skip, SEEK_SET)) {
bu_log("ERROR: Unable to seek %zd %s%s in FILE2\n",
f1_skip,
print_bytes?"byte":"pixel",
Modified: brlcad/trunk/include/bu/file.h
===
--- brlcad/trunk/include/bu/file.h 2018-11-08 18:47:48 UTC (rev 71992)
+++ brlcad/trunk/include/bu/file.h 2018-11-08 20:23:59 UTC (rev 71993)
@@ -171,6 +171,11 @@
BU_EXPORT extern char *bu_file_realpath(const char *path, char *resolved_path);
+/** NEW: Do not use. */
+BU_EXPORT extern int bu_fseek(FILE *stream, off_t offset, int origin);
+/** NEW: Do not use. */
+BU_EXPORT extern off_t bu_ftell(FILE *stream);
+
/** @} */
__END_DECLS
Modified: brlcad/trunk/src/anim/anim_sort.c
===
--- brlcad/trunk/src/anim/anim_sort.c 2018-11-08 18:47:48 UTC (rev 71992)
+++ brlcad/trunk/src/anim/anim_sort.c 2018-11-08 20:23:59 UTC (rev 71993)
@@ -100,11 +100,11 @@
}
/* copy any lines preceding the first "start" command */
-last_pos = ftell(stdin);
+last_pos = bu_ftell(stdin);
while (bu_fgets(line, MAXLEN, stdin)!=NULL) {
if (bu_strncmp(line, "start", 5)) {
printf("%s", line);
- last_pos = ftell(stdin);
+ last_pos = bu_ftell(stdin);
} else
break;
}
@@ -134,9 +134,9 @@
number = -1;
success = 0; /* tells whether or not any frames have been found which
have the current frame number*/
if (incremental) {
- fseek(stdin, 0, 0);
+ bu_fseek(stdin, 0, 0);
} else {
- fseek(stdin, last_pos, 0);
+ bu_fseek(stdin, last_pos, 0);
}
reserve = MAXLEN*MAXLINES;
@@ -159,7 +159,7 @@
printf("%s", line);
if (!suppressed) printf("clean;\n");
success = 1;
- last_pos = ftell(stdin);
+ last_pos = bu_ftell(stdin);
}
/* print contents until next "end" */
while (bu_fgets(line, MAXLEN, stdin)!=NULL) {
Modified: brlcad/trunk/src/conv/asc/asc2g.c
===
--- brlcad/trunk/src/conv/asc/asc2g.c 2018-11-08 18:47:48 UTC (rev 71992)
+++ brlcad/trunk/src/conv/asc/asc2g.c 2018-11-08 20:23:59 UTC (rev 71993)
@@ -1049,7 +1049,7 @@
name = bu_strdup(cp);
/* Count up the number of poly data lines which follow */
-startpos = ftell(ifp);
+startpos = bu_ftell(ifp);
for (nlines = 0;; nlines++) {
if (bu_fgets(buf, BUFSIZE, ifp) == NUL
[brlcad-commits] SF.net SVN: brlcad:[71994] brlcad/trunk
Revision: 71994
http://sourceforge.net/p/brlcad/code/71994
Author: starseeker
Date: 2018-11-08 20:56:06 + (Thu, 08 Nov 2018)
Log Message:
---
ftell looks like it may be the more problematic case here - see if we can use
just bu_ftell and go with the define trick for fseek
Modified Paths:
--
brlcad/trunk/bench/pixcmp.c
brlcad/trunk/include/bu/file.h
brlcad/trunk/include/config_win.h.in
brlcad/trunk/src/anim/anim_sort.c
brlcad/trunk/src/conv/asc/asc2g.c
brlcad/trunk/src/conv/dxf/dxf-g.c
brlcad/trunk/src/conv/fast4-g.c
brlcad/trunk/src/conv/g-acad.c
brlcad/trunk/src/conv/iges/findp.c
brlcad/trunk/src/conv/iges/g-iges.c
brlcad/trunk/src/conv/iges/readrec.c
brlcad/trunk/src/conv/iges/recsize.c
brlcad/trunk/src/conv/nastran-g.c
brlcad/trunk/src/conv/vdeck/vdeck.c
brlcad/trunk/src/fbed/char.c
brlcad/trunk/src/lgt/char.c
brlcad/trunk/src/lgt/ir.c
brlcad/trunk/src/lgt/octree.c
brlcad/trunk/src/libbu/file.c
brlcad/trunk/src/libgcv/plugins/fastgen4/fastgen4_read.c
brlcad/trunk/src/libicv/rot.c
brlcad/trunk/src/librt/db_corrupt.c
brlcad/trunk/src/librt/db_io.c
brlcad/trunk/src/librt/db_scan.c
brlcad/trunk/src/librt/primitives/primitive_util.c
brlcad/trunk/src/rt/do.c
brlcad/trunk/src/rt/view.c
brlcad/trunk/src/util/ap-pix.c
brlcad/trunk/src/util/bwcrop.c
brlcad/trunk/src/util/bwhisteq.c
brlcad/trunk/src/util/bwrot.c
brlcad/trunk/src/util/bwscale.c
brlcad/trunk/src/util/hex.c
brlcad/trunk/src/util/pixcrop.c
brlcad/trunk/src/util/pixrot.c
brlcad/trunk/src/util/pixscale.c
Modified: brlcad/trunk/bench/pixcmp.c
===
--- brlcad/trunk/bench/pixcmp.c 2018-11-08 20:23:59 UTC (rev 71993)
+++ brlcad/trunk/bench/pixcmp.c 2018-11-08 20:56:06 UTC (rev 71994)
@@ -215,7 +215,7 @@
}
/* skip requested pixels/bytes in FILE1 */
-if (f1_skip && bu_fseek(f1, f1_skip, SEEK_SET)) {
+if (f1_skip && fseek(f1, f1_skip, SEEK_SET)) {
bu_log("ERROR: Unable to seek %zd %s%s in FILE1\n",
f1_skip,
print_bytes?"byte":"pixel",
@@ -225,7 +225,7 @@
}
/* skip requested pixels in FILE2 */
-if (f2_skip && bu_fseek(f2, f2_skip, SEEK_SET)) {
+if (f2_skip && fseek(f2, f2_skip, SEEK_SET)) {
bu_log("ERROR: Unable to seek %zd %s%s in FILE2\n",
f1_skip,
print_bytes?"byte":"pixel",
Modified: brlcad/trunk/include/bu/file.h
===
--- brlcad/trunk/include/bu/file.h 2018-11-08 20:23:59 UTC (rev 71993)
+++ brlcad/trunk/include/bu/file.h 2018-11-08 20:56:06 UTC (rev 71994)
@@ -171,9 +171,12 @@
BU_EXPORT extern char *bu_file_realpath(const char *path, char *resolved_path);
-/** NEW: Do not use. */
-BU_EXPORT extern int bu_fseek(FILE *stream, off_t offset, int origin);
-/** NEW: Do not use. */
+/**
+ * This wrapper appears to be necessary (at least on Visual Studio) to handle
+ * situations where 32 and 64 bit versions of this function have different
+ * function signatures (a simple define of the 32 bit version to the 64 bit
+ * version will produce compile errors.)
+ */
BU_EXPORT extern off_t bu_ftell(FILE *stream);
/** @} */
Modified: brlcad/trunk/include/config_win.h.in
===
--- brlcad/trunk/include/config_win.h.in2018-11-08 20:23:59 UTC (rev
71993)
+++ brlcad/trunk/include/config_win.h.in2018-11-08 20:56:06 UTC (rev
71994)
@@ -212,6 +212,13 @@
# define lseek _lseek
#endif
+/* set up fseek */
+#if defined(SIZEOF_VOID_P) && SIZEOF_VOID_P == 8
+# define fseek _fseeki64
+#else
+# define fseek _fseek
+#endif
+
#cmakedefine fmax __max
#define ioctl ioctlsocket
Modified: brlcad/trunk/src/anim/anim_sort.c
===
--- brlcad/trunk/src/anim/anim_sort.c 2018-11-08 20:23:59 UTC (rev 71993)
+++ brlcad/trunk/src/anim/anim_sort.c 2018-11-08 20:56:06 UTC (rev 71994)
@@ -134,9 +134,9 @@
number = -1;
success = 0; /* tells whether or not any frames have been found which
have the current frame number*/
if (incremental) {
- bu_fseek(stdin, 0, 0);
+ fseek(stdin, 0, 0);
} else {
- bu_fseek(stdin, last_pos, 0);
+ fseek(stdin, last_pos, 0);
}
reserve = MAXLEN*MAXLINES;
Modified: brlcad/trunk/src/conv/asc/asc2g.c
===
--- brlcad/trunk/src/conv/asc/asc2g.c 2018-11-08 20:23:59 UTC (rev 71993)
+++ brlcad/trunk/src/conv/asc/asc2g.c 2018-11-08 20:56:06 UTC (rev 71994)
@@ -1065,7 +1065,7 @@
pg->max_npts = 0;
/* Return to first 'Q' record */
-bu_fseek(ifp, startpos, 0);
+fseek(ifp, startpos, 0);
for (nlines = 0; nlines <
[brlcad-commits] SF.net SVN: brlcad:[71995] brlcad/trunk/src/mged/mged.c
Revision: 71995
http://sourceforge.net/p/brlcad/code/71995
Author: starseeker
Date: 2018-11-08 21:02:50 + (Thu, 08 Nov 2018)
Log Message:
---
Build fix for MSVC
Modified Paths:
--
brlcad/trunk/src/mged/mged.c
Modified: brlcad/trunk/src/mged/mged.c
===
--- brlcad/trunk/src/mged/mged.c2018-11-08 20:56:06 UTC (rev 71994)
+++ brlcad/trunk/src/mged/mged.c2018-11-08 21:02:50 UTC (rev 71995)
@@ -1138,6 +1138,10 @@
/* if there is more than a file name remaining, mged is not interactive
*/
interactive = 0;
} else {
+#if defined(_WIN32) && !defined(CYGWIN)
+ if(!isatty(fileno(stdin)) || !isatty(fileno(stdout)))
+ interactive = 0;
+#else
struct timeval timeout;
/* wait 1/10sec for input, in case we're piped */
@@ -1196,7 +1200,7 @@
}
} /* read_set */
-
+#endif
} /* argc > 1 */
if (bu_debug > 0)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71996] brlcad/trunk
Revision: 71996
http://sourceforge.net/p/brlcad/code/71996
Author: starseeker
Date: 2018-11-08 21:11:26 + (Thu, 08 Nov 2018)
Log Message:
---
Nope - second parameter of 64 bit fseek function also causes MSVC problems.
Modified Paths:
--
brlcad/trunk/bench/pixcmp.c
brlcad/trunk/include/bu/file.h
brlcad/trunk/include/config_win.h.in
brlcad/trunk/src/anim/anim_sort.c
brlcad/trunk/src/conv/asc/asc2g.c
brlcad/trunk/src/conv/dxf/dxf-g.c
brlcad/trunk/src/conv/fast4-g.c
brlcad/trunk/src/conv/g-acad.c
brlcad/trunk/src/conv/iges/findp.c
brlcad/trunk/src/conv/iges/g-iges.c
brlcad/trunk/src/conv/iges/readrec.c
brlcad/trunk/src/conv/iges/recsize.c
brlcad/trunk/src/conv/nastran-g.c
brlcad/trunk/src/conv/vdeck/vdeck.c
brlcad/trunk/src/fbed/char.c
brlcad/trunk/src/lgt/char.c
brlcad/trunk/src/lgt/ir.c
brlcad/trunk/src/lgt/octree.c
brlcad/trunk/src/libbu/file.c
brlcad/trunk/src/libgcv/plugins/fastgen4/fastgen4_read.c
brlcad/trunk/src/libicv/rot.c
brlcad/trunk/src/librt/db_corrupt.c
brlcad/trunk/src/librt/db_io.c
brlcad/trunk/src/librt/db_scan.c
brlcad/trunk/src/rt/do.c
brlcad/trunk/src/rt/view.c
brlcad/trunk/src/util/ap-pix.c
brlcad/trunk/src/util/bwcrop.c
brlcad/trunk/src/util/bwhisteq.c
brlcad/trunk/src/util/bwrot.c
brlcad/trunk/src/util/bwscale.c
brlcad/trunk/src/util/hex.c
brlcad/trunk/src/util/pixcrop.c
brlcad/trunk/src/util/pixrot.c
brlcad/trunk/src/util/pixscale.c
Modified: brlcad/trunk/bench/pixcmp.c
===
--- brlcad/trunk/bench/pixcmp.c 2018-11-08 21:02:50 UTC (rev 71995)
+++ brlcad/trunk/bench/pixcmp.c 2018-11-08 21:11:26 UTC (rev 71996)
@@ -215,7 +215,7 @@
}
/* skip requested pixels/bytes in FILE1 */
-if (f1_skip && fseek(f1, f1_skip, SEEK_SET)) {
+if (f1_skip && bu_fseek(f1, f1_skip, SEEK_SET)) {
bu_log("ERROR: Unable to seek %zd %s%s in FILE1\n",
f1_skip,
print_bytes?"byte":"pixel",
@@ -225,7 +225,7 @@
}
/* skip requested pixels in FILE2 */
-if (f2_skip && fseek(f2, f2_skip, SEEK_SET)) {
+if (f2_skip && bu_fseek(f2, f2_skip, SEEK_SET)) {
bu_log("ERROR: Unable to seek %zd %s%s in FILE2\n",
f1_skip,
print_bytes?"byte":"pixel",
Modified: brlcad/trunk/include/bu/file.h
===
--- brlcad/trunk/include/bu/file.h 2018-11-08 21:02:50 UTC (rev 71995)
+++ brlcad/trunk/include/bu/file.h 2018-11-08 21:11:26 UTC (rev 71996)
@@ -177,6 +177,14 @@
* function signatures (a simple define of the 32 bit version to the 64 bit
* version will produce compile errors.)
*/
+BU_EXPORT extern int bu_fseek(FILE *stream, off_t offset, int origin);
+
+/**
+ * This wrapper appears to be necessary (at least on Visual Studio) to handle
+ * situations where 32 and 64 bit versions of this function have different
+ * function signatures (a simple define of the 32 bit version to the 64 bit
+ * version will produce compile errors.)
+ */
BU_EXPORT extern off_t bu_ftell(FILE *stream);
/** @} */
Modified: brlcad/trunk/include/config_win.h.in
===
--- brlcad/trunk/include/config_win.h.in2018-11-08 21:02:50 UTC (rev
71995)
+++ brlcad/trunk/include/config_win.h.in2018-11-08 21:11:26 UTC (rev
71996)
@@ -212,13 +212,6 @@
# define lseek _lseek
#endif
-/* set up fseek */
-#if defined(SIZEOF_VOID_P) && SIZEOF_VOID_P == 8
-# define fseek _fseeki64
-#else
-# define fseek _fseek
-#endif
-
#cmakedefine fmax __max
#define ioctl ioctlsocket
Modified: brlcad/trunk/src/anim/anim_sort.c
===
--- brlcad/trunk/src/anim/anim_sort.c 2018-11-08 21:02:50 UTC (rev 71995)
+++ brlcad/trunk/src/anim/anim_sort.c 2018-11-08 21:11:26 UTC (rev 71996)
@@ -134,9 +134,9 @@
number = -1;
success = 0; /* tells whether or not any frames have been found which
have the current frame number*/
if (incremental) {
- fseek(stdin, 0, 0);
+ bu_fseek(stdin, 0, 0);
} else {
- fseek(stdin, last_pos, 0);
+ bu_fseek(stdin, last_pos, 0);
}
reserve = MAXLEN*MAXLINES;
Modified: brlcad/trunk/src/conv/asc/asc2g.c
===
--- brlcad/trunk/src/conv/asc/asc2g.c 2018-11-08 21:02:50 UTC (rev 71995)
+++ brlcad/trunk/src/conv/asc/asc2g.c 2018-11-08 21:11:26 UTC (rev 71996)
@@ -1065,7 +1065,7 @@
pg->max_npts = 0;
/* Return to first 'Q' record */
-fseek(ifp, startpos, 0);
+bu_fseek(ifp, startpos, 0);
for (nlines = 0; nlines < pg->npoly; nlines++) {
struct rt_pg_face_internal *fp = &pg->poly[nlines];
Modified: brlcad/trunk/src/conv/dxf
[brlcad-commits] SF.net SVN: brlcad:[71997] brlcad/trunk
Revision: 71997
http://sourceforge.net/p/brlcad/code/71997
Author: starseeker
Date: 2018-11-08 21:18:49 + (Thu, 08 Nov 2018)
Log Message:
---
Go with a slightly fancier off_t detection + redefinition
Modified Paths:
--
brlcad/trunk/CMakeLists.txt
brlcad/trunk/include/common.h
brlcad/trunk/include/config_win.h.in
Modified: brlcad/trunk/CMakeLists.txt
===
--- brlcad/trunk/CMakeLists.txt 2018-11-08 21:11:26 UTC (rev 71996)
+++ brlcad/trunk/CMakeLists.txt 2018-11-08 21:18:49 UTC (rev 71997)
@@ -2545,10 +2545,15 @@
BRLCAD_TYPE_SIZE("uintptr_t" "")
BRLCAD_TYPE_SIZE("sig_t" "signal.h")
-# If we have an off_t that's too small, we've got a problem
+# If we have an off_t that's too small, we'll need to deal with that in order
to
+# support large files successfully.
if (CMAKE_SIZEOF_VOID_P AND HAVE_OFF_T)
if (${CMAKE_SIZEOF_VOID_P} GREATER ${HAVE_OFF_T})
-message(WARNING "Platform void pointer size is ${CMAKE_SIZEOF_VOID_P}, but
off_t size is ${HAVE_OFF_T}!")
+if (NOT DEFINED OFF_T_SIZE_MISMATCH)
+ message("Note: platform void pointer size (${CMAKE_SIZEOF_VOID_P}) is
greater than off_t size (${HAVE_OFF_T})")
+endif (NOT DEFINED OFF_T_SIZE_MISMATCH)
+CONFIG_H_APPEND(BRLCAD "#define OFF_T_SIZE_MISMATCH 1\n")
+set(OFF_T_SIZE_MISMATCH 1 CACHE INTERNAL "Have off_t that is too small
for platform.")
endif (${CMAKE_SIZEOF_VOID_P} GREATER ${HAVE_OFF_T})
endif (CMAKE_SIZEOF_VOID_P AND HAVE_OFF_T)
Modified: brlcad/trunk/include/common.h
===
--- brlcad/trunk/include/common.h 2018-11-08 21:11:26 UTC (rev 71996)
+++ brlcad/trunk/include/common.h 2018-11-08 21:18:49 UTC (rev 71997)
@@ -155,6 +155,22 @@
# define FMIN(a, b) (((a)<(b))?(a):(b))
#endif
+/* If we've got the wrong off_t size, do something about it (*before*
+ we include sys/types.h, which can hold the incorrect definition.)
+ Also set any other related defines that might be needed. */
+#if defined(OFF_T_SIZE_MISMATCH)
+/*# pragma message("Fixing off_t definition")*/
+# ifdef off_t
+#undef off_t
+# endif
+typedef ptrdiff_t off_t;
+# ifdef _off_t
+#undef _off_t
+# endif
+typedef ptrdiff_t _off_t;
+# define _OFF_T_DEFINED
+#endif
+
/**
* C99 does not provide a ssize_t even though it is provided by SUS97.
* regardless, we use it so make sure it's declared by using the
Modified: brlcad/trunk/include/config_win.h.in
===
--- brlcad/trunk/include/config_win.h.in2018-11-08 21:11:26 UTC (rev
71996)
+++ brlcad/trunk/include/config_win.h.in2018-11-08 21:18:49 UTC (rev
71997)
@@ -227,8 +227,6 @@
* types
*/
-#define off_t ptrdiff_t
-
typedef int pid_t;
typedef int socklen_t;
typedef unsigned int gid_t;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[71999] brlcad/trunk/src/librt/primitives/brep/brep.cpp
Revision: 71999
http://sourceforge.net/p/brlcad/code/71999
Author: starseeker
Date: 2018-11-09 17:21:36 + (Fri, 09 Nov 2018)
Log Message:
---
Start experimenting with turning NURBS brep raytrace debugging with an
environment variable, so we can flip this on and off at need rather than
needing to recompile.
Modified Paths:
--
brlcad/trunk/src/librt/primitives/brep/brep.cpp
Modified: brlcad/trunk/src/librt/primitives/brep/brep.cpp
===
--- brlcad/trunk/src/librt/primitives/brep/brep.cpp 2018-11-09 01:48:23 UTC
(rev 71998)
+++ brlcad/trunk/src/librt/primitives/brep/brep.cpp 2018-11-09 17:21:36 UTC
(rev 71999)
@@ -44,6 +44,7 @@
#include "vmath.h"
#include "bu/cv.h"
+#include "bu/opt.h"
#include "bu/time.h"
#include "brep.h"
#include "bn/dvec.h"
@@ -143,9 +144,21 @@
bool
brep_pt_trimmed(pt2d_t pt, const ON_BrepFace& face)
{
+int debug_output = 0;
bool retVal = false;
-TRACE1("brep_pt_trimmed: " << PT2(pt));
+/* If we've got debugging set in the environment, grab the value */
+if (getenv("LIBRT_BREP_DEBUG")) {
+ char *envstr = getenv("LIBRT_BREP_DEBUG");
+ if (bu_opt_int(NULL, 1, (const char **)&envstr, (void *)&debug_output)
== -1) {
+ debug_output = 0;
+ }
+}
+
+if (debug_output > 1) {
+ std::cerr << "brep_pt_trimmed: " << PT2(pt) << std::endl;
+}
+
// for each loop
const ON_Surface* surf = face.SurfaceOf();
double umin, umax;
@@ -455,9 +468,21 @@
int
rt_brep_prep(struct soltab *stp, struct rt_db_internal* ip, struct rt_i* rtip)
{
-//int64_t start;
+int debug_output = 0;
+int64_t start = 0;
-TRACE1("rt_brep_prep");
+/* If we've got debugging set in the environment, grab the value */
+if (getenv("LIBRT_BREP_DEBUG")) {
+ char *envstr = getenv("LIBRT_BREP_DEBUG");
+ if (bu_opt_int(NULL, 1, (const char **)&envstr, (void *)&debug_output)
== -1) {
+ debug_output = 0;
+ }
+}
+
+if (debug_output > 1) {
+ std::cerr << "rt_brep_prep" << std::endl;
+}
+
/* This prepares the NURBS specific data structures to be used
* during intersection... i.e. acceleration data structures and
* whatever else is needed.
@@ -479,12 +504,17 @@
/* The workhorse routines of BREP prep are called by brep_build_bvh
*/
-//start = bu_gettime();
+if (debug_output > 1) {
+ start = bu_gettime();
+}
if (brep_build_bvh(bs) < 0) {
return -1;
}
-//bu_log("!!! BUILD BVH: %.2f sec\n", (bu_gettime() - start) / 100.0);
+if (debug_output > 1) {
+ bu_log("rt_brep_prep BVH BUILD: %.2f sec\n", (bu_gettime() - start) /
100.0);
+}
+
/* Once a proper SurfaceTree is built, finalize the bounding
* volumes. This takes no time. */
bs->bvh->GetBBox(stp->st_min, stp->st_max);
@@ -944,6 +974,17 @@
ON_wString curveinfo;
ON_TextLog log(curveinfo);
+/* If we've got debugging set in the environment, grab the value */
+int debug_output = 0;
+if (getenv("LIBRT_BREP_DEBUG")) {
+ char *envstr = getenv("LIBRT_BREP_DEBUG");
+ if (bu_opt_int(NULL, 1, (const char **)&envstr, (void *)&debug_output)
== -1) {
+ debug_output = 0;
+ }
+}
+
+
+
if (!approximationsInit) {
approximationsInit = true;
for (int i = 0; i < MAX_CURVES; i++) {
@@ -958,7 +999,9 @@
if (surf == NULL) {
return false;
}
-TRACE1("utah_isTrimmed: " << uv);
+if (debug_output > 1) {
+ std::cerr << "utah_isTrimmed: " << uv << std::endl;
+}
// for each loop
for (int li = 0; li < face->LoopCount(); li++) {
ON_BrepLoop* loop = face->Loop(li);
@@ -1051,6 +1094,7 @@
int
utah_brep_intersect(const BBNode* sbv, const ON_BrepFace* face, const
ON_Surface* surf, pt2d_t& uv, const ON_Ray& ray, HitList& hits)
{
+int debug_output = 0;
ON_3dVector N[MAX_BREP_SUBDIVISION_INTERSECTS];
double t[MAX_BREP_SUBDIVISION_INTERSECTS];
ON_2dPoint ouv[MAX_BREP_SUBDIVISION_INTERSECTS];
@@ -1060,6 +1104,18 @@
double grazing_float = sbv->m_normal * ray.m_dir;
+/* If we've got debugging set in the environment, grab the value */
+if (getenv("LIBRT_BREP_DEBUG")) {
+ char *envstr = getenv("LIBRT_BREP_DEBUG");
+ if (bu_opt_int(NULL, 1, (const char **)&envstr, (void *)&debug_output)
== -1) {
+ debug_output = 0;
+ }
+}
+
+if (debug_output) {
+ bu_log("\nutah_brep_intersect: face (m_face_index): %d\n",
face->m_face_index);
+}
+
if (fabs(grazing_float) < 0.2) {
numhits = utah_newton_4corner_solver(sbv, surf, ray, ouv, t, N,
converged, 1);
} else {
@@ -1067,6 +1123,11 @@
}
if (converged) {
+
+ if (debug_output) {
+ bu_log("\nutah_brep_intersect(%d): %d hits\n", face->m_face_index,
numhits);
+ }
+
[brlcad-commits] SF.net SVN: brlcad:[72000] brlcad/trunk/src/librt/primitives/brep/brep.cpp
Revision: 72000
http://sourceforge.net/p/brlcad/code/72000
Author: starseeker
Date: 2018-11-09 21:10:27 + (Fri, 09 Nov 2018)
Log Message:
---
refactor the debug printing some more
Modified Paths:
--
brlcad/trunk/src/librt/primitives/brep/brep.cpp
Modified: brlcad/trunk/src/librt/primitives/brep/brep.cpp
===
--- brlcad/trunk/src/librt/primitives/brep/brep.cpp 2018-11-09 17:21:36 UTC
(rev 71999)
+++ brlcad/trunk/src/librt/primitives/brep/brep.cpp 2018-11-09 21:10:27 UTC
(rev 72000)
@@ -110,6 +110,142 @@
using namespace brlcad;
+int brep_debug()
+{
+int debug_output = 0;
+/* If we've got debugging set in the environment, grab the value */
+if (getenv("BREP_DEBUG")) {
+ char *envstr = getenv("BREP_DEBUG");
+ if (bu_opt_int(NULL, 1, (const char **)&envstr, (void *)&debug_output)
== -1) {
+ return 0;
+ }
+}
+return debug_output;
+}
+
+
+class brep_hit
+{
+public:
+
+enum hit_type {
+ CLEAN_HIT,
+ CLEAN_MISS,
+ NEAR_HIT,
+ NEAR_MISS,
+ CRACK_HIT //applied to first point of two near_miss points with same
normal direction, second point removed
+};
+enum hit_direction {
+ ENTERING,
+ LEAVING
+};
+
+const ON_BrepFace& face;
+fastf_t dist;
+point_t origin;
+point_t point;
+vect_t normal;
+pt2d_t uv;
+bool trimmed;
+bool closeToEdge;
+bool oob;
+enum hit_type hit;
+enum hit_direction direction;
+int m_adj_face_index;
+// XXX - calculate the dot of the dir with the normal here!
+const BBNode *sbv;
+
+brep_hit(const ON_BrepFace& f, const ON_Ray& ray, const point_t p, const
vect_t n, const pt2d_t _uv)
+ : face(f), trimmed(false), closeToEdge(false), oob(false),
hit(CLEAN_HIT), direction(ENTERING), m_adj_face_index(0), sbv(NULL)
+{
+ vect_t dir;
+ VMOVE(origin, ray.m_origin);
+ VMOVE(point, p);
+ VMOVE(normal, n);
+ VSUB2(dir, point, origin);
+ dist = VDOT(ray.m_dir, dir);
+ move(uv, _uv);
+}
+
+brep_hit(const ON_BrepFace& f, fastf_t d, const ON_Ray& ray, const point_t
p, const vect_t n, const pt2d_t _uv)
+ : face(f), dist(d), trimmed(false), closeToEdge(false), oob(false),
hit(CLEAN_HIT), direction(ENTERING), m_adj_face_index(0), sbv(NULL)
+{
+ VMOVE(origin, ray.m_origin);
+ VMOVE(point, p);
+ VMOVE(normal, n);
+ move(uv, _uv);
+}
+
+brep_hit(const brep_hit& h)
+ : face(h.face), dist(h.dist), trimmed(h.trimmed),
closeToEdge(h.closeToEdge), oob(h.oob), hit(h.hit), direction(h.direction),
m_adj_face_index(h.m_adj_face_index), sbv(h.sbv)
+{
+ VMOVE(origin, h.origin);
+ VMOVE(point, h.point);
+ VMOVE(normal, h.normal);
+ move(uv, h.uv);
+
+}
+
+brep_hit& operator=(const brep_hit& h)
+{
+ const_cast(face) = h.face;
+ dist = h.dist;
+ VMOVE(origin, h.origin);
+ VMOVE(point, h.point);
+ VMOVE(normal, h.normal);
+ move(uv, h.uv);
+ trimmed = h.trimmed;
+ closeToEdge = h.closeToEdge;
+ oob = h.oob;
+ sbv = h.sbv;
+ hit = h.hit;
+ direction = h.direction;
+ m_adj_face_index = h.m_adj_face_index;
+
+ return *this;
+}
+
+bool operator==(const brep_hit& h) const
+{
+ return NEAR_ZERO(dist - h.dist, BREP_SAME_POINT_TOLERANCE);
+}
+
+bool operator<(const brep_hit& h) const
+{
+ return dist < h.dist;
+}
+};
+
+
+void log_hits(std::list &hits, int UNUSED(verbosity))
+{
+struct bu_vls logstr = BU_VLS_INIT_ZERO;
+bu_vls_sprintf(&logstr, "\nKey: _CRACK_ = CRACK_HIT; _CH_ = CLEAN_HIT;
_NH_ = NEAR_HIT; _NM_ = NEAR_MISS\n");
+bu_vls_printf(&logstr, " {...} = data for 1 hit pnt; + = ENTERING; -
= LEAVING; (#) = m_face_index\n");
+bu_vls_printf(&logstr, " ; <#> = distance from previous point; [#] =
face reversed\n\n");
+for (std::list::iterator i = hits.begin(); i != hits.end(); ++i)
{
+ point_t prev;
+
+ const brep_hit &out = *i;
+
+ if (i != hits.begin()) {
+ bu_vls_printf(&logstr, "<%g>", DIST_PT_PT(out.point, prev));
+ }
+ bu_vls_printf(&logstr,"{");
+ if (out.hit == brep_hit::CRACK_HIT)
bu_vls_printf(&logstr,"_CRACK_(%d)", out.face.m_face_index);
+ if (out.hit == brep_hit::CLEAN_HIT) bu_vls_printf(&logstr,"_CH_(%d)",
out.face.m_face_index);
+ if (out.hit == brep_hit::NEAR_HIT) bu_vls_printf(&logstr,"_NH_(%d)",
out.face.m_face_index);
+ if (out.hit == brep_hit::NEAR_MISS) bu_vls_printf(&logstr,"_NM_(%d)",
out.face.m_face_index);
+ if (out.direction == brep_hit::ENTERING) bu_vls_printf(&logstr,"+");
+ if (out.direction == brep_hit::LEAVING) bu_vls_printf(&logstr,"-");
+ bu_vls_printf(&logstr,"[%d]", out.sbv->get_face().m_bRev);
+ bu_vls_printf(&logstr,"}");
[brlcad-commits] SF.net SVN: brlcad:[72001] brlcad/trunk/src/librt/primitives/brep/brep.cpp
Revision: 72001
http://sourceforge.net/p/brlcad/code/72001
Author: starseeker
Date: 2018-11-09 21:20:43 + (Fri, 09 Nov 2018)
Log Message:
---
This is a dangerous change, and will need extensive testing, but getting a case
where the near miss resolving logic is ending up with a single near-miss point
surviving in the middle of the hit points along a ray. Need to get a better
sense of why this is happening, but an immediately obvious thing to do is be
more agressive about stripping out a NM point when we have an odd point count.
I suspect there are other dragons lurking here - this may be part of the
problem we sometimes have with odd results along grazing tangent rays, for
example - and we may need something more generally sophisticated here that
factors in matters such as angles between hit normals and ray directions when
voting which points to keep or ignore.
Modified Paths:
--
brlcad/trunk/src/librt/primitives/brep/brep.cpp
Modified: brlcad/trunk/src/librt/primitives/brep/brep.cpp
===
--- brlcad/trunk/src/librt/primitives/brep/brep.cpp 2018-11-09 21:10:27 UTC
(rev 72000)
+++ brlcad/trunk/src/librt/primitives/brep/brep.cpp 2018-11-09 21:20:43 UTC
(rev 72001)
@@ -1468,7 +1468,7 @@
}
/* If we've got an odd number of hits, try tossing out a near-miss hit.
Try the last and first
-* hits. */
+* hits first, and if neither of those qualify see if there's an
interior hit. */
if (!hits.empty() && ((hits.size() % 2) != 0)) {
const brep_hit &curr_hit = hits.back();
@@ -1478,9 +1478,12 @@
}
if (!hits.empty() && ((hits.size() % 2) != 0)) {
- const brep_hit &curr_hit = hits.front();
- if (curr_hit.hit == brep_hit::NEAR_MISS) {
- hits.pop_front();
+ for (std::list::iterator i = hits.begin(); i !=
hits.end(); ++i) {
+ const brep_hit &h = *i;
+ if (h.hit == brep_hit::NEAR_MISS) {
+ hits.erase(i);
+ break;
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[72003] brlcad/trunk/src/librt/primitives/brep/brep.cpp
Revision: 72003
http://sourceforge.net/p/brlcad/code/72003
Author: starseeker
Date: 2018-11-13 16:57:37 + (Tue, 13 Nov 2018)
Log Message:
---
Checkpoint - back out previous removal of near miss interior point in odd hit
count - that would work for some cases but not others. The correct fix looks
like it needs to happen elsewhere.
Modified Paths:
--
brlcad/trunk/src/librt/primitives/brep/brep.cpp
Modified: brlcad/trunk/src/librt/primitives/brep/brep.cpp
===
--- brlcad/trunk/src/librt/primitives/brep/brep.cpp 2018-11-13 04:03:16 UTC
(rev 72002)
+++ brlcad/trunk/src/librt/primitives/brep/brep.cpp 2018-11-13 16:57:37 UTC
(rev 72003)
@@ -110,15 +110,28 @@
using namespace brlcad;
-int brep_debug()
+int brep_debug(const char *objname)
{
-int debug_output = 0;
+static int debug_output = 0; // TODO - understand how we can/can't use
static vars for this...
/* If we've got debugging set in the environment, grab the value */
-if (getenv("BREP_DEBUG")) {
- char *envstr = getenv("BREP_DEBUG");
+if (getenv("LIBRT_BREP_DEBUG")) {
+ // TODO - cache previous value of env var in a static buffer so we can
skip
+ // doing anything if things haven't changed
+ char *envstr = getenv("LIBRT_BREP_DEBUG");
if (bu_opt_int(NULL, 1, (const char **)&envstr, (void *)&debug_output)
== -1) {
+ /* If we don't have a number, check if the value matches the
objname.
+* If it does, enable all possible debug output only when shooting
+* this object.
+* TODO - add support for specifying name and verbosity levels
+* TODO - add support for specifying a specific ray or range of
+* rays via the environment variable as well. TODO - can we
set/clear
+* static variables in brep_debug so we don't have to do string
+* ops every time? */
+ if (BU_STR_EQUAL(objname, envstr)) return INT_MAX;
return 0;
}
+} else {
+ debug_output = 0;
}
return debug_output;
}
@@ -216,6 +229,21 @@
}
};
+const char *brep_hit_type_str(int hit)
+{
+static const char *terr = "!!ERROR!!";
+static const char *clean_hit = "_CH_";
+static const char *clean_miss = "_MISS_";
+static const char *near_hit = "_NH_";
+static const char *near_miss = "_NM_";
+static const char *crack_hit = "_CRACK_";
+if (hit == brep_hit::CLEAN_HIT) return clean_hit;
+if (hit == brep_hit::CLEAN_MISS) return clean_miss;
+if (hit == brep_hit::CRACK_HIT) return crack_hit;
+if (hit == brep_hit::NEAR_HIT) return near_hit;
+if (hit == brep_hit::NEAR_MISS) return near_miss;
+return terr;
+}
void log_hits(std::list &hits, int UNUSED(verbosity))
{
@@ -222,7 +250,8 @@
struct bu_vls logstr = BU_VLS_INIT_ZERO;
bu_vls_sprintf(&logstr, "\nKey: _CRACK_ = CRACK_HIT; _CH_ = CLEAN_HIT;
_NH_ = NEAR_HIT; _NM_ = NEAR_MISS\n");
bu_vls_printf(&logstr, " {...} = data for 1 hit pnt; + = ENTERING; -
= LEAVING; (#) = m_face_index\n");
-bu_vls_printf(&logstr, " ; <#> = distance from previous point; [#] =
face reversed\n\n");
+bu_vls_printf(&logstr, " [1] = face reversed (m_bRev true); [0] =
face not reversed (m_bRev false)\n");
+bu_vls_printf(&logstr, " <#> = distance from previous point to next
hit point\n\n");
for (std::list::iterator i = hits.begin(); i != hits.end(); ++i)
{
point_t prev;
@@ -232,10 +261,7 @@
bu_vls_printf(&logstr, "<%g>", DIST_PT_PT(out.point, prev));
}
bu_vls_printf(&logstr,"{");
- if (out.hit == brep_hit::CRACK_HIT)
bu_vls_printf(&logstr,"_CRACK_(%d)", out.face.m_face_index);
- if (out.hit == brep_hit::CLEAN_HIT) bu_vls_printf(&logstr,"_CH_(%d)",
out.face.m_face_index);
- if (out.hit == brep_hit::NEAR_HIT) bu_vls_printf(&logstr,"_NH_(%d)",
out.face.m_face_index);
- if (out.hit == brep_hit::NEAR_MISS) bu_vls_printf(&logstr,"_NM_(%d)",
out.face.m_face_index);
+ bu_vls_printf(&logstr,"%s(%d)", brep_hit_type_str((int)out.hit),
out.face.m_face_index);
if (out.direction == brep_hit::ENTERING) bu_vls_printf(&logstr,"+");
if (out.direction == brep_hit::LEAVING) bu_vls_printf(&logstr,"-");
bu_vls_printf(&logstr,"[%d]", out.sbv->get_face().m_bRev);
@@ -244,7 +270,7 @@
}
bu_log("%s\n", bu_vls_addr(&logstr));
bu_vls_free(&logstr);
-}
+}
ON_Ray toXRay(const struct xray* rp)
{
@@ -1134,7 +1160,6 @@
int
utah_brep_intersect(const BBNode* sbv, const ON_BrepFace* face, const
ON_Surface* surf, pt2d_t& uv, const ON_Ray& ray, std::list& hits)
{
-int debug_output = 0;
ON_3dVector N[MAX_BREP_SUBDIVISION_INTERSECTS];
double t[MAX_BREP_SUBDIVISION_INTERSECTS];
ON_2dPoint ouv[MAX_BREP_SUBDIVISION_INTERSECTS];
@@ -1144,18 +1169,6 @@
double
[brlcad-commits] SF.net SVN: brlcad:[72004] brlcad/trunk/src/librt/primitives/brep/brep.cpp
Revision: 72004
http://sourceforge.net/p/brlcad/code/72004
Author: starseeker
Date: 2018-11-13 19:24:36 + (Tue, 13 Nov 2018)
Log Message:
---
Kicked this around with Keith trying to come up with a fix that is minimally
invasive as far as disturbing other parts of this logic - this seems to do the
job.
Modified Paths:
--
brlcad/trunk/src/librt/primitives/brep/brep.cpp
Modified: brlcad/trunk/src/librt/primitives/brep/brep.cpp
===
--- brlcad/trunk/src/librt/primitives/brep/brep.cpp 2018-11-13 16:57:37 UTC
(rev 72003)
+++ brlcad/trunk/src/librt/primitives/brep/brep.cpp 2018-11-13 19:24:36 UTC
(rev 72004)
@@ -1189,7 +1189,7 @@
_pt = ray.m_origin + (ray.m_dir * t[i]);
VMOVE(vpt, _pt);
if (face->m_bRev) {
- bu_log("Reversing normal for Face:%d\n",
face->m_face_index);
+ //bu_log("Reversing normal for Face:%d\n",
face->m_face_index);
_norm.Reverse();
}
VMOVE(vnorm, _norm);
@@ -1457,6 +1457,23 @@
}
}
}
+ } else {
+ prev = curr;
+ prev--;
+ brep_hit &prev_hit = (*prev);
+ if ((curr_hit.hit == brep_hit::CLEAN_HIT || curr_hit.hit ==
brep_hit::NEAR_HIT) && prev_hit.hit == brep_hit::NEAR_MISS) {
+ if (curr_hit.direction == brep_hit::ENTERING) {
+ if (debug_output > 2) {
+ bu_log("Removing only remaining near miss (face
%d)\n", prev_hit.face.m_face_index);
+ }
+ (void)hits.erase(prev);
+ } else {
+ if (debug_output) {
+ bu_log("Clean hit is an exit, but we have an
unculled near miss behind it - promote to a crack hit\n");
+ }
+ prev_hit.hit = brep_hit::CRACK_HIT;
+ }
+ }
}
}
curr++;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[72006] brlcad/trunk
Revision: 72006
http://sourceforge.net/p/brlcad/code/72006
Author: starseeker
Date: 2018-11-14 14:37:56 + (Wed, 14 Nov 2018)
Log Message:
---
Tweak rt_brep_valid so we can expand its tests out beyond just running the
openNURBS tests, as well as setting the stage for evenually being able to run
just specific tests instead of all or nothing.
Modified Paths:
--
brlcad/trunk/include/rt/primitives/brep.h
brlcad/trunk/src/libged/brep.c
brlcad/trunk/src/libged/lint.cpp
brlcad/trunk/src/librt/primitives/brep/brep.cpp
Modified: brlcad/trunk/include/rt/primitives/brep.h
===
--- brlcad/trunk/include/rt/primitives/brep.h 2018-11-13 22:10:04 UTC (rev
72005)
+++ brlcad/trunk/include/rt/primitives/brep.h 2018-11-14 14:37:56 UTC (rev
72006)
@@ -27,6 +27,7 @@
#include "common.h"
#include "vmath.h"
#include "bu/list.h"
+#include "bu/vls.h"
#include "bn/tol.h"
#include "rt/defines.h"
@@ -45,8 +46,15 @@
const struct bn_tol *tol,
const struct rt_view_info *info);
/* BREP validity test */
-RT_EXPORT extern int rt_brep_valid(struct rt_db_internal *ip, struct bu_vls
*log);
+#define RT_BREP_OPENNURBS0x1/**< @brief OpenNURBS tests (default)*/
+#define RT_BREP_UV_PARAM 0x2/**< @brief sanity checks for UV
parameterization bounds */
+RT_EXPORT extern int rt_brep_valid(struct bu_vls *log, struct rt_db_internal
*ip, int flags);
+/* BREP function to make sure all curve and surface parameterizations range
+ * from either 0 to their 3D length or from 0 to pmax (if pmax is nonzero.)
+ */
+RT_EXPORT extern int rt_brep_normalize(struct rt_db_internal *ip, double pmax);
+
/** @} */
__END_DECLS
Modified: brlcad/trunk/src/libged/brep.c
===
--- brlcad/trunk/src/libged/brep.c 2018-11-13 22:10:04 UTC (rev 72005)
+++ brlcad/trunk/src/libged/brep.c 2018-11-14 14:37:56 UTC (rev 72006)
@@ -253,7 +253,7 @@
bi = (struct rt_brep_internal*)intern.idb_ptr;
if (BU_STR_EQUAL(argv[2], "valid")) {
- int valid = rt_brep_valid(&intern, gedp->ged_result_str);
+ int valid = rt_brep_valid(gedp->ged_result_str, &intern, 0);
return (valid) ? GED_OK : GED_ERROR;
}
Modified: brlcad/trunk/src/libged/lint.cpp
===
--- brlcad/trunk/src/libged/lint.cpp2018-11-13 22:10:04 UTC (rev 72005)
+++ brlcad/trunk/src/libged/lint.cpp2018-11-14 14:37:56 UTC (rev 72006)
@@ -407,7 +407,7 @@
rt_db_free_internal(&intern);
break;
case DB5_MINORTYPE_BRLCAD_BREP:
- not_valid = !rt_brep_valid(&intern, &vlog);
+ not_valid = !rt_brep_valid(&vlog, &intern, 0);
if (not_valid) {
obj.name = std::string(dp->d_namep);
obj.type= std::string("brep");
Modified: brlcad/trunk/src/librt/primitives/brep/brep.cpp
===
--- brlcad/trunk/src/librt/primitives/brep/brep.cpp 2018-11-13 22:10:04 UTC
(rev 72005)
+++ brlcad/trunk/src/librt/primitives/brep/brep.cpp 2018-11-14 14:37:56 UTC
(rev 72006)
@@ -96,7 +96,7 @@
RT_EXPORT extern int rt_brep_boolean(struct rt_db_internal *out, const struct
rt_db_internal *ip1, const struct rt_db_internal *ip2, db_op_t operation);
struct rt_selection_set *rt_brep_find_selections(const struct rt_db_internal
*ip, const struct rt_selection_query *query);
int rt_brep_process_selection(struct rt_db_internal *ip, struct db_i *dbip,
const struct rt_selection *selection, const struct rt_selection_operation *op);
-int rt_brep_valid(struct rt_db_internal *ip, struct bu_vls *log);
+int rt_brep_valid(struct bu_vls *log, struct rt_db_internal *ip, int flags);
int rt_brep_prep_serialize(struct soltab *stp, const struct rt_db_internal
*ip, struct bu_external *external, size_t *version);
#ifdef __cplusplus
}
@@ -5158,29 +5158,78 @@
return 0;
}
-int rt_brep_valid(struct rt_db_internal *ip, struct bu_vls *log)
+static void brep_log(struct bu_vls *log, const char *fmt, ...)
{
+va_list ap;
+if (log) {
+ BU_CK_VLS(log);
+ va_start(ap, fmt);
+ bu_vls_vprintf(log, fmt, ap);
+}
+va_end(ap);
+}
+
+
+int rt_brep_valid(struct bu_vls *log, struct rt_db_internal *ip, int flags)
+{
+int ret = 1; /* Start assuming it is valid - we need to prove it isn't */
RT_CK_DB_INTERNAL(ip);
if (ip->idb_type != ID_BREP) {
- if (log) bu_vls_printf(log, "Object is not a brep.\n");
+ brep_log(log, "Object is not a brep.\n");
return 0;
}
struct rt_brep_internal *bi = (struct rt_brep_internal *)ip->idb_ptr;
-ON_wString s;
-ON_TextLog dump(s);
+ON_Brep *brep = NULL;
if (bi == NULL || bi->brep == NULL) {
- if (log) bu_vls_
[brlcad-commits] SF.net SVN: brlcad:[72007] brlcad/trunk/misc
Revision: 72007 http://sourceforge.net/p/brlcad/code/72007 Author: starseeker Date: 2018-11-14 16:29:05 + (Wed, 14 Nov 2018) Log Message: --- Stash an example script showing the combination of gcv/gdal and mged being used to make a .g file of the Hawaii islands chain from the University of Washington's Geomorphological Research Group terrain data files. Illustrates warping and downsampling with gdalwarp and concating multiple terrain data sets into a single .g file. Modified Paths: -- brlcad/trunk/misc/CMakeLists.txt Added Paths: --- brlcad/trunk/misc/hawaii_islands.sh Modified: brlcad/trunk/misc/CMakeLists.txt === --- brlcad/trunk/misc/CMakeLists.txt2018-11-14 14:37:56 UTC (rev 72006) +++ brlcad/trunk/misc/CMakeLists.txt2018-11-14 16:29:05 UTC (rev 72007) @@ -77,6 +77,7 @@ check/gap.sh clang-static-analyzer-run.sh flawfinder + hawaii_islands.sh jove.emacs macosx/README macosx/Resources/License.rtf Added: brlcad/trunk/misc/hawaii_islands.sh === --- brlcad/trunk/misc/hawaii_islands.sh (rev 0) +++ brlcad/trunk/misc/hawaii_islands.sh 2018-11-14 16:29:05 UTC (rev 72007) @@ -0,0 +1,63 @@ +#!/bin/sh + +# Data from http://gis.ess.washington.edu/data/raster/tenmeter/hawaii/index.html + +# Cleanup +rm -f hawaii.g +rm -f *.bil *.dem +rm -f README* +rm -f *.blw *.hdr *.stx + +# Unpack +for filename in *.zip; do + unzip $filename +done +rm -f README* +rmdir oahu + +# Big Island is UTM zone 5, reproject +# TODO - is this correct? Big island isn't currently importing +# in the right relative location compared to the other islands... +gdalwarp -t_srs '+proj=utm +zone=4 +datum=WGS84' hawaii.bil bigisland_zone4.bil + +# Downsample to a data density we can more easily manipulate in +# BRL-CAD dsp objects. +gdalwarp -tr 75 75 -r average bigisland_zone4.bil bigisland.tiff +gdalwarp -tr 75 75 -r average kahoolawe.bil kahoolawe.tiff +gdalwarp -tr 75 75 -r average kauai.bil kauai.tiff +gdalwarp -tr 75 75 -r average lanai.bil lanai.tiff +gdalwarp -tr 75 75 -r average maui.bil maui.tiff +gdalwarp -tr 75 75 -r average molokai.bilmolokai.tiff +gdalwarp -tr 75 75 -r average niihau.bil niihau.tiff +gdalwarp -tr 75 75 -r average oahu.bil oahu.tiff + +# Make individual .g files for each island +gcv bigisland.tiff bigisland.g +gcv kahoolawe.tiff kahoolawe.g +gcv kauai.tiff kauai.g +gcv lanai.tiff lanai.g +gcv maui.tiff maui.g +gcv molokai.tiff molokai.g +gcv niihau.tiffniihau.g +gcv oahu.tiff oahu.g + +# Merge all the islands into a single file +mged bigisland.g dbconcat kahoolawe.g +mged bigisland.g dbconcat kauai.g +mged bigisland.g dbconcat lanai.g +mged bigisland.g dbconcat maui.g +mged bigisland.g dbconcat molokai.g +mged bigisland.g dbconcat niihau.g +mged bigisland.g dbconcat oahu.g + +# The big island doesn't quite end up where we want it relative to the other +# islands (TODO - are we not warping it correctly?)) but in the meantime we can +# adjust its position to be approximately correct. +mged bigisland.g "units km;e bigisland.s;sed bigisland.s; tra 640 0 0; accept" + +# Done +mv bigisland.g hawaii.g + +# Cleanup +rm kahoolawe.g kauai.g lanai.g maui.g molokai.g niihau.g oahu.g +rm *.tiff Property changes on: brlcad/trunk/misc/hawaii_islands.sh ___ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/x-sh \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[72008] brlcad/trunk/regress/gcv/dem/CMakeLists.txt
Revision: 72008
http://sourceforge.net/p/brlcad/code/72008
Author: starseeker
Date: 2018-11-14 18:43:58 + (Wed, 14 Nov 2018)
Log Message:
---
The DEM test isn't ready to be hooked in yet. Two issues have cropped up - one
is that the test is too sensitive (should only be checking object data, not
whole .g file). More difficult technically is that it looks like GDAL is not
picking up our local copy of PROJ4 correctly, even with PROJ_STATIC set.
Confusingly, the conversion will still succeed, but the attributes end up
different depending on whether PROJ4 is installed in the final BRL-CAD install
directory (where GDAL can find it) or not yet installed (in which case it looks
like it is falling back on some internal default rather than finding the
libproj in the build directory). Not sure yet what rewiring will be needed to
get this to actually work the same way consistently.
Modified Paths:
--
brlcad/trunk/regress/gcv/dem/CMakeLists.txt
Modified: brlcad/trunk/regress/gcv/dem/CMakeLists.txt
===
--- brlcad/trunk/regress/gcv/dem/CMakeLists.txt 2018-11-14 16:29:05 UTC (rev
72007)
+++ brlcad/trunk/regress/gcv/dem/CMakeLists.txt 2018-11-14 18:43:58 UTC (rev
72008)
@@ -10,8 +10,8 @@
add_custom_target(regress-gcv-dem DEPENDS gcv
"${CMAKE_CURRENT_BINARY_DIR}/dem.done")
set_target_properties(regress-gcv-dem PROPERTIES FOLDER "BRL-CAD Regression
Tests")
set_target_properties(regress-gcv-dem PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
-Add_Regression_Test(gcv-dem "gcv;libgcv_gdal")
-add_dependencies(regress-gcv regress-gcv-dem)
+#Add_Regression_Test(gcv-dem "gcv;libgcv_gdal")
+#add_dependencies(regress-gcv regress-gcv-dem)
DISTCLEAN(
"${CMAKE_CURRENT_BINARY_DIR}/dem.done"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[72009] brlcad/trunk/regress/gcv/dem/ regress-dem.cmake.in
Revision: 72009
http://sourceforge.net/p/brlcad/code/72009
Author: starseeker
Date: 2018-11-14 22:17:05 + (Wed, 14 Nov 2018)
Log Message:
---
PROJ-4 wasn't being run correctly when this MD5 sum was generated.
Modified Paths:
--
brlcad/trunk/regress/gcv/dem/regress-dem.cmake.in
Modified: brlcad/trunk/regress/gcv/dem/regress-dem.cmake.in
===
--- brlcad/trunk/regress/gcv/dem/regress-dem.cmake.in 2018-11-14 18:43:58 UTC
(rev 72008)
+++ brlcad/trunk/regress/gcv/dem/regress-dem.cmake.in 2018-11-14 22:17:05 UTC
(rev 72009)
@@ -25,7 +25,7 @@
file(WRITE "${CBDIR}/regress-dem.log" "${dem_g_log}")
# Known "good" md5sum of output for comparison
-set(EXPECTED_MD5 "80f98f409514586e0be12884e2118230")
+set(EXPECTED_MD5 "0ef24b4e9569d038055dcabad3157776")
# get and clean up md5sum from generated output
execute_process(COMMAND "@CMAKE_COMMAND@" -E md5sum "${CBDIR}/hawaii-c.g"
OUTPUT_VARIABLE genmd5)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[72010] brlcad/trunk
Revision: 72010
http://sourceforge.net/p/brlcad/code/72010
Author: starseeker
Date: 2018-11-14 22:22:11 + (Wed, 14 Nov 2018)
Log Message:
---
Fix two issues with bu_dir. 1. Make the return buffer be a pointer to a read
only static MAXPATHLEN buffer if the user didn't supply a buffer, per the
bu/app.h comments. 2. Make the lookup values for relative paths values from
the configure-time variables, rather than hardcoded strings. This means the
bu_dir lookup logic will now reflect any overrids to bin, lib, etc. directory
locations.
Modified Paths:
--
brlcad/trunk/CMakeLists.txt
brlcad/trunk/misc/CMake/Path_Setup.cmake
brlcad/trunk/src/libbu/dir.c
Modified: brlcad/trunk/CMakeLists.txt
===
--- brlcad/trunk/CMakeLists.txt 2018-11-14 22:17:05 UTC (rev 72009)
+++ brlcad/trunk/CMakeLists.txt 2018-11-14 22:22:11 UTC (rev 72010)
@@ -925,6 +925,15 @@
# Let programs know what the executable suffix is on this platform, if any
CONFIG_H_APPEND(BRLCAD "#define EXECUTABLE_SUFFIX
\"${CMAKE_EXECUTABLE_SUFFIX}\"\n")
+# Define the various relative paths for bu_dir (be sure to have included
+# Path_Setup.cmake before this point, as that file defines these variables.)
+CONFIG_H_APPEND(BRLCAD "#define BRLCAD_BIN_DIR \"${BIN_DIR}\"\n")
+CONFIG_H_APPEND(BRLCAD "#define BRLCAD_LIB_DIR \"${LIB_DIR}\"\n")
+CONFIG_H_APPEND(BRLCAD "#define BRLCAD_LIBEXEC_DIR \"${LIBEXEC_DIR}\"\n")
+CONFIG_H_APPEND(BRLCAD "#define BRLCAD_INCLUDE_DIR \"${INCLUDE_DIR}\"\n")
+CONFIG_H_APPEND(BRLCAD "#define BRLCAD_DATA_DIR \"${DATA_DIR}\"\n")
+CONFIG_H_APPEND(BRLCAD "#define BRLCAD_DOC_DIR \"${DOC_DIR}\"\n")
+CONFIG_H_APPEND(BRLCAD "#define BRLCAD_MAN_DIR \"${MAN_DIR}\"\n")
#--
# If we're not debugging, we want HIDDEN to be defined as static. Set
Modified: brlcad/trunk/misc/CMake/Path_Setup.cmake
===
--- brlcad/trunk/misc/CMake/Path_Setup.cmake2018-11-14 22:17:05 UTC (rev
72009)
+++ brlcad/trunk/misc/CMake/Path_Setup.cmake2018-11-14 22:22:11 UTC (rev
72010)
@@ -40,20 +40,18 @@
set(BIN_DIR bin)
endif(NOT BIN_DIR)
-# The location in which to install BRL-CAD header files.
-if(NOT INCLUDE_DIR)
- set(INCLUDE_DIR include)
-endif(NOT INCLUDE_DIR)
-
# The location in which to install BRL-CAD libraries.
if(NOT LIB_DIR)
set(LIB_DIR lib)
endif(NOT LIB_DIR)
+if(NOT LIBEXEC_DIR)
+ set(LIBEXEC_DIR libexec)
+endif(NOT LIBEXEC_DIR)
-# The location in which to install BRL-CAD configuration files.
-if(NOT CONF_DIR)
- set(CONF_DIR etc)
-endif(NOT CONF_DIR)
+# The location in which to install BRL-CAD header files.
+if(NOT INCLUDE_DIR)
+ set(INCLUDE_DIR include)
+endif(NOT INCLUDE_DIR)
# The location in which to install BRL-CAD data files
if(NOT DATA_DIR)
@@ -60,18 +58,18 @@
set(DATA_DIR share)
endif(NOT DATA_DIR)
+# The location in which to install BRL-CAD documentation files
+if(NOT DOC_DIR)
+ set(DOC_DIR ${DATA_DIR}/doc)
+endif(NOT DOC_DIR)
+
# The location in which to install BRL-CAD Manual pages
if(NOT MAN_DIR)
set(MAN_DIR ${DATA_DIR}/man)
endif(NOT MAN_DIR)
-# The location in which to install BRL-CAD documentation files
-if(NOT DOC_DIR)
- set(DOC_DIR ${DATA_DIR}/doc)
-endif(NOT DOC_DIR)
-
# Make sure no absolute paths have been supplied to these variables
-set(INSTALL_DIRS BIN INCLUDE LIB CONF DATA MAN DOC)
+set(INSTALL_DIRS BIN INCLUDE LIB LIBEXEC DATA MAN DOC)
foreach(instdir ${INSTALL_DIRS})
get_filename_component(instdir_full ${${instdir}_DIR} ABSOLUTE)
if("${${instdir}_DIR}" STREQUAL "${instdir_full}")
Modified: brlcad/trunk/src/libbu/dir.c
===
--- brlcad/trunk/src/libbu/dir.c2018-11-14 22:17:05 UTC (rev 72009)
+++ brlcad/trunk/src/libbu/dir.c2018-11-14 22:22:11 UTC (rev 72010)
@@ -288,12 +288,14 @@
vdir(char *result, size_t len, va_list args)
{
struct bu_vls vls = BU_VLS_INIT_ZERO;
-char buf[MAXPATHLEN] = {0};
+static char buf[MAXPATHLEN] = {0};
const char *cpath;
uintptr_t arg;
arg = va_arg(args, uintptr_t);
+memset(buf, 0, MAXPATHLEN);
+
while (arg != (uintptr_t)NULL) {
switch ((bu_dir_t)arg) {
case BU_DIR_CURR:
@@ -304,31 +306,31 @@
bu_log("UNIMPLEMENTED\n");
break;
case BU_DIR_BIN:
- cpath = bu_brlcad_root("bin", 1);
+ cpath = bu_brlcad_root(BRLCAD_BIN_DIR, 1);
append(&vls, cpath);
break;
case BU_DIR_LIB:
- cpath = bu_brlcad_root("lib", 1);
+ cpath = bu_brlcad_root(BRLCAD_LIB_DIR, 1);
append(&vls, cpath);
break;
case BU_DIR_LIBEXEC:
- cpath = bu_brlcad_root("libexec", 1);
+ cpath = bu_brlcad
[brlcad-commits] SF.net SVN: brlcad:[72011] brlcad/trunk/src
Revision: 72011
http://sourceforge.net/p/brlcad/code/72011
Author: starseeker
Date: 2018-11-14 22:31:53 + (Wed, 14 Nov 2018)
Log Message:
---
Need two things to make PROJ-4 work from the build directory (or other
non-install locations). First, need to manage the dictionary files used for
definitions so that they are visible in the build dir hierarchy. Since, need
to hook into the PROJ_LIB environment variable to tell PROJ-4 where it needs to
be looking.
Modified Paths:
--
brlcad/trunk/src/libgcv/plugins/gdal/gdal.cpp
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/libgcv/plugins/gdal/gdal.cpp
===
--- brlcad/trunk/src/libgcv/plugins/gdal/gdal.cpp 2018-11-14 22:22:11 UTC
(rev 72010)
+++ brlcad/trunk/src/libgcv/plugins/gdal/gdal.cpp 2018-11-14 22:31:53 UTC
(rev 72011)
@@ -51,7 +51,9 @@
#include
#include "vrtdataset.h"
+#include "bu/app.h"
#include "bu/cv.h"
+#include "bu/env.h"
#include "bu/path.h"
#include "bu/units.h"
#include "raytrace.h"
@@ -250,6 +252,15 @@
state->input_file = source_path;
state->wdbp = context->dbip->dbi_wdbp;
+/* If the environment is identifying a PROJ_LIB directory use it,
+ * else set it to the correct one for BRL-CAD */
+if (!getenv("PROJ_LIB")) {
+ const char *pjenv = NULL;
+ bu_setenv("PROJ_LIB", bu_dir(NULL, 0, BU_DIR_DATA, "proj", NULL), 1);
+ pjenv = getenv("PROJ_LIB");
+ bu_log("Setting PROJ_LIB to %s\n", pjenv);
+}
+
GDALAllRegister();
state->hDataset = GDALOpenEx(source_path, GDAL_OF_READONLY |
GDAL_OF_VERBOSE_ERROR, NULL, NULL, NULL);
Modified: brlcad/trunk/src/other/CMakeLists.txt
===
--- brlcad/trunk/src/other/CMakeLists.txt 2018-11-14 22:22:11 UTC (rev
72010)
+++ brlcad/trunk/src/other/CMakeLists.txt 2018-11-14 22:31:53 UTC (rev
72011)
@@ -1179,6 +1179,13 @@
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")
+ # Need data files in order for PROJ-4 to work...
+ get_directory_property(PROJ_DICTIONARY DIRECTORY
${CMAKE_CURRENT_SOURCE_DIR}/proj-4/nad DEFINITION PROJ_DICTIONARY)
+ set(proj_dict)
+ foreach(pfile ${PROJ_DICTIONARY})
+set(proj_dict ${proj_dict} proj-4/nad/${pfile})
+ endforeach(pfile ${PROJ_DICTIONARY})
+ BRLCAD_MANAGE_FILES("${proj_dict}" "${DATA_DIR}/proj")
endif(BRLCAD_PROJ4_BUILD)
mark_as_advanced(PROJ4_INCLUDE_DIRS)
mark_as_advanced(PROJ4_LIBRARY)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[72014] brlcad/trunk/src/librt/primitives/brep/brep.cpp
Revision: 72014
http://sourceforge.net/p/brlcad/code/72014
Author: starseeker
Date: 2018-11-15 00:58:53 + (Thu, 15 Nov 2018)
Log Message:
---
initialize
Modified Paths:
--
brlcad/trunk/src/librt/primitives/brep/brep.cpp
Modified: brlcad/trunk/src/librt/primitives/brep/brep.cpp
===
--- brlcad/trunk/src/librt/primitives/brep/brep.cpp 2018-11-15 00:49:35 UTC
(rev 72013)
+++ brlcad/trunk/src/librt/primitives/brep/brep.cpp 2018-11-15 00:58:53 UTC
(rev 72014)
@@ -253,7 +253,7 @@
bu_vls_printf(&logstr, " [1] = face reversed (m_bRev true); [0] =
face not reversed (m_bRev false)\n");
bu_vls_printf(&logstr, " <#> = distance from previous point to next
hit point\n\n");
for (std::list::iterator i = hits.begin(); i != hits.end(); ++i)
{
- point_t prev;
+ point_t prev = VINIT_ZERO;
const brep_hit &out = *i;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
___
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:[72016] brlcad/trunk/TODO
Revision: 72016 http://sourceforge.net/p/brlcad/code/72016 Author: starseeker Date: 2018-11-16 16:07:06 + (Fri, 16 Nov 2018) Log Message: --- Keith and Sean figured out that attribute normalization is causing peformance problems when creating regions - need to address. Modified Paths: -- brlcad/trunk/TODO Modified: brlcad/trunk/TODO === --- brlcad/trunk/TODO 2018-11-15 06:52:08 UTC (rev 72015) +++ brlcad/trunk/TODO 2018-11-16 16:07:06 UTC (rev 72016) @@ -26,6 +26,8 @@ - db file needs to be split up - large db tests need to be enabled +* attribute normalization is drastically slowing down + region creation - need to fix or back out THESE TASKS SHOULD HAPPEN WITHIN TWO RELEASE ITERATIONS --- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ 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:[72018] brlcad/trunk
Revision: 72018
http://sourceforge.net/p/brlcad/code/72018
Author: starseeker
Date: 2018-11-16 20:45:25 + (Fri, 16 Nov 2018)
Log Message:
---
Make a stab at having the edge miss tolerance in uv space be keyed off of 3D
size information and the size of the 2D uv space, rather than being a hard
coded number. Needs testing.
Modified Paths:
--
brlcad/trunk/include/brep/curvetree.h
brlcad/trunk/include/brep/defines.h
brlcad/trunk/src/libbrep/opennurbs_ext.cpp
brlcad/trunk/src/librt/primitives/brep/brep.cpp
Modified: brlcad/trunk/include/brep/curvetree.h
===
--- brlcad/trunk/include/brep/curvetree.h 2018-11-16 18:15:37 UTC (rev
72017)
+++ brlcad/trunk/include/brep/curvetree.h 2018-11-16 20:45:25 UTC (rev
72018)
@@ -69,6 +69,9 @@
void getLeavesAbove(std::list &out_leaves,
const ON_2dPoint &pt, fastf_t tol) const;
void getLeavesRight(std::list &out_leaves,
const ON_2dPoint &pt, fastf_t tol) const;
+ /* Tolerance to use for trimming in this CurveTree's associated
m_face */
+ double uv_edge_miss_tol;
+
private:
friend class BBNode;
@@ -96,9 +99,12 @@
static ON_BoundingBox initialLoopBBox(const ON_BrepFace &face);
const ON_BrepFace * const m_face;
+ /* m_face->SurfaceOf() width and height in UV domain */
+ double width_3d;
+ double height_3d;
+
BRNode *m_root;
-
struct Stl : public PooledObject {
Stl() : m_sortedX() {}
Modified: brlcad/trunk/include/brep/defines.h
===
--- brlcad/trunk/include/brep/defines.h 2018-11-16 18:15:37 UTC (rev 72017)
+++ brlcad/trunk/include/brep/defines.h 2018-11-16 20:45:25 UTC (rev 72018)
@@ -28,6 +28,7 @@
#define BREP_DEFINES_H
#include "common.h"
+#include "bn/tol.h"
/** @{ */
/** @file brep/defines.h */
@@ -102,11 +103,20 @@
* The EDGE_MISS_TOLERANCE setting is critical in a couple of ways -
* too small and the allowed uncertainty region near edges will be
* smaller than the actual uncertainty needed for accurate solid
- * raytracing, too large and trimming will not be adequate. May need
- * to adapt this to the scale of the model, perhaps using bounding box
- * size to key off of.
+ * raytracing, too large and trimming will not be adequate. In order
+ * to adapt this to UV space, the ratio of the Brep surface's
+ * diagonal length and the tolerance is used to solve for a
+ * corresponding UV space tolerance, given the 2D UV space diagonal
+ * length of the surface in question. Hence, the latter value
+ * (BREP_2D_UV_EDGE_MISS_TOL) is not a constant but is adjusted to
+ * fit the given surface's UV space.
+ *
+ * surface 3D diagonal length surface 2D diagonal length
+ * --- = --
+ * BREP_3D_EDGE_MISS_TOLERANCE uv_edge_miss_tol
+ *
*/
-/* #define BREP_EDGE_MISS_TOLERANCE 5e-2 */
+#define BREP_3D_EDGE_MISS_TOLERANCE 0.1
#define BREP_EDGE_MISS_TOLERANCE 5e-3
#define BREP_SAME_POINT_TOLERANCE 1e-6
Modified: brlcad/trunk/src/libbrep/opennurbs_ext.cpp
===
--- brlcad/trunk/src/libbrep/opennurbs_ext.cpp 2018-11-16 18:15:37 UTC (rev
72017)
+++ brlcad/trunk/src/libbrep/opennurbs_ext.cpp 2018-11-16 20:45:25 UTC (rev
72018)
@@ -139,6 +139,19 @@
m_stl(new Stl),
m_sortedX_indices(NULL)
{
+face->SurfaceOf()->GetSurfaceSize(&width_3d, &height_3d);
+double diag_len_3d = sqrt(width_3d*width_3d + height_3d*height_3d);
+ON_Interval udom = face->SurfaceOf()->Domain(0);
+ON_Interval vdom = face->SurfaceOf()->Domain(1);
+double diag_len_uv = sqrt((udom[1]-udom[0])*(udom[1]-udom[0]) +
(vdom[1]-vdom[0])*(vdom[1]-vdom[0]));
+uv_edge_miss_tol = (diag_len_uv * BREP_3D_EDGE_MISS_TOLERANCE) /
diag_len_3d;
+
+#if 0
+bu_log("Face %d 3D diag. len: %g\n", face->m_face_index, diag_len_3d);
+bu_log("Face %d UV diag. len: %g\n", face->m_face_index, diag_len_uv);
+bu_log("Face %d uv_edge_miss_tol: %g\n", face->m_face_index,
uv_edge_miss_tol);
+#endif
+
for (int li = 0; li < face->LoopCount(); li++) {
bool innerLoop = (li > 0) ? true : false;
const ON_BrepLoop* loop = face->Loop(li);
Modified: brlcad/trunk/src/librt/primitives/brep/brep.cpp
===
--- brlcad/trunk/src/librt/primitives/brep/brep.cpp 2018-11-16 18:15:37 UTC
(rev 72017)
+++ brlcad/trunk/src/librt/primitives/brep/brep.cpp 2018-11-16 20:45:25 UTC
(rev 72018)
@@ -1180,7 +1180,7 @@
for (int i = 0; i < numhits; i++) {
double closesttrim;
const BRNode* trimBR = NULL;
- int trim_status = sbv->isTri
