FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the initial texture path problem. Loaders are setting the one given to ssgLoad as the default one behind our back :-(

Browse Source
This commit is contained in:
fredb
2006-04-29 08:09:51 +00:00
parent f72b3882c3
commit f664f7a201
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/model.cxx
+4 -3
View File
@@ -234,12 +234,13 @@ static void makeDList( ssgBranch *b, const set<ssgBranch *> &ignore )
} }
} }
class sgLoaderOptions : public ssgLoaderOptions { class SGLoaderOptions : public ssgLoaderOptions {
public: public:
SGLoaderOptions() { ssgSetCurrentOptions( this ); } // Install our own loader options at startup
void endLoad() {} // Avoid clearing the texture cache after every model load void endLoad() {} // Avoid clearing the texture cache after every model load
}; };
static sgLoaderOptions loaderOptions; static SGLoaderOptions loaderOptions;
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
@@ -286,7 +287,7 @@ sgLoad3DModel( const string &fg_root, const string &path,
texturepath = texturepath.dir(); texturepath = texturepath.dir();
ssgTexturePath((char *)texturepath.c_str()); ssgTexturePath((char *)texturepath.c_str());
model = (ssgBranch *)ssgLoad((char *)modelpath.c_str(), &loaderOptions); model = (ssgBranch *)ssgLoad((char *)modelpath.c_str());
if (model == 0) if (model == 0)
throw sg_io_exception("Failed to load 3D model", throw sg_io_exception("Failed to load 3D model",
sg_location(modelpath.str())); sg_location(modelpath.str()));