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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

21
src/osg/Image.cpp
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;

3
src/osg/State.cpp
View File

@@ -212,7 +212,8 @@ void State::apply(const StateSet* dstate)
//pushStateSet(dstate);
//apply();
//popStateSet();
//return;
if (dstate)
{

4
src/osg/Texture1D.cpp
View File

@@ -50,8 +50,8 @@ int Texture1D::compare(const StateAttribute& sa) const
{
if (rhs._image.valid())
{
if (_image->getFileName()<rhs._image->getFileName()) return -1;
else if (_image->getFileName()>rhs._image->getFileName()) return 1;;
int result = _image->compare(*rhs._image);
if (result!=0) return result;
}
else
{

4
src/osg/Texture2D.cpp
View File

@@ -52,8 +52,8 @@ int Texture2D::compare(const StateAttribute& sa) const
{
if (rhs._image.valid())
{
if (_image->getFileName()<rhs._image->getFileName()) return -1;
else if (_image->getFileName()>rhs._image->getFileName()) return 1;;
int result = _image->compare(*rhs._image);
if (result!=0) return result;
}
else
{

4
src/osg/Texture3D.cpp
View File

@@ -57,8 +57,8 @@ int Texture3D::compare(const StateAttribute& sa) const
{
if (rhs._image.valid())
{
if (_image->getFileName()<rhs._image->getFileName()) return -1;
else if (_image->getFileName()>rhs._image->getFileName()) return 1;;
int result = _image->compare(*rhs._image);
if (result!=0) return result;
}
else
{

4
src/osg/TextureCubeMap.cpp
View File

@@ -129,8 +129,8 @@ int TextureCubeMap::compare(const StateAttribute& sa) const
{
if (rhs._images[n].valid())
{
if (_images[n]->getFileName()<rhs._images[n]->getFileName()) return -1;
else if (_images[n]->getFileName()>rhs._images[n]->getFileName()) return 1;;
int result = _images[n]->compare(*rhs._images[n]);
if (result!=0) return result;
}
else
{