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

Merge branch 'master' into shader_pipeline

Browse Source
This commit is contained in:
Robert Osfield 2018-03-19 11:00:07 +00:00
commit 10e1c29d2e
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/osgviewerWX/osgviewerWX.cpp
View File

@ -208,7 +208,7 @@ void OSGCanvas::OnKeyUp(wxKeyEvent &event)
// event.Skip() to allow processing to continue.
}
void OSGCanvas::OnMouseEnter(wxMouseEvent &event)
void OSGCanvas::OnMouseEnter(wxMouseEvent & /*event*/)
{
// Set focus to ourselves, so keyboard events get directed to us
SetFocus();

2
src/osgPlugins/pdf/ReaderWriterPDF.cpp
View File

@ -234,7 +234,7 @@ class ReaderWriterPDF : public osgDB::ReaderWriter
return readImage(file,options);
}
virtual osgDB::ReaderWriter::ReadResult readImage(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const
virtual osgDB::ReaderWriter::ReadResult readImage(const std::string& fileName, const osgDB::ReaderWriter::Options* /*options*/) const
{
if (!osgDB::equalCaseInsensitive(osgDB::getFileExtension(fileName),"pdf"))
{

2
src/osgWrappers/deprecated-dotosg/osg/Texture.cpp
View File

@ -541,6 +541,7 @@ bool Texture_matchShadowTextureModeStr(const char* str,Texture::ShadowTextureMod
if ( strcmp(str,"GL_LUMINANCE")==0) value = Texture::LUMINANCE;
else if (strcmp(str,"GL_INTENSITY")==0) value = Texture::INTENSITY;
else if (strcmp(str,"GL_ALPHA")==0) value = Texture::ALPHA;
else if (strcmp(str,"GL_NONE")==0) value = Texture::NONE;
else return false;
return true;
@ -553,6 +554,7 @@ const char* Texture_getShadowTextureModeStr(Texture::ShadowTextureMode value)
case( Texture::LUMINANCE ): return "GL_LUMINANCE";
case( Texture::INTENSITY ): return "GL_INTENSITY";
case( Texture::ALPHA ): return "GL_ALPHA";
case( Texture::NONE ): return "GL_NONE";
}
return NULL;
}