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

Warning fixes from Gideon May.

Browse Source
This commit is contained in:
Robert Osfield
2003-07-23 11:45:37 +00:00
parent 246a5828de
commit 2ce08d8088
6 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/osg/TriangleFunctor
View File

@@ -33,7 +33,7 @@ public:
virtual ~TriangleFunctor() {}
virtual void setVertexArray(unsigned int count,const Vec2* vertices)
virtual void setVertexArray(unsigned int,const Vec2*)
{
notify(WARN)<<"Triangle Functor does not support Vec2* vertex arrays"<<std::endl;
}
@@ -44,7 +44,7 @@ public:
_vertexArrayPtr = vertices;
}
virtual void setVertexArray(unsigned int count,const Vec4* vertices)
virtual void setVertexArray(unsigned int,const Vec4* )
{
notify(WARN)<<"Triangle Functor does not support Vec4* vertex arrays"<<std::endl;
}

2
src/osgParticle/FluidFrictionOperator.cpp
View File

@@ -27,7 +27,7 @@ osgParticle::FluidFrictionOperator::FluidFrictionOperator(const FluidFrictionOpe
{
}
void osgParticle::FluidFrictionOperator::operate(Particle *P, double dt)
void osgParticle::FluidFrictionOperator::operate(Particle *P, double)
{
float r = (ovr_rad_ > 0)? ovr_rad_ : P->getRadius();
osg::Vec3 v = P->getVelocity();

1
src/osgPlugins/dw/ReaderWriterDW.cpp
View File

@@ -415,7 +415,6 @@ public:
const _face *f1, const _face *f2,
const int ipr[2], const int nv) {
int gsidx[4];
int nbeg=verts.size()-4; // first vertex in vec3array
gsidx[0]=f1->getidx(ipr[1]); // vertex position index
gsidx[1]=f1->getidx(ipr[0]); // vertex position index
gsidx[2]=f2->getidx(nv-ipr[0]-1); // vertex position index

3
src/osgPlugins/flt/MultiTextureRecord.cpp
View File

@@ -29,9 +29,6 @@ MultiTextureRecord::~MultiTextureRecord()
// virtual
void MultiTextureRecord::endian()
{
int flightVersion = getFlightVersion();
SMultiTexture *pSMultiTexture = (SMultiTexture*)getData();
ENDIAN( pSMultiTexture->layers );

2
src/osgPlugins/osg/ReaderWriterOSG.cpp
View File

@@ -88,7 +88,7 @@ class OSGReaderWriter : public ReaderWriter
return WriteResult("Unable to open file for output");
}
virtual WriteResult writeNode(const Node& node,const std::string& fileName, const osgDB::ReaderWriter::Options* options)
virtual WriteResult writeNode(const Node& node,const std::string& fileName, const osgDB::ReaderWriter::Options*)
{
std::string ext = getFileExtension(fileName);
if (!acceptsExtension(ext)) return WriteResult::FILE_NOT_HANDLED;

6
src/osgUtil/TriStrip_graph_array.h
View File

@@ -389,7 +389,7 @@ inline void graph_array<nodetype, arctype>::swap(_mytype & Right) {
template <class nodetype, class arctype>
void unmark_nodes(graph_array<nodetype, arctype> & G)
{
typedef graph_array<nodetype, arctype>::node_iterator node_it;
typedef typename graph_array<nodetype, arctype>::node_iterator node_it;
for (node_it NodeIt = G.begin(); NodeIt != G.end(); ++NodeIt)
NodeIt->unmark();
@@ -399,7 +399,7 @@ void unmark_nodes(graph_array<nodetype, arctype> & G)
template <class nodetype, class arctype>
void unmark_arcs_from_node(typename graph_array<nodetype, arctype>::node & N)
{
typedef graph_array<nodetype, arctype>::out_arc_iterator arc_it;
typedef typename graph_array<nodetype, arctype>::out_arc_iterator arc_it;
for (arc_it ArcIt = N.out_begin(); ArcIt != N.out_end(); ++ArcIt)
ArcIt->unmark();
@@ -409,7 +409,7 @@ void unmark_arcs_from_node(typename graph_array<nodetype, arctype>::node & N)
template <class nodetype, class arctype>
void unmark_arcs(graph_array<nodetype, arctype> & G)
{
typedef graph_array<nodetype, arctype>::node_iterator node_it;
typedef typename graph_array<nodetype, arctype>::node_iterator node_it;
for (node_it NodeIt = G.begin(); NodeIt != G.end(); ++NodeIt)
unmark_arcs_from_node(* NodeIt);