From 88130dfa5ac5ccb878e9fb63a8c17b2d19df0158 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 17 Oct 2002 11:50:53 +0000 Subject: [PATCH] Checked in fix for std::hex for dumb arsed compilers. --- src/Demos/osgtexture2D/osgtexture2D.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Demos/osgtexture2D/osgtexture2D.cpp b/src/Demos/osgtexture2D/osgtexture2D.cpp index e086ef5a9..93a14d677 100644 --- a/src/Demos/osgtexture2D/osgtexture2D.cpp +++ b/src/Demos/osgtexture2D/osgtexture2D.cpp @@ -22,8 +22,12 @@ // +// include std to get round dumb compilers which can't handle std::hex/dec. +using namespace std; + typedef std::vector< osg::ref_ptr > ImageList; + class Texture2DCallback : public osg::NodeCallback { public: @@ -39,7 +43,7 @@ class Texture2DCallback : public osg::NodeCallback _prevTime = 0.0; } - virtual ~Texture2DCallback() {} + virtual ~Texture2DCallback() {} virtual void operator()(osg::Node*, osg::NodeVisitor* nv) { @@ -48,7 +52,7 @@ class Texture2DCallback : public osg::NodeCallback double currTime = nv->getFrameStamp()->getReferenceTime(); if (currTime-_prevTime>1.0) { - std::cout<<"Updating texturing filter to "<setFilter(osg::Texture2D::MAG_FILTER,_filterRange[_currPos]); _currPos++; if (_currPos>=_filterRange.size()) _currPos=0; @@ -91,7 +95,7 @@ ImageList getImagesFromFiles(std::vector& commandLine) if (imageList.size()==0) { - osg::notify(osg::WARN) << "No image data loaded."<