From d91e1ff4bb5fa3c009de7df4a189024e8939bffe Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 21 Sep 2006 09:50:10 +0000 Subject: [PATCH] From Loic Dachary, renamed _mips to of_mips to prevent compile problem under MIIPS --- src/osgPlugins/OpenFlight/AttrData.cpp | 2 +- src/osgPlugins/OpenFlight/AttrData.h | 2 +- src/osgPlugins/OpenFlight/ReaderWriterATTR.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osgPlugins/OpenFlight/AttrData.cpp b/src/osgPlugins/OpenFlight/AttrData.cpp index b6b51f7ce..f49ab21bc 100644 --- a/src/osgPlugins/OpenFlight/AttrData.cpp +++ b/src/osgPlugins/OpenFlight/AttrData.cpp @@ -82,7 +82,7 @@ AttrData::AttrData() : controlPoints(0) // TODO: { - _mips[0]=_mips[1]=_mips[2]=_mips[3]=_mips[4]=_mips[5]=_mips[6]=_mips[7]=0.0f; + of_mips[0]=of_mips[1]=of_mips[2]=of_mips[3]=of_mips[4]=of_mips[5]=of_mips[6]=of_mips[7]=0.0f; } AttrData::AttrData(const AttrData& attr, const osg::CopyOp& copyop) : diff --git a/src/osgPlugins/OpenFlight/AttrData.h b/src/osgPlugins/OpenFlight/AttrData.h index ac35427ec..2baf9866e 100644 --- a/src/osgPlugins/OpenFlight/AttrData.h +++ b/src/osgPlugins/OpenFlight/AttrData.h @@ -167,7 +167,7 @@ class AttrData : public osg::Object // 1 - TX_PACK_8 // 2 - TX_PACK_16 int32 useMips; // TRUE if using following 8 floats for MIPMAP kernel - float32 _mips[8]; // 8 floats for kernel of separable symmetric filter + float32 of_mips[8]; // 8 floats for kernel of separable symmetric filter int32 useLodScale; // Boolean if TRUE send: float32 lod0; // LOD0 for TX_CONTROL_POINT float32 scale0; // SCALE0 for TX_CONTROL_POINT diff --git a/src/osgPlugins/OpenFlight/ReaderWriterATTR.cpp b/src/osgPlugins/OpenFlight/ReaderWriterATTR.cpp index 16aa77add..912e2f2a0 100644 --- a/src/osgPlugins/OpenFlight/ReaderWriterATTR.cpp +++ b/src/osgPlugins/OpenFlight/ReaderWriterATTR.cpp @@ -97,7 +97,7 @@ ReaderWriter::ReadResult ReaderWriterATTR::readObject(const std::string& file, c attr->extFormat = in.readInt32(); attr->useMips = in.readInt32(); for (int n=0; n<8; n++) - attr->_mips[n] = in.readFloat32(); + attr->of_mips[n] = in.readFloat32(); attr->useLodScale = in.readInt32(); attr->lod0 = in.readFloat32(); attr->scale0 = in.readFloat32();