Bug fixes to osgText to handle the osgUtil::Optimizer being used on a scene

graph containing text.

Fixed warning in MD2 plugin.
This commit is contained in:
Robert Osfield
2003-03-11 13:30:03 +00:00
parent 4cdbbf1b4a
commit 78de76f17f
14 changed files with 65 additions and 18 deletions

View File

@@ -81,6 +81,27 @@ void Image::deallocateData()
}
}
int Image::compare(const Image& rhs) const
{
if (getFileName()<rhs.getFileName()) return -1;
else if (getFileName()>rhs.getFileName()) return 1;
// need to test against image contents here...
COMPARE_StateAttribute_Parameter(_s)
COMPARE_StateAttribute_Parameter(_t)
COMPARE_StateAttribute_Parameter(_internalTextureFormat)
COMPARE_StateAttribute_Parameter(_pixelFormat)
COMPARE_StateAttribute_Parameter(_dataType)
COMPARE_StateAttribute_Parameter(_packing)
COMPARE_StateAttribute_Parameter(_modifiedTag)
// still need implement checks for
// _data
// _mipmapData
return 0;
}
void Image::setFileName(const std::string& fileName)
{
_fileName = fileName;