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

From Paul Melis, "Here is a list of fixes to misspelled APIs. Unfortunately, more than one

Browse Source 
of these are public APIs and therefore will break linkage to existing
shared libraries."

Note from Robert Osfield, updated wrappers.
This commit is contained in:
Robert Osfield
2007-06-27 20:36:16 +00:00
parent 64b8e3062f
commit eac3dc1963
58 changed files with 124 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgDB/DatabasePager.cpp
View File

@@ -843,7 +843,7 @@ void DatabasePager::removeExpiredSubgraphs(double currentFrameTime)
osgDB::Registry::instance()->getSharedStateManager()->prune();
// update the Registry object cache.
osgDB::Registry::instance()->updateTimeStampOfObjectsInCacheWithExtenalReferences(currentFrameTime);
osgDB::Registry::instance()->updateTimeStampOfObjectsInCacheWithExternalReferences(currentFrameTime);
osgDB::Registry::instance()->removeExpiredObjectsInCache(expiryTime);

2
src/osgDB/Input.cpp
View File

@@ -36,7 +36,7 @@ osg::Object* Input::getObjectForUniqueID(const std::string& uniqueID)
}
void Input::regisiterUniqueIDForObject(const std::string& uniqueID,osg::Object* obj)
void Input::registerUniqueIDForObject(const std::string& uniqueID,osg::Object* obj)
{
_uniqueIDToObjectMap[uniqueID] = obj;
}

6
src/osgDB/Registry.cpp
View File

@@ -783,7 +783,7 @@ osg::Object* Registry::readObjectOfType(const basic_type_wrapper &btw,Input& fr)
bool iteratorAdvanced = false;
if (fr[0].matchWord("UniqueID") && fr[1].isString())
{
fr.regisiterUniqueIDForObject(fr[1].getStr(),obj);
fr.registerUniqueIDForObject(fr[1].getStr(),obj);
fr += 2;
iteratorAdvanced = true;
}
@@ -905,7 +905,7 @@ osg::Object* Registry::readObject(DotOsgWrapperMap& dowMap,Input& fr)
bool iteratorAdvanced = false;
if (fr[0].matchWord("UniqueID") && fr[1].isString())
{
fr.regisiterUniqueIDForObject(fr[1].getStr(),obj);
fr.registerUniqueIDForObject(fr[1].getStr(),obj);
fr += 2;
iteratorAdvanced = true;
}
@@ -1790,7 +1790,7 @@ osg::Object* Registry::getFromObjectCache(const std::string& fileName)
else return 0;
}
void Registry::updateTimeStampOfObjectsInCacheWithExtenalReferences(double currentTime)
void Registry::updateTimeStampOfObjectsInCacheWithExternalReferences(double currentTime)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_objectCacheMutex);