diff --git a/src/osgPlugins/txp/ReaderWriterTXP.cpp b/src/osgPlugins/txp/ReaderWriterTXP.cpp index b8557afe1..814de1d76 100644 --- a/src/osgPlugins/txp/ReaderWriterTXP.cpp +++ b/src/osgPlugins/txp/ReaderWriterTXP.cpp @@ -35,7 +35,7 @@ public: std::string foundname = osgDB::findFile(filename.c_str()); if( !foundname.empty()) { - if (archive.OpenFile(foundname)) + if (archive.OpenFile(foundname.c_str())) { notify(INFO) << "TXPFile::loadFile(): loading archive: " << foundname << std::endl; diff --git a/src/osgPlugins/txp/TrPageArchive.cpp b/src/osgPlugins/txp/TrPageArchive.cpp index d2506a6e1..f46c3abc9 100644 --- a/src/osgPlugins/txp/TrPageArchive.cpp +++ b/src/osgPlugins/txp/TrPageArchive.cpp @@ -39,7 +39,7 @@ TrPageArchive::~TrPageArchive() { } -bool TrPageArchive::OpenFile(const std::string &file) +bool TrPageArchive::OpenFile(const char* file) { m_alternate_path = osgDB::getFilePath(file); std::string name = osgDB::getSimpleFileName(file); diff --git a/src/osgPlugins/txp/TrPageArchive.h b/src/osgPlugins/txp/TrPageArchive.h index 883d11718..aa82cb196 100644 --- a/src/osgPlugins/txp/TrPageArchive.h +++ b/src/osgPlugins/txp/TrPageArchive.h @@ -44,7 +44,7 @@ namespace txp ~TrPageArchive(); // open archive file - bool OpenFile(const std::string& filename); + virtual bool OpenFile(const char* file); /// Load and create textures and materials void LoadMaterials(); diff --git a/src/osgPlugins/txp/TrPageParser.h b/src/osgPlugins/txp/TrPageParser.h index 2ba71c452..28d287c66 100644 --- a/src/osgPlugins/txp/TrPageParser.h +++ b/src/osgPlugins/txp/TrPageParser.h @@ -27,22 +27,12 @@ #include #include #include +#include +#include +#include #include #include "trpage_read.h" -// forward declarations -namespace osg -{ - class Group; - class Node; - class Material; - class Texture; - class TexEnv; - class Light; - class Transparency; - class CullFace; -}; - namespace txp { class TrPageParser : public trpgSceneParser