Various clean ups for the release.

src/Demos/Makefile

@@ -1,7 +1,10 @@
 #!smake
 SHELL=/bin/sh
 
-DIRS = sgv osgconv osgcube osgreflect osgtexture osgimpostor osgviews osgtext hangglide osgcluster
+DIRS = sgv osgconv osgcube osgreflect osgtexture osgimpostor osgviews hangglide osgcluster
+
+# comment out if you don't have the freetype and GLU1.3 library installed.
+DIRS += osgtext 
 
 all :
 	for f in $(DIRS) ; do cd $$f; $(MAKE) || exit 1; cd ..; done

src/Demos/hangglide/base.cpp

@@ -66,7 +66,7 @@ Node *makeBase( void )
 
     Texture *tex = new Texture;
 
-    tex->setImage(osgDB::readImageFile("water.rgb"));
+    tex->setImage(osgDB::readImageFile("Images/water.rgb"));
     tex->setWrap( Texture::WRAP_S, Texture::REPEAT );
     tex->setWrap( Texture::WRAP_T, Texture::REPEAT );
 

src/Demos/hangglide/sky.cpp

@@ -89,7 +89,7 @@ Node *makeSky( void )
     gset->setPrimLengths( lengths );
 
     Texture *tex = new Texture;
-    tex->setImage(osgDB::readImageFile("white.rgb"));
+    tex->setImage(osgDB::readImageFile("Images/white.rgb"));
 
     StateSet *dstate = new StateSet;
 

src/Demos/hangglide/tank.cpp

@@ -116,7 +116,7 @@ Node *makeTank( void )
 
     tex->setWrap( Texture::WRAP_S, Texture::REPEAT );
     tex->setWrap( Texture::WRAP_T, Texture::REPEAT );
-    tex->setImage(osgDB::readImageFile("tank.rgb"));
+    tex->setImage(osgDB::readImageFile("Images/tank.rgb"));
 
     StateSet *dstate = new StateSet;
     dstate->setAttributeAndModes( tex, StateAttribute::ON );

src/Demos/hangglide/terrain.cpp

@@ -118,7 +118,7 @@ Node *makeTerrain( void )
 
     Texture *tex = new Texture;
 
-    tex->setImage(osgDB::readImageFile("lz.rgb"));
+    tex->setImage(osgDB::readImageFile("Images/lz.rgb"));
 
     StateSet *dstate = new StateSet;
     dstate->setMode( GL_LIGHTING, StateAttribute::OFF );

src/Demos/hangglide/trees.cpp

@@ -219,7 +219,7 @@ Node *makeTrees( void )
     struct _tree  *t;
 
     Texture *tex = new Texture;
-    tex->setImage(osgDB::readImageFile("tree0.rgba"));
+    tex->setImage(osgDB::readImageFile("Images/tree0.rgba"));
 
     StateSet *dstate = new StateSet;
     

src/Demos/osgimpostor/osgimpostor.cpp

@@ -79,7 +79,7 @@ int main( int argc, char **argv )
     osg::Node* model = osgDB::readNodeFiles(commandLine);
     if (!model)
     {
-        write_usage(osg::notify(osg::NOTICE),argv[0]);
+//        write_usage(osg::notify(osg::NOTICE),argv[0]);
         return 1;
     }
     

src/Demos/osgreflect/osgreflect.cpp

@@ -164,7 +164,7 @@ int main( int argc, char **argv )
 
     if (!loadedModel)
     {
-        write_usage(osg::notify(osg::NOTICE),argv[0]);
+//        write_usage(osg::notify(osg::NOTICE),argv[0]);
         return 1;
     }
     
@@ -347,7 +347,7 @@ int main( int argc, char **argv )
         osg::Transparency* trans = new osg::Transparency;
         trans->setFunction(osg::Transparency::ONE,osg::Transparency::ONE);
 
-        osg::StateSet* statesetBin5 = createMirrorTexturedState("tank.rgb");
+        osg::StateSet* statesetBin5 = createMirrorTexturedState("Images/tank.rgb");
 
         statesetBin5->setRenderBinDetails(5,"RenderBin");
         statesetBin5->setMode(GL_CULL_FACE,osg::StateAttribute::OFF);

src/Demos/osgtext/main.cpp

@@ -45,16 +45,8 @@ using namespace osgGLUT;
 #define        TEXT_COL_3D        osg::Vec4(.99,.3,.2,1)
 
 
-#ifdef WIN32
-std::string    ttfPath("./fonts/times.ttf");
-std::string    ttfPath1("./fonts/verdana.ttf");
-
-#else
-
-std::string    ttfPath("dirtydoz.ttf");
-std::string    ttfPath1("fudd.ttf");
-
-#endif
+std::string    ttfPath("fonts/dirtydoz.ttf");
+std::string    ttfPath1("fonts/fudd.ttf");
 
 int    gFontSize=18;
 int    gFontSize1=24;

src/Demos/osgviews/osgviews.cpp

@@ -77,7 +77,7 @@ int main( int argc, char **argv )
     osg::Node* rootnode = osgDB::readNodeFiles(commandLine);
     if (!rootnode)
     {
-        write_usage(osg::notify(osg::NOTICE),argv[0]);
+//        write_usage(osg::notify(osg::NOTICE),argv[0]);
         return 1;
     }
 

src/Demos/sgv/sgv.cpp

@@ -80,7 +80,7 @@ int main( int argc, char **argv )
     osg::Node* rootnode = osgDB::readNodeFiles(commandLine);
     if (!rootnode)
     {
-        write_usage(osg::notify(osg::NOTICE),argv[0]);
+//        write_usage(osg::notify(osg::NOTICE),argv[0]);
         return 1;
     }