Fixed shadows warnings

This commit is contained in:
Robert Osfield
2016-05-26 11:13:56 +01:00
parent 80e318ce15
commit dbce12842e
12 changed files with 50 additions and 56 deletions

View File

@@ -108,7 +108,7 @@ typedef vector<BufferConfig> BufferConfigList;
vector<FboConfig> validConfigs;
// Ugly global variables for the viewport width and height
int width, height;
// int width, height;
// This is only used when testing possible frame buffer configurations
// to find valid ones.
@@ -406,10 +406,10 @@ AppState::AppState(osgViewer::Viewer* viewer_)
void AppState::setStateFromConfig(const FboConfig& config)
{
Camera* camera = viewer->getSlave(0)._camera.get();
setAttachmentsFromConfig(camera, config);
Camera* cam = viewer->getSlave(0)._camera.get();
setAttachmentsFromConfig(cam, config);
osgViewer::Renderer* renderer
= dynamic_cast<osgViewer::Renderer*>(camera->getRenderer());
= dynamic_cast<osgViewer::Renderer*>(cam->getRenderer());
if (renderer)
renderer->setCameraRequiresSetUp(true);
if (configText.valid())
@@ -954,8 +954,8 @@ int main(int argc, char **argv)
return 1;
gc->setResizedCallback(new ResizedCallback(appState.get()));
const GraphicsContext::Traits* traits = gc->getTraits();
width = traits->width;
height = traits->height;
int width = traits->width;
int height = traits->height;
if (arguments.argc()<=1)
{
arguments.getApplicationUsage()->write(std::cout,osg::ApplicationUsage::COMMAND_LINE_OPTION);