Release version 1.13

Using tarball (with SHA1):
70cae3fc83d24f4e8af47e930f9114f0a3307e88 *3DVisualizer-1.13.tar.gz

Abstract/VariableManager.cpp

@@ -101,6 +101,13 @@ void VariableManager::prepareScalarVariable(int scalarVariableIndex)
 	/* Calculate the scalar extractor's value range: */
 	sv.valueRange=dataSet->calcScalarValueRange(sv.scalarExtractor);
 
+	/* Check for and correct an empty value range: */
+	if(sv.valueRange.first==sv.valueRange.second)
+		{
+		sv.valueRange.first-=1.0;
+		sv.valueRange.second+=1.0;
+		}
+
 	/* Create a 256-entry OpenGL color map for rendering: */
 	sv.colorMap=new GLColorMap(GLColorMap::GREYSCALE|GLColorMap::RAMP_ALPHA,1.0f,1.0f,sv.valueRange.first,sv.valueRange.second);
 	++sv.colorMapVersion;

HISTORY

@@ -121,3 +121,11 @@
 - Bumped required Vrui version number to 2.5-001.
 - Fixed line parser error in StructuredHexahedralTecplotASCIIFile.
 - Small changes to build system in line with Vrui.
+- Fixed build error; forgot an object file. Pointed out by Rob Porritt.
+
+3D Visualizer 1.13:
+- Fixed matrix stack handling error in Visualizer::display that affected
+  rendering of embedded scene graphs.
+- Bumped required Vrui version number to 2.7-001.
+- Improved variable manager to properly handle "empty" scalar value
+  ranges.

README

@@ -1,6 +1,6 @@
 ========================================================================
-README for 3D Visualizer version 1.12
-Copyright (c) 2005-2012 Oliver Kreylos
+README for 3D Visualizer version 1.13
+Copyright (c) 2005-2013 Oliver Kreylos
 ========================================================================
 
 Overview
@@ -28,7 +28,7 @@ Science Foundation.
 Requirements
 ============
 
-3D Visualizer version 1.12 requires Vrui version 2.5 build 001 or newer.
+3D Visualizer version 1.13 requires Vrui version 2.5 build 001 or newer.
 To read images in PNG, JPEG, or TIFF formats, libpng, libjpeg, or
 libtiff have to be installed, respectively, and Vrui has to be
 configured with support for these image formats (see Vrui README file).

VERSION

@@ -1 +1 @@
-3DVisualizer 1.12
+3DVisualizer 1.13

Visualizer.cpp

@@ -1,7 +1,7 @@
 /***********************************************************************
 Visualizer - Test application for the new visualization component
 framework.
-Copyright (c) 2005-2012 Oliver Kreylos
+Copyright (c) 2005-2013 Oliver Kreylos
 
 This file is part of the 3D Data Visualizer (Visualizer).
 
@@ -56,12 +56,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include <GLMotif/TextField.h>
 #include <GLMotif/Button.h>
 #include <GLMotif/CascadeButton.h>
+#include <SceneGraph/GLRenderState.h>
 #include <SceneGraph/NodeCreator.h>
 #include <SceneGraph/VRMLFile.h>
-#include <SceneGraph/GLRenderState.h>
 #include <Vrui/Vrui.h>
 #include <Vrui/CoordinateManager.h>
 #include <Vrui/OpenFile.h>
+#include <Vrui/SceneGraphSupport.h>
 #ifdef VISUALIZER_USE_COLLABORATION
 #include <Collaboration/CollaborationClient.h>
 #endif
@@ -1101,15 +1102,22 @@ void Visualizer::display(GLContextData& contextData) const
 		/* Save OpenGL state: */
 		glPushAttrib(GL_ENABLE_BIT|GL_LIGHTING_BIT|GL_TEXTURE_BIT);
 
-		/* Create a render state to traverse the scene graph: */
-		SceneGraph::GLRenderState renderState(contextData,Vrui::getHeadPosition(),Vrui::getInverseNavigationTransformation().transform(Vrui::getUpDirection()));
+		/* Save the modelview matrix: */
+		renderState.setMatrixMode(1);
+		glPushMatrix();
+
+		/* Create a render state to traverse the scene graphs: */
+		SceneGraph::GLRenderState* sgRenderState=Vrui::createRenderState(true,contextData);
 
 		/* Render all additional scene graphs: */
 		for(std::vector<SG>::const_iterator sgIt=sceneGraphs.begin();sgIt!=sceneGraphs.end();++sgIt)
 			if(sgIt->render)
-				sgIt->root->glRenderAction(renderState);
+				sgIt->root->glRenderAction(*sgRenderState);
+
+		delete sgRenderState;
 
 		/* Restore OpenGL state: */
+		glPopMatrix();
 		glPopAttrib();
 		}
 

Visualizer.h

@@ -1,7 +1,7 @@
 /***********************************************************************
 Visualizer - Test application for the new visualization component
 framework.
-Copyright (c) 2005-2012 Oliver Kreylos
+Copyright (c) 2005-2013 Oliver Kreylos
 
 This file is part of the 3D Data Visualizer (Visualizer).
 

makefile

@@ -1,7 +1,7 @@
 ########################################################################
 # Makefile for 3D Visualizer, a generic visualization program for 3D
 # multivariate gridded data.
-# Copyright (c) 1999-2012 Oliver Kreylos
+# Copyright (c) 1999-2013 Oliver Kreylos
 #
 # This file is part of the WhyTools Build Environment.
 # 
@@ -25,7 +25,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 := $(HOME)/Vrui-2.5/share/make
+VRUI_MAKEDIR := $(HOME)/Vrui-2.7/share/make
 ifdef DEBUG
   VRUI_MAKEDIR := $(VRUI_MAKEDIR)/debug
 endif
@@ -105,7 +105,7 @@ PACKAGEROOT := $(shell pwd)
 # subsequent release versions of 3D Visualizer from clobbering each
 # other. The value should be identical to the major.minor version
 # number found in VERSION in the root package directory.
-VERSION = 1.12
+VERSION = 1.13
 
 # Set up resource directories: */
 PLUGINSDIREXT = 3DVisualizer-$(VERSION)
@@ -276,6 +276,7 @@ VISUALIZER_SOURCES = $(ABSTRACT_SOURCES) \
                      Visualizer.cpp
 ifneq ($(USE_SHADERS),0)
   VISUALIZER_SOURCES += TwoSidedSurfaceShader.cpp \
+                        TwoSided1DTexturedSurfaceShader.cpp \
                         Polyhedron.cpp \
                         Raycaster.cpp \
                         SingleChannelRaycaster.cpp \