Added a set of test runs to the makefiles and demos. The demos now have

titles relevenat to their function.

Makefile

@@ -168,3 +168,8 @@ stats :
 	cat src/Demos/*/*.cpp | wc -l
 	cat src/osgPlugins/*/*.cpp src/osgPlugins/*/*.h | wc -l
 	cat include/*/* src/*/*.cpp src/Demos/*/*.cpp src/osgPlugins/*/*.cpp src/osgPlugins/*/*.h | wc -l
+
+
+test :
+	@echo running tests:
+	for f in $(DIRS) ; do cd $$f; $(MAKE) test; cd ..;  done

src/Demos/Makefile

@@ -36,3 +36,6 @@ instlinks :
 
 instclean :
 	for f in $(DIRS)  ; do cd $$f; $(MAKE) instclean; cd ..;  done
+
+test :
+	for f in $(DIRS)  ; do cd $$f; $(MAKE) test; cd ..;  done

src/Demos/hangglide/Makefile

@@ -31,3 +31,6 @@ C++FLAGS += -I. -I$(OSGHOME)/include
 LDFLAGS += -L$(OSGHOME)/lib
 
 include $(OSGHOME)/Make/makerules
+
+test :
+	hangglide

src/Demos/hangglide/hangglide.cpp

@@ -33,6 +33,7 @@ int main( int argc, char **argv )
 
     // initialize the viewer.
     osgGLUT::Viewer viewer;
+    viewer.setWindowTitle(argv[0]);
     
     // configure the viewer from the commandline arguments, and eat any
     // parameters that have been matched.

src/Demos/osgbillboard/Makefile

@@ -22,3 +22,6 @@ C++FLAGS += -I$(OSGHOME)/include
 LDFLAGS += -L$(OSGHOME)/lib
 
 include $(OSGHOME)/Make/makerules
+
+test :
+	osgbillboard Images/tree0.rgba Images/reflect.rgb

src/Demos/osgbillboard/osgbillboard.cpp

@@ -384,6 +384,7 @@ int main( int argc, char **argv )
 
     // initialize the viewer.
     osgGLUT::Viewer viewer;
+    viewer.setWindowTitle(argv[0]);
 
     // configure the viewer from the commandline arguments, and eat any
     // parameters that have been matched.

src/Demos/osgcluster/Makefile

@@ -23,3 +23,5 @@ LDFLAGS += -L$(OSGHOME)/lib
 
 include $(OSGHOME)/Make/makerules
 
+test :
+	@echo no current test for osgconv:

src/Demos/osgcluster/osgcluster.cpp

@@ -337,6 +337,7 @@ int main( int argc, char **argv )
 
     // initialize the viewer.
     osgGLUT::Viewer viewer;
+    viewer.setWindowTitle(argv[0]);
     viewer.addViewport( mySceneView.get() );
     
     // register trackball, flight and drive.

src/Demos/osgconv/Makefile

@@ -23,3 +23,6 @@ C++FLAGS += -I$(OSGHOME)/include
 LDFLAGS += -L$(OSGHOME)/lib
 
 include $(OSGHOME)/Make/makerules
+
+test :
+	@echo no current test for osgconv:

src/Demos/osgcopy/Makefile

@@ -20,3 +20,5 @@ LDFLAGS += -L$(OSGHOME)/lib
 
 include $(OSGHOME)/Make/makerules
 
+test :
+	@echo no current test for osgconv:

src/Demos/osgcopy/osgcopy.cpp

@@ -183,6 +183,7 @@ int main( int argc, char **argv )
 
     // initialize the viewer.
     osgGLUT::Viewer viewer;
+    viewer.setWindowTitle(argv[0]);
     
     // configure the viewer from the commandline arguments, and eat any
     // parameters that have been matched.

src/Demos/osgcube/Makefile

@@ -17,3 +17,6 @@ C++FLAGS += -I$(OSGHOME)/include
 LDFLAGS += -L$(OSGHOME)/lib
 
 include $(OSGHOME)/Make/makerules
+
+test :
+	osgcube

src/Demos/osgcube/osgcube.cpp

@@ -170,6 +170,7 @@ int main( int argc, char **argv )
 
     // create the viewer and the model to it.
     osgGLUT::Viewer viewer;
+    viewer.setWindowTitle(argv[0]);
 
     // configure the viewer from the commandline arguments, and eat any
     // parameters that have been matched.

src/Demos/osgimpostor/Makefile

@@ -22,3 +22,5 @@ LDFLAGS += -L$(OSGHOME)/lib
 
 include $(OSGHOME)/Make/makerules
 
+test :
+	osgimpostor Town.osg

src/Demos/osgimpostor/osgimpostor.cpp

@@ -66,6 +66,7 @@ int main( int argc, char **argv )
     
     // initialize the viewer.
     osgGLUT::Viewer viewer;
+    viewer.setWindowTitle(argv[0]);
     
     // configure the viewer from the commandline arguments, and eat any
     // parameters that have been matched.

src/Demos/osgreflect/Makefile

@@ -22,3 +22,6 @@ C++FLAGS += -I$(OSGHOME)/include
 LDFLAGS += -L$(OSGHOME)/lib
 
 include $(OSGHOME)/Make/makerules
+
+test :
+	osgreflect cow.osg

src/Demos/osgreflect/osgreflect.cpp

@@ -149,6 +149,7 @@ int main( int argc, char **argv )
 
     // initialize the viewer.
     osgGLUT::Viewer viewer;
+    viewer.setWindowTitle(argv[0]);
     
     // configure the viewer from the commandline arguments, and eat any
     // parameters that have been matched.

src/Demos/osgscribe/Makefile

@@ -20,3 +20,5 @@ LDFLAGS += -L$(OSGHOME)/lib
 
 include $(OSGHOME)/Make/makerules
 
+test :
+	osgscribe cow.osg

src/Demos/osgscribe/osgscribe.cpp

@@ -70,6 +70,7 @@ int main( int argc, char **argv )
 
     // initialize the viewer.
     osgGLUT::Viewer viewer;
+    viewer.setWindowTitle(argv[0]);
     
     // configure the viewer from the commandline arguments, and eat any
     // parameters that have been matched.

src/Demos/osgtext/Makefile

@@ -18,5 +18,8 @@ MACOSXLIBS = -losgGLUT -losgText -losgUtil -losgDB -losg -lfreetype -ldl -lobjc
 C++FLAGS += -I$(OSGHOME)/include -I. 
 LDFLAGS += -L$(OSGHOME)/lib -L/usr/freeware/lib32
 
+
 include $(OSGHOME)/Make/makerules
 
+test :
+	osgtext 

src/Demos/osgtext/main.cpp

@@ -585,6 +585,7 @@ int main( int argc, char **argv )
 
     // initialize the viewer.
     TextViewer    viewer;
+    viewer.setWindowTitle(argv[0]);
 /*
     viewer.addViewport( rootNode );
     viewer.getViewportSceneView(0)->setBackgroundColor(osg::Vec4(.2,.2,.2,1));

src/Demos/osgtexture/Makefile

@@ -22,3 +22,6 @@ C++FLAGS += -I$(OSGHOME)/include
 LDFLAGS += -L$(OSGHOME)/lib
 
 include $(OSGHOME)/Make/makerules
+
+test :
+	osgtexture Images/lz.rgb Images/reflect.rgb

src/Demos/osgtexture/osgtexture.cpp

@@ -380,6 +380,7 @@ int main( int argc, char **argv )
 
     // initialize the viewer.
     osgGLUT::Viewer viewer;
+    viewer.setWindowTitle(argv[0]);
 
     // configure the viewer from the commandline arguments, and eat any
     // parameters that have been matched.

src/Demos/osgviews/Makefile

@@ -22,3 +22,6 @@ LDFLAGS += -L$(OSGHOME)/lib
 
 include $(OSGHOME)/Make/makerules
 
+test :
+	osgviews glider.osg
+

src/Demos/osgviews/osgviews.cpp

@@ -64,6 +64,7 @@ int main( int argc, char **argv )
 
     // initialize the viewer.
     osgGLUT::Viewer viewer;
+    viewer.setWindowTitle(argv[0]);
     
     // configure the viewer from the commandline arguments, and eat any
     // parameters that have been matched.

src/Demos/sgv/Makefile

@@ -18,5 +18,10 @@ MACOSXLIBS = -losgGLUT -losgUtil -losgDB -losg -lm -ldl -lstdc++ -lobjc
 C++FLAGS += -I$(OSGHOME)/include
 LDFLAGS += -L$(OSGHOME)/lib
 
+
 include $(OSGHOME)/Make/makerules
 
+test :
+	sgv cow.osg
+	sgv Town.osg
+

src/Demos/sgv/sgv.cpp

@@ -67,7 +67,8 @@ int main( int argc, char **argv )
 
     // initialize the viewer.
     osgGLUT::Viewer viewer;
-    
+    viewer.setWindowTitle(argv[0]);
+
     // configure the viewer from the commandline arguments, and eat any
     // parameters that have been matched.
     viewer.readCommandLine(commandLine);

src/Makefile

@@ -43,3 +43,6 @@ instlinks :
 
 instclean :
 	for f in $(DIRS)  ; do cd $$f; $(MAKE) instclean; cd ..;  done
+
+test :
+	(cd Demos; make test; )

src/osgUtil/DepthSortedBin.cpp

@@ -75,6 +75,8 @@ void DepthSortedBin::sort_local()
 
 void DepthSortedBin::draw_local(osg::State& state,RenderLeaf*& previous)
 {
+    sort_local();
+
     if (_drawOrder==BACK_TO_FRONT)
     {
         // render the bin from back to front.

src/osgUtil/RenderBin.cpp

@@ -149,6 +149,8 @@ void RenderBin::draw(osg::State& state,RenderLeaf*& previous)
 
 void RenderBin::draw_local(osg::State& state,RenderLeaf*& previous)
 {
+    sort_local();
+
     // draw local bin.
     for(RenderGraphList::iterator oitr=_renderGraphList.begin();
         oitr!=_renderGraphList.end();

src/osgUtil/SceneView.cpp

@@ -223,10 +223,6 @@ void SceneView::cull()
     _cullVisitor->popCullViewState();
 
 
-    // do any state sorting required.
-    _renderStage->sort();
-
-
     const osg::EarthSky* earthSky = _cullVisitor->getEarthSky();
     if (earthSky)
     {