diff --git a/BathymetrySaverTool.cpp b/BathymetrySaverTool.cpp index b5d59bb9..5b36417e 100644 --- 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 index 2e986cb2..04cd4377 100644 --- 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 index e0c444c9..a64052ab 100644 --- 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- -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 index 4d58b86d..b6c54260 100644 --- 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 "<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 "<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 index 3c6cd91e..c571b603 100644 --- 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 b/etc/SARndbox-2.6/BoxLayout.txt similarity index 100% rename from etc/SARndbox-2.5/BoxLayout.txt rename to etc/SARndbox-2.6/BoxLayout.txt diff --git a/etc/SARndbox-2.5/HeightColorMap.cpt b/etc/SARndbox-2.6/HeightColorMap.cpt similarity index 100% rename from etc/SARndbox-2.5/HeightColorMap.cpt rename to etc/SARndbox-2.6/HeightColorMap.cpt diff --git a/etc/SARndbox-2.5/SARndbox.cfg b/etc/SARndbox-2.6/SARndbox.cfg similarity index 100% rename from etc/SARndbox-2.5/SARndbox.cfg rename to etc/SARndbox-2.6/SARndbox.cfg diff --git a/makefile b/makefile index 5af673de..caf04b4c 100644 --- 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/share/SARndbox-2.5/Shaders/SurfaceAddContourLines.fs b/share/SARndbox-2.6/Shaders/SurfaceAddContourLines.fs similarity index 100% rename from share/SARndbox-2.5/Shaders/SurfaceAddContourLines.fs rename to share/SARndbox-2.6/Shaders/SurfaceAddContourLines.fs diff --git a/share/SARndbox-2.5/Shaders/SurfaceAddWaterColor.fs b/share/SARndbox-2.6/Shaders/SurfaceAddWaterColor.fs similarity index 100% rename from share/SARndbox-2.5/Shaders/SurfaceAddWaterColor.fs rename to share/SARndbox-2.6/Shaders/SurfaceAddWaterColor.fs diff --git a/share/SARndbox-2.5/Shaders/SurfaceDepthShader.fs b/share/SARndbox-2.6/Shaders/SurfaceDepthShader.fs similarity index 100% rename from share/SARndbox-2.5/Shaders/SurfaceDepthShader.fs rename to share/SARndbox-2.6/Shaders/SurfaceDepthShader.fs diff --git a/share/SARndbox-2.5/Shaders/SurfaceDepthShader.vs b/share/SARndbox-2.6/Shaders/SurfaceDepthShader.vs similarity index 100% rename from share/SARndbox-2.5/Shaders/SurfaceDepthShader.vs rename to share/SARndbox-2.6/Shaders/SurfaceDepthShader.vs diff --git a/share/SARndbox-2.5/Shaders/SurfaceElevationShader.fs b/share/SARndbox-2.6/Shaders/SurfaceElevationShader.fs similarity index 100% rename from share/SARndbox-2.5/Shaders/SurfaceElevationShader.fs rename to share/SARndbox-2.6/Shaders/SurfaceElevationShader.fs diff --git a/share/SARndbox-2.5/Shaders/SurfaceElevationShader.vs b/share/SARndbox-2.6/Shaders/SurfaceElevationShader.vs similarity index 100% rename from share/SARndbox-2.5/Shaders/SurfaceElevationShader.vs rename to share/SARndbox-2.6/Shaders/SurfaceElevationShader.vs diff --git a/share/SARndbox-2.5/Shaders/SurfaceGlobalAmbientHeightMapShader.fs b/share/SARndbox-2.6/Shaders/SurfaceGlobalAmbientHeightMapShader.fs similarity index 100% rename from share/SARndbox-2.5/Shaders/SurfaceGlobalAmbientHeightMapShader.fs rename to share/SARndbox-2.6/Shaders/SurfaceGlobalAmbientHeightMapShader.fs diff --git a/share/SARndbox-2.5/Shaders/SurfaceGlobalAmbientHeightMapShader.vs b/share/SARndbox-2.6/Shaders/SurfaceGlobalAmbientHeightMapShader.vs similarity index 100% rename from share/SARndbox-2.5/Shaders/SurfaceGlobalAmbientHeightMapShader.vs rename to share/SARndbox-2.6/Shaders/SurfaceGlobalAmbientHeightMapShader.vs diff --git a/share/SARndbox-2.5/Shaders/SurfaceIlluminate.fs b/share/SARndbox-2.6/Shaders/SurfaceIlluminate.fs similarity index 100% rename from share/SARndbox-2.5/Shaders/SurfaceIlluminate.fs rename to share/SARndbox-2.6/Shaders/SurfaceIlluminate.fs diff --git a/share/SARndbox-2.5/Shaders/SurfaceShadowedIlluminatedHeightMapShader.fs b/share/SARndbox-2.6/Shaders/SurfaceShadowedIlluminatedHeightMapShader.fs similarity index 100% rename from share/SARndbox-2.5/Shaders/SurfaceShadowedIlluminatedHeightMapShader.fs rename to share/SARndbox-2.6/Shaders/SurfaceShadowedIlluminatedHeightMapShader.fs diff --git a/share/SARndbox-2.5/Shaders/SurfaceShadowedIlluminatedHeightMapShader.vs b/share/SARndbox-2.6/Shaders/SurfaceShadowedIlluminatedHeightMapShader.vs similarity index 100% rename from share/SARndbox-2.5/Shaders/SurfaceShadowedIlluminatedHeightMapShader.vs rename to share/SARndbox-2.6/Shaders/SurfaceShadowedIlluminatedHeightMapShader.vs diff --git a/share/SARndbox-2.5/Shaders/Water2BathymetryUpdateShader.fs b/share/SARndbox-2.6/Shaders/Water2BathymetryUpdateShader.fs similarity index 100% rename from share/SARndbox-2.5/Shaders/Water2BathymetryUpdateShader.fs rename to share/SARndbox-2.6/Shaders/Water2BathymetryUpdateShader.fs diff --git a/share/SARndbox-2.5/Shaders/Water2BoundaryShader.fs b/share/SARndbox-2.6/Shaders/Water2BoundaryShader.fs similarity index 100% rename from share/SARndbox-2.5/Shaders/Water2BoundaryShader.fs rename to share/SARndbox-2.6/Shaders/Water2BoundaryShader.fs diff --git a/share/SARndbox-2.5/Shaders/Water2EulerStepShader.fs b/share/SARndbox-2.6/Shaders/Water2EulerStepShader.fs similarity index 100% rename from share/SARndbox-2.5/Shaders/Water2EulerStepShader.fs rename to share/SARndbox-2.6/Shaders/Water2EulerStepShader.fs diff --git a/share/SARndbox-2.5/Shaders/Water2FluxAndDerivativeShader.fs b/share/SARndbox-2.6/Shaders/Water2FluxAndDerivativeShader.fs similarity index 100% rename from share/SARndbox-2.5/Shaders/Water2FluxAndDerivativeShader.fs rename to share/SARndbox-2.6/Shaders/Water2FluxAndDerivativeShader.fs diff --git a/share/SARndbox-2.5/Shaders/Water2MaxStepSizeShader.fs b/share/SARndbox-2.6/Shaders/Water2MaxStepSizeShader.fs similarity index 100% rename from share/SARndbox-2.5/Shaders/Water2MaxStepSizeShader.fs rename to share/SARndbox-2.6/Shaders/Water2MaxStepSizeShader.fs diff --git a/share/SARndbox-2.5/Shaders/Water2RungeKuttaStepShader.fs b/share/SARndbox-2.6/Shaders/Water2RungeKuttaStepShader.fs similarity index 100% rename from share/SARndbox-2.5/Shaders/Water2RungeKuttaStepShader.fs rename to share/SARndbox-2.6/Shaders/Water2RungeKuttaStepShader.fs diff --git a/share/SARndbox-2.5/Shaders/Water2SlopeAndFluxAndDerivativeShader.fs b/share/SARndbox-2.6/Shaders/Water2SlopeAndFluxAndDerivativeShader.fs similarity index 100% rename from share/SARndbox-2.5/Shaders/Water2SlopeAndFluxAndDerivativeShader.fs rename to share/SARndbox-2.6/Shaders/Water2SlopeAndFluxAndDerivativeShader.fs diff --git a/share/SARndbox-2.5/Shaders/Water2SlopeShader.fs b/share/SARndbox-2.6/Shaders/Water2SlopeShader.fs similarity index 100% rename from share/SARndbox-2.5/Shaders/Water2SlopeShader.fs rename to share/SARndbox-2.6/Shaders/Water2SlopeShader.fs diff --git a/share/SARndbox-2.5/Shaders/Water2WaterAdaptShader.fs b/share/SARndbox-2.6/Shaders/Water2WaterAdaptShader.fs similarity index 100% rename from share/SARndbox-2.5/Shaders/Water2WaterAdaptShader.fs rename to share/SARndbox-2.6/Shaders/Water2WaterAdaptShader.fs diff --git a/share/SARndbox-2.5/Shaders/Water2WaterAddShader.fs b/share/SARndbox-2.6/Shaders/Water2WaterAddShader.fs similarity index 100% rename from share/SARndbox-2.5/Shaders/Water2WaterAddShader.fs rename to share/SARndbox-2.6/Shaders/Water2WaterAddShader.fs diff --git a/share/SARndbox-2.5/Shaders/Water2WaterAddShader.vs b/share/SARndbox-2.6/Shaders/Water2WaterAddShader.vs similarity index 100% rename from share/SARndbox-2.5/Shaders/Water2WaterAddShader.vs rename to share/SARndbox-2.6/Shaders/Water2WaterAddShader.vs diff --git a/share/SARndbox-2.5/Shaders/Water2WaterUpdateShader.fs b/share/SARndbox-2.6/Shaders/Water2WaterUpdateShader.fs similarity index 100% rename from share/SARndbox-2.5/Shaders/Water2WaterUpdateShader.fs rename to share/SARndbox-2.6/Shaders/Water2WaterUpdateShader.fs diff --git a/share/SARndbox-2.5/Shaders/WaterRenderingShader.fs b/share/SARndbox-2.6/Shaders/WaterRenderingShader.fs similarity index 100% rename from share/SARndbox-2.5/Shaders/WaterRenderingShader.fs rename to share/SARndbox-2.6/Shaders/WaterRenderingShader.fs diff --git a/share/SARndbox-2.5/Shaders/WaterRenderingShader.vs b/share/SARndbox-2.6/Shaders/WaterRenderingShader.vs similarity index 100% rename from share/SARndbox-2.5/Shaders/WaterRenderingShader.vs rename to share/SARndbox-2.6/Shaders/WaterRenderingShader.vs