diff --git a/Make/makedefs b/Make/makedefs index 9d989003c..b6e72f5bf 100644 --- a/Make/makedefs +++ b/Make/makedefs @@ -117,9 +117,9 @@ ifeq ($(OS),IRIX) C++ = CC DEPFLAGS = -M - INC += + INC += -I/usr/local/include DEF += -LANG:std -OPT:Olimit=0 \ - -DEBUG:wof=1682 -DEBUG:woff=3303\ + -DEBUG:woff=1682 -DEBUG:woff=3303\ -MDupdate $(MAKEDEPEND) OPTF = -O2 DBGF = -g @@ -130,7 +130,7 @@ ifeq ($(ARCH),64) else ARCHARGS = -n32 endif - LINKARGS = -LANG:std -OPT:Olimit=0 + LINKARGS = -LANG:std -OPT:Olimit=0 -L/usr/local/lib32 -rpath /usr/local/lib32 DYNAMICLIBRARYLIB = -ldl OSG_LIBS = -losgGLUT -losgDB -losgUtil -losg FREETYPE_LIB = -lfreetype diff --git a/include/osg/ImpostorSprite b/include/osg/ImpostorSprite index dc604dc94..10c3f8f86 100644 --- a/include/osg/ImpostorSprite +++ b/include/osg/ImpostorSprite @@ -103,7 +103,7 @@ class SG_EXPORT ImpostorSprite : public Drawable /** calculate the pixel error value for passing in the ModelViewProjectionWindow transform, * which transform local coords into screen space.*/ - const float ImpostorSprite::calcPixelError(const Matrix& MVPW) const; + const float calcPixelError(const Matrix& MVPW) const; void setTexture(Texture* tex,int s,int t); diff --git a/include/osgUtil/CullVisitor b/include/osgUtil/CullVisitor index f508710a4..16bd4d927 100644 --- a/include/osgUtil/CullVisitor +++ b/include/osgUtil/CullVisitor @@ -308,9 +308,7 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor } else { - // default construction to identity. - static osg::Matrix identity; - return identity; + return _identity; } } @@ -322,9 +320,7 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor } else { - // default construction to identity. - static osg::Matrix identity; - return identity; + return _identity; } } @@ -337,9 +333,7 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor } else { - // default construction to identity. - static osg::Matrix identity; - return identity; + return _identity; } } @@ -355,9 +349,7 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor } else { - // default construction to identity. - static osg::Matrix identity; - return identity; + return _identity; } } @@ -389,6 +381,7 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor unsigned int _bbCornerNear; unsigned int _bbCornerFar; + osg::Matrix _identity; osg::ref_ptr _rootRenderGraph; RenderGraph* _currentRenderGraph; diff --git a/src/osgPlugins/lib3ds/atmosphere.cpp b/src/osgPlugins/lib3ds/atmosphere.cpp index bee7d3d62..a19517d73 100644 --- a/src/osgPlugins/lib3ds/atmosphere.cpp +++ b/src/osgPlugins/lib3ds/atmosphere.cpp @@ -79,7 +79,6 @@ layer_fog_read(Lib3dsLayerFog *fog, FILE *f) { Lib3dsChunk c; Lib3dsWord chunk; - Lib3dsBool have_lin=LIB3DS_FALSE; if (!lib3ds_chunk_read_start(&c, LIB3DS_LAYER_FOG, f)) { return(LIB3DS_FALSE); @@ -94,7 +93,6 @@ layer_fog_read(Lib3dsLayerFog *fog, FILE *f) switch (chunk) { case LIB3DS_LIN_COLOR_F: lib3ds_rgb_read(fog->col,f); - have_lin=LIB3DS_TRUE; break; case LIB3DS_COLOR_F: lib3ds_rgb_read(fog->col,f); diff --git a/src/osgPlugins/lib3ds/background.cpp b/src/osgPlugins/lib3ds/background.cpp index b4c6a71cc..3931f11b9 100644 --- a/src/osgPlugins/lib3ds/background.cpp +++ b/src/osgPlugins/lib3ds/background.cpp @@ -39,7 +39,6 @@ solid_bgnd_read(Lib3dsBackground *background, FILE *f) { Lib3dsChunk c; Lib3dsWord chunk; - Lib3dsBool have_lin=LIB3DS_FALSE; if (!lib3ds_chunk_read_start(&c, LIB3DS_SOLID_BGND, f)) { return(LIB3DS_FALSE); @@ -49,7 +48,6 @@ solid_bgnd_read(Lib3dsBackground *background, FILE *f) switch (chunk) { case LIB3DS_LIN_COLOR_F: lib3ds_rgb_read(background->solid.col, f); - have_lin=LIB3DS_TRUE; break; case LIB3DS_COLOR_F: lib3ds_rgb_read(background->solid.col, f); diff --git a/src/osgPlugins/lib3ds/tracks.cpp b/src/osgPlugins/lib3ds/tracks.cpp index 9dd94e08c..2e5873b64 100644 --- a/src/osgPlugins/lib3ds/tracks.cpp +++ b/src/osgPlugins/lib3ds/tracks.cpp @@ -1160,14 +1160,14 @@ lib3ds_quat_track_read(Lib3dsQuatTrack *track, FILE *f) { int keys; int i,j; - Lib3dsQuatKey *p,*k; + Lib3dsQuatKey *k; track->flags=lib3ds_word_read(f); lib3ds_dword_read(f); lib3ds_dword_read(f); keys=lib3ds_intd_read(f); - for (p=0,i=0; itcb, f)) { return(LIB3DS_FALSE); diff --git a/src/osgPlugins/txp/TrPageParser.cpp b/src/osgPlugins/txp/TrPageParser.cpp index b9c3248db..10a515986 100644 --- a/src/osgPlugins/txp/TrPageParser.cpp +++ b/src/osgPlugins/txp/TrPageParser.cpp @@ -270,7 +270,7 @@ void* billboardRead::Parse(trpgToken /*tok*/,trpgReadBuffer &buf) Billboard* bl = new Billboard(); int m; bill.GetMode(m); - if( m = trpgBillboard::Eye) + if( m == trpgBillboard::Eye) bl->setMode(Billboard::POINT_ROT_EYE); else if(m == trpgBillboard::World ) bl->setMode(Billboard::POINT_ROT_WORLD); diff --git a/src/osgPlugins/txp/trpage_geom.cpp b/src/osgPlugins/txp/trpage_geom.cpp index 08f072859..4ee5d610d 100644 --- a/src/osgPlugins/txp/trpage_geom.cpp +++ b/src/osgPlugins/txp/trpage_geom.cpp @@ -643,9 +643,10 @@ bool trpgGeometry::Write(trpgWriteBuffer &buf) buf.Add(td.doubleData[j]); buf.End(); - float u; - for (j=0;j