From 9e04bf1ece244dadffd6685ac42f6fc69c2aa7b9 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Sun, 6 Feb 2011 10:04:55 +0100 Subject: [PATCH] Temporary warning when compiling against OSG 2.9.11. Current OSG development isn't supported by FG yet, so add a warning for now... --- simgear/scene/model/SGPagedLOD.cxx | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/simgear/scene/model/SGPagedLOD.cxx b/simgear/scene/model/SGPagedLOD.cxx index 0b837b36..02b187ea 100644 --- a/simgear/scene/model/SGPagedLOD.cxx +++ b/simgear/scene/model/SGPagedLOD.cxx @@ -68,9 +68,30 @@ void SGPagedLOD::forceLoad(osgDB::DatabasePager *dbp, osg::FrameStamp* framestam unsigned childNum = getNumChildren(); setTimeStamp(childNum, 0); double priority=1.0; +#if SG_OSG_MIN_VERSION_REQUIRED(2,9,11) + // osgDB::DatabasePager::requestNodeFile changed with OSG 2.9.11 + + #ifdef __GNUC__ + #warning !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + #warning !! Your version of OpenSceneGraph is currently unsupported. + #warning !! Use latest stable OSG (2.8.3) or a OSG developer release up to 2.9.10. + #warning !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + #else + // Alas! Why is MSVC different (again)? :) + #pragma WARNING( Your version of OpenSceneGraph is currently unsupported. ) + #pragma WARNING( Use latest stable OSG (2.8.3) or a OSG developer release up to 2.9.10. ) + #endif + + //TODO We need to adapt to OSG 2.9.11 (and future releases). This doesn't work yet... + dbp->requestNodeFile(getFileName(childNum),this,priority,framestamp, + getDatabaseRequest(childNum), + _readerWriterOptions.get()); +#else + // OSG revisions up to 2.9.10 dbp->requestNodeFile(getFileName(childNum),this,priority,framestamp, getDatabaseRequest(childNum), _readerWriterOptions.get()); +#endif } bool SGPagedLOD_writeLocalData(const Object& obj, osgDB::Output& fw) -- 2.39.5