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

Temporary warning when compiling against OSG 2.9.11.

Browse Source 
Current OSG development isn't supported by FG yet, so add a
warning for now...
This commit is contained in:
ThorstenB
2011-02-06 10:04:55 +01:00
parent 29c8c9f989
commit 9e04bf1ece
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/SGPagedLOD.cxx
+21
View File
@@ -68,9 +68,30 @@ void SGPagedLOD::forceLoad(osgDB::DatabasePager *dbp, osg::FrameStamp* framestam
unsigned childNum = getNumChildren(); unsigned childNum = getNumChildren();
setTimeStamp(childNum, 0); setTimeStamp(childNum, 0);
double priority=1.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, dbp->requestNodeFile(getFileName(childNum),this,priority,framestamp,
getDatabaseRequest(childNum), getDatabaseRequest(childNum),
_readerWriterOptions.get()); _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) bool SGPagedLOD_writeLocalData(const Object& obj, osgDB::Output& fw)