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

From Joson Daly, fix for forward/backward/swing animation handling both 15.8 and

Browse Source 
versions prior to 15.8, and...

" Here's another fix for OpenFlight.  The symptom was that ATTR files were
not being read correctly, and the TexEnv on a texture that should have
been set to DECAL was instead defaulting to MODULATE.  The cause is that
the ATTR reader cannot tell by itself what version it's reading (the
version information isn't present in the ATTR files), and instead relies
on the ReaderWriter::Options passed in to get the OpenFlight version.

My change clones the current ReaderWriter::Options and prepends the
appropriate FLT_VER option before the ReaderWriterATTR object is
called.  I also made the parsing of the FLT_VER string and value more
robust in the ReaderWriterATTR itself.  I think I commented things OK,
but let me know if you need me to explain anything."
This commit is contained in:
Robert Osfield
2005-04-14 07:55:45 +00:00
parent d6d764a729
commit 6b86d2d70d
2 changed files with 78 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/osgPlugins/flt/ReaderWriterATTR.cpp
View File

@@ -42,6 +42,7 @@
#include <iostream>
#include <fstream>
#include <sstream>
#include "AttrData.h"
@@ -757,17 +758,29 @@ class ReaderWriterATTR : public osgDB::ReaderWriter
std::string fileName = osgDB::findDataFile( file, options );
if (fileName.empty()) return ReadResult::FILE_NOT_FOUND;
// options
char buf[256];
int version=0;
int version;
const osgDB::ReaderWriter::Options* rwOptions=
osgDB::Registry::instance()->getOptions();
if (rwOptions)
// Check the options string for the OpenFlight file version
if (options)
{
sscanf(rwOptions->getOptionString().c_str(),"%s %d", buf, &version);
if (strcmp(buf, "FLT_VER")) version=0;
// Get the character index of the FLT_VER option in the option
// string
uint optionIndex = options->getOptionString().find("FLT_VER");
// Default to zero for the version if it's not found
if (optionIndex == std::string::npos)
version = 0;
else
{
// Copy the option string, starting with the F in FLT_VER
std::string fltVersionStr(options->getOptionString(),
optionIndex);
std::string optionText;
// Read the version from the string
std::istringstream ins(fltVersionStr);
ins >> optionText >> version;
}
}
Attr attr(version);
@@ -790,3 +803,4 @@ class ReaderWriterATTR : public osgDB::ReaderWriter
// now register with Registry to instantiate the above
// reader/writer.
osgDB::RegisterReaderWriterProxy<ReaderWriterATTR> g_readerWriter_ATTR_Proxy;

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

@@ -878,14 +878,22 @@ osg::Group* ConvertFromFLT::visitGroup(osg::Group& osgParent, GroupRecord* rec)
SGroup* currentGroup = (SGroup*) rec->getData();
const bool forwardAnim = (currentGroup->dwFlags & GroupRecord::FORWARD_ANIM)!=0;
// Check for forward animation (sequence)
bool forwardAnim = (currentGroup->dwFlags & GroupRecord::FORWARD_ANIM) != 0;
// For versions prior to 15.8, the swing bit can be set independently
// of the animation bit. This implies forward animation (with swing)
if ((fltVer < 1580) && (currentGroup->dwFlags & GroupRecord::SWING_ANIM))
forwardAnim = true;
// OpenFlight 15.8 adds backwards animations
const bool backwardAnim = ( (fltVer >= 1580) &&
((currentGroup->dwFlags & GroupRecord::BACKWARD_ANIM) != 0) );
// Regardless of forwards or backwards, animation could have swing bit set
const osg::Sequence::LoopMode loopMode = ( (currentGroup->dwFlags & GroupRecord::SWING_ANIM) == 0 ) ?
osg::Sequence::LOOP : osg::Sequence::SWING;
if( forwardAnim || backwardAnim)
{
osg::Sequence* animSeq = new osg::Sequence;
@@ -1545,7 +1553,27 @@ void ConvertFromFLT::setTexture ( FaceRecord *rec, SFace *pSFace, osg::StateSet
if (pTexturePool)
{
int nIndex = (int)pSFace->iTexturePattern;
flt::AttrData *textureAttrData = pTexturePool->getTexture(nIndex,rec->getFltFile()->getOptions());
// Copy the current set of options
osg::ref_ptr<osgDB::ReaderWriter::Options> versionOptions =
(osgDB::ReaderWriter::Options*)rec->getFltFile()->
getOptions()->clone(osg::CopyOp(osg::CopyOp::SHALLOW_COPY));
// Create a new set of ReaderWriter options, and prepend the
// OpenFlight version option ("FLT_VER") and number to the current
// option string. This will inform the ATTR reader what version
// of OpenFlight file it's dealing with, so it knows how much data
// to read. (Unfortunately, this seems to be the only way to
// communicate with the ATTR reader from here).
char versionStr[30];
sprintf(versionStr, "FLT_VER %d ", rec->getFlightVersion());
std::string newString(versionStr);
newString.append(versionOptions->getOptionString());
versionOptions->setOptionString(newString);
// Finally, get the texture from the texture pool
flt::AttrData *textureAttrData =
pTexturePool->getTexture(nIndex, versionOptions.get());
osg::StateSet *textureStateSet;
if (textureAttrData)
@@ -1565,7 +1593,8 @@ void ConvertFromFLT::setTexture ( FaceRecord *rec, SFace *pSFace, osg::StateSet
flt::AttrData *detailTextureAttrData = NULL;
if (pSFace->iDetailTexturePattern != -1) {
int nIndex2 = (int)pSFace->iDetailTexturePattern;
detailTextureAttrData = pTexturePool->getTexture(nIndex2,rec->getFltFile()->getOptions());
detailTextureAttrData =
pTexturePool->getTexture(nIndex2,versionOptions.get());
if (detailTextureAttrData && detailTextureAttrData->stateset) {
osg::Texture2D *detTexture = dynamic_cast<osg::Texture2D*>(detailTextureAttrData->stateset->getTextureAttribute( 0, osg::StateAttribute::TEXTURE));
textureStateSet->setTextureAttributeAndModes(1,detTexture,osg::StateAttribute::ON);
@@ -1659,6 +1688,22 @@ ConvertFromFLT::addMultiTexture( DynGeoSet* dgset, MultiTextureRecord* mtr )
return;
}
// Copy the current set of options
osg::ref_ptr<osgDB::ReaderWriter::Options> versionOptions =
(osgDB::ReaderWriter::Options*)mtr->getFltFile()->
getOptions()->clone(osg::CopyOp(osg::CopyOp::SHALLOW_COPY));
// Create a new set of ReaderWriter options, and prepend the
// OpenFlight version option ("FLT_VER") and number to the current
// option string. This will inform the ATTR reader what version
// of OpenFlight file it's dealing with, so it knows how much data
// to read. (Unfortunately, this seems to be the only way to
// communicate with the ATTR reader from here).
char versionStr[30];
sprintf(versionStr, "FLT_VER %d ", mtr->getFlightVersion());
std::string newString(versionStr);
newString.append(versionOptions->getOptionString());
versionOptions->setOptionString(newString);
CERR << "ConvertFromFLT::addMultiTexture\n";
int l = 0;
@@ -1681,11 +1726,13 @@ ConvertFromFLT::addMultiTexture( DynGeoSet* dgset, MultiTextureRecord* mtr )
osg::notify(osg::WARN)<<"ConvertFromFLT::addMultiTexture(DynGeoSet*, MultiTextureRecord*) pTexturePool invalid."<<std::endl;
return;
}
// Get the texture attribute data from the texture pool
flt::AttrData *textureAttrData = dynamic_cast<flt::AttrData *> (pTexturePool->getTexture((int)mt->data[l].texture,mtr->getFltFile()->getOptions()));
CERR << "pTexturePool->getTexture((int)mt->data[l].texture): " << pTexturePool->getTexture((int)mt->data[l].texture,mtr->getFltFile()->getOptions()) << "\n";
// 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()));
CERR << "pTexturePool->getTexture((int)mt->data[l].texture): " << pTexturePool->getTexture((int)mt->data[l].texture,versionOptions.get()) << "\n";
if (!textureAttrData)
{
CERR << "unable to set up multi-texture layer." << std::endl;