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

Updates to osgDB::Archive, and IVE plugin to support usage via the Archive.

Browse Source
This commit is contained in:
Robert Osfield
2004-10-28 12:16:47 +00:00
parent e97364899b
commit 90e5586777
3 changed files with 129 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/osgDB/Archive
View File

@@ -44,10 +44,10 @@ class OSGDB_EXPORT Archive : public ReaderWriter
};
/** open the archive.*/
virtual void create(const std::string& filename, unsigned int indexBlockSize=4096);
virtual bool create(const std::string& filename, unsigned int indexBlockSize=4096);
/** open the archive.*/
virtual void open(const std::string& filename, Status status);
virtual bool open(const std::string& filename, Status status);
/** close the archive.*/
virtual void close();
@@ -87,7 +87,7 @@ class OSGDB_EXPORT Archive : public ReaderWriter
inline pos_type getPositionNextIndexBlock() const { return _filePositionNextIndexBlock; }
void read(std::istream& in);
static IndexBlock* read(std::istream& in);
bool getFileReferences(FileNamePositionMap& indexMap);
@@ -124,8 +124,6 @@ class OSGDB_EXPORT Archive : public ReaderWriter
typedef std::list< osg::ref_ptr<IndexBlock> > IndexBlockList;
void readIndexBlocks();
void writeIndexBlocks();
bool addFileReference(pos_type position, const std::string& fileName);

114
src/osgDB/Archive.cpp
View File

@@ -53,22 +53,30 @@ void Archive::IndexBlock::allocateData(unsigned int blockSize)
}
}
void Archive::IndexBlock::read(std::istream& in)
Archive::IndexBlock* Archive::IndexBlock::read(std::istream& in)
{
_filePosition = in.tellg();
in.read(reinterpret_cast<char*>(&_blockSize), sizeof(_blockSize));
in.read(reinterpret_cast<char*>(&_filePositionNextIndexBlock), sizeof(_filePositionNextIndexBlock));
in.read(reinterpret_cast<char*>(&_offsetOfNextAvailableSpace), sizeof(_offsetOfNextAvailableSpace));
if (!in) return 0;
allocateData(_blockSize);
if (_data)
osg::ref_ptr<IndexBlock> indexBlock = new IndexBlock;
indexBlock->_filePosition = in.tellg();
in.read(reinterpret_cast<char*>(&indexBlock->_blockSize), sizeof(indexBlock->_blockSize));
in.read(reinterpret_cast<char*>(&indexBlock->_filePositionNextIndexBlock), sizeof(indexBlock->_filePositionNextIndexBlock));
in.read(reinterpret_cast<char*>(&indexBlock->_offsetOfNextAvailableSpace), sizeof(indexBlock-> _offsetOfNextAvailableSpace));
indexBlock->allocateData(indexBlock->_blockSize);
if (indexBlock->_data)
{
in.read(reinterpret_cast<char*>(_data),_blockSize);
in.read(reinterpret_cast<char*>(indexBlock->_data),indexBlock->_blockSize);
}
else
{
osg::notify(osg::NOTICE)<<"Allocation Problem in Archive::IndexBlock::read(std::istream& in)"<<std::endl;
return 0;
}
osg::notify(osg::NOTICE)<<"Read index block"<<std::endl;
return indexBlock.release();
}
@@ -87,6 +95,9 @@ bool Archive::IndexBlock::getFileReferences(FileNamePositionMap& indexMap)
std::string filename(ptr, ptr+filename_size);
// record this entry into the FileNamePositionMap
indexMap[filename] = position;
ptr += filename_size;
}
}
@@ -129,6 +140,8 @@ bool Archive::IndexBlock::addFileReference(pos_type position, const std::string&
*ptr = filename[i];
}
_offsetOfNextAvailableSpace = ptr-_data;
_requiresWrite = true;
osg::notify(osg::NOTICE)<<"Archive::IndexBlock::addFileReference("<<(unsigned int)position<<", "<<filename<<")"<<std::endl;
@@ -144,6 +157,7 @@ void Archive::IndexBlock::setPositionNextIndexBlock(pos_type position)
Archive::Archive()
{
osg::notify(osg::NOTICE)<<"Don't forget endian...."<<std::endl;
}
Archive::~Archive()
@@ -151,7 +165,7 @@ Archive::~Archive()
close();
}
void Archive::create(const std::string& filename, unsigned int indexBlockSize)
bool Archive::create(const std::string& filename, unsigned int indexBlockSize)
{
_status = WRITE;
_output.open(filename.c_str());
@@ -164,19 +178,82 @@ void Archive::create(const std::string& filename, unsigned int indexBlockSize)
indexBlock->write(_output);
_indexBlockList.push_back(indexBlock);
}
return true;
}
void Archive::open(const std::string& filename, Status status)
bool Archive::open(const std::string& filename, Status status)
{
if (status==READ)
{
_status = status;
_input.open(filename.c_str());
if (_input)
{
osg::notify(osg::NOTICE)<<"trying Archive::open("<<filename<<")"<<std::endl;
char identifier[4];
_input.read(identifier,4);
bool validArchive = (identifier[0]=='o' && identifier[1]=='s' && identifier[2]=='g' && identifier[3]=='a');
if (validArchive)
{
_input.read(reinterpret_cast<char*>(&_version),sizeof(_version));
IndexBlock *indexBlock = 0;
while ( (indexBlock=Archive::IndexBlock::read(_input)) != 0)
{
_indexBlockList.push_back(indexBlock);
if (indexBlock->getPositionNextIndexBlock()==pos_type(0)) break;
_input.seekg(indexBlock->getPositionNextIndexBlock());
}
osg::notify(osg::NOTICE)<<"Archive::open("<<filename<<") succeeded"<<std::endl;
// now need to build the filename map.
_indexMap.clear();
for(IndexBlockList::iterator itr=_indexBlockList.begin();
itr!=_indexBlockList.end();
++itr)
{
(*itr)->getFileReferences(_indexMap);
}
for(FileNamePositionMap::iterator mitr=_indexMap.begin();
mitr!=_indexMap.end();
++mitr)
{
osg::notify(osg::NOTICE)<<" filename "<<(mitr->first)<<" pos="<<(int)(mitr->second)<<std::endl;
}
return true;
}
}
osg::notify(osg::NOTICE)<<"Archive::open("<<filename<<") failed"<<std::endl;
_input.close();
return false;
}
else // status==WRITE
{
_status = status;
_output.open(filename.c_str());
if (open(filename,READ))
{
_input.close();
_status = WRITE;
_output.open(filename.c_str());
return true;
}
else // no file opened so resort to creating the archive.
{
return create(filename, 4096);
}
}
}
@@ -184,6 +261,15 @@ void Archive::close()
{
_input.close();
if (_status==WRITE)
{
writeIndexBlocks();
_output.close();
}
}
void Archive::writeIndexBlocks()
{
if (_status==WRITE)
{
for(IndexBlockList::iterator itr=_indexBlockList.begin();
@@ -195,11 +281,9 @@ void Archive::close()
(*itr)->write(_output);
}
}
_output.close();
}
}
bool Archive::fileExists(const std::string& filename) const
{
return (_indexMap.count(filename)!=0);
@@ -265,6 +349,8 @@ ReaderWriter::ReadResult Archive::readObject(const std::string& fileName,const O
osg::notify(osg::NOTICE)<<"Archive::readObject(obj, "<<fileName<<") failed, file not found in archive"<<std::endl;
return ReadResult(ReadResult::FILE_NOT_FOUND);
}
_input.seekg(itr->second);
ReaderWriter* rw = osgDB::Registry::instance()->getReaderWriterForExtension(getLowerCaseFileExtension(fileName));
if (!rw)

26
src/osgPlugins/ive/ReaderWriterIVE.cpp
View File

@@ -20,6 +20,11 @@ class IVEReaderWriter : public ReaderWriter
return equalCaseInsensitive(extension,"ive");
}
virtual ReadResult readObject(const std::string& file, const Options* options)
{
return readNode(file, options);
}
virtual ReadResult readNode(const std::string& file, const Options* options)
{
std::string ext = osgDB::getLowerCaseFileExtension(file);
@@ -42,6 +47,11 @@ class IVEReaderWriter : public ReaderWriter
return readNode(istream,local_opt.get());
}
virtual ReadResult readObject(std::istream& fin, const Options* options)
{
return readNode(fin, options);
}
virtual ReadResult readNode(std::istream& fin, const Options* options)
{
#define IVE_CATCH_EXCEPTIONS
@@ -64,6 +74,15 @@ class IVEReaderWriter : public ReaderWriter
#endif
}
virtual WriteResult writeObject(const Object& object,const std::string& fileName, const osgDB::ReaderWriter::Options* options)
{
const Node* node = dynamic_cast<const Node*>(&object);
if (node) return writeNode( *node, fileName, options );
return WriteResult::FILE_NOT_HANDLED;
}
virtual WriteResult writeNode(const Node& node,const std::string& fileName, const osgDB::ReaderWriter::Options* options)
{
std::string ext = getFileExtension(fileName);
@@ -75,6 +94,13 @@ class IVEReaderWriter : public ReaderWriter
return result;
}
virtual WriteResult writeObject(const Object& object,std::ostream& fout, const osgDB::ReaderWriter::Options* options)
{
const Node* node = dynamic_cast<const Node*>(&object);
if (node) return writeNode( *node, fout, options );
return WriteResult::FILE_NOT_HANDLED;
}
virtual WriteResult writeNode(const Node& node,std::ostream& fout, const osgDB::ReaderWriter::Options* options)
{
try