Release version 2.6 revision 2

Using tarball (with SHA1): 25efd7732292b5f33ae29bab3657183a5ffd45aa *SARndbox-2.6.tar.gz
KeckCAVES · Jun 17, 2019 · d1e51b5 · d1e51b5
1 parent 6d6438f
commit d1e51b5
Show file tree

Hide file tree

Showing 35 changed files with 18 additions and 16 deletions.
diff --git a/BathymetrySaverTool.cpp b/BathymetrySaverTool.cpp
@@ -1,7 +1,7 @@
 /***********************************************************************
 BathymetrySaverTool - Tool to save the current bathymetry grid of an
 augmented reality sandbox to a file or network socket.
-Copyright (c) 2016 Oliver Kreylos
+Copyright (c) 2016-2018 Oliver Kreylos
 
 This file is part of the Augmented Reality Sandbox (SARndbox).
 
@@ -643,7 +643,7 @@ void BathymetrySaverTool::frame(void)
 				postUpdate();
 				}
 			}
-		catch(std::runtime_error err)
+		catch(const std::runtime_error& err)
 			{
 			Misc::formattedUserError("Save Bathymetry: Unable to save bathymetry due to exception \"%s\"",err.what());
 			}

diff --git a/HISTORY b/HISTORY
@@ -111,3 +111,7 @@ SARndbox-2.5:
   is pressed.
 - Added handling of multi-line commands on the control pipe and simple
   error checking.
+
+SARndbox-2.6:
+- Bumped Vrui version requirement to Vrui-4.6-005.
+- Bumped Kinect version requirement to Kinect-3.7.
diff --git a/README b/README
@@ -1,5 +1,5 @@
 ========================================================================
-README for Augmented Reality Sandbox (SARndbox) version 2.5
+README for Augmented Reality Sandbox (SARndbox) version 2.6
 Copyright (c) 2012-2018 Oliver Kreylos
 ========================================================================
 
@@ -15,8 +15,8 @@ surface using a calibrated projector.
 Requirements
 ============
 
-The Augmented Reality Sandbox requires Vrui version 4.5 build 001 or
-newer, and the Kinect 3D Video Capture Project version 3.5 or newer.
+The Augmented Reality Sandbox requires Vrui version 4.6 build 005 or
+newer, and the Kinect 3D Video Capture Project version 3.7 or newer.
 
 Installation Guide
 ==================
@@ -42,7 +42,7 @@ references to ~/src in the following instructions need to be changed.
 2. Change into the Augmented Reality Sandbox's base directory:
    > cd SARndbox-<version>
 
-3. If the Vrui version installed in step 0 was not 4.5, or Vrui's
+3. If the Vrui version installed in step 0 was not 4.6, or Vrui's
    installation directory was changed from the default of /usr/local,
    adapt the makefile using a text editor. Change the value of
    VRUI_MAKEDIR close to the beginning of the file as follows:

diff --git a/Sandbox.cpp b/Sandbox.cpp
@@ -216,7 +216,7 @@ void Sandbox::RenderSettings::loadProjectorTransform(const char* projectorTransf
 
 		projectorTransformValid=true;
 		}
-	catch(std::runtime_error err)
+	catch(const std::runtime_error& err)
 		{
 		/* Print an error message and disable calibrated projections: */
 		std::cerr<<"Unable to load projector transformation from file "<<fullProjectorTransformName<<" due to exception "<<err.what()<<std::endl;
@@ -235,7 +235,7 @@ void Sandbox::RenderSettings::loadHeightMap(const char* heightMapName)
 		delete elevationColorMap;
 		elevationColorMap=newElevationColorMap;
 		}
-	catch(std::runtime_error err)
+	catch(const std::runtime_error& err)
 		{
 		std::cerr<<"Ignoring height map due to exception "<<err.what()<<std::endl;
 		}
@@ -1221,7 +1221,7 @@ void Sandbox::frame(void)
 								if(rsIt->elevationColorMap!=0)
 									rsIt->elevationColorMap->load(tokens[1].c_str());
 							}
-						catch(std::runtime_error err)
+						catch(const std::runtime_error& err)
 							{
 							std::cerr<<"Cannot read height color map "<<tokens[1]<<" due to exception "<<err.what()<<std::endl;
 							}

diff --git a/SurfaceRenderer.cpp b/SurfaceRenderer.cpp
@@ -797,7 +797,7 @@ void SurfaceRenderer::renderSinglePass(const int viewport[4],const PTransform& p
 			glDeleteObjectARB(dataItem->heightMapShader);
 			dataItem->heightMapShader=newShader;
 			}
-		catch(std::runtime_error err)
+		catch(const std::runtime_error& err)
 			{
 			Misc::formattedUserError("SurfaceRenderer::renderSinglePass: Caught exception %s while rebuilding surface shader",err.what());
 			}

diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-Augmented Reality Sandbox 2.5
-release date 05/17/2018
+Augmented Reality Sandbox 2.6
+release date 12/16/2018
diff --git a/etc/SARndbox-2.5/BoxLayout.txt → etc/SARndbox-2.6/BoxLayout.txt b/etc/SARndbox-2.5/BoxLayout.txt → etc/SARndbox-2.6/BoxLayout.txt
diff --git a/etc/SARndbox-2.5/HeightColorMap.cpt → etc/SARndbox-2.6/HeightColorMap.cpt b/etc/SARndbox-2.5/HeightColorMap.cpt → etc/SARndbox-2.6/HeightColorMap.cpt
diff --git a/etc/SARndbox-2.5/SARndbox.cfg → etc/SARndbox-2.6/SARndbox.cfg b/etc/SARndbox-2.5/SARndbox.cfg → etc/SARndbox-2.6/SARndbox.cfg
diff --git a/makefile b/makefile
@@ -24,7 +24,7 @@
 # matches the default Vrui installation; if Vrui's installation
 # directory was changed during Vrui's installation, the directory below
 # must be adapted.
-VRUI_MAKEDIR := /usr/local/share/Vrui-4.5/make
+VRUI_MAKEDIR := /usr/local/share/Vrui-4.6/make
 ifdef DEBUG
   VRUI_MAKEDIR := $(VRUI_MAKEDIR)/debug
 endif
@@ -47,7 +47,7 @@ INSTALLDIR := $(PWD)
 # clobbering each other. The value should be identical to the
 # major.minor version number found in VERSION in the root package
 # directory.
-VERSION = 2.5
+VERSION = 2.6
 
 # Set up resource directories: */
 CONFIGDIR = etc/SARndbox-$(VERSION)
@@ -71,8 +71,6 @@ SHAREINSTALLDIR = $(INSTALLDIR)/$(RESOURCEDIR)
 # Specify additional compiler and linker flags
 ########################################################################
 
-CFLAGS += -Wall -pedantic
-
 ########################################################################
 # List common packages used by all components of this project
 # (Supported packages can be found in $(VRUI_MAKEDIR)/Packages.*)

diff --git a/...box-2.5/Shaders/SurfaceAddContourLines.fs → ...box-2.6/Shaders/SurfaceAddContourLines.fs b/...box-2.5/Shaders/SurfaceAddContourLines.fs → ...box-2.6/Shaders/SurfaceAddContourLines.fs
diff --git a/...ndbox-2.5/Shaders/SurfaceAddWaterColor.fs → ...ndbox-2.6/Shaders/SurfaceAddWaterColor.fs b/...ndbox-2.5/Shaders/SurfaceAddWaterColor.fs → ...ndbox-2.6/Shaders/SurfaceAddWaterColor.fs
diff --git a/...ARndbox-2.5/Shaders/SurfaceDepthShader.fs → ...ARndbox-2.6/Shaders/SurfaceDepthShader.fs b/...ARndbox-2.5/Shaders/SurfaceDepthShader.fs → ...ARndbox-2.6/Shaders/SurfaceDepthShader.fs
diff --git a/...ARndbox-2.5/Shaders/SurfaceDepthShader.vs → ...ARndbox-2.6/Shaders/SurfaceDepthShader.vs b/...ARndbox-2.5/Shaders/SurfaceDepthShader.vs → ...ARndbox-2.6/Shaders/SurfaceDepthShader.vs
diff --git a/...box-2.5/Shaders/SurfaceElevationShader.fs → ...box-2.6/Shaders/SurfaceElevationShader.fs b/...box-2.5/Shaders/SurfaceElevationShader.fs → ...box-2.6/Shaders/SurfaceElevationShader.fs
diff --git a/...box-2.5/Shaders/SurfaceElevationShader.vs → ...box-2.6/Shaders/SurfaceElevationShader.vs b/...box-2.5/Shaders/SurfaceElevationShader.vs → ...box-2.6/Shaders/SurfaceElevationShader.vs
diff --git a/...rs/SurfaceGlobalAmbientHeightMapShader.fs → ...rs/SurfaceGlobalAmbientHeightMapShader.fs b/...rs/SurfaceGlobalAmbientHeightMapShader.fs → ...rs/SurfaceGlobalAmbientHeightMapShader.fs
diff --git a/...rs/SurfaceGlobalAmbientHeightMapShader.vs → ...rs/SurfaceGlobalAmbientHeightMapShader.vs b/...rs/SurfaceGlobalAmbientHeightMapShader.vs → ...rs/SurfaceGlobalAmbientHeightMapShader.vs
diff --git a/...SARndbox-2.5/Shaders/SurfaceIlluminate.fs → ...SARndbox-2.6/Shaders/SurfaceIlluminate.fs b/...SARndbox-2.5/Shaders/SurfaceIlluminate.fs → ...SARndbox-2.6/Shaders/SurfaceIlluminate.fs
diff --git a/...faceShadowedIlluminatedHeightMapShader.fs → ...faceShadowedIlluminatedHeightMapShader.fs b/...faceShadowedIlluminatedHeightMapShader.fs → ...faceShadowedIlluminatedHeightMapShader.fs
diff --git a/...faceShadowedIlluminatedHeightMapShader.vs → ...faceShadowedIlluminatedHeightMapShader.vs b/...faceShadowedIlluminatedHeightMapShader.vs → ...faceShadowedIlluminatedHeightMapShader.vs
diff --git a/...5/Shaders/Water2BathymetryUpdateShader.fs → ...6/Shaders/Water2BathymetryUpdateShader.fs b/...5/Shaders/Water2BathymetryUpdateShader.fs → ...6/Shaders/Water2BathymetryUpdateShader.fs
diff --git a/...ndbox-2.5/Shaders/Water2BoundaryShader.fs → ...ndbox-2.6/Shaders/Water2BoundaryShader.fs b/...ndbox-2.5/Shaders/Water2BoundaryShader.fs → ...ndbox-2.6/Shaders/Water2BoundaryShader.fs
diff --git a/...dbox-2.5/Shaders/Water2EulerStepShader.fs → ...dbox-2.6/Shaders/Water2EulerStepShader.fs b/...dbox-2.5/Shaders/Water2EulerStepShader.fs → ...dbox-2.6/Shaders/Water2EulerStepShader.fs
diff --git a/.../Shaders/Water2FluxAndDerivativeShader.fs → .../Shaders/Water2FluxAndDerivativeShader.fs b/.../Shaders/Water2FluxAndDerivativeShader.fs → .../Shaders/Water2FluxAndDerivativeShader.fs
diff --git a/...ox-2.5/Shaders/Water2MaxStepSizeShader.fs → ...ox-2.6/Shaders/Water2MaxStepSizeShader.fs b/...ox-2.5/Shaders/Water2MaxStepSizeShader.fs → ...ox-2.6/Shaders/Water2MaxStepSizeShader.fs
diff --git a/...2.5/Shaders/Water2RungeKuttaStepShader.fs → ...2.6/Shaders/Water2RungeKuttaStepShader.fs b/...2.5/Shaders/Water2RungeKuttaStepShader.fs → ...2.6/Shaders/Water2RungeKuttaStepShader.fs
diff --git a/.../Water2SlopeAndFluxAndDerivativeShader.fs → .../Water2SlopeAndFluxAndDerivativeShader.fs b/.../Water2SlopeAndFluxAndDerivativeShader.fs → .../Water2SlopeAndFluxAndDerivativeShader.fs
diff --git a/...SARndbox-2.5/Shaders/Water2SlopeShader.fs → ...SARndbox-2.6/Shaders/Water2SlopeShader.fs b/...SARndbox-2.5/Shaders/Water2SlopeShader.fs → ...SARndbox-2.6/Shaders/Water2SlopeShader.fs
diff --git a/...box-2.5/Shaders/Water2WaterAdaptShader.fs → ...box-2.6/Shaders/Water2WaterAdaptShader.fs b/...box-2.5/Shaders/Water2WaterAdaptShader.fs → ...box-2.6/Shaders/Water2WaterAdaptShader.fs
diff --git a/...ndbox-2.5/Shaders/Water2WaterAddShader.fs → ...ndbox-2.6/Shaders/Water2WaterAddShader.fs b/...ndbox-2.5/Shaders/Water2WaterAddShader.fs → ...ndbox-2.6/Shaders/Water2WaterAddShader.fs
diff --git a/...ndbox-2.5/Shaders/Water2WaterAddShader.vs → ...ndbox-2.6/Shaders/Water2WaterAddShader.vs b/...ndbox-2.5/Shaders/Water2WaterAddShader.vs → ...ndbox-2.6/Shaders/Water2WaterAddShader.vs
diff --git a/...ox-2.5/Shaders/Water2WaterUpdateShader.fs → ...ox-2.6/Shaders/Water2WaterUpdateShader.fs b/...ox-2.5/Shaders/Water2WaterUpdateShader.fs → ...ox-2.6/Shaders/Water2WaterUpdateShader.fs
diff --git a/...ndbox-2.5/Shaders/WaterRenderingShader.fs → ...ndbox-2.6/Shaders/WaterRenderingShader.fs b/...ndbox-2.5/Shaders/WaterRenderingShader.fs → ...ndbox-2.6/Shaders/WaterRenderingShader.fs
diff --git a/...ndbox-2.5/Shaders/WaterRenderingShader.vs → ...ndbox-2.6/Shaders/WaterRenderingShader.vs b/...ndbox-2.5/Shaders/WaterRenderingShader.vs → ...ndbox-2.6/Shaders/WaterRenderingShader.vs