merge trunk to STABLE from r39997 to r40005. apparently the first syn…

…c done in r40000 was wrong or at least woefully incomplete.. HACKING instruction may be insufficient. this is a heavy sync performed manually.

svn:revision:40006
svn:branch:STABLE
svn:account:brlcad

BUGS

@@ -95,6 +95,18 @@ Recent Bugs
 
 * mged rotation halts after a few events and after zooming in/out at
   least once (Mac OS X 10.5)
+  More info:  This problem appears to be specific to a particular
+  X11 version or versions - it has been observed with 
+  xorg-server-1.4.2-apple33 on 10.5.  It does not occur with the
+  community XQuartz 2.5.0 (xorg-server 1.7.6), nor does it occur
+  when Tk 8.5.8 is compiled to use the Aqua backend. At least one other
+  (possibly earlier) verison of X11 from Apple on a 10.5 Mac did not
+  exhibit bad rotate behavior. The problem is not specifically the 
+  zooming action - rather, the zoom triggers
+  a Tk focus call on the display manager window (rather than the 
+  Tk parent window) and the problem manifests when focus is on the
+  display manager window.  mged classic mode, where there is no
+  parent window, exhibits the bad rotate behavior immediately.
 
 * rtedge fills in nearly entire faces of an object when executing on a
   model that is in perspective mode. Effects really bad on small sized

NEWS

@@ -20,6 +20,8 @@ converted and work continues on the technical side to develop
 stylesheets for publishing corresponding PDF documents on the BRL-CAD
 website.
 
+* fixed nirt output formatting in MGED - Cliff Yapp
+* rt can now output directly to PNG, among others - Erik Greenwald
 * fixed crash-on-exit bug with iges-g importer - Richard Weiss
 * fixed framebuffer shutdown and memory management bugs - Bob Parker
 * added all remaining shape tools to the Windows build - Sean Morrison

README

@@ -1,5 +1,5 @@
 			    BRL-CAD
-			 Release 7.16.8
+			 Release 7.16.10
 		       http://brlcad.org/
 
 BRL-CAD is a powerful cross-platform open source combinatorial

TODO

@@ -900,7 +900,7 @@ FUNCTIONALITY NEEDED TO SPEED UP RAYTRACING
 
 * implement SIMD shots
 
-* implement SAH for all primitives
+* implement SAH for all primitives (routine that fires a ray at each primitive for initial estimate, caches result)
 
 * write and use kdtree - make traversal cache coherent
 

configure.ac

@@ -380,6 +380,9 @@ BC_ARG_WITH([with_x11], [x11], [Specify use of or path to X11 (optional)], [auto
 # use opengl
 BC_ARG_WITH([with_opengl], [ogl], [Specify use of or path to OpenGL (optional)], [no])
 
+# use Apple opengl
+BC_ARG_WITH([with_agl], [agl], [Specify use of or path to Apple OpenGL (optional)], [no])
+
 # use wgl
 BC_ARG_WITH([with_wgl], [wgl], [Specify use of or path to WindowsGL], [auto])
 
@@ -615,6 +618,9 @@ BC_ARG_WITH_ALIAS([with_x11], [x])
 # with opengl aliases (help uses ogl)
 BC_ARG_WITH_ALIAS([with_opengl], [opengl])
 
+# with agl aliases (help uses agl)
+BC_ARG_WITH_ALIAS([with_agl], [agl])
+
 # with wgl aliases (help uses wgl)
 BC_ARG_WITH_ALIAS([with_wgl], [windowsgl])
 
@@ -879,6 +885,9 @@ AC_MSG_RESULT($bc_with_x11)
 AC_MSG_CHECKING(whether to compile the OpenGL interfaces)
 AC_MSG_RESULT($bc_with_opengl)
 
+AC_MSG_CHECKING(whether to compile the AGL interfaces)
+AC_MSG_RESULT($bc_with_agl)
+
 AC_MSG_CHECKING(whether to compile the WindowsGL interfaces)
 AC_MSG_RESULT($bc_with_wgl)
 
@@ -1461,6 +1470,27 @@ if test "x$bc_with_opengl" != "xno" ; then
     fi
 fi
 
+dnl check if the Apple OpenGL framework is available
+FRAMEWORK_OPENGL=""
+if test "xbc_with_agl" != "xno" ; then
+    AC_MSG_CHECKING([whether -framework OpenGL is available])
+    framework_opengl=no
+    PRELIBS="$LIBS"
+    LIBS="$LIBS -framework OpenGL"
+    AC_TRY_LINK([#include <OpenGL/OpenGL.h>], [
+    GLboolean values;
+    void (*func)() = glBegin;
+    if (GL_FALSE) {
+        func(GL_POINTS);
+        glGetBooleanv(GL_DEPTH_TEST, &values);
+        glEnd();
+    }
+    ], [framework_opengl=yes ; FRAMEWORK_OPENGL="-framework OpenGL"])
+    LIBS="$PRELIBS"
+    AC_MSG_RESULT($framework_opengl)
+fi
+AC_SUBST(FRAMEWORK_OPENGL)
+
 dnl check if the Windows WGL graphics library links
 wgl_link_works=no
 LIBWGL=""
@@ -1650,7 +1680,17 @@ if test "x$bc_with_opengl" != "xno" -o "x$bc_with_wgl" != "xno" ; then
     fi
     CPPFLAGS="$PRECPPFLAGS"
 fi # bc_with_opengl
-GL_CPPFLAGS="$GL_H_CPPFLAGS $GLX_H_CPPFLAGS"
+
+AGL_CPPFLAGS=""
+if test "x$bc_with_agl" != "xno"; then
+    # Apple OpenGL is a bit different - the GL_CPPFLAGS need to contain
+    # the call to the OpenGL framework.
+    GL_H_CPPFLAGS=
+    GLX_H_CPPFLAGS=
+    AGL_CPPFLAGS="-framework OpenGL"
+fi
+
+GL_CPPFLAGS="$GL_H_CPPFLAGS $GLX_H_CPPFLAGS $AGL_CPPFLAGS"
 AC_SUBST(GL_CPPFLAGS)
 
 
@@ -3390,6 +3430,11 @@ AC_MSG_CHECKING(for OpenGL library availability)
 AC_MSG_RESULT($gl_link_works)
 AC_SUBST(LIBGL)
 
+dnl *** Apple OpenGL ***
+AC_MSG_CHECKING(for Apple OpenGL framework availability)
+AC_MSG_RESULT($framework_opengl)
+AC_SUBST(FRAMEWORK_AGL)
+
 dnl *** libopengl32 ***
 AC_MSG_CHECKING(for WindowsGL library availability)
 AC_MSG_RESULT($wgl_link_works)
@@ -3615,6 +3660,51 @@ fi # bc_with_opengl
 AC_MSG_CHECKING(whether to build against OpenGL)
 AC_MSG_RESULT($build_against_opengl)
 
+dnl *** Apple OpenGL interface compilation ***
+build_against_agl="no"
+if test "x$bc_with_agl" != "xno" ; then
+    AC_MSG_CHECKING(for Apple OpenGL functionality)
+    agl_works=no
+    PRELIBS="$LIBS"
+    PRECPPFLAGS="$CPPFLAGS"
+    PRELDFLAGS="$LDFLAGS"
+    LIBS="$LIBS $LIBGL"
+    CPPFLAGS="$CPPFLAGS $GL_CPPFLAGS"
+    LDFLAGS="$LDFLAGS $FRAMEWORK_OPENGL"
+    AC_TRY_RUN([
+#include <OpenGL/OpenGL.h>
+main(int argc, char *argv[]) {
+    GLboolean values;
+    void (*func)() = glBegin;
+    if (GL_FALSE || argc > 1) {
+	func(GL_POINTS);
+	glGetBooleanv(GL_DEPTH_TEST, &values);
+	glEnd();
+    }
+    return 0;
+}
+    ], [agl_works=yes])
+    LIBS="$PRELIBS"
+    CPPFLAGS="$PRECPPFLAGS"
+    LDFLAGS="$PRELDFLAGS"
+    AC_MSG_RESULT($agl_works)
+
+    dnl figure out whether we need to build against opengl
+    if test "x$agl_works" = "xyes" ; then
+	build_against_agl="yes"
+    else
+	if test "x$bc_with_agl" = "xyes" ; then
+	    AC_MSG_NOTICE([Apple OpenGL was requested, but no system OpenGL libraries were found])
+	    AC_MSG_NOTICE([}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}])
+	    AC_MSG_NOTICE([Try adding --without-agl])
+	    AC_MSG_ERROR([*** Using Apple OpenGL was requested, yet no system OpenGL was found ***])
+	else
+	    AC_MSG_NOTICE([OpenGL does not appear to be functionally available])
+	fi
+    fi
+fi # bc_with_agl
+AC_MSG_CHECKING(whether to build against Apple OpenGL)
+AC_MSG_RESULT($build_against_agl)
 
 dnl *** WindowsGL interface compilation ***
 build_against_wgl="no"

doc/BRL-CAD.bib

@@ -8,6 +8,45 @@
 %%%
 
 
+@TECHREPORT{Muuss83a,
+  author = {Muuss, Michael and Applin, Keith and Suckling, Robert and Moss, Gary and Weaver, Earl and Stanley, Charles},
+  title = {GED: An Interactive Solid Modeling System For Vulnerability Assessments},
+  institution = {United States Army, Ballistic Research Laboratory},
+  year = {1983},
+  month = {March},
+  number = {BRL-TR-02480},
+  address = {U.S. Army Ballistic Research Laboratory, Aberdeen Proving Ground, MD 21005},
+  note = {Approved for Public Release; Distribution is Unlimited.},
+  owner = {morrison},
+  timestamp = {2010.05.06}
+}
+
+@TECHREPORT{Deitz84a,
+  author = {Deitz, Paul},
+  title = {Solid Geometric Modeling - The Key to Improved Materiel Acquisition from Concept to Deployment},
+  institution = {United States Army, Ballistic Research Laboratory},
+  year = {1984},
+  month = {September},
+  number = {BRL-MR-3383},
+  address = {U.S. Army Ballistic Research Laboratory, Aberdeen Proving Ground, MD 21005},
+  note = {Approved for Public Release; Distribution is Unlimited.},
+  owner = {morrison},
+  timestamp = {2010.05.06}
+}
+
+@TECHREPORT{Deitz84b,
+  author = {Deitz, Paul},
+  title = {Solid Modeling at the US Army Ballistic Research Laboratory},
+  institution = {United States Army, Ballistic Research Laboratory},
+  year = {1984},
+  month = {October},
+  number = {ADA147491},
+  address = {U.S. Army Ballistic Research Laboratory, Aberdeen Proving Ground, MD 21005},
+  note = {Approved for Public Release; Distribution is Unlimited.},
+  owner = {morrison},
+  timestamp = {2010.05.06}
+}
+
 @UGMPRESENTATION{Anderson02a,
   author = {Anderson, John},
   title = {Converting Between BRL-CAD and Other Formats},
@@ -50,6 +89,7 @@ @BOOKLET{Anderson93a
   address = {Aberdeen Proving Ground, Maryland 21005-5066},
   month = {December},
   year = {1993},
+  number = {ARL-TR-315},
   note = {Approved for Public Release; Distribution is Unlimited.},
   owner = {cyapp},
   timestamp = {2008.02.06}
@@ -376,12 +416,12 @@ @INCOLLECTION{Deitz88a
 	Report BRL-MR-3667)},
   booktitle = {The Ballistics Research Laboratory CAD Package Release 4.0},
   publisher = {The U.S. Army Ballistic Research Laboratory},
+  month = {February},
   year = {1988},
   volume = {Volume V - The BRL-CAD Analyst's Manual},
-  number = {V5S12A11},
+  number = {V5S12A11 and BRL-MR-3667},
   pages = {pp. 1-26},
   address = {Aberdeen Proving Ground, Maryland 21005-5066},
-  month = {February},
   note = {Approved for Public Release; Distribution Unlimited.},
   owner = {cyapp},
   timestamp = {2008.02.05}
@@ -1297,11 +1337,11 @@ @INPROCEEDINGS{Muuss91c
   author = {Muuss, Michael John and Butler, Lee A.},
   title = {Combinatorial Solid Geometry, Boundary Representations, and Non-Manifold
 	Geometry},
-  booktitle = {The Ballistics Research Laboratory CAD Package Release 4.0},
+  booktitle = {State of the Art in Computer Graphics: Visualization and Modeling; also The Ballistics Research Laboratory CAD Package Release 4.0},
   year = {1991},
-  pages = {pp. 1-73},
+  pages = {pp. 1-73 (pp. 185-223 in SACG)},
   address = {Aberdeen Proving Ground, Maryland 21005-5066},
-  publisher = {The U.S. Army Ballistic Research Laboratory},
+  publisher = {The U.S. Army Ballistic Research Laboratory (Springer-Verlag, New York in SACG)},
   note = {Included in The Ballistics Research Laboratory CAD Package Release
 	4.0 Volume V - The BRL-CAD Analyst's Manual
 	

include/bn.h

@@ -1298,8 +1298,8 @@ BN_EXPORT extern void bn_mathtab_constant();
  *
  */
 
-extern double bn_randmt();
-extern void bn_randmt_seed(unsigned long seed);
+BN_EXPORT BU_EXTERN(double bn_randmt, ());
+BN_EXPORT BU_EXTERN(void bn_randmt_seed, (unsigned long seed));
 
 
 /*----------------------------------------------------------------------*/