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

From David Callu, warning fixes and removal of spaces at end of lines.

Browse Source
This commit is contained in:
Robert Osfield
2013-06-28 12:00:43 +00:00
parent d82768417d
commit 097aedf23c
100 changed files with 496 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/osgViewer/CompositeViewer.cpp
View File

@@ -30,7 +30,7 @@ CompositeViewer::CompositeViewer()
constructorInit();
}
CompositeViewer::CompositeViewer(const CompositeViewer& cv,const osg::CopyOp& copyop):
CompositeViewer::CompositeViewer(const CompositeViewer& cv,const osg::CopyOp& /*copyop*/):
osg::Object(true),
ViewerBase(cv)
{
@@ -299,7 +299,7 @@ bool CompositeViewer::checkEvents()
}
}
}
// get events from all windows attached to Viewer.
Windows windows;
getWindows(windows);
@@ -309,7 +309,7 @@ bool CompositeViewer::checkEvents()
{
if ((*witr)->checkEvents()) return true;
}
return false;
}
@@ -468,7 +468,7 @@ void CompositeViewer::getScenes(Scenes& scenes, bool onlyValid)
}
}
void CompositeViewer::getViews(Views& views, bool onlyValid)
void CompositeViewer::getViews(Views& views, bool /*onlyValid*/)
{
views.clear();
@@ -733,11 +733,11 @@ void CompositeViewer::generateSlavePointerData(osg::Camera* camera, osgGA::GUIEv
// : project ray into RTT Camera's clip space, and RTT Camera's is Relative RF and sharing same scene graph as master then transform coords.
// if camera isn't the master it must be a slave and could need reprojecting.
osgViewer::View* view = dynamic_cast<osgViewer::View*>(camera->getView());
if (!view) return;
osg::Camera* view_masterCamera = view->getCamera();
if (camera!=view_masterCamera)
{
@@ -751,7 +751,7 @@ void CompositeViewer::generateSlavePointerData(osg::Camera* camera, osgGA::GUIEv
double master_max_x = 1.0;
double master_min_y = -1.0;
double master_max_y = 1.0;
osg::Matrix masterCameraVPW = view_masterCamera->getViewMatrix() * view_masterCamera->getProjectionMatrix();
if (view_masterCamera->getViewport())
{
@@ -829,8 +829,8 @@ void CompositeViewer::generateSlavePointerData(osg::Camera* camera, osgGA::GUIEv
}
}
}
void CompositeViewer::generatePointerData(osgGA::GUIEventAdapter& event)
{
osgViewer::GraphicsWindow* gw = dynamic_cast<osgViewer::GraphicsWindow*>(event.getGraphicsContext());
@@ -841,7 +841,7 @@ void CompositeViewer::generatePointerData(osgGA::GUIEventAdapter& event)
bool invert_y = event.getMouseYOrientation()==osgGA::GUIEventAdapter::Y_INCREASING_DOWNWARDS;
if (invert_y && gw->getTraits()) y = gw->getTraits()->height - y;
event.addPointerData(new osgGA::PointerData(gw, x, 0, gw->getTraits()->width,
y, 0, gw->getTraits()->height));
@@ -893,7 +893,7 @@ void CompositeViewer::reprojectPointerData(osgGA::GUIEventAdapter& source_event,
osg::Viewport* viewport = camera ? camera->getViewport() : 0;
if (!viewport) return;
dest_event.addPointerData(new osgGA::PointerData(camera, (x-viewport->x())/viewport->width()*2.0f-1.0f, -1.0, 1.0,
(y-viewport->y())/viewport->height()*2.0f-1.0f, -1.0, 1.0));
@@ -935,9 +935,9 @@ void CompositeViewer::eventTraversal()
// set done if there are no windows
checkWindowStatus(contexts);
if (_done) return;
osgGA::EventQueue::Events all_events;
for(Contexts::iterator citr = contexts.begin();
citr != contexts.end();
++citr)
@@ -963,7 +963,7 @@ void CompositeViewer::eventTraversal()
// sort all the events in time order so we can make sure we pass them all on in the correct order.
all_events.sort(SortEvents());
// pass on pointer data onto non mouse events to keep the position data usable by all recipients of all events.
for(osgGA::EventQueue::Events::iterator itr = all_events.begin();
itr != all_events.end();
@@ -991,23 +991,23 @@ void CompositeViewer::eventTraversal()
reprojectPointerData(*_previousEvent, *event);
}
#if 0
#if 0
// assign topmost PointeData settings as the events X,Y and InputRange
osgGA::PointerData* pd = event->getPointerData(event->getNumPointerData()-1);
event->setX(pd->x);
event->setY(pd->y);
event->setInputRange(pd->xMin, pd->yMin, pd->xMax, pd->yMax);
event->setMouseYOrientation(osgGA::GUIEventAdapter::Y_INCREASING_UPWARDS);
#else
#else
if (event->getMouseYOrientation()!=osgGA::GUIEventAdapter::Y_INCREASING_UPWARDS)
{
event->setY((event->getYmax()-event->getY())+event->getYmin());
event->setMouseYOrientation(osgGA::GUIEventAdapter::Y_INCREASING_UPWARDS);
}
#endif
#endif
_previousEvent = event;
break;
}
default:
@@ -1018,28 +1018,28 @@ void CompositeViewer::eventTraversal()
osgGA::PointerData* pd = event->getNumPointerData()>0 ? event->getPointerData(event->getNumPointerData()-1) : 0;
osg::Camera* camera = pd ? dynamic_cast<osg::Camera*>(pd->object.get()) : 0;
osgViewer::View* view = camera ? dynamic_cast<osgViewer::View*>(camera->getView()) : 0;
if (!view)
if (!view)
{
if (_viewWithFocus.valid())
if (_viewWithFocus.valid())
{
// OSG_NOTICE<<"Falling back to using _viewWithFocus"<<std::endl;
view = _viewWithFocus.get();
}
else if (!_views.empty())
else if (!_views.empty())
{
// OSG_NOTICE<<"Falling back to using first view as one with focus"<<std::endl;
view = _views[0].get();
}
}
// reassign view with focus
if (_viewWithFocus != view) _viewWithFocus = view;
if (view)
if (view)
{
viewEventsMap[view].push_back( event );
osgGA::GUIEventAdapter* eventState = view->getEventQueue()->getCurrentEventState();
eventState->copyPointerDataFrom(*event);
}
@@ -1073,7 +1073,7 @@ void CompositeViewer::eventTraversal()
break;
}
}
for(RefViews::iterator vitr = _views.begin();
vitr != _views.end();
@@ -1327,9 +1327,9 @@ void CompositeViewer::updateTraversal()
{
view->setFusionDistance( view->getCameraManipulator()->getFusionDistanceMode(),
view->getCameraManipulator()->getFusionDistanceValue() );
view->getCameraManipulator()->updateCamera(*(view->getCamera()));
}
view->updateSlaves();

7
src/osgViewer/Keystone.cpp
View File

@@ -36,7 +36,8 @@ Keystone::Keystone():
top_left(-1.0,1.0),
top_right(1.0,1.0) {}
Keystone::Keystone(const Keystone& rhs, const osg::CopyOp&):
Keystone::Keystone(const Keystone& rhs, const osg::CopyOp & copyop):
osg::Object(rhs, copyop),
keystoneEditingEnabled(rhs.keystoneEditingEnabled),
gridColour(rhs.gridColour),
bottom_left(rhs.bottom_left),
@@ -97,7 +98,7 @@ struct KeystoneCullCallback : public osg::Drawable::CullCallback
META_Object(osg,KeystoneCullCallback);
/** do customized cull code, return true if drawable should be culled.*/
virtual bool cull(osg::NodeVisitor* nv, osg::Drawable* drawable, osg::RenderInfo* renderInfo) const
virtual bool cull(osg::NodeVisitor* /*nv*/, osg::Drawable* /*drawable*/, osg::RenderInfo* /*renderInfo*/) const
{
return _keystone.valid() ? !_keystone->getKeystoneEditingEnabled() : true;
}
@@ -413,7 +414,7 @@ osg::Vec2d KeystoneHandler::incrementScale(const osgGA::GUIEventAdapter& ea) con
return _defaultIncrement;
}
bool KeystoneHandler::handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa, osg::Object* obj, osg::NodeVisitor* nv)
bool KeystoneHandler::handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& /*aa*/, osg::Object* obj, osg::NodeVisitor* /*nv*/)
{
osg::Camera* camera = dynamic_cast<osg::Camera*>(obj);
osg::Viewport* viewport = camera ? camera->getViewport() : 0;

4
src/osgViewer/PixelBufferX11.cpp
View File

@@ -439,7 +439,7 @@ bool PixelBufferX11::makeCurrentImplementation()
#endif
}
bool PixelBufferX11::makeContextCurrentImplementation(osg::GraphicsContext* readContext)
bool PixelBufferX11::makeContextCurrentImplementation(osg::GraphicsContext* /*readContext*/)
{
// OSG_NOTICE<<"PixelBufferX11::makeContextCurrentImplementation() not implementation yet."<<std::endl;
return makeCurrentImplementation();
@@ -464,7 +464,7 @@ bool PixelBufferX11::releaseContextImplementation()
}
void PixelBufferX11::bindPBufferToTextureImplementation(GLenum buffer)
void PixelBufferX11::bindPBufferToTextureImplementation(GLenum /*buffer*/)
{
OSG_NOTICE<<"PixelBufferX11::bindPBufferToTextureImplementation() not implementation yet."<<std::endl;
}

20
src/osgViewer/Renderer.cpp
View File

@@ -65,7 +65,7 @@ EXTQuerySupport::EXTQuerySupport():
{
}
void EXTQuerySupport::checkQuery(osg::Stats* stats, osg::State* state,
void EXTQuerySupport::checkQuery(osg::Stats* stats, osg::State* /*state*/,
osg::Timer_t startTick)
{
for(QueryFrameNumberList::iterator itr = _queryFrameNumberList.begin();
@@ -118,19 +118,19 @@ GLuint EXTQuerySupport::createQueryObject()
}
}
void EXTQuerySupport::beginQuery(unsigned int frameNumber, osg::State* state)
void EXTQuerySupport::beginQuery(unsigned int frameNumber, osg::State* /*state*/)
{
GLuint query = createQueryObject();
_extensions->glBeginQuery(GL_TIME_ELAPSED, query);
_queryFrameNumberList.push_back(QueryFrameNumberPair(query, frameNumber));
}
void EXTQuerySupport::endQuery(osg::State* state)
void EXTQuerySupport::endQuery(osg::State* /*state*/)
{
_extensions->glEndQuery(GL_TIME_ELAPSED);
}
void OpenGLQuerySupport::initialize(osg::State* state, osg::Timer_t startTick)
void OpenGLQuerySupport::initialize(osg::State* state, osg::Timer_t /*startTick*/)
{
_extensions = osg::Drawable::getExtensions(state->getContextID(),true);
}
@@ -177,7 +177,7 @@ void ARBQuerySupport::initialize(osg::State* state, osg::Timer_t startTick)
OpenGLQuerySupport::initialize(state, startTick);
}
void ARBQuerySupport::beginQuery(unsigned int frameNumber, osg::State* state)
void ARBQuerySupport::beginQuery(unsigned int frameNumber, osg::State* /*state*/)
{
QueryPair query;
if (_availableQueryObjects.empty())
@@ -194,14 +194,14 @@ void ARBQuerySupport::beginQuery(unsigned int frameNumber, osg::State* state)
_queryFrameList.push_back(ActiveQuery(query, frameNumber));
}
void ARBQuerySupport::endQuery(osg::State* state)
void ARBQuerySupport::endQuery(osg::State* /*state*/)
{
_extensions->glQueryCounter(_queryFrameList.back().queries.second,
GL_TIMESTAMP);
}
void ARBQuerySupport::checkQuery(osg::Stats* stats, osg::State* state,
osg::Timer_t startTick)
osg::Timer_t /*startTick*/)
{
for(QueryFrameList::iterator itr = _queryFrameList.begin();
itr != _queryFrameList.end();
@@ -390,7 +390,7 @@ Renderer::Renderer(osg::Camera* camera):
((view && view->getDisplaySettings()) ? view->getDisplaySettings() : osg::DisplaySettings::instance().get());
_serializeDraw = ds ? ds->getSerializeDrawDispatch() : false;
unsigned int sceneViewOptions = osgUtil::SceneView::HEADLIGHT;
if (view)
{
@@ -423,7 +423,7 @@ Renderer::Renderer(osg::Camera* camera):
_sceneView[0]->setResetColorMaskToAllOn(false);
_sceneView[1]->setResetColorMaskToAllOn(false);
}
_sceneView[0]->setCamera(_camera.get(), false);
_sceneView[1]->setCamera(_camera.get(), false);
@@ -898,7 +898,7 @@ void Renderer::operator () (osg::Object* object)
if (camera) cull();
}
void Renderer::operator () (osg::GraphicsContext* context)
void Renderer::operator () (osg::GraphicsContext* /*context*/)
{
if (_graphicsThreadDoesCull)
{

4
src/osgViewer/ScreenCaptureHandler.cpp
View File

@@ -206,7 +206,7 @@ void WindowCaptureCallback::ContextData::updateTimings(osg::Timer_t tick_start,
osg::Timer_t tick_afterReadPixels,
osg::Timer_t tick_afterMemCpy,
osg::Timer_t tick_afterCaptureOperation,
unsigned int dataSize)
unsigned int /*dataSize*/)
{
_timeForReadPixels = osg::Timer::instance()->delta_s(tick_start, tick_afterReadPixels);
_timeForMemCpy = osg::Timer::instance()->delta_s(tick_afterReadPixels, tick_afterMemCpy);
@@ -770,7 +770,7 @@ bool ScreenCaptureHandler::handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIAc
{
_stopCapture = false;
removeCallbackFromViewer(*viewer);
}
}
break;
}

34
src/osgViewer/Viewer.cpp
View File

@@ -295,18 +295,18 @@ bool Viewer::readConfiguration(const std::string& filename)
//OSG_NOTICE<<"Error: Unable to load configuration file \""<<filename<<"\""<<std::endl;
return false;
}
ViewConfig* config = dynamic_cast<ViewConfig*>(object.get());
if (config)
{
OSG_NOTICE<<"Using osgViewer::Config : "<<config->className()<<std::endl;
config->configure(*this);
osgDB::writeObjectFile(*config,"test.osgt");
return true;
}
CompositeViewer* compositeViewer = dynamic_cast<CompositeViewer*>(object.get());
if (compositeViewer)
@@ -363,7 +363,7 @@ bool Viewer::checkNeedToDoFrame()
// check if events are available and need processing
if (checkEvents()) return true;
// now check if any of the event handles have prompted a redraw.
if (_requestRedraw) return true;
if (_requestContinousUpdate) return true;
@@ -395,7 +395,7 @@ bool Viewer::checkEvents()
{
if ((*witr)->checkEvents()) return true;
}
return false;
}
@@ -678,7 +678,7 @@ void Viewer::generateSlavePointerData(osg::Camera* camera, osgGA::GUIEventAdapte
double master_max_x = 1.0;
double master_min_y = -1.0;
double master_max_y = 1.0;
osg::Matrix masterCameraVPW = getCamera()->getViewMatrix() * getCamera()->getProjectionMatrix();
if (getCamera()->getViewport())
{
@@ -758,8 +758,8 @@ void Viewer::generateSlavePointerData(osg::Camera* camera, osgGA::GUIEventAdapte
}
}
}
void Viewer::generatePointerData(osgGA::GUIEventAdapter& event)
{
osgViewer::GraphicsWindow* gw = dynamic_cast<osgViewer::GraphicsWindow*>(event.getGraphicsContext());
@@ -770,7 +770,7 @@ void Viewer::generatePointerData(osgGA::GUIEventAdapter& event)
bool invert_y = event.getMouseYOrientation()==osgGA::GUIEventAdapter::Y_INCREASING_DOWNWARDS;
if (invert_y && gw->getTraits()) y = gw->getTraits()->height - y;
event.addPointerData(new osgGA::PointerData(gw, x, 0, gw->getTraits()->width,
y, 0, gw->getTraits()->height));
@@ -822,7 +822,7 @@ void Viewer::reprojectPointerData(osgGA::GUIEventAdapter& source_event, osgGA::G
osg::Viewport* viewport = camera ? camera->getViewport() : 0;
if (!viewport) return;
dest_event.addPointerData(new osgGA::PointerData(camera, (x-viewport->x())/viewport->width()*2.0f-1.0f, -1.0, 1.0,
(y-viewport->y())/viewport->height()*2.0f-1.0f, -1.0, 1.0));
@@ -838,7 +838,7 @@ void Viewer::eventTraversal()
if (_done) return;
double cutOffTime = _frameStamp->getReferenceTime();
double beginEventTraversal = osg::Timer::instance()->delta_s(_startTick, osg::Timer::instance()->tick());
// OSG_NOTICE<<"Viewer::frameEventTraversal()."<<std::endl;
@@ -926,17 +926,17 @@ void Viewer::eventTraversal()
#endif
eventState->copyPointerDataFrom(*event);
break;
}
default:
event->copyPointerDataFrom(*eventState);
break;
}
events.push_back(event);
}
for(itr = gw_events.begin();
itr != gw_events.end();
++itr)
@@ -1174,13 +1174,13 @@ void Viewer::updateTraversal()
}
}
void Viewer::getScenes(Scenes& scenes, bool onlyValid)
void Viewer::getScenes(Scenes& scenes, bool /*onlyValid*/)
{
scenes.clear();
scenes.push_back(_scene.get());
}
void Viewer::getViews(Views& views, bool onlyValid)
void Viewer::getViews(Views& views, bool /*onlyValid*/)
{
views.clear();
views.push_back(this);