FGFS-4.1/OpenSceneGraph
4
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

2
src/osgViewer/CompositeViewer.cpp
View File

@@ -922,7 +922,7 @@ void CompositeViewer::updateTraversal()
if (scene->getDatabasePager())
{
// syncronize changes required by the DatabasePager thread to the scene graph
// synchronize changes required by the DatabasePager thread to the scene graph
scene->getDatabasePager()->updateSceneGraph(_frameStamp->getReferenceTime());
}

26
src/osgViewer/Renderer.cpp
View File

@@ -254,7 +254,7 @@ void Renderer::cull()
if (_done || _graphicsThreadDoesCull) return;
// note we assume lock has already been aquired.
// note we assume lock has already been acquired.
osgUtil::SceneView* sceneView = _availableQueue.takeFront();
DEBUG_MESSAGE<<"cull() got SceneView "<<sceneView<<std::endl;
@@ -274,7 +274,7 @@ void Renderer::cull()
const osg::FrameStamp* fs = state->getFrameStamp();
int frameNumber = fs ? fs->getFrameNumber() : 0;
// do cull taversal
// do cull traversal
osg::Timer_t beforeCullTick = osg::Timer::instance()->tick();
sceneView->inheritCullSettings(*(sceneView->getCamera()));
@@ -356,15 +356,15 @@ void Renderer::draw()
state->getDynamicObjectRenderingCompletedCallback()->completed(state);
}
bool aquireGPUStats = stats && _timerQuerySupported && stats->collectStats("gpu");
bool acquireGPUStats = stats && _timerQuerySupported && stats->collectStats("gpu");
if (aquireGPUStats)
if (acquireGPUStats)
{
checkQuery(stats);
}
// do draw traveral
if (aquireGPUStats)
// do draw traversal
if (acquireGPUStats)
{
checkQuery(stats);
beginQuery(frameNumber);
@@ -404,7 +404,7 @@ void Renderer::draw()
sceneView->flushDeletedGLObjects(availableTime);
}
if (aquireGPUStats)
if (acquireGPUStats)
{
endQuery();
checkQuery(stats);
@@ -464,14 +464,14 @@ void Renderer::cull_draw()
initialize(state);
}
bool aquireGPUStats = stats && _timerQuerySupported && stats->collectStats("gpu");
bool acquireGPUStats = stats && _timerQuerySupported && stats->collectStats("gpu");
if (aquireGPUStats)
if (acquireGPUStats)
{
checkQuery(stats);
}
// do cull taversal
// do cull traversal
osg::Timer_t beforeCullTick = osg::Timer::instance()->tick();
sceneView->inheritCullSettings(*(sceneView->getCamera()));
@@ -487,8 +487,8 @@ void Renderer::cull_draw()
#endif
// do draw traveral
if (aquireGPUStats)
// do draw traversal
if (acquireGPUStats)
{
checkQuery(stats);
beginQuery(frameNumber);
@@ -526,7 +526,7 @@ void Renderer::cull_draw()
sceneView->flushDeletedGLObjects(availableTime);
}
if (aquireGPUStats)
if (acquireGPUStats)
{
endQuery();
checkQuery(stats);

14
src/osgViewer/StatsHandler.cpp
View File

@@ -566,7 +566,7 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
std::string font("fonts/arial.ttf");
// collect all the relevant camers
// collect all the relevant cameras
ViewerBase::Cameras validCameras;
viewer->getCameras(validCameras);
@@ -581,7 +581,7 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
}
}
// check for querry time support
// check for query time support
unsigned int numCamrasWithTimerQuerySupport = 0;
for(ViewerBase::Cameras::iterator citr = cameras.begin();
citr != cameras.end();
@@ -598,7 +598,7 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
}
}
bool aquireGPUStats = numCamrasWithTimerQuerySupport==cameras.size();
bool acquireGPUStats = numCamrasWithTimerQuerySupport==cameras.size();
float leftPos = 10.0f;
float startBlocks = 150.0f;
@@ -749,7 +749,7 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
citr != cameras.end();
++citr)
{
group->addChild(createCameraStats(font, pos, startBlocks, aquireGPUStats, characterSize, viewer->getStats(), *citr));
group->addChild(createCameraStats(font, pos, startBlocks, acquireGPUStats, characterSize, viewer->getStats(), *citr));
}
@@ -886,7 +886,7 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
#endif
}
osg::Node* StatsHandler::createCameraStats(const std::string& font, osg::Vec3& pos, float startBlocks, bool aquireGPUStats, float characterSize, osg::Stats* viewerStats, osg::Camera* camera)
osg::Node* StatsHandler::createCameraStats(const std::string& font, osg::Vec3& pos, float startBlocks, bool acquireGPUStats, float characterSize, osg::Stats* viewerStats, osg::Camera* camera)
{
osg::Stats* stats = camera->getStats();
if (!stats) return 0;
@@ -972,7 +972,7 @@ osg::Node* StatsHandler::createCameraStats(const std::string& font, osg::Vec3& p
pos.y() -= characterSize*1.5f;
}
if (aquireGPUStats)
if (acquireGPUStats)
{
pos.x() = leftPos;
@@ -1015,7 +1015,7 @@ osg::Node* StatsHandler::createCameraStats(const std::string& font, osg::Vec3& p
void StatsHandler::getUsage(osg::ApplicationUsage& usage) const
{
usage.addKeyboardMouseBinding("s","Onscreen stats.");
usage.addKeyboardMouseBinding("s","On screen stats.");
usage.addKeyboardMouseBinding("S","Output stats to console.");
}

8
src/osgViewer/View.cpp
View File

@@ -59,7 +59,7 @@ public:
};
/** callback class to use to allow matrix manipulators to querry the application for the local coordinate frame.*/
/** callback class to use to allow matrix manipulators to query the application for the local coordinate frame.*/
class ViewerCoordinateFrameCallback : public osgGA::MatrixManipulator::CoordinateFrameCallback
{
public:
@@ -142,7 +142,7 @@ View::View():
// make sure View is safe to reference multi-threaded.
setThreadSafeRefUnref(true);
// need to attach a Renderer to the maaster camera which has been default constructed
// need to attach a Renderer to the master camera which has been default constructed
getCamera()->setRenderer(createRenderer(getCamera()));
setEventQueue(new osgGA::EventQueue);
@@ -157,7 +157,7 @@ View::View(const osgViewer::View& view, const osg::CopyOp& copyop):
{
_scene = new Scene;
// need to attach a Renderer to the maaster camera which has been default constructed
// need to attach a Renderer to the master camera which has been default constructed
getCamera()->setRenderer(createRenderer(getCamera()));
setEventQueue(new osgGA::EventQueue);
@@ -271,7 +271,7 @@ void View::setSceneData(osg::Node* node)
if (getSceneData())
{
// now make sure the scene graph is set up with the correct DataVariance to protect the dyamic elements of
// now make sure the scene graph is set up with the correct DataVariance to protect the dynamic elements of
// the scene graph from being run in parallel.
osgUtil::Optimizer::StaticObjectDetectionVisitor sodv;
getSceneData()->accept(sodv);

4
src/osgViewer/Viewer.cpp
View File

@@ -430,7 +430,7 @@ void Viewer::realize()
// initialize the global timer to be relative to the current time.
osg::Timer::instance()->setStartTick();
// pass on the start tick to all the associated eventqueues
// pass on the start tick to all the associated event queues
setStartTick(osg::Timer::instance()->getStartTick());
setUpThreading();
@@ -839,7 +839,7 @@ void Viewer::updateTraversal()
if (_scene->getDatabasePager())
{
// syncronize changes required by the DatabasePager thread to the scene graph
// synchronize changes required by the DatabasePager thread to the scene graph
_scene->getDatabasePager()->updateSceneGraph(_frameStamp->getReferenceTime());
}

4
src/osgViewer/ViewerEventHandlers.cpp
View File

@@ -459,7 +459,7 @@ bool RecordCameraPathHandler::handle(const osgGA::GUIEventAdapter &ea, osgGA::GU
// check for a KeySwitchManipulator, create one if not present, and then add this
// to either the newly created one or the existing one. However, the code do that was
// EXTREMELY dirty, so I opted for a simpler solution. At a later date, someone may
// want to implement the original recomendation (which is in a mailing list reply
// want to implement the original recommendation (which is in a mailing list reply
// from June 1st by Robert in a thread called "osgviewer Camera Animation (preliminary)".
else if (ea.getKey() == _keyEventTogglePlayback)
{
@@ -483,7 +483,7 @@ bool RecordCameraPathHandler::handle(const osgGA::GUIEventAdapter &ea, osgGA::GU
_animPathManipulator->home(ea,aa);
// If we succesfully found our _filename file, set it and keep a copy
// If we successfully found our _filename file, set it and keep a copy
// around of the original MatrixManipulator to restore later.
if (_animPathManipulator.valid() && _animPathManipulator->valid())
{