[brlcad-commits] SF.net SVN: brlcad:[51215] brlcad/branches/STABLE
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <sta...@us...> - 2012-06-18 19:39:18
|
Revision: 51215 http://brlcad.svn.sourceforge.net/brlcad/?rev=51215&view=rev Author: starseeker Date: 2012-06-18 19:38:59 +0000 (Mon, 18 Jun 2012) Log Message: ----------- Synce trunk and STABLE - trunk r51214 Revision Links: -------------- http://brlcad.svn.sourceforge.net/brlcad/?rev=51214&view=rev Modified Paths: -------------- brlcad/branches/STABLE/BUGS brlcad/branches/STABLE/CMakeLists.txt brlcad/branches/STABLE/HACKING brlcad/branches/STABLE/NEWS brlcad/branches/STABLE/TODO brlcad/branches/STABLE/bench/CMakeLists.txt brlcad/branches/STABLE/bench/benchmark.1 brlcad/branches/STABLE/configure.ac brlcad/branches/STABLE/db/CMakeLists.txt brlcad/branches/STABLE/doc/docbook/CMakeLists.txt brlcad/branches/STABLE/doc/docbook/articles/en/TEMPLATE.xml brlcad/branches/STABLE/doc/docbook/system/README brlcad/branches/STABLE/doc/docbook/system/man1/en/CMakeLists.txt brlcad/branches/STABLE/doc/docbook/system/man1/en/rtwizard.xml brlcad/branches/STABLE/doc/docbook/system/man5/en/CMakeLists.txt brlcad/branches/STABLE/doc/docbook/system/mann/en/edit.xml brlcad/branches/STABLE/doc/docbook/system/mann/en/gr.xml brlcad/branches/STABLE/include/bio.h brlcad/branches/STABLE/include/bu.h brlcad/branches/STABLE/include/ged.h brlcad/branches/STABLE/include/raytrace.h brlcad/branches/STABLE/include/vmath.h brlcad/branches/STABLE/misc/CMake/BRLCAD_CMakeFiles.cmake brlcad/branches/STABLE/misc/CMake/BRLCAD_Targets.cmake brlcad/branches/STABLE/misc/CMake/CompilerFlags.cmake brlcad/branches/STABLE/misc/CMake/FindGL.cmake brlcad/branches/STABLE/misc/CMake/FindX11.cmake brlcad/branches/STABLE/regress/CMakeLists.txt brlcad/branches/STABLE/regress/Makefile.am brlcad/branches/STABLE/regress/dsp.sh brlcad/branches/STABLE/regress/red.sh brlcad/branches/STABLE/sh/CMakeLists.txt brlcad/branches/STABLE/src/Makefile.am brlcad/branches/STABLE/src/adrt/isst.bat brlcad/branches/STABLE/src/anim/anim_script.1 brlcad/branches/STABLE/src/anim/anim_sort.1 brlcad/branches/STABLE/src/anim/anim_track.1 brlcad/branches/STABLE/src/anim/anim_track.c brlcad/branches/STABLE/src/anim/cattrack.c brlcad/branches/STABLE/src/archer/archer.bat brlcad/branches/STABLE/src/brlman/CMakeLists.txt brlcad/branches/STABLE/src/brlman/brlman.sh.in brlcad/branches/STABLE/src/conv/CMakeLists.txt brlcad/branches/STABLE/src/conv/Makefile.am brlcad/branches/STABLE/src/conv/asc/asc2pix.c brlcad/branches/STABLE/src/conv/asc/g2asc.1 brlcad/branches/STABLE/src/conv/asc/pix2asc.1 brlcad/branches/STABLE/src/conv/asc/pix2asc.c brlcad/branches/STABLE/src/conv/dbclean.1 brlcad/branches/STABLE/src/conv/fast4-g.1 brlcad/branches/STABLE/src/conv/g-voxel.c brlcad/branches/STABLE/src/conv/iges/g-iges.c brlcad/branches/STABLE/src/conv/intaval/glob.h brlcad/branches/STABLE/src/conv/intaval/read_dra.cpp brlcad/branches/STABLE/src/conv/intaval/read_dra.h brlcad/branches/STABLE/src/conv/intaval/regtab.cpp brlcad/branches/STABLE/src/conv/intaval/regtab.h brlcad/branches/STABLE/src/conv/intaval/tgf-g.cpp brlcad/branches/STABLE/src/conv/nmg/asc-nmg.1 brlcad/branches/STABLE/src/conv/obj-g.c brlcad/branches/STABLE/src/conv/step/MeasureValue.cpp brlcad/branches/STABLE/src/conv/step/PCurveOrSurface.cpp brlcad/branches/STABLE/src/conv/vdeck/vdeck.1 brlcad/branches/STABLE/src/conv/viewpoint-g.1 brlcad/branches/STABLE/src/fb/cell-fb.1 brlcad/branches/STABLE/src/fb/fblabel.c brlcad/branches/STABLE/src/fb/fbpoint.1 brlcad/branches/STABLE/src/fb/fbscanplot.1 brlcad/branches/STABLE/src/fb/orle-fb.c brlcad/branches/STABLE/src/fbed/fbed.1 brlcad/branches/STABLE/src/fbserv/fbserv.1 brlcad/branches/STABLE/src/gtools/CMakeLists.txt brlcad/branches/STABLE/src/gtools/Makefile.am brlcad/branches/STABLE/src/gtools/g_diff.1 brlcad/branches/STABLE/src/gtools/g_diff.c brlcad/branches/STABLE/src/gtools/g_lint.1 brlcad/branches/STABLE/src/gtools/remapid.1 brlcad/branches/STABLE/src/irprep/firpass.1 brlcad/branches/STABLE/src/irprep/ir-X.1 brlcad/branches/STABLE/src/irprep/irdisp.1 brlcad/branches/STABLE/src/irprep/pictx.1 brlcad/branches/STABLE/src/irprep/secpass.1 brlcad/branches/STABLE/src/irprep/shapefact.1 brlcad/branches/STABLE/src/irprep/showtherm.1 brlcad/branches/STABLE/src/libanalyze/CMakeLists.txt brlcad/branches/STABLE/src/libanalyze/Makefile.am brlcad/branches/STABLE/src/libbn/CMakeLists.txt brlcad/branches/STABLE/src/libbn/Makefile.am brlcad/branches/STABLE/src/libbn/noise.c brlcad/branches/STABLE/src/libbu/CMakeLists.txt brlcad/branches/STABLE/src/libbu/Makefile.am brlcad/branches/STABLE/src/libbu/argv.c brlcad/branches/STABLE/src/libbu/basename.c brlcad/branches/STABLE/src/libbu/bitv.c brlcad/branches/STABLE/src/libbu/color.c brlcad/branches/STABLE/src/libbu/ctype.c brlcad/branches/STABLE/src/libbu/hook.c brlcad/branches/STABLE/src/libbu/lex.c brlcad/branches/STABLE/src/libbu/log.c brlcad/branches/STABLE/src/libbu/parallel.c brlcad/branches/STABLE/src/libbu/test_ctype.c brlcad/branches/STABLE/src/libbu/test_vls_vprintf.c brlcad/branches/STABLE/src/libbu/vls_internals.h brlcad/branches/STABLE/src/libcursor/CMakeLists.txt brlcad/branches/STABLE/src/libcursor/Makefile.am brlcad/branches/STABLE/src/libdm/CMakeLists.txt brlcad/branches/STABLE/src/libdm/Makefile.am brlcad/branches/STABLE/src/libfb/CMakeLists.txt brlcad/branches/STABLE/src/libfb/Makefile.am brlcad/branches/STABLE/src/libfb/if_X24.c brlcad/branches/STABLE/src/libfb/if_disk.c brlcad/branches/STABLE/src/libfft/CMakeLists.txt brlcad/branches/STABLE/src/libfft/Makefile.am brlcad/branches/STABLE/src/libgcv/CMakeLists.txt brlcad/branches/STABLE/src/libgcv/Makefile.am brlcad/branches/STABLE/src/libged/CMakeLists.txt brlcad/branches/STABLE/src/libged/Makefile.am brlcad/branches/STABLE/src/libged/analyze.c brlcad/branches/STABLE/src/libged/brep.c brlcad/branches/STABLE/src/libged/rt.c brlcad/branches/STABLE/src/libged/simulate/simrt.c brlcad/branches/STABLE/src/libged/simulate/simulate.c brlcad/branches/STABLE/src/libged/simulate/simutils.c brlcad/branches/STABLE/src/libged/simulate/simutils.h brlcad/branches/STABLE/src/libged/wdb_obj.c brlcad/branches/STABLE/src/libicv/CMakeLists.txt brlcad/branches/STABLE/src/libicv/Makefile.am brlcad/branches/STABLE/src/libicv/fileformat.c brlcad/branches/STABLE/src/libmultispectral/CMakeLists.txt brlcad/branches/STABLE/src/libmultispectral/Makefile.am brlcad/branches/STABLE/src/liboptical/CMakeLists.txt brlcad/branches/STABLE/src/liboptical/Makefile.am brlcad/branches/STABLE/src/liborle/CMakeLists.txt brlcad/branches/STABLE/src/liborle/Makefile.am brlcad/branches/STABLE/src/liborle/rle.c brlcad/branches/STABLE/src/libpc/CMakeLists.txt brlcad/branches/STABLE/src/libpc/Makefile.am brlcad/branches/STABLE/src/libpkg/CMakeLists.txt brlcad/branches/STABLE/src/libpkg/Makefile.am brlcad/branches/STABLE/src/librt/CMakeLists.txt brlcad/branches/STABLE/src/librt/Makefile.am brlcad/branches/STABLE/src/librt/bundle.c brlcad/branches/STABLE/src/librt/librt_private.h brlcad/branches/STABLE/src/librt/mkbundle.c brlcad/branches/STABLE/src/librt/primitives/arb8/arb8.c brlcad/branches/STABLE/src/librt/primitives/bot/bot.c brlcad/branches/STABLE/src/librt/primitives/bot/tie.c brlcad/branches/STABLE/src/librt/primitives/brep/brep_debug.cpp brlcad/branches/STABLE/src/librt/primitives/ell/ell.c brlcad/branches/STABLE/src/librt/primitives/metaball/metaball_tri.c brlcad/branches/STABLE/src/librt/primitives/nmg/nmg_extrude.c brlcad/branches/STABLE/src/librt/primitives/nmg/nmg_fuse.c brlcad/branches/STABLE/src/librt/primitives/nmg/nmg_misc.c brlcad/branches/STABLE/src/librt/primitives/nmg/nmg_mk.c brlcad/branches/STABLE/src/librt/primitives/nmg/nmg_tri_mc.c brlcad/branches/STABLE/src/librt/primitives/pipe/pipe_brep.cpp brlcad/branches/STABLE/src/librt/primitives/pnts/pnts.c brlcad/branches/STABLE/src/librt/primitives/table.c brlcad/branches/STABLE/src/librt/primitives/tgc/tgc.c brlcad/branches/STABLE/src/librt/primitives/tor/tor.c brlcad/branches/STABLE/src/librtserver/Makefile.am brlcad/branches/STABLE/src/librtserver/rtserver.c brlcad/branches/STABLE/src/libsysv/CMakeLists.txt brlcad/branches/STABLE/src/libsysv/Makefile.am brlcad/branches/STABLE/src/libtclcad/CMakeLists.txt brlcad/branches/STABLE/src/libtclcad/Makefile.am brlcad/branches/STABLE/src/libtclcad/tclcad_obj.c brlcad/branches/STABLE/src/libtermio/CMakeLists.txt brlcad/branches/STABLE/src/libtermio/Makefile.am brlcad/branches/STABLE/src/libwdb/CMakeLists.txt brlcad/branches/STABLE/src/libwdb/Makefile.am brlcad/branches/STABLE/src/mged/CMakeLists.txt brlcad/branches/STABLE/src/mged/mged.bat brlcad/branches/STABLE/src/nirt/showshot.1 brlcad/branches/STABLE/src/other/CMakeLists.txt brlcad/branches/STABLE/src/other/URToolkit/man/rleClock.1 brlcad/branches/STABLE/src/other/incrTcl/itk/CMake/FindX11.cmake brlcad/branches/STABLE/src/other/iwidgets/doc/CMakeLists.txt brlcad/branches/STABLE/src/other/libregex/regex.h brlcad/branches/STABLE/src/other/libregex/regex2.h brlcad/branches/STABLE/src/other/libregex/regexec.c brlcad/branches/STABLE/src/other/step/CMakeLists.txt brlcad/branches/STABLE/src/other/step/data/CMakeLists.txt brlcad/branches/STABLE/src/other/step/include/exppp/exppp.h brlcad/branches/STABLE/src/other/step/include/express/alg.h brlcad/branches/STABLE/src/other/step/include/express/basic.h brlcad/branches/STABLE/src/other/step/include/express/caseitem.h brlcad/branches/STABLE/src/other/step/include/express/dict.h brlcad/branches/STABLE/src/other/step/include/express/entity.h brlcad/branches/STABLE/src/other/step/include/express/error.h brlcad/branches/STABLE/src/other/step/include/express/expr.h brlcad/branches/STABLE/src/other/step/include/express/express.h brlcad/branches/STABLE/src/other/step/include/express/hash.h brlcad/branches/STABLE/src/other/step/include/express/lexact.h brlcad/branches/STABLE/src/other/step/include/express/linklist.h brlcad/branches/STABLE/src/other/step/include/express/memory.h brlcad/branches/STABLE/src/other/step/include/express/object.h brlcad/branches/STABLE/src/other/step/include/express/resolve.h brlcad/branches/STABLE/src/other/step/include/express/schema.h brlcad/branches/STABLE/src/other/step/include/express/scope.h brlcad/branches/STABLE/src/other/step/include/express/stmt.h brlcad/branches/STABLE/src/other/step/include/express/symbol.h brlcad/branches/STABLE/src/other/step/include/express/type.h brlcad/branches/STABLE/src/other/step/include/express/variable.h brlcad/branches/STABLE/src/other/step/src/base/CMakeLists.txt brlcad/branches/STABLE/src/other/step/src/base/scl_memmgr.cc brlcad/branches/STABLE/src/other/step/src/cldai/CMakeLists.txt brlcad/branches/STABLE/src/other/step/src/cldai/sdaiApplication_instance_set.cc brlcad/branches/STABLE/src/other/step/src/cldai/sdaiApplication_instance_set.h brlcad/branches/STABLE/src/other/step/src/cldai/sdaiBinary.cc brlcad/branches/STABLE/src/other/step/src/cldai/sdaiBinary.h brlcad/branches/STABLE/src/other/step/src/cldai/sdaiDaObject.cc brlcad/branches/STABLE/src/other/step/src/cldai/sdaiDaObject.h brlcad/branches/STABLE/src/other/step/src/cldai/sdaiEntity_extent.cc brlcad/branches/STABLE/src/other/step/src/cldai/sdaiEntity_extent.h brlcad/branches/STABLE/src/other/step/src/cldai/sdaiEntity_extent_set.cc brlcad/branches/STABLE/src/other/step/src/cldai/sdaiEntity_extent_set.h brlcad/branches/STABLE/src/other/step/src/cldai/sdaiEnum.cc brlcad/branches/STABLE/src/other/step/src/cldai/sdaiEnum.h brlcad/branches/STABLE/src/other/step/src/cldai/sdaiModel_contents.cc brlcad/branches/STABLE/src/other/step/src/cldai/sdaiModel_contents.h brlcad/branches/STABLE/src/other/step/src/cldai/sdaiModel_contents_list.cc brlcad/branches/STABLE/src/other/step/src/cldai/sdaiModel_contents_list.h brlcad/branches/STABLE/src/other/step/src/cldai/sdaiObject.cc brlcad/branches/STABLE/src/other/step/src/cldai/sdaiObject.h brlcad/branches/STABLE/src/other/step/src/cldai/sdaiSession_instance.cc brlcad/branches/STABLE/src/other/step/src/cldai/sdaiSession_instance.h brlcad/branches/STABLE/src/other/step/src/cldai/sdaiString.cc brlcad/branches/STABLE/src/other/step/src/cldai/sdaiString.h brlcad/branches/STABLE/src/other/step/src/cleditor/CMakeLists.txt brlcad/branches/STABLE/src/other/step/src/cleditor/STEPfile.cc brlcad/branches/STABLE/src/other/step/src/cleditor/STEPfile.h brlcad/branches/STABLE/src/other/step/src/cleditor/STEPfile.inline.cc brlcad/branches/STABLE/src/other/step/src/cleditor/SdaiHeaderSchema.cc brlcad/branches/STABLE/src/other/step/src/cleditor/SdaiHeaderSchema.h brlcad/branches/STABLE/src/other/step/src/cleditor/SdaiHeaderSchemaAll.cc brlcad/branches/STABLE/src/other/step/src/cleditor/SdaiHeaderSchemaClasses.h brlcad/branches/STABLE/src/other/step/src/cleditor/SdaiHeaderSchemaInit.cc brlcad/branches/STABLE/src/other/step/src/cleditor/SdaiSchemaInit.cc brlcad/branches/STABLE/src/other/step/src/cleditor/SdaiSchemaInit.h brlcad/branches/STABLE/src/other/step/src/cleditor/cmdmgr.cc brlcad/branches/STABLE/src/other/step/src/cleditor/cmdmgr.h brlcad/branches/STABLE/src/other/step/src/cleditor/dispnode.cc brlcad/branches/STABLE/src/other/step/src/cleditor/dispnode.h brlcad/branches/STABLE/src/other/step/src/cleditor/dispnodelist.cc brlcad/branches/STABLE/src/other/step/src/cleditor/dispnodelist.h brlcad/branches/STABLE/src/other/step/src/cleditor/instmgr.cc brlcad/branches/STABLE/src/other/step/src/cleditor/instmgr.h brlcad/branches/STABLE/src/other/step/src/cleditor/mgrnode.cc brlcad/branches/STABLE/src/other/step/src/cleditor/mgrnode.h brlcad/branches/STABLE/src/other/step/src/cleditor/mgrnodearray.cc brlcad/branches/STABLE/src/other/step/src/cleditor/mgrnodearray.h brlcad/branches/STABLE/src/other/step/src/cleditor/mgrnodelist.cc brlcad/branches/STABLE/src/other/step/src/cleditor/mgrnodelist.h brlcad/branches/STABLE/src/other/step/src/cleditor/needFunc.cc brlcad/branches/STABLE/src/other/step/src/cleditor/needFunc.h brlcad/branches/STABLE/src/other/step/src/cleditor/seeinfodefault.h brlcad/branches/STABLE/src/other/step/src/clstepcore/CMakeLists.txt brlcad/branches/STABLE/src/other/step/src/clstepcore/ExpDict.cc brlcad/branches/STABLE/src/other/step/src/clstepcore/ExpDict.h brlcad/branches/STABLE/src/other/step/src/clstepcore/ExpDict.inline.cc brlcad/branches/STABLE/src/other/step/src/clstepcore/Registry.h brlcad/branches/STABLE/src/other/step/src/clstepcore/Registry.inline.cc brlcad/branches/STABLE/src/other/step/src/clstepcore/STEPaggregate.cc brlcad/branches/STABLE/src/other/step/src/clstepcore/STEPaggregate.h brlcad/branches/STABLE/src/other/step/src/clstepcore/STEPattribute.cc brlcad/branches/STABLE/src/other/step/src/clstepcore/STEPattribute.h brlcad/branches/STABLE/src/other/step/src/clstepcore/STEPattribute.inline.cc brlcad/branches/STABLE/src/other/step/src/clstepcore/STEPattributeList.cc brlcad/branches/STABLE/src/other/step/src/clstepcore/STEPattributeList.h brlcad/branches/STABLE/src/other/step/src/clstepcore/STEPcomplex.cc brlcad/branches/STABLE/src/other/step/src/clstepcore/STEPcomplex.h brlcad/branches/STABLE/src/other/step/src/clstepcore/STEPundefined.cc brlcad/branches/STABLE/src/other/step/src/clstepcore/STEPundefined.h brlcad/branches/STABLE/src/other/step/src/clstepcore/SingleLinkList.cc brlcad/branches/STABLE/src/other/step/src/clstepcore/SingleLinkList.h brlcad/branches/STABLE/src/other/step/src/clstepcore/SingleLinkList.inline.cc brlcad/branches/STABLE/src/other/step/src/clstepcore/collect.cc brlcad/branches/STABLE/src/other/step/src/clstepcore/complexSupport.h brlcad/branches/STABLE/src/other/step/src/clstepcore/complexlist.cc brlcad/branches/STABLE/src/other/step/src/clstepcore/entlist.cc brlcad/branches/STABLE/src/other/step/src/clstepcore/entnode.cc brlcad/branches/STABLE/src/other/step/src/clstepcore/match-ors.cc brlcad/branches/STABLE/src/other/step/src/clstepcore/multlist.cc brlcad/branches/STABLE/src/other/step/src/clstepcore/non-ors.cc brlcad/branches/STABLE/src/other/step/src/clstepcore/orlist.cc brlcad/branches/STABLE/src/other/step/src/clstepcore/print.cc brlcad/branches/STABLE/src/other/step/src/clstepcore/read_func.cc brlcad/branches/STABLE/src/other/step/src/clstepcore/read_func.h brlcad/branches/STABLE/src/other/step/src/clstepcore/sdai.cc brlcad/branches/STABLE/src/other/step/src/clstepcore/sdai.h brlcad/branches/STABLE/src/other/step/src/clstepcore/sdaiApplication_instance.cc brlcad/branches/STABLE/src/other/step/src/clstepcore/sdaiApplication_instance.h brlcad/branches/STABLE/src/other/step/src/clstepcore/sdaiSelect.h brlcad/branches/STABLE/src/other/step/src/clstepcore/trynext.cc brlcad/branches/STABLE/src/other/step/src/clutils/CMakeLists.txt brlcad/branches/STABLE/src/other/step/src/clutils/Str.h brlcad/branches/STABLE/src/other/step/src/clutils/dirobj.cc brlcad/branches/STABLE/src/other/step/src/clutils/dirobj.h brlcad/branches/STABLE/src/other/step/src/clutils/errordesc.cc brlcad/branches/STABLE/src/other/step/src/clutils/errordesc.h brlcad/branches/STABLE/src/other/step/src/clutils/gennode.cc brlcad/branches/STABLE/src/other/step/src/clutils/gennode.h brlcad/branches/STABLE/src/other/step/src/clutils/gennodearray.cc brlcad/branches/STABLE/src/other/step/src/clutils/gennodearray.h brlcad/branches/STABLE/src/other/step/src/clutils/gennodelist.cc brlcad/branches/STABLE/src/other/step/src/clutils/gennodelist.h brlcad/branches/STABLE/src/other/step/src/clutils/scl_hash.cc brlcad/branches/STABLE/src/other/step/src/clutils/scl_hash.h brlcad/branches/STABLE/src/other/step/src/exppp/CMakeLists.txt brlcad/branches/STABLE/src/other/step/src/exppp/exppp.c brlcad/branches/STABLE/src/other/step/src/express/CMakeLists.txt brlcad/branches/STABLE/src/other/step/src/express/alg.c brlcad/branches/STABLE/src/other/step/src/express/caseitem.c brlcad/branches/STABLE/src/other/step/src/express/dict.c brlcad/branches/STABLE/src/other/step/src/express/entity.c brlcad/branches/STABLE/src/other/step/src/express/error.c brlcad/branches/STABLE/src/other/step/src/express/expparse.y brlcad/branches/STABLE/src/other/step/src/express/expr.c brlcad/branches/STABLE/src/other/step/src/express/express.c brlcad/branches/STABLE/src/other/step/src/express/fedex.c brlcad/branches/STABLE/src/other/step/src/express/hash.c brlcad/branches/STABLE/src/other/step/src/express/lexact.c brlcad/branches/STABLE/src/other/step/src/express/linklist.c brlcad/branches/STABLE/src/other/step/src/express/memory.c brlcad/branches/STABLE/src/other/step/src/express/object.c brlcad/branches/STABLE/src/other/step/src/express/resolve.c brlcad/branches/STABLE/src/other/step/src/express/schema.c brlcad/branches/STABLE/src/other/step/src/express/scope.c brlcad/branches/STABLE/src/other/step/src/express/stmt.c brlcad/branches/STABLE/src/other/step/src/express/symbol.c brlcad/branches/STABLE/src/other/step/src/express/type.c brlcad/branches/STABLE/src/other/step/src/express/variable.c brlcad/branches/STABLE/src/other/step/src/fedex_plus/CMakeLists.txt brlcad/branches/STABLE/src/other/step/src/fedex_plus/classes.c brlcad/branches/STABLE/src/other/step/src/fedex_plus/classes.h brlcad/branches/STABLE/src/other/step/src/fedex_plus/classes_misc.c brlcad/branches/STABLE/src/other/step/src/fedex_plus/classes_wrapper.cc brlcad/branches/STABLE/src/other/step/src/fedex_plus/collect.cc brlcad/branches/STABLE/src/other/step/src/fedex_plus/complexlist.cc brlcad/branches/STABLE/src/other/step/src/fedex_plus/entlist.cc brlcad/branches/STABLE/src/other/step/src/fedex_plus/entnode.cc brlcad/branches/STABLE/src/other/step/src/fedex_plus/expressbuild.cc brlcad/branches/STABLE/src/other/step/src/fedex_plus/fedex_main.c brlcad/branches/STABLE/src/other/step/src/fedex_plus/match-ors.cc brlcad/branches/STABLE/src/other/step/src/fedex_plus/multlist.cc brlcad/branches/STABLE/src/other/step/src/fedex_plus/multpass.c brlcad/branches/STABLE/src/other/step/src/fedex_plus/non-ors.cc brlcad/branches/STABLE/src/other/step/src/fedex_plus/orlist.cc brlcad/branches/STABLE/src/other/step/src/fedex_plus/print.cc brlcad/branches/STABLE/src/other/step/src/fedex_plus/selects.c brlcad/branches/STABLE/src/other/step/src/fedex_plus/trynext.cc brlcad/branches/STABLE/src/other/step/src/fedex_plus/write.cc brlcad/branches/STABLE/src/other/step.dist brlcad/branches/STABLE/src/other/tcl/library/CMakeLists.txt brlcad/branches/STABLE/src/other/tk/CMake/FindX11.cmake brlcad/branches/STABLE/src/other/tk/CMakeLists.txt brlcad/branches/STABLE/src/other/tkhtml/CMake/FindX11.cmake brlcad/branches/STABLE/src/other/tkpng/CMake/FindX11.cmake brlcad/branches/STABLE/src/other/tktable/CMake/FindX11.cmake brlcad/branches/STABLE/src/other/tktable/CMakeLists.txt brlcad/branches/STABLE/src/other/togl/CMake/FindGL.cmake brlcad/branches/STABLE/src/proc-db/CMakeLists.txt brlcad/branches/STABLE/src/proc-db/csgbrep.cpp brlcad/branches/STABLE/src/remrt/remrt.1 brlcad/branches/STABLE/src/rt/reshoot.1 brlcad/branches/STABLE/src/rt/rt_bot_faces.1 brlcad/branches/STABLE/src/rt/rtg3.1 brlcad/branches/STABLE/src/rt/rthide.1 brlcad/branches/STABLE/src/rt/rtscale.1 brlcad/branches/STABLE/src/rt/rtshot.c brlcad/branches/STABLE/src/rttherm/rttherm.1 brlcad/branches/STABLE/src/tab/tabinterp.1 brlcad/branches/STABLE/src/tclscripts/archer/Archer.tcl brlcad/branches/STABLE/src/tclscripts/archer/ArcherCore.tcl brlcad/branches/STABLE/src/tclscripts/archer/images/CMakeLists.txt brlcad/branches/STABLE/src/tclscripts/lib/Accordian.tcl brlcad/branches/STABLE/src/tclscripts/lib/Ged.tcl brlcad/branches/STABLE/src/tclscripts/lib/RtImage.tcl brlcad/branches/STABLE/src/tclscripts/man_browser.tcl brlcad/branches/STABLE/src/tclscripts/mged/build_region.tcl brlcad/branches/STABLE/src/tclscripts/mged/grouper.tcl brlcad/branches/STABLE/src/tclscripts/rtwizard/rtwizard.bat brlcad/branches/STABLE/src/tclscripts/rtwizard/rtwizard.tcl brlcad/branches/STABLE/src/util/asc-pl.1 brlcad/branches/STABLE/src/util/bary.1 brlcad/branches/STABLE/src/util/buffer.1 brlcad/branches/STABLE/src/util/bwmod.1 brlcad/branches/STABLE/src/util/dunnsnap.1 brlcad/branches/STABLE/src/util/hex.1 brlcad/branches/STABLE/src/util/imgdims.1 brlcad/branches/STABLE/src/util/loop.1 brlcad/branches/STABLE/src/util/pix-bw.1 brlcad/branches/STABLE/src/util/pixborder.1 brlcad/branches/STABLE/src/util/pixclump.1 brlcad/branches/STABLE/src/util/pixcut.1 brlcad/branches/STABLE/src/util/pixdsplit.1 brlcad/branches/STABLE/src/util/pixdsplit.c brlcad/branches/STABLE/src/util/pixinterp2x.1 brlcad/branches/STABLE/src/util/pl-X.1 brlcad/branches/STABLE/src/util/pl-pl.1 brlcad/branches/STABLE/src/util/pl-ps.1 brlcad/branches/STABLE/src/util/pl-tek.1 brlcad/branches/STABLE/src/util/plrot.1 brlcad/branches/STABLE/src/util/png-bw.1 brlcad/branches/STABLE/src/util/png-pix.1 brlcad/branches/STABLE/src/util/random.1 brlcad/branches/STABLE/src/util/terrain.1 brlcad/branches/STABLE/src/vfont/CMakeLists.txt Added Paths: ----------- brlcad/branches/STABLE/doc/docbook/system/man1/en/asc2dsp.xml brlcad/branches/STABLE/doc/docbook/system/man5/en/dsp.xml brlcad/branches/STABLE/regress/asc2dsp.sh brlcad/branches/STABLE/regress/dsp/ brlcad/branches/STABLE/regress/dsp/asc2dsp-new.asc brlcad/branches/STABLE/regress/dsp/asc2dsp-old.asc brlcad/branches/STABLE/regress/dsp/dsp-1-1.asc brlcad/branches/STABLE/regress/dsp/dsp-1-2.asc brlcad/branches/STABLE/regress/dsp/dsp-2-1.asc brlcad/branches/STABLE/regress/dsp/dsp-2-2.asc brlcad/branches/STABLE/regress/dsp/dsp-2-3.asc brlcad/branches/STABLE/regress/dsp/dsp-2-4.asc brlcad/branches/STABLE/regress/dsp/dsp-2-5.asc brlcad/branches/STABLE/regress/dsp/dsp-3-1.asc brlcad/branches/STABLE/regress/dsp/dsp-3-2.asc brlcad/branches/STABLE/regress/dsp/dsp-3-3.asc brlcad/branches/STABLE/regress/dsp/dsp-3-4.asc brlcad/branches/STABLE/regress/dsp/dsp-3-5.asc brlcad/branches/STABLE/regress/dsp/dsp-3-6.asc brlcad/branches/STABLE/regress/dsp/dsp-3-7.asc brlcad/branches/STABLE/regress/dsp/dsp-3-8.asc brlcad/branches/STABLE/regress/dsp/dsp-common.sh brlcad/branches/STABLE/regress/dsp/run-dsp-case-set-0.sh brlcad/branches/STABLE/regress/dsp/run-dsp-case-set-1.sh brlcad/branches/STABLE/regress/dsp/run-dsp-case-set-2.sh brlcad/branches/STABLE/regress/dsp/run-dsp-case-set-3.sh brlcad/branches/STABLE/src/brlman/brlman.bat brlcad/branches/STABLE/src/brlman/brlman.tcl brlcad/branches/STABLE/src/conv/asc/asc2dsp.c brlcad/branches/STABLE/src/conv/asc/asc2g.1 brlcad/branches/STABLE/src/conv/asc/asc2pix.1 brlcad/branches/STABLE/src/libged/dag.cpp brlcad/branches/STABLE/src/libged/rtwizard.c brlcad/branches/STABLE/src/other/step/include/scl_export.h brlcad/branches/STABLE/src/other/step/include/xgetopt.h brlcad/branches/STABLE/src/other/step/src/fedex_plus/xgetopt.cc brlcad/branches/STABLE/src/tclscripts/archer/images/rtimage.png Removed Paths: ------------- brlcad/branches/STABLE/regress/dsp/asc2dsp-new.asc brlcad/branches/STABLE/regress/dsp/asc2dsp-old.asc brlcad/branches/STABLE/regress/dsp/dsp-1-1.asc brlcad/branches/STABLE/regress/dsp/dsp-1-2.asc brlcad/branches/STABLE/regress/dsp/dsp-2-1.asc brlcad/branches/STABLE/regress/dsp/dsp-2-2.asc brlcad/branches/STABLE/regress/dsp/dsp-2-3.asc brlcad/branches/STABLE/regress/dsp/dsp-2-4.asc brlcad/branches/STABLE/regress/dsp/dsp-2-5.asc brlcad/branches/STABLE/regress/dsp/dsp-3-1.asc brlcad/branches/STABLE/regress/dsp/dsp-3-2.asc brlcad/branches/STABLE/regress/dsp/dsp-3-3.asc brlcad/branches/STABLE/regress/dsp/dsp-3-4.asc brlcad/branches/STABLE/regress/dsp/dsp-3-5.asc brlcad/branches/STABLE/regress/dsp/dsp-3-6.asc brlcad/branches/STABLE/regress/dsp/dsp-3-7.asc brlcad/branches/STABLE/regress/dsp/dsp-3-8.asc brlcad/branches/STABLE/regress/dsp/dsp-common.sh brlcad/branches/STABLE/regress/dsp/run-dsp-case-set-0.sh brlcad/branches/STABLE/regress/dsp/run-dsp-case-set-1.sh brlcad/branches/STABLE/regress/dsp/run-dsp-case-set-2.sh brlcad/branches/STABLE/regress/dsp/run-dsp-case-set-3.sh brlcad/branches/STABLE/src/brlman/Makefile.am brlcad/branches/STABLE/src/brlman/brlman.1 brlcad/branches/STABLE/src/other/step/src/clutils/scl_char_str_list.cc brlcad/branches/STABLE/src/other/step/src/clutils/scl_char_str_list.h Property Changed: ---------------- brlcad/branches/STABLE/ brlcad/branches/STABLE/doc/docbook/articles/ brlcad/branches/STABLE/doc/docbook/books/ brlcad/branches/STABLE/doc/docbook/lessons/ brlcad/branches/STABLE/src/libbu/test_ctype.c brlcad/branches/STABLE/src/libged/polyclip.cpp Property changes on: brlcad/branches/STABLE ___________________________________________________________________ Modified: svn:mergeinfo - /brlcad/branches/cmake:43219 /brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-50908 + /brlcad/branches/cmake:43219 /brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-51214 Modified: brlcad/branches/STABLE/BUGS =================================================================== --- brlcad/branches/STABLE/BUGS 2012-06-18 16:29:58 UTC (rev 51214) +++ brlcad/branches/STABLE/BUGS 2012-06-18 19:38:59 UTC (rev 51215) @@ -15,6 +15,24 @@ Recent Bugs ----------- +* metaball tessellation enters either an infinite loop or an absurdly + long tessellation process - observed on Linux 64 bit sytem - quick + test: + + rm -f metaball.g && mged -c metaball.g "make m.s metaball; facetize m.bot m.s" + +* corruption/crash issue rendering terra.g without terra.dsp, + possibly/probably parallel-related in libbn/noise.c's + bn_noise_turb() function. gdb eventually catches a segfault in + find_spec_wgt() loop with indications of corrupted memory. valgrind + confirms corrupted memory (8 bytes) after a build_spec_table() + realloc within find_spec_wgt() but it's not clear why. etbl + book-keeping seems okay.. corrupted read consistently detected on + spec_wgts = ep->spec_wgts line in bn_noise_turb(). observed on + 64-bit linux system: + + rm -f terra.pix && valgrind bin/rt -o terra.pix -P1 -H3 -s1024 share/brlcad/7.21.0/db/terra.g all.g + * mged 'joint' hold command isn't working. looks like the fp_names book-keeping is fuxored or the db_lookup is returning NULL (or isn't yet performed). Modified: brlcad/branches/STABLE/CMakeLists.txt =================================================================== --- brlcad/branches/STABLE/CMakeLists.txt 2012-06-18 16:29:58 UTC (rev 51214) +++ brlcad/branches/STABLE/CMakeLists.txt 2012-06-18 19:38:59 UTC (rev 51215) @@ -88,7 +88,7 @@ # Stash the initial CMakeCache.txt file, if it exists, for subsequent # comparison if(EXISTS ${CMAKE_BINARY_DIR}/CMakeCache.txt) - configure_file(${CMAKE_BINARY_DIR}/CMakeCache.txt ${CMAKE_BINARY_DIR}/CMakeCache.txt.prev COPY_ONLY) + configure_file(${CMAKE_BINARY_DIR}/CMakeCache.txt ${CMAKE_BINARY_DIR}/CMakeCache.txt.prev COPYONLY) DISTCLEAN(${CMAKE_BINARY_DIR}/CMakeCache.txt.prev) endif(EXISTS ${CMAKE_BINARY_DIR}/CMakeCache.txt) DISTCLEAN(${CMAKE_BINARY_DIR}/CMakeCache.txt) @@ -586,6 +586,15 @@ mark_as_advanced(CMAKE_BUILD_TYPE) endif(NOT CMAKE_CONFIGURATION_TYPES) +# Normalize the build type capitalization and handle NONE case +string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE_UPPER) +if ("${BUILD_TYPE_UPPER}" STREQUAL "RELEASE") + set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build Type" FORCE) +endif ("${BUILD_TYPE_UPPER}" STREQUAL "RELEASE") +if ("${BUILD_TYPE_UPPER}" STREQUAL "DEBUG") + set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build Type" FORCE) +endif ("${BUILD_TYPE_UPPER}" STREQUAL "DEBUG") + if(CMAKE_BUILD_TYPE MATCHES "NONE") set(CMAKE_BUILD_TYPE "") endif(CMAKE_BUILD_TYPE MATCHES "NONE") @@ -876,6 +885,17 @@ set(PREVIOUS_CONFIGURE_TYPE ${CMAKE_WORD_SIZE} CACHE STRING "Previous configuration word size" FORCE) mark_as_advanced(PREVIOUS_CONFIGURE_TYPE) +# Auto-reconfiguration - by default, a CMake generated build system +# will re-run CMake if it detects that build system logic has changed. +# This is normally a good thing, but becomes problematic when using +# Visual Studio - recent versions of MSVC will individually prompt for +# a re-loading of generated solution files one at a time. Since +# BRL-CAD has over a thousand such files in a default build, the only +# viable approach is to close Visual Studio, re-run CMake manually, +# and re-open the project in Visual Studio. +if("${CMAKE_GENERATOR}" MATCHES "Visual Studio") + set(CMAKE_SUPPRESS_REGENERATION ON) +endif("${CMAKE_GENERATOR}" MATCHES "Visual Studio") # ******************************************************************* # *** Top Level Configure Options - Stage 1 of 9 *** @@ -1565,6 +1585,7 @@ BRLCAD_INCLUDE_FILE(sys/mount.h HAVE_SYS_MOUNT_H) BRLCAD_INCLUDE_FILE(sys/param.h HAVE_SYS_PARAM_H) BRLCAD_INCLUDE_FILE(sys/prctl.h HAVE_SYS_PRCTL_H) +BRLCAD_INCLUDE_FILE(sys/resource.h HAVE_SYS_RESOURCE_H) BRLCAD_INCLUDE_FILE(sys/sched.h HAVE_SYS_SCHED_H) BRLCAD_INCLUDE_FILE(sys/select.h HAVE_SYS_SELECT_H) BRLCAD_INCLUDE_FILE(sys/socket.h HAVE_SYS_SOCKET_H) Modified: brlcad/branches/STABLE/HACKING =================================================================== --- brlcad/branches/STABLE/HACKING 2012-06-18 16:29:58 UTC (rev 51214) +++ brlcad/branches/STABLE/HACKING 2012-06-18 19:38:59 UTC (rev 51215) @@ -643,10 +643,6 @@ 2) Stylistic whitespace -Space around operators and between multiple statements. - a = (b + c) * d; /* ok */ - b = 2; c = 3; /* ok */ - No space immediately inside parentheses. while (1) { ... /* ok */ for (i = 0; i < max; i++) { ... /* ok */ @@ -683,8 +679,8 @@ BRL-CAD uses the "The One True Brace Style" from BSD KNF and K&R. Opening braces should be on the same line as their statement, closing braces should line up with that same statement. Functions, however, -are treated special and place the opening brace on a separate line. -See http://en.wikipedia.org/wiki/Indent_style for details. +are treated specially and we place their opening braces on separate +lines. See http://en.wikipedia.org/wiki/Indent_style for details. int some_function(char *j) { @@ -1144,7 +1140,7 @@ 0) All code is committed to SVN. All commits have been reviewed. Notify developer mailing list of intention to release. - echo "Release preparations have begun. Please hold off disruptive commits until the release is tagged, tomorrow at the latest. Ensure your API changes are in doc/deprecation.txt and user-visibile changes are in NEWS." | mail -s "Release preparations commencing" brl...@li... + echo "Release preparations have begun. Please refrain from disruptive commits until the release is tagged or 24-hours have passed, whichever first. Ensure API changes are in doc/deprecation.txt, user-visibile changes are in NEWS, and help with release testing." | mail -s "Release preparations commencing" brl...@li... 1) Update TODO and BUGS. Verify all user-visible changes are in NEWS. Verify doc/deprecation.txt reflects all API and application changes. Modified: brlcad/branches/STABLE/NEWS =================================================================== --- brlcad/branches/STABLE/NEWS 2012-06-18 16:29:58 UTC (rev 51214) +++ brlcad/branches/STABLE/NEWS 2012-06-18 19:38:59 UTC (rev 51215) @@ -13,6 +13,14 @@ --- 2012-04-XX Release 7.21.X --- ---------------------------------------------------------------------- +* numerous manual page corrections and improvements - Tom Browder +* integration of rtwizard traits into archer - Bob Parker, Cliff Yapp +* new asc2dsp prep tool for displacement map data files - Tom Browder +* fixed a problem with rt writing pix files on Windows - Bob Parker +* added new raw-g raw triangle mesh to BoT importer - Daniel Roßberg +* added Windows man page support (using html) to brlman - Cliff Yapp +* added support for section numbers to brlman script - Cliff Yapp +* new manual pages for asc2dsp, dsp, asc2pix, and asc2g - Tom Browder * fixed bug creating binary uniform (binunif) objects - Sean Morrison * fixed memory corruption bug reading v4 geometry - Sean Morrison * fixed bug where small raytraces were being rotated - Erik Greenwald @@ -34,7 +42,7 @@ * upgraded libpng to 1.5.10 - Cliff Yapp * fixed various memory leaks in the comgeom-g geometry importer - Tom Browder, Nick Reed -* fixed comgeom-g bug importing ARS primitive objects - Tom Brower +* fixed comgeom-g bug importing ars primitive objects - Tom Browder * added new command-line invocation support to rtwizard - Cliff Yapp * fixed BoT mesh hit offset and vanish TIE render bugs - Keith Bowman * improved nurbs raytracing when shooting from inside - Keith Bowman @@ -46,6 +54,8 @@ * fixed bug in fast4-g importer handling HOLE/WALL cards - Nick Reed * fixed field truncation bug in comgeom-g importer - Tom Browder * fixed log file clobber bug in the benchmark suite - Cliff Yapp +* enabled new 'select' command for use within mged - Richard Weiss +* added preliminary object 'select' command to archer - Bob Parker * improved support for the Intel C/C++ compiler (icc) - Sean Morrison * now sorting top level object alphabetically in rtwizard - Cliff Yapp * "About BRL-CAD" article translation to Russian - Ilya @@ -53,6 +63,7 @@ * "About BRL-CAD" article translation to Italian - Unknown Contributor, Tom Browder * improved handling of rgb/color attributes by adjust cmd - Cliff Yapp +* added initial support for step-g import of assemblies - Keith Bowman * added a basic SWIG spec file - Erik Greenwald * fixed referenced object highlighting in archer treeview - Bob Parker * fixed error handling input reading failure in burst - Sean Morrison @@ -79,6 +90,7 @@ * fixed orientation bug in mged 'ypr' rotation command - Nick Reed * fixed mged bug setting color via Combination Editor - Nicholas Reed * fixed numerous xyz/ypr orientation bugs in anim tools - Nick Reed +* improved tessellation of pipe bends for conversion - Richard Weiss * fixed keypoint vertex bug when editing extrude objects - Nick Reed * fixed eto error converting hyp objects with asc2g tool - Nick Reed # fixed mged bug processing edcodes command arguments - Bob Parker Modified: brlcad/branches/STABLE/TODO =================================================================== --- brlcad/branches/STABLE/TODO 2012-06-18 16:29:58 UTC (rev 51214) +++ brlcad/branches/STABLE/TODO 2012-06-18 19:38:59 UTC (rev 51215) @@ -18,40 +18,11 @@ THESE TASKS SHOULD HAPPEN BEFORE THE NEXT RELEASE ------------------------------------------------- -* something wrong with brep/nurbs subdivision spatial partitioning - causing inline failure in BANode<ON_BoundingBox>::addChild(). - disable NOSTRICTCXX strict flag on librt with Release mode - compilation to diagnose. need to make sure class composition and - data members are correct and, iff correct, expand inline-unit-growth - to accommodate. +THESE TASKS SHOULD HAPPEN WITHIN TWO RELEASE ITERATIONS +------------------------------------------------------- -* make sure mged's sketch editor works (particularly for circles) - -* bump library versions to 20. been 19 for way too long, not - following proper library versioning compatibility numbering. - -* add regression test for 'red' command unsetting the region flag - -* quickly verify cross-platform that mged -c + attach X + draw doesn't - crash. - -* g-nff is crashing, fix it; more specifically, it is - getting a bu_bomb abort with a failed region conversion - with supposedly a stack trace to a bu_bomb log but - no stack trace is printed to the log (getting same error - with g-euclid, g-euclid1, g-iges, g-jack, g-nmg, g-obj, - g-off, g-tankill, g-x3d, g-xxx_facets) - * test illuminate (e.g. oed) + Z, report of crash (on Windows) -* review and test extensively (post-coverity review) - -* investigate and fix the idents command first column bug - - -THESE TASKS SHOULD HAPPEN WITHIN TWO RELEASE ITERATIONS -------------------------------------------------------- - * bu_bomb not printing stack trace as it is supposed to * g-nff man page is out of sync with g-nff options @@ -87,6 +58,34 @@ THESE ARE UNSCHEDULED BACKLOG TASKS ----------------------------------- +* something wrong with brep/nurbs subdivision spatial partitioning + causing inline failure in BANode<ON_BoundingBox>::addChild(). + disable NOSTRICTCXX strict flag on librt with Release mode + compilation to diagnose. need to make sure class composition and + data members are correct and, iff correct, expand inline-unit-growth + to accommodate. + +* investigate why Eric Raymond's doclifter + (http://www.catb.org/~esr/doclifter/)is failing on these man page + source files: + + ./src/anim/anim_sort.1 + ./src/canon/canonize.1 + ./src/util/pixrot.1 + ./src/tab/tabinterp.1 + ./src/tab/tabsub.1 + ./src/anim/anim_time.1 + ./src/libbn/libplot3.3 + ./src/libbu/htond.3 + ./src/libbu/redblack.3 + ./src/libcursor/libcursor.3 + ./src/liborle/liborle.3 + ./src/librt/librt.3 + ./src/libwdb/libwdb.3 + +* update mged to not call wdb_init_obj and wdb_create_cmd, trace down + other vestiges of wdb_obj for removal + * migrate the mged 'joint' command to libged * add support to rt tools and gtools for specifying az/el in radians @@ -664,6 +663,10 @@ * complete conversion of existing manual pages into docbook format + note that Eric Raymond's "manlifter" (a driver for his "doclifter") + can be used to aid the project (see + http://www.catb.org/~esr/doclifter/) + * add an option to bot_dump for outputting surface normals. Make sure all supported dump formats (obj, dxf, etc) optionally write out normals. Consider adding an option to smoothly interpolate normals @@ -1293,8 +1296,11 @@ they have any code we could snarf to make life easier, but regardless we need a libbu API on top of any other code - at such a core level, we can't introduce an external API. - - + +* add per-face analysis of primitives like tgc, arb to their respective + analyze commands in libged + + CONVERTERS ---------- @@ -1654,7 +1660,15 @@ one attribute object entity that can do everything a binunif can do, then allow attributes on objects to provide that same flexibility. +* change format of related programs (especially filters) so the + input/output files are handled identically. two examples of + different handling: + png-pix file.png > file.pix + pix-bw < file.pix > file.bw + + (desired style to be determined) + FUNCTIONALITY NEEDED TO SPEED UP RAYTRACING ------------------------------------------- Modified: brlcad/branches/STABLE/bench/CMakeLists.txt =================================================================== --- brlcad/branches/STABLE/bench/CMakeLists.txt 2012-06-18 16:29:58 UTC (rev 51214) +++ brlcad/branches/STABLE/bench/CMakeLists.txt 2012-06-18 19:38:59 UTC (rev 51215) @@ -8,12 +8,16 @@ BRLCAD_ADDEXEC(pixcmp pixcmp.c libbu) -configure_file(run.sh ${CMAKE_BINARY_DIR}/bin/benchmark COPYONLY) -install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/benchmark DESTINATION ${BIN_DIR}) -foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES}) - string(TOUPPER "${CFG_TYPE}" CFG_TYPE_UPPER) - configure_file(run.sh ${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/bin/benchmark COPY_ONLY) -endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES}) +configure_file(run.sh ${CMAKE_CURRENT_BINARY_DIR}/benchmark COPYONLY) +install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/benchmark DESTINATION ${BIN_DIR}) +if(CMAKE_CONFIGURATION_TYPES) + foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES}) + string(TOUPPER "${CFG_TYPE}" CFG_TYPE_UPPER) + configure_file(run.sh ${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/bin/benchmark COPYONLY) + endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES}) +else(CMAKE_CONFIGURATION_TYPES) + configure_file(run.sh ${CMAKE_BINARY_DIR}/bin/benchmark COPYONLY) +endif(CMAKE_CONFIGURATION_TYPES) file(WRITE ${CMAKE_BINARY_DIR}/CMakeTmp/benchmsg.cmake "message(\"---\")\n") file(APPEND ${CMAKE_BINARY_DIR}/CMakeTmp/benchmsg.cmake "message(\"Run 'make benchmark-clean' in the bench directory to delete the logic\")\n") Modified: brlcad/branches/STABLE/bench/benchmark.1 =================================================================== --- brlcad/branches/STABLE/bench/benchmark.1 2012-06-18 16:29:58 UTC (rev 51214) +++ brlcad/branches/STABLE/bench/benchmark.1 2012-06-18 19:38:59 UTC (rev 51215) @@ -164,7 +164,7 @@ .PP When the benchmark completes, output should be saved to several log files including a 'summary' file containing tabulated results, a -'\*benchmark.log' file containing the output from a given run, and +'benchmark.log' file containing the output from a given run, and multiple log files for each test frame. Use the \fIclean\fR and \fIclobber\fR commands during execution to remove the files generated during the benchmark. Modified: brlcad/branches/STABLE/configure.ac =================================================================== --- brlcad/branches/STABLE/configure.ac 2012-06-18 16:29:58 UTC (rev 51214) +++ brlcad/branches/STABLE/configure.ac 2012-06-18 19:38:59 UTC (rev 51215) @@ -4148,8 +4148,6 @@ src/archer/plugins/Wizards/tankwizard/Makefile src/archer/plugins/Wizards/tankwizard/images/Makefile src/archer/plugins/Wizards/tirewizard/Makefile - src/brlman/Makefile - src/brlman/brlman.sh src/burst/Makefile src/bwish/Makefile src/canon/Makefile Modified: brlcad/branches/STABLE/db/CMakeLists.txt =================================================================== --- brlcad/branches/STABLE/db/CMakeLists.txt 2012-06-18 16:29:58 UTC (rev 51214) +++ brlcad/branches/STABLE/db/CMakeLists.txt 2012-06-18 19:38:59 UTC (rev 51215) @@ -37,26 +37,45 @@ xmp.asc ) -file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${DATA_DIR}/db) +# Get our root path +if(CMAKE_CONFIGURATION_TYPES) + set(bin_root "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}") +else(CMAKE_CONFIGURATION_TYPES) + set(bin_root "${CMAKE_BINARY_DIR}") +endif(CMAKE_CONFIGURATION_TYPES) + +# Make sure the db directories are there +if(CMAKE_CONFIGURATION_TYPES) + foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES}) + file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${CFG_TYPE}/${DATA_DIR}/db) + endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES}) +else(CMAKE_CONFIGURATION_TYPES) + file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${DATA_DIR}/db) +endif(CMAKE_CONFIGURATION_TYPES) + foreach(g_model ${G_SAMPLE_MODELS}) string(REGEX REPLACE "([0-9a-z]*).asc" "\\1" g_model_root "${g_model}") + set(output_file ${bin_root}/${DATA_DIR}/db/${g_model_root}.g) add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/${DATA_DIR}/db/${g_model_root}.g - COMMAND asc2g ${CMAKE_CURRENT_SOURCE_DIR}/${g_model} ${CMAKE_BINARY_DIR}/${DATA_DIR}/db/${g_model_root}.g - DEPENDS asc2g ${CMAKE_CURRENT_SOURCE_DIR}/${g_model} + OUTPUT ${output_file} + COMMAND asc2g ${CMAKE_CURRENT_SOURCE_DIR}/${g_model} ${output_file} + DEPENDS asc2g ${CMAKE_CURRENT_SOURCE_DIR}/${g_model} ) - add_custom_target(${g_model_root}.g ALL DEPENDS ${CMAKE_BINARY_DIR}/${DATA_DIR}/db/${g_model_root}.g) + add_custom_target(${g_model_root}.g ALL DEPENDS ${output_file}) if(BRLCAD_INSTALL_EXAMPLE_GEOMETRY) - install(FILES ${CMAKE_BINARY_DIR}/${DATA_DIR}/db/${g_model_root}.g DESTINATION ${DATA_DIR}/db) + if(NOT "${CMAKE_CFG_INTDIR}" STREQUAL "." AND CMAKE_CONFIGURATION_FILES) + string(REPLACE "${CMAKE_CFG_INTDIR}" "\${BUILD_TYPE}" output_file "${output_file}") + endif(NOT "${CMAKE_CFG_INTDIR}" STREQUAL "." AND CMAKE_CONFIGURATION_FILES) + install(FILES ${output_file} DESTINATION ${DATA_DIR}/db) endif(BRLCAD_INSTALL_EXAMPLE_GEOMETRY) - set(BUILT_MODELS "${BUILT_MODELS};${CMAKE_BINARY_DIR}/${DATA_DIR}/db/${g_model_root}.g") + set(BUILT_MODELS "${BUILT_MODELS};${output_file}") endforeach(g_model ${G_SAMPLE_MODELS}) CMAKEFILES(${G_SAMPLE_MODELS}) SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${BUILT_MODELS}") if(BRLCAD_INSTALL_EXAMPLE_GEOMETRY) - BRLCAD_ADDDATA(terra.dsp db) + BRLCAD_ADDDATA(terra.dsp db) endif(BRLCAD_INSTALL_EXAMPLE_GEOMETRY) CMAKEFILES(Makefile.am cornell.rt db.php include) Modified: brlcad/branches/STABLE/doc/docbook/CMakeLists.txt =================================================================== --- brlcad/branches/STABLE/doc/docbook/CMakeLists.txt 2012-06-18 16:29:58 UTC (rev 51214) +++ brlcad/branches/STABLE/doc/docbook/CMakeLists.txt 2012-06-18 19:38:59 UTC (rev 51215) @@ -55,7 +55,6 @@ include(${BRLCAD_SOURCE_DIR}/misc/CMake/DocBook.cmake) # For the html files, we need brlcad.css -file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${DATA_DIR}/${DOC_DIR}/html/css) if(NOT CMAKE_CONFIGURATION_TYPES) configure_file(css/brlcad.css ${CMAKE_BINARY_DIR}/${DATA_DIR}/${DOC_DIR}/html/css/brlcad.css) else(NOT CMAKE_CONFIGURATION_TYPES) Property changes on: brlcad/branches/STABLE/doc/docbook/articles ___________________________________________________________________ Modified: svn:mergeinfo - /brlcad/trunk/doc/docbook/articles:37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-50908 + /brlcad/trunk/doc/docbook/articles:37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-51214 Modified: brlcad/branches/STABLE/doc/docbook/articles/en/TEMPLATE.xml =================================================================== --- brlcad/branches/STABLE/doc/docbook/articles/en/TEMPLATE.xml 2012-06-18 16:29:58 UTC (rev 51214) +++ brlcad/branches/STABLE/doc/docbook/articles/en/TEMPLATE.xml 2012-06-18 19:38:59 UTC (rev 51215) @@ -55,7 +55,7 @@ <para> Another paragraph with embedded list is shown here. Each - paragraph gets it's own para and should be wrapped for + paragraph gets its own para and should be wrapped for readability and localized context diff comparisons. <info><title>A list of items:</title></info> Property changes on: brlcad/branches/STABLE/doc/docbook/books ___________________________________________________________________ Modified: svn:mergeinfo - /brlcad/trunk/doc/docbook/books:37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-50908 + /brlcad/trunk/doc/docbook/books:37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-51214 Property changes on: brlcad/branches/STABLE/doc/docbook/lessons ___________________________________________________________________ Modified: svn:mergeinfo - /brlcad/trunk/doc/docbook/lessons:37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-50908 + /brlcad/trunk/doc/docbook/lessons:37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-51214 Modified: brlcad/branches/STABLE/doc/docbook/system/README =================================================================== --- brlcad/branches/STABLE/doc/docbook/system/README 2012-06-18 16:29:58 UTC (rev 51214) +++ brlcad/branches/STABLE/doc/docbook/system/README 2012-06-18 19:38:59 UTC (rev 51215) @@ -21,3 +21,6 @@ search.xml for a more elaborate example - but it should provide a convenient "container" for what has been the common documentation format in previous work. + +The file './man1/en/rt.xml' is a good example of the format for a +command-line BRL-CAD user command. Modified: brlcad/branches/STABLE/doc/docbook/system/man1/en/CMakeLists.txt =================================================================== --- brlcad/branches/STABLE/doc/docbook/system/man1/en/CMakeLists.txt 2012-06-18 16:29:58 UTC (rev 51214) +++ brlcad/branches/STABLE/doc/docbook/system/man1/en/CMakeLists.txt 2012-06-18 19:38:59 UTC (rev 51215) @@ -1,4 +1,5 @@ set(docbook_man1_EN + asc2dsp.xml bwscale.xml coil.xml db.xml Copied: brlcad/branches/STABLE/doc/docbook/system/man1/en/asc2dsp.xml (from rev 51214, brlcad/trunk/doc/docbook/system/man1/en/asc2dsp.xml) =================================================================== --- brlcad/branches/STABLE/doc/docbook/system/man1/en/asc2dsp.xml (rev 0) +++ brlcad/branches/STABLE/doc/docbook/system/man1/en/asc2dsp.xml 2012-06-18 19:38:59 UTC (rev 51215) @@ -0,0 +1,87 @@ +<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="rt1"> + <refmeta> + <refentrytitle>ASC2DSP</refentrytitle> + <manvolnum>1</manvolnum> + <refmiscinfo class="source">BRL-CAD</refmiscinfo> + <refmiscinfo class="manual">BRL-CAD User Commands</refmiscinfo> + </refmeta> + + <refnamediv xml:id="name"> + <refname>asc2dsp</refname> + <refpurpose> + convert an ASCII dsp file to the BRL-CAD DSP (Displacement map) binary format + </refpurpose> + </refnamediv> + + <!-- body begins here --> + <refsynopsisdiv xml:id="synopsis"> + <cmdsynopsis sepchar=" "> + <command>rt</command> + <arg choice="plain" rep="norepeat"><replaceable>file.asc</replaceable></arg> + <arg choice="plain" rep="norepeat"><replaceable>file.dsp</replaceable></arg> + </cmdsynopsis> + </refsynopsisdiv> + + <refsection xml:id="description"><info><title>DESCRIPTION</title></info> + + <para> + <emphasis remap="I">Asc2dsp</emphasis> converts ASCII (decimal + integer) cell (point) files to the binary form of a file in + BRL-CAD's dsp format. Pixels are defined by + whitespace-delimited, unsigned decimal integers in the range 0 + to 2^16-1 (65535). The output file is in dsp binary format (one + network unsigned short int per cell (point). + </para> + + <para>The grid is oriented in the X-Y plane where width is in the + X direction and length is in the Y direction. When used to create + a dsp object im mged, the bottom left cell will have its bottom-left + corner at X = 0, Y = 0, its bottom at Z = 0, and its top at Z + equal to the value input in the ASCII file. Note that entries in the + ASCII file are read in the same manner as a pix file, i.e., filling the + grid from bottom to top, left to right, so the first cell defined in the ASCII + file is the bottom-left cell when the dsp file is imported + with mged. Note also that white space is ignored so the user + can lay out the grid row by row to aid visualizing the end product + (always remembering that the order of the rows will be reversed + during input by mged).</para> + + <para>An easy way to create the input file for asc2dsp is to first create it + row by row in natural form with the top row being the desired top row and so on + in desired viewing order. Then take the finished file and filter it through + the Unix utility tac which will reverse the order of the rows (lines). + </para> + + <para> + Note the user must ensure that the input file is valid for mged so that width + times length equals the actual number of cells (points). + </para> + + </refsection> + + <refsection xml:id="see_also"><info><title>SEE ALSO</title></info> + <para> + <citerefentry><refentrytitle>tac</refentrytitle><manvolnum>1</manvolnum></citerefentry>, + <citerefentry><refentrytitle>mged</refentrytitle><manvolnum>1</manvolnum></citerefentry>, + <citerefentry><refentrytitle>dsp</refentrytitle><manvolnum>5</manvolnum></citerefentry>. + </para> + </refsection> + + <refsection xml:id="diagnostics"><info><title>DIAGNOSTICS</title></info> + <para>Error conditions include invalid input characters or an input + value greater than 65535. + Descriptive messages are printed on stderr.</para> + </refsection> + + <info><corpauthor>BRL-CAD Team</corpauthor></info> + + <refsection xml:id="copyright"><info><title>COPYRIGHT</title></info> + <para>This software is Copyright (c) 2012-2012 United States Government as + represented by the U.S. Army Research Laboratory. All rights reserved.</para> + </refsection> + + <refsection xml:id="bug_reports"><info><title>BUG REPORTS</title></info> + <para>Reports of bugs or problems should be submitted via electronic + mail to <de...@br...>, or via the "cadbug.sh" script.</para> + </refsection> +</refentry> Modified: brlcad/branches/STABLE/doc/docbook/system/man1/en/rtwizard.xml =================================================================== --- brlcad/branches/STABLE/doc/docbook/system/man1/en/rtwizard.xml 2012-06-18 16:29:58 UTC (rev 51214) +++ brlcad/branches/STABLE/doc/docbook/system/man1/en/rtwizard.xml 2012-06-18 19:38:59 UTC (rev 51215) @@ -91,6 +91,29 @@ </listitem> </varlistentry> <varlistentry> + <term><option>-d</option> <replaceable>framebuffer_device</replaceable></term> + <term><option>--fbserv-device</option> <replaceable>framebuffer_device</replaceable></term> + <listitem> + <para> + The type of framebuffer to use when running fbserv to establish a framebuffer. By default, + "/dev/mem" is used for a non-graphical framebuffer - other options include /dev/X, /dev/ogl, + and (Windows only) /dev/wgl. A /dev/mem framebuffer created by <command>rtwizard</command> + will be closed after the image generation is complete. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><option>-p</option> <replaceable>port_number</replaceable></term> + <term><option>--fbserv-port</option> <replaceable>port_number</replaceable></term> + <listitem> + <para> + The number of the framebuffer port to use when running <command>fbserv</command> to establish a framebuffer. An + existing framebuffer may also be specified and used. In the case of a pre-existing non-grapical framebuffer, + <command>rtwizard</command> will not close the framebuffer automatically after the raytracing process is complete. + </para> + </listitem> + </varlistentry> + <varlistentry> <term><option>--gui</option></term> <listitem> <para> @@ -110,7 +133,14 @@ </varlistentry> </variablelist> - <variablelist remap="TP"><title>Model View Options</title> + <variablelist remap="TP"><title>Model View Options - User Level</title> + <para> + When it comes to preparing the view for an RtWizard image, there are two options. One + is to use the "user level" controls, which reflect the view manipulations used by users + on the command line. The other is to use the "low level" specifiers, which are more + typically used when <command>rtwizard</command> is run by automated scripts. The two + methods are mutually exclusive. + </para> <varlistentry> <term><option>-a</option> <replaceable>angle (degrees)</replaceable></term> <term><option>--azimuth</option> <replaceable>angle (degrees)</replaceable></term> @@ -136,6 +166,15 @@ </listitem> </varlistentry> <varlistentry> + <term><option>-P</option> <replaceable>angle (degrees)</replaceable></term> + <term><option>--perspective</option> <replaceable>angle (degrees)</replaceable></term> + <listitem> + <para> + Set the perspective angle. + </para> + </listitem> + </varlistentry> + <varlistentry> <term><option>-z</option> <replaceable>value</replaceable></term> <term><option>--zoom</option> <replaceable>value</replaceable></term> <listitem> @@ -144,8 +183,46 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term><option>--center</option> <replaceable>X Y Z</replaceable> </term> + <listitem> + <para> + Set the xyz coordinates of the center of the view. + </para> + </listitem> + </varlistentry> </variablelist> + <variablelist remap="TP"><title>Model View Options - Low Level</title> + <para> + When specifying a low level view model is "all or nothing" - all options + are required to correctly define the view. + </para> + <varlistentry> + <term><option>--viewsize</option> <replaceable>view_size(mm)</replaceable></term> + <listitem> + <para>Set the view size.</para> + </listitem> + </varlistentry> + <varlistentry> + <term><option>--orientation</option> <replaceable>element_1 element_2 element_3 element_4</replaceable> </term> + <listitem> + <para> + Set view quaternion. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><option>--eye_pt</option> <replaceable>X Y Z</replaceable></term> + <listitem> + <para> ... [truncated message content] |