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

From Alberto Farre,

Browse Source 
"ConvertFromFLT::addMultiTexture makes ENDIAN conversion for SMultiTexture
 struct attributes.
 When an flt object is multi-instantiated y should be done just first time,
 because SMultiTexture struct is always the same, currently is being done for
 each instance.

 Attached file fix the problem but perhaps a more clean fix would be making
 ENDIAN conversion at writing attributes time instead of at reading time. "
This commit is contained in:
Robert Osfield
2005-05-12 15:51:28 +00:00
parent 54abc6f471
commit d44977490c
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/osgPlugins/flt/flt2osg.cpp
View File

@@ -1717,6 +1717,11 @@ ConvertFromFLT::addMultiTexture( DynGeoSet* dgset, MultiTextureRecord* mtr )
CERR << "effect: " << mt->data[l].effect << "\n";
CERR << "mapping: " << mt->data[l].mapping << "\n";
CERR << "data: " << mt->data[l].data << "\n";
int mtDataTexture = mt->data[l].texture;
int mtDataEffect = mt->data[l].effect;
int mtDataMapping = mt->data[l].mapping;
int mtDataData = mt->data[l].data;
mt->data[l].endian();
TexturePool* pTexturePool = mtr->getFltFile()->getTexturePool();
@@ -1730,9 +1735,9 @@ ConvertFromFLT::addMultiTexture( DynGeoSet* dgset, MultiTextureRecord* mtr )
// Get the texture attribute data from the texture pool
flt::AttrData *textureAttrData =
dynamic_cast<flt::AttrData *>(pTexturePool->
getTexture((int)mt->data[l].texture,versionOptions.get()));
getTexture(mtDataTexture,versionOptions.get()));
CERR << "pTexturePool->getTexture((int)mt->data[l].texture): " << pTexturePool->getTexture((int)mt->data[l].texture,versionOptions.get()) << "\n";
CERR << "pTexturePool->getTexture(mtDataTexture): " << pTexturePool->getTexture(mtDataTexture,versionOptions.get()) << "\n";
if (!textureAttrData)
{
CERR << "unable to set up multi-texture layer." << std::endl;