FGFS-4.1/OpenSceneGraph
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Loic Dachary, renamed _mips to of_mips to prevent compile problem under MIIPS

Browse Source
This commit is contained in:
Robert Osfield
2006-09-21 09:50:10 +00:00
parent f6fe0de6e5
commit d91e1ff4bb
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgPlugins/OpenFlight/AttrData.cpp
View File

@@ -82,7 +82,7 @@ AttrData::AttrData() :
controlPoints(0) controlPoints(0)
// TODO: // 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) : AttrData::AttrData(const AttrData& attr, const osg::CopyOp& copyop) :

2
src/osgPlugins/OpenFlight/AttrData.h
View File

@@ -167,7 +167,7 @@ class AttrData : public osg::Object
// 1 - TX_PACK_8 // 1 - TX_PACK_8
// 2 - TX_PACK_16 // 2 - TX_PACK_16
int32 useMips; // TRUE if using following 8 floats for MIPMAP kernel 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: int32 useLodScale; // Boolean if TRUE send:
float32 lod0; // LOD0 for TX_CONTROL_POINT float32 lod0; // LOD0 for TX_CONTROL_POINT
float32 scale0; // SCALE0 for TX_CONTROL_POINT float32 scale0; // SCALE0 for TX_CONTROL_POINT

2
src/osgPlugins/OpenFlight/ReaderWriterATTR.cpp
View File

@@ -97,7 +97,7 @@ ReaderWriter::ReadResult ReaderWriterATTR::readObject(const std::string& file, c
attr->extFormat = in.readInt32(); attr->extFormat = in.readInt32();
attr->useMips = in.readInt32(); attr->useMips = in.readInt32();
for (int n=0; n<8; n++) for (int n=0; n<8; n++)
attr->_mips[n] = in.readFloat32(); attr->of_mips[n] = in.readFloat32();
attr->useLodScale = in.readInt32(); attr->useLodScale = in.readInt32();
attr->lod0 = in.readFloat32(); attr->lod0 = in.readFloat32();
attr->scale0 = in.readFloat32(); attr->scale0 = in.readFloat32();