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

From David Callu, warning fixes

Browse Source
This commit is contained in:
Robert Osfield
2007-09-07 15:03:56 +00:00
parent 18e688ea5f
commit 8e7e6529be
26 changed files with 90 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/osgdepthpeeling/Utility.h
View File

@@ -53,5 +53,5 @@ double smoothNoise(unsigned width, unsigned height, unsigned x, unsigned y, unsi
Get a quad with screen size in order to show a texture full screen
*/
osg::Geode* getCanvasQuad(unsigned width, unsigned height, double depth=-1);
};
}
#endif

4
examples/osgtext/osgtext.cpp
View File

@@ -483,9 +483,9 @@ public:
UpdateTextOperation(osg::Group* group):
Operation("UpdateTextOperation", true),
_group(group),
_maxNumChildren(200),
_maxNumTextPerGeode(10)
_maxNumTextPerGeode(10),
_group(group)
{
}

34
genwrapper.conf
View File

@@ -179,22 +179,22 @@ end
configure file "osg/Array"
emit after "
STD_VECTOR_REFLECTOR(std::vector<osg::Vec2>);
STD_VECTOR_REFLECTOR(std::vector<osg::Vec3>);
STD_VECTOR_REFLECTOR(std::vector<osg::Vec4>);
STD_VECTOR_REFLECTOR(std::vector<osg::Vec2b>);
STD_VECTOR_REFLECTOR(std::vector<osg::Vec3b>);
STD_VECTOR_REFLECTOR(std::vector<osg::Vec4b>);
STD_VECTOR_REFLECTOR(std::vector<osg::Vec2s>);
STD_VECTOR_REFLECTOR(std::vector<osg::Vec3s>);
STD_VECTOR_REFLECTOR(std::vector<osg::Vec4s>);
STD_VECTOR_REFLECTOR(std::vector<osg::Vec4ub>);
STD_VECTOR_REFLECTOR(std::vector<GLubyte>);
STD_VECTOR_REFLECTOR(std::vector<GLbyte>);
STD_VECTOR_REFLECTOR(std::vector<GLushort>);
STD_VECTOR_REFLECTOR(std::vector<GLshort>);
STD_VECTOR_REFLECTOR(std::vector<GLuint>);
STD_VECTOR_REFLECTOR(std::vector<GLint>);
STD_VECTOR_REFLECTOR(std::vector<osg::Vec2>)
STD_VECTOR_REFLECTOR(std::vector<osg::Vec3>)
STD_VECTOR_REFLECTOR(std::vector<osg::Vec4>)
STD_VECTOR_REFLECTOR(std::vector<osg::Vec2b>)
STD_VECTOR_REFLECTOR(std::vector<osg::Vec3b>)
STD_VECTOR_REFLECTOR(std::vector<osg::Vec4b>)
STD_VECTOR_REFLECTOR(std::vector<osg::Vec2s>)
STD_VECTOR_REFLECTOR(std::vector<osg::Vec3s>)
STD_VECTOR_REFLECTOR(std::vector<osg::Vec4s>)
STD_VECTOR_REFLECTOR(std::vector<osg::Vec4ub>)
STD_VECTOR_REFLECTOR(std::vector<GLubyte>)
STD_VECTOR_REFLECTOR(std::vector<GLbyte>)
STD_VECTOR_REFLECTOR(std::vector<GLushort>)
STD_VECTOR_REFLECTOR(std::vector<GLshort>)
STD_VECTOR_REFLECTOR(std::vector<GLuint>)
STD_VECTOR_REFLECTOR(std::vector<GLint>)
"
end
@@ -203,7 +203,7 @@ end
# StateSet and related types need some advanced tweaking
configure reflector "std::map< osg::StateAttribute::GLMode, osg::StateAttribute::GLModeValue >"
replace with "STD_MAP_REFLECTOR_WITH_TYPES(std::map< osg::StateAttribute::GLMode COMMA osg::StateAttribute::GLModeValue >, osg::StateAttribute::GLMode, osg::StateAttribute::Values);"
replace with "STD_MAP_REFLECTOR_WITH_TYPES(std::map< osg::StateAttribute::GLMode COMMA osg::StateAttribute::GLModeValue >, osg::StateAttribute::GLMode, osg::StateAttribute::Values)"
end
configure reflector "osg::StateSet"

4
include/osgManipulator/Dragger
View File

@@ -36,10 +36,10 @@ class OSGMANIPULATOR_EXPORT PointerInfo
PointerInfo();
PointerInfo(const PointerInfo& rhs):
_hitList(rhs._hitList),
_nearPoint(rhs._nearPoint),
_farPoint(rhs._farPoint),
_eyeDir(rhs._eyeDir),
_hitList(rhs._hitList)
_eyeDir(rhs._eyeDir)
{
_hitIter = _hitList.begin();
}

2
include/osgSim/OverlayNode
View File

@@ -36,7 +36,7 @@ class OSGSIM_EXPORT OverlayNode : public osg::Group
{
OBJECT_DEPENDENT_WITH_ORTHOGRAPHIC_OVERLAY,
VIEW_DEPENDENT_WITH_ORTHOGRAPHIC_OVERLAY,
VIEW_DEPENDENT_WITH_PERSPECTIVE_OVERLAY,
VIEW_DEPENDENT_WITH_PERSPECTIVE_OVERLAY
};
OverlayNode(OverlayTechnique technique=OBJECT_DEPENDENT_WITH_ORTHOGRAPHIC_OVERLAY);

6
include/osgUtil/StateGraph
View File

@@ -67,8 +67,8 @@ class OSGUTIL_EXPORT StateGraph : public osg::Referenced
StateGraph():
osg::Referenced(false),
_parent(NULL),
_stateset(NULL),
_parent(NULL),
_stateset(NULL),
_depth(0),
_averageDistance(0),
_minimumDistance(0),
@@ -79,7 +79,7 @@ class OSGUTIL_EXPORT StateGraph : public osg::Referenced
StateGraph(StateGraph* parent,const osg::StateSet* stateset):
osg::Referenced(false),
_parent(parent),
_parent(parent),
_stateset(stateset),
_depth(0),
_averageDistance(0),

8
src/osg/BufferObject.cpp
View File

@@ -351,8 +351,8 @@ void VertexBufferObject::compileBuffer(State& state) const
// osg::notify(osg::NOTICE)<<"VertexBufferObject::compileBuffer frameNumber="<<state.getFrameStamp()->getFrameNumber()<<std::endl;
unsigned int totalSizeRequired = 0;
unsigned int numModified = 0;
unsigned int numNotModified = 0;
// unsigned int numModified = 0;
// unsigned int numNotModified = 0;
for(BufferEntryArrayPairs::const_iterator itr = _bufferEntryArrayPairs.begin();
itr != _bufferEntryArrayPairs.end();
++itr)
@@ -520,8 +520,8 @@ void ElementBufferObject::compileBuffer(State& state) const
Extensions* extensions = getExtensions(contextID,true);
unsigned int totalSizeRequired = 0;
unsigned int numModified = 0;
unsigned int numNotModified = 0;
// unsigned int numModified = 0;
// unsigned int numNotModified = 0;
for(BufferEntryDrawElementsPairs::const_iterator itr = _bufferEntryDrawElementsPairs.begin();
itr != _bufferEntryDrawElementsPairs.end();
++itr)

4
src/osg/Camera.cpp
View File

@@ -21,8 +21,8 @@ Camera::Camera():
_clearColor(osg::Vec4(0.0f,0.0f,0.0f,1.0f)),
_clearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT),
_transformOrder(PRE_MULTIPLY),
_renderOrder(POST_RENDER),
_projectionResizePolicy(HORIZONTAL),
_renderOrder(POST_RENDER),
_renderOrderNum(0),
_drawBuffer(GL_NONE),
_readBuffer(GL_NONE),
@@ -37,8 +37,8 @@ Camera::Camera(const Camera& camera,const CopyOp& copyop):
CullSettings(camera),
_view(camera._view),
_allowEventFocus(camera._allowEventFocus),
_clearColor(camera._clearColor),
_displaySettings(camera._displaySettings),
_clearColor(camera._clearColor),
_clearMask(camera._clearMask),
_colorMask(camera._colorMask),
_viewport(camera._viewport),

2
src/osg/Geometry.cpp
View File

@@ -1244,7 +1244,7 @@ void Geometry::drawImplementation(RenderInfo& renderInfo) const
{
State& state = *renderInfo.getState();
unsigned int contextID = state.getContextID();
// unsigned int contextID = state.getContextID();
// osg::notify(osg::NOTICE)<<"Geometry::drawImplementation"<<std::endl;

2
src/osgDB/Registry.cpp
View File

@@ -1329,7 +1329,7 @@ void Registry::addArchiveExtension(const std::string ext)
return;
}
_archiveExtList.push_back(ext);
};
}
ReaderWriter::ReadResult Registry::read(const ReadFunctor& readFunctor)
{

2
src/osgGA/EventQueue.cpp
View File

@@ -367,6 +367,6 @@ void EventQueue::userEvent(osg::Referenced* userEventData, double time)
event->setTime(time);
addEvent(event);
};
}

2
src/osgPlugins/Inventor/ConvertToInventor.h
View File

@@ -41,7 +41,7 @@ namespace osg {
class ShapeDrawable;
class TexEnv;
class TexGen;
};
}

2
src/osgPlugins/Inventor/GroupSoLOD.cpp
View File

@@ -3,7 +3,7 @@
#include "GroupSoLOD.h"
SO_NODE_SOURCE(GroupSoLOD);
SO_NODE_SOURCE(GroupSoLOD)
void GroupSoLOD::initClass()
{

4
src/osgPlugins/dds/ReaderWriterDDS.cpp
View File

@@ -314,7 +314,7 @@ osg::Image* ReadDDSFile(std::istream& _istream)
unsigned int dataType;
};
const int UNSUPPORTED = 0;
const unsigned int UNSUPPORTED = 0;
static const RGBFormat rgbFormats[] =
{
@@ -355,7 +355,7 @@ osg::Image* ReadDDSFile(std::istream& _istream)
bool found = false;
for ( int i = 0; i < sizeof ( rgbFormats ) / sizeof ( RGBFormat ); i++ )
for ( unsigned int i = 0; i < sizeof ( rgbFormats ) / sizeof ( RGBFormat ); i++ )
{
const RGBFormat& f = rgbFormats[ i ];
if ( ddsd.ddpfPixelFormat.dwRGBBitCount == f.bitCount &&

2
src/osgPlugins/gif/ReaderWriterGIF.cpp
View File

@@ -48,7 +48,7 @@
extern "C"
{
#include <gif_lib.h>
};
}
#define ERR_NO_ERROR 0
#define ERR_OPEN 1

2
src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
View File

@@ -49,7 +49,7 @@ extern "C"
{
#include <jpeglib.h>
#include "jerror.h"
};
}
#include <setjmp.h>
#include <string.h>

12
src/osgPlugins/logo/ReaderWriterLOGO.cpp
View File

@@ -248,12 +248,20 @@ class LOGOReaderWriter : public osgDB::ReaderWriter
pos = Logos::LowerCenter;
else if( str == "Camera" )
{
unsigned int n;
if( (fscanf( fp, "%d", &n )) != 1 )
int tn;
if( (fscanf( fp, "%d", &tn )) != 1 )
{
osg::notify(osg::WARN) << "Error... Camera requires an integer argument\n";
break;
}
if (tn < 0)
{
osg::notify(osg::WARN) << "Error... Camera requires an positive or null value argument\n";
break;
}
unsigned int n = static_cast<unsigned int>(tn);
if( screen != n )
{
screen = n;

2
src/osgPlugins/lwo/old_Lwo2.cpp
View File

@@ -60,7 +60,7 @@ Lwo2::~Lwo2()
{
delete (*itr_surf).second;
}
};
}
bool
Lwo2::ReadFile( const string& filename )

3
src/osgPlugins/net/sockinet.cpp
View File

@@ -66,7 +66,8 @@ extern "C" {
#define socklen_t int
#endif
void herror(const char*);
// need add throw() under Linux when compile with aggressive warning
void herror(const char*) throw();
sockinetaddr::sockinetaddr ()
{

6
src/osgPlugins/txp/ReaderWriterTXP.cpp
View File

@@ -77,7 +77,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterTXP::local_readNode(const std::strin
{
int x,y,lod;
unsigned int id;
sscanf(name.c_str(),"tile%d_%dx%d_%d",&lod,&x,&y,&id);
sscanf(name.c_str(),"tile%d_%dx%d_%u",&lod,&x,&y,&id);
TXPArchive* archive = getArchive(id,osgDB::getFilePath(file));
// The way this is done a 'tile' should only be created for lod 0 only,
@@ -191,7 +191,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterTXP::local_readNode(const std::strin
{
int x,y,lod;
unsigned int id;
sscanf(name.c_str(),"subtiles%d_%dx%d_%d",&lod,&x,&y,&id);
sscanf(name.c_str(),"subtiles%d_%dx%d_%u",&lod,&x,&y,&id);
TXPArchive* archive = getArchive(id,osgDB::getFilePath(file));
int majorVersion, minorVersion;
@@ -207,7 +207,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterTXP::local_readNode(const std::strin
{
int nbChild;
sscanf(name.c_str(),"subtiles%d_%dx%d_%d_%d",&lod,&x,&y,&id, &nbChild);
sscanf(name.c_str(),"subtiles%d_%dx%d_%u_%d",&lod,&x,&y,&id, &nbChild);
std::vector<TXPArchive::TileLocationInfo> locs;
bool status = true;
status = extractChildrenLocations(name, lod, locs, nbChild);

10
src/osgSim/OverlayNode.cpp
View File

@@ -1179,7 +1179,9 @@ void OverlayNode::init()
void OverlayNode::init_OBJECT_DEPENDENT_WITH_ORTHOGRAPHIC_OVERLAY()
{
osg::notify(osg::INFO)<<"OverlayNode::init() - OBJECT_DEPENDENT_WITH_ORTHOGRAPHIC_OVERLAY"<<std::endl;
OverlayData& overlayData = getOverlayData(0);
// force initialization of _overlayDataMap for the key 0 (or NULL)
getOverlayData(0);
}
void OverlayNode::init_VIEW_DEPENDENT_WITH_ORTHOGRAPHIC_OVERLAY()
@@ -1563,7 +1565,7 @@ void OverlayNode::traverse_VIEW_DEPENDENT_WITH_ORTHOGRAPHIC_OVERLAY(osg::NodeVis
if (usePerspectiveShaders)
{
// osg::notify(osg::NOTICE)<<"ratio = "<<ratio<<std::endl;
double original_width = max_side-min_side;
// double original_width = max_side-min_side;
double minRatio = 0.02;
if (ratio<minRatio) ratio = minRatio;
@@ -1622,7 +1624,7 @@ void OverlayNode::traverse_VIEW_DEPENDENT_WITH_ORTHOGRAPHIC_OVERLAY(osg::NodeVis
if (local_base_up < lowest_up)
{
lowest_up = local_base_up;
double side_over_up = delta_side / delta_up;
// double side_over_up = delta_side / delta_up;
}
}
@@ -1640,7 +1642,7 @@ void OverlayNode::traverse_VIEW_DEPENDENT_WITH_ORTHOGRAPHIC_OVERLAY(osg::NodeVis
min_side = mid_side - max_half_width;
max_side = mid_side + max_half_width;
double new_width = max_side-min_side;
// double new_width = max_side-min_side;
double y0 = (1.0 + ratio) / (1.0 - ratio);

2
src/osgTerrain/GeometryTechnique.cpp
View File

@@ -375,7 +375,7 @@ void GeometryTechnique::generateGeometry(Locator* masterLocator, const osg::Vec3
}
// populate primitive sets
bool optimizeOrientations = _elevations!=0;
// bool optimizeOrientations = _elevations!=0;
bool swapOrientation = !(masterLocator->orientationOpenGL());
osg::DrawElementsUInt* elements = new osg::DrawElementsUInt(GL_TRIANGLES);

6
src/osgUtil/CullVisitor.cpp
View File

@@ -201,7 +201,7 @@ void CullVisitor::computeNearPlane()
if (!_nearPlaneCandidateMap.empty())
{
osg::Timer_t start_t = osg::Timer::instance()->tick();
// osg::Timer_t start_t = osg::Timer::instance()->tick();
// update near from defferred list of drawables
unsigned int numTests = 0;
@@ -219,7 +219,7 @@ void CullVisitor::computeNearPlane()
}
}
osg::Timer_t end_t = osg::Timer::instance()->tick();
// osg::Timer_t end_t = osg::Timer::instance()->tick();
// osg::notify(osg::NOTICE)<<"Took "<<osg::Timer::instance()->delta_m(start_t,end_t)<<"ms to test "<<numTests<<" out of "<<_nearPlaneCandidateMap.size()<<std::endl;
_nearPlaneCandidateMap.clear();
@@ -1206,7 +1206,7 @@ void CullVisitor::apply(osg::Camera& camera)
// will do later.
osgUtil::RenderStage* previous_stage = getCurrentRenderBin()->getStage();
unsigned int contextID = getState() ? getState()->getContextID() : 0;
// unsigned int contextID = getState() ? getState()->getContextID() : 0;
// use render to texture stage.
// create the render to texture stage.

12
src/osgViewer/ViewerEventHandlers.cpp
View File

@@ -142,11 +142,11 @@ void WindowSizeHandler::toggleFullscreen(osgViewer::GraphicsWindow *window)
int x;
int y;
int width;
int height;
int height;
window->getWindowRectangle(x, y, width, height);
bool isFullScreen = x == 0 && y == 0 && width == screenWidth && height == screenHeight;
bool isFullScreen = x == 0 && y == 0 && width == (int)screenWidth && height == (int)screenHeight;
if (isFullScreen)
{
@@ -188,11 +188,11 @@ void WindowSizeHandler::changeWindowedResolution(osgViewer::GraphicsWindow *wind
int x;
int y;
int width;
int height;
int height;
window->getWindowRectangle(x, y, width, height);
bool isFullScreen = x == 0 && y == 0 && width == screenWidth && height == screenHeight;
bool isFullScreen = x == 0 && y == 0 && width == (int)screenWidth && height == (int)screenHeight;
if (window->getWindowDecoration() == true || isFullScreen == false)
{
@@ -356,8 +356,8 @@ RecordCameraPathHandler::RecordCameraPathHandler(const std::string& filename):
_currentlyRecording(false),
_currentlyPlaying(false),
_delta(0.0f),
_lastFrameTime(osg::Timer::instance()->tick()),
_animStartTime(0)
_animStartTime(0),
_lastFrameTime(osg::Timer::instance()->tick())
{
_animPath = new osg::AnimationPath();

32
src/osgWrappers/osg/Array.cpp
View File

@@ -2084,20 +2084,20 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLushort COMMA osg::Array::USho
END_REFLECTOR
STD_VECTOR_REFLECTOR(std::vector<osg::Vec2>);
STD_VECTOR_REFLECTOR(std::vector<osg::Vec3>);
STD_VECTOR_REFLECTOR(std::vector<osg::Vec4>);
STD_VECTOR_REFLECTOR(std::vector<osg::Vec2b>);
STD_VECTOR_REFLECTOR(std::vector<osg::Vec3b>);
STD_VECTOR_REFLECTOR(std::vector<osg::Vec4b>);
STD_VECTOR_REFLECTOR(std::vector<osg::Vec2s>);
STD_VECTOR_REFLECTOR(std::vector<osg::Vec3s>);
STD_VECTOR_REFLECTOR(std::vector<osg::Vec4s>);
STD_VECTOR_REFLECTOR(std::vector<osg::Vec4ub>);
STD_VECTOR_REFLECTOR(std::vector<GLubyte>);
STD_VECTOR_REFLECTOR(std::vector<GLbyte>);
STD_VECTOR_REFLECTOR(std::vector<GLushort>);
STD_VECTOR_REFLECTOR(std::vector<GLshort>);
STD_VECTOR_REFLECTOR(std::vector<GLuint>);
STD_VECTOR_REFLECTOR(std::vector<GLint>);
STD_VECTOR_REFLECTOR(std::vector<osg::Vec2>)
STD_VECTOR_REFLECTOR(std::vector<osg::Vec3>)
STD_VECTOR_REFLECTOR(std::vector<osg::Vec4>)
STD_VECTOR_REFLECTOR(std::vector<osg::Vec2b>)
STD_VECTOR_REFLECTOR(std::vector<osg::Vec3b>)
STD_VECTOR_REFLECTOR(std::vector<osg::Vec4b>)
STD_VECTOR_REFLECTOR(std::vector<osg::Vec2s>)
STD_VECTOR_REFLECTOR(std::vector<osg::Vec3s>)
STD_VECTOR_REFLECTOR(std::vector<osg::Vec4s>)
STD_VECTOR_REFLECTOR(std::vector<osg::Vec4ub>)
STD_VECTOR_REFLECTOR(std::vector<GLubyte>)
STD_VECTOR_REFLECTOR(std::vector<GLbyte>)
STD_VECTOR_REFLECTOR(std::vector<GLushort>)
STD_VECTOR_REFLECTOR(std::vector<GLshort>)
STD_VECTOR_REFLECTOR(std::vector<GLuint>)
STD_VECTOR_REFLECTOR(std::vector<GLint>)

2
src/osgWrappers/osg/StateSet.cpp
View File

@@ -767,7 +767,7 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Uniform >)
0);
END_REFLECTOR
STD_MAP_REFLECTOR_WITH_TYPES(std::map< osg::StateAttribute::GLMode COMMA osg::StateAttribute::GLModeValue >, osg::StateAttribute::GLMode, osg::StateAttribute::Values);
STD_MAP_REFLECTOR_WITH_TYPES(std::map< osg::StateAttribute::GLMode COMMA osg::StateAttribute::GLModeValue >, osg::StateAttribute::GLMode, osg::StateAttribute::Values)
STD_MAP_REFLECTOR(std::map< osg::StateAttribute::TypeMemberPair COMMA osg::StateSet::RefAttributePair >)
STD_MAP_REFLECTOR(std::map< std::string COMMA osg::StateSet::RefUniformPair >)