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

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

Browse Source
This commit is contained in:
Robert Osfield
2007-12-10 17:30:18 +00:00
parent 1dcb6cc4fd
commit f4afa427a7
216 changed files with 613 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/osgDB/DatabasePager.cpp
View File

@@ -225,7 +225,7 @@ int DatabasePager::cancel()
// result = Thread::cancel();
//join();
// release the frameBlock and _databasePagerThreadBlock incase its holding up thread cancelation.
// release the frameBlock and _databasePagerThreadBlock in case its holding up thread cancellation.
_databasePagerThreadBlock->release();
// then wait for the the thread to stop running.
@@ -361,7 +361,7 @@ void DatabasePager::requestNodeFile(const std::string& fileName,osg::Group* grou
if (!foundEntry)
{
osg::notify(osg::INFO)<<"In DatabasePager::requestNodeFile("<<fileName<<")"<<std::endl;
osg::notify(osg::INFO)<<"In DatabasePager::fileRquest("<<fileName<<")"<<std::endl;
osg::ref_ptr<DatabaseRequest> databaseRequest = new DatabaseRequest;
@@ -448,7 +448,7 @@ public:
{
if (stateset)
{
// search for the existance of any texture object attributes
// search for the existence of any texture object attributes
bool foundTextureState = false;
for(unsigned int i=0;i<stateset->getTextureAttributeList().size();++i)
{
@@ -725,7 +725,7 @@ void DatabasePager::run()
if (firstTime)
{
// do a yield to get round a peculiar thread hang when testCancel() is called
// in certain cirumstances - of which there is no particular pattern.
// in certain circumstances - of which there is no particular pattern.
YieldCurrentThread();
firstTime = false;
}
@@ -783,7 +783,7 @@ void DatabasePager::addLoadedDataToSceneGraph(double timeStamp)
}
group->addChild(databaseRequest->_loadedModel.get());
osg::notify(osg::INFO)<<"merged subgraph "<<databaseRequest->_fileName<<" after "<<databaseRequest->_numOfRequests<<" requests and time="<<(timeStamp-databaseRequest->_timestampFirstRequest)*1000.0<<std::endl;
osg::notify(osg::INFO)<<"merged subgraph"<<databaseRequest->_fileName<<" after "<<databaseRequest->_numOfRequests<<" requests and time="<<(timeStamp-databaseRequest->_timestampFirstRequest)*1000.0<<std::endl;
double timeToMerge = timeStamp-databaseRequest->_timestampFirstRequest;
@@ -1042,7 +1042,7 @@ void DatabasePager::compileGLObjects(osg::State& state, double& availableTime)
osg::ref_ptr<DatabaseRequest> databaseRequest;
// get the first compileable entry.
// get the first compilable entry.
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_dataToCompileListMutex);
if (!_dataToCompileList.empty())

2
src/osgDB/DotOsgWrapper.cpp
View File

@@ -27,7 +27,7 @@ DotOsgWrapper::DotOsgWrapper(osg::Object* proto,
_name = name;
// copy the names in the space deliminated associates input into
// copy the names in the space delimited associates input into
// a vector of separated names.
std::string::size_type start_of_name = associates.find_first_not_of(' ');
while (start_of_name!=std::string::npos)

22
src/osgDB/Registry.cpp
View File

@@ -151,7 +151,7 @@ Registry* Registry::instance(bool erase)
// definition of the Registry
Registry::Registry()
{
// comment out because it was causing problems under OSX - causing it to crash osgconv when constucting ostream in osg::notify().
// comment out because it was causing problems under OSX - causing it to crash osgconv when constructing ostream in osg::notify().
// notify(INFO) << "Constructing osg::Registry"<<std::endl;
_createNodeFromImage = false;
@@ -250,7 +250,7 @@ Registry::Registry()
addFileExtensionAlias("fon", "freetype"); // Windows bitmap fonts
addFileExtensionAlias("fnt", "freetype"); // Windows bitmap fonts
// wont't add type1 and type2 until resolve extension collision with Peformer binary and ascii files.
// wont't add type1 and type2 until resolve extension collision with Performer binary and ascii files.
// addFileExtensionAlias("pfb", "freetype"); // type1 binary
// addFileExtensionAlias("pfa", "freetype"); // type2 ascii
@@ -281,9 +281,9 @@ void Registry::destruct()
// object cache clear needed here to prevent crash in unref() of
// the objects it contains when running the TXP plugin.
// Not sure why, but perhaps there is is something in a TXP plugin
// which is deleted the data before its ref count hits zero, perhaps
// which deletes the data before its ref count hits zero, perhaps
// even some issue with objects be allocated by a plugin that is
// mainted after that plugin is deleted... Robert Osfield, Jan 2004.
// maintained after that plugin is deleted... Robert Osfield, Jan 2004.
clearObjectCache();
clearArchiveCache();
@@ -756,7 +756,7 @@ osg::Object* Registry::readObjectOfType(const basic_type_wrapper &btw,Input& fr)
{
// we have a composite name so now strip off the library name
// are try to load it, and then retry the readObject to see
// if we can recongise the objects.
// if we can recognize the objects.
std::string libraryName = std::string(token,0,posDoubleColon);
@@ -821,7 +821,7 @@ osg::Object* Registry::readObjectOfType(const basic_type_wrapper &btw,Input& fr)
// we have a composite name so now strip off the library name
// are try to load it, and then retry the find to see
// if we can recongise the objects.
// if we can recognize the objects.
std::string libraryName = std::string(token,0,posDoubleColon);
@@ -883,7 +883,7 @@ osg::Object* Registry::readObject(DotOsgWrapperMap& dowMap,Input& fr)
{
// we have a composite name so now strip off the library name
// are try to load it, and then retry the readObject to see
// if we can recongise the objects.
// if we can recognize the objects.
std::string libraryName = std::string(token,0,posDoubleColon);
@@ -943,7 +943,7 @@ osg::Object* Registry::readObject(DotOsgWrapperMap& dowMap,Input& fr)
// we have a composite name so now strip off the library name
// are try to load it, and then retry the find to see
// if we can recongise the objects.
// if we can recognize the objects.
std::string libraryName = std::string(token,0,posDoubleColon);
@@ -1217,7 +1217,7 @@ bool Registry::writeObject(const osg::Object& obj,Output& fw)
// we have a composite name so now strip off the library name
// are try to load it, and then retry the find to see
// if we can recongise the objects.
// if we can recognize the objects.
std::string libraryName = std::string(token,0,posDoubleColon);
@@ -1564,7 +1564,7 @@ ReaderWriter::ReadResult Registry::openArchiveImplementation(const std::string&
ReaderWriter::ReadResult result = readImplementation(ReadArchiveFunctor(fileName, status, indexBlockSizeHint, options),false);
// default to using chaching archive if no options structure provided, but if options are provided use archives
// default to using caching archive if no options structure provided, but if options are provided use archives
// only if supplied.
if (result.validArchive() &&
(!options || (options->getObjectCacheHint() & ReaderWriter::Options::CACHE_ARCHIVES)) )
@@ -1831,7 +1831,7 @@ void Registry::removeExpiredObjectsInCache(double expiryTime)
typedef std::vector<std::string> ObjectsToRemove;
ObjectsToRemove objectsToRemove;
// first collect all the exprired entries in the ObjectToRemove list.
// first collect all the expired entries in the ObjectToRemove list.
for(ObjectCache::iterator oitr=_objectCache.begin();
oitr!=_objectCache.end();
++oitr)