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

4
include/OpenThreads/Exports
View File

@@ -39,6 +39,10 @@
#endif
#endif
#ifndef OT_UNUSED
#define OT_UNUSED(var) (void) var
#endif
#endif

4
include/osg/BufferObject
View File

@@ -696,9 +696,9 @@ class OSG_EXPORT BufferData : public Object
unsigned int getNumClients() const { return _numClients; }
void addClient(osg::Object *client) { ++_numClients; }
void addClient(osg::Object * /*client*/) { ++_numClients; }
void removeClient(osg::Object *client) { --_numClients; }
void removeClient(osg::Object */*client*/) { --_numClients; }
protected:

6
include/osg/Export
View File

@@ -60,6 +60,12 @@
#endif
#endif
#ifndef OSG_UNUSED
#define OSG_UNUSED(var) (void) var
#endif
/**
\namespace osg

8
include/osg/ImageStream
View File

@@ -92,22 +92,22 @@ class OSG_EXPORT ImageStream : public Image
virtual void setVolume(float) {}
virtual float getVolume() const { return 0.0f; }
/// set the balance of the audio: -1 = left, 0 = center, 1 = right
virtual float getAudioBalance() { return 0.0f; }
virtual void setAudioBalance(float b) {}
virtual void setAudioBalance(float /*b*/) {}
typedef std::vector< osg::ref_ptr<osg::AudioStream> > AudioStreams;
void setAudioStreams(const AudioStreams& asl) { _audioStreams = asl; }
AudioStreams& getAudioStreams() { return _audioStreams; }
const AudioStreams& getAudioStreams() const { return _audioStreams; }
/** create a suitable texture for this imagestream, return NULL, if not supported
* implement this method in subclasses to use special technologies like CoreVideo
* or similar.
*/
virtual osg::Texture* createSuitableTexture() { return NULL; }
protected:
virtual void applyLoopingMode() {}

18
include/osg/TextureBuffer
View File

@@ -24,7 +24,7 @@
#define GL_MAX_TEXTURE_BUFFER_SIZE_ARB 0x8C2B
#define GL_TEXTURE_BINDING_BUFFER_ARB 0x8C2C
#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB 0x8C2D
#define GL_TEXTURE_BUFFER_FORMAT_ARB 0x8C2E
#define GL_TEXTURE_BUFFER_FORMAT_ARB 0x8C2E
#endif
namespace osg {
@@ -87,15 +87,15 @@ class OSG_EXPORT TextureBuffer : public Texture
virtual int getTextureWidth() const { return _textureWidth; }
virtual int getTextureHeight() const { return 1; }
virtual int getTextureDepth() const { return 1; }
inline void setUsageHint( GLenum usageHint ) { _usageHint=usageHint; }
inline GLenum getUsageHint() const { return _usageHint; }
virtual void allocateMipmap(State& state) const {};
virtual void allocateMipmap(State& /*state*/) const {};
/** Bind the texture buffer.*/
virtual void apply(State& state) const;
/** Bind buffer to different target. */
void bindBufferAs(unsigned int contextID, GLenum target);
void unbindBufferAs(unsigned int contextID, GLenum target);
@@ -113,11 +113,11 @@ class OSG_EXPORT TextureBuffer : public Texture
typedef buffered_value<unsigned int> ImageModifiedCount;
mutable ImageModifiedCount _modifiedCount;
class TextureBufferObject : public osg::Referenced
{
public:
TextureBufferObject(unsigned int contextID, GLenum usageHint) :
TextureBufferObject(unsigned int contextID, GLenum usageHint) :
_id(0),
_usageHint(usageHint)
{
@@ -126,7 +126,7 @@ class OSG_EXPORT TextureBuffer : public Texture
void bindBuffer(GLenum target);
void unbindBuffer(GLenum target);
void texBuffer(GLenum internalFormat);
void bufferData( osg::Image* image );
void bufferSubData( osg::Image* image );
@@ -136,8 +136,8 @@ class OSG_EXPORT TextureBuffer : public Texture
GLenum _usageHint;
osg::GLBufferObject::Extensions* _extensions;
};
typedef osg::buffered_object<osg::ref_ptr<TextureBufferObject> > TextureBufferObjectList;
typedef osg::buffered_object<osg::ref_ptr<TextureBufferObject> > TextureBufferObjectList;
mutable TextureBufferObjectList _textureBufferObjects;
};

84
include/osg/ValueObject
View File

@@ -44,55 +44,55 @@ class ValueObject : public Object
class GetValueVisitor
{
public:
virtual void apply(bool value) {}
virtual void apply(char value) {}
virtual void apply(unsigned char value) {}
virtual void apply(short value) {}
virtual void apply(unsigned short value) {}
virtual void apply(int value) {}
virtual void apply(unsigned int value) {}
virtual void apply(float value) {}
virtual void apply(double value) {}
virtual void apply(const std::string& value) {}
virtual void apply(const osg::Vec2f& value) {}
virtual void apply(const osg::Vec3f& value) {}
virtual void apply(const osg::Vec4f& value) {}
virtual void apply(const osg::Vec2d& value) {}
virtual void apply(const osg::Vec3d& value) {}
virtual void apply(const osg::Vec4d& value) {}
virtual void apply(const osg::Quat& value) {}
virtual void apply(const osg::Plane& value) {}
virtual void apply(const osg::Matrixf& value) {}
virtual void apply(const osg::Matrixd& value) {}
virtual void apply(bool /*value*/) {}
virtual void apply(char /*value*/) {}
virtual void apply(unsigned char /*value*/) {}
virtual void apply(short /*value*/) {}
virtual void apply(unsigned short /*value*/) {}
virtual void apply(int /*value*/) {}
virtual void apply(unsigned int /*value*/) {}
virtual void apply(float /*value*/) {}
virtual void apply(double /*value*/) {}
virtual void apply(const std::string& /*value*/) {}
virtual void apply(const osg::Vec2f& /*value*/) {}
virtual void apply(const osg::Vec3f& /*value*/) {}
virtual void apply(const osg::Vec4f& /*value*/) {}
virtual void apply(const osg::Vec2d& /*value*/) {}
virtual void apply(const osg::Vec3d& /*value*/) {}
virtual void apply(const osg::Vec4d& /*value*/) {}
virtual void apply(const osg::Quat& /*value*/) {}
virtual void apply(const osg::Plane& /*value*/) {}
virtual void apply(const osg::Matrixf& /*value*/) {}
virtual void apply(const osg::Matrixd& /*value*/) {}
};
class SetValueVisitor
{
public:
virtual void apply(bool& value) {}
virtual void apply(char& value) {}
virtual void apply(unsigned char& value) {}
virtual void apply(short& value) {}
virtual void apply(unsigned short& value) {}
virtual void apply(int& value) {}
virtual void apply(unsigned int& value) {}
virtual void apply(float& value) {}
virtual void apply(double& value) {}
virtual void apply(std::string& value) {}
virtual void apply(osg::Vec2f& value) {}
virtual void apply(osg::Vec3f& value) {}
virtual void apply(osg::Vec4f& value) {}
virtual void apply(osg::Vec2d& value) {}
virtual void apply(osg::Vec3d& value) {}
virtual void apply(osg::Vec4d& value) {}
virtual void apply(osg::Quat& value) {}
virtual void apply(osg::Plane& value) {}
virtual void apply(osg::Matrixf& value) {}
virtual void apply(osg::Matrixd& value) {}
virtual void apply(bool& /*value*/) {}
virtual void apply(char& /*value*/) {}
virtual void apply(unsigned char& /*value*/) {}
virtual void apply(short& /*value*/) {}
virtual void apply(unsigned short& /*value*/) {}
virtual void apply(int& /*value*/) {}
virtual void apply(unsigned int& /*value*/) {}
virtual void apply(float& /*value*/) {}
virtual void apply(double& /*value*/) {}
virtual void apply(std::string& /*value*/) {}
virtual void apply(osg::Vec2f& /*value*/) {}
virtual void apply(osg::Vec3f& /*value*/) {}
virtual void apply(osg::Vec4f& /*value*/) {}
virtual void apply(osg::Vec2d& /*value*/) {}
virtual void apply(osg::Vec3d& /*value*/) {}
virtual void apply(osg::Vec4d& /*value*/) {}
virtual void apply(osg::Quat& /*value*/) {}
virtual void apply(osg::Plane& /*value*/) {}
virtual void apply(osg::Matrixf& /*value*/) {}
virtual void apply(osg::Matrixd& /*value*/) {}
};
virtual bool get(GetValueVisitor& gvv) const { return false; }
virtual bool set(SetValueVisitor& gvv) { return false; }
virtual bool get(GetValueVisitor& /*gvv*/) const { return false; }
virtual bool set(SetValueVisitor& /*gvv*/) { return false; }
protected:
virtual ~ValueObject() {}
};

4
include/osgAnimation/Action
View File

@@ -46,7 +46,7 @@ namespace osgAnimation
META_Object(osgAnimation,Callback);
virtual void operator()(Action* action, osgAnimation::ActionVisitor* nv) {}
virtual void operator()(Action* /*action*/, osgAnimation::ActionVisitor* /*nv*/) {}
Callback* getNestedCallback() { return _nestedCallback.get(); }
void addNestedCallback(Callback* callback)
@@ -119,7 +119,7 @@ namespace osgAnimation
// get the number of loop, the frame relative to loop.
// return true if in range, and false if out of range.
bool evaluateFrame(unsigned int frame, unsigned int& resultframe, unsigned int& nbloop );
virtual void traverse(ActionVisitor& visitor) {}
virtual void traverse(ActionVisitor& /*visitor*/) {}
//virtual void evaluate(unsigned int frame);
protected:

2
include/osgAnimation/AnimationUpdateCallback
View File

@@ -42,7 +42,7 @@ namespace osgAnimation
META_Object(osgAnimation, AnimationUpdateCallback<T>);
const std::string& getName() const { return T::getName(); }
bool link(Channel* channel) { return 0; }
bool link(Channel* /*channel*/) { return 0; }
int link(Animation* animation)
{
if (T::getName().empty())

2
include/osgAnimation/MorphGeometry
View File

@@ -40,7 +40,7 @@ namespace osgAnimation
public:
MorphTarget(osg::Geometry* geom, float w = 1.0) : _geom(geom), _weight(w) {}
void setWeight(float weight) { _weight = weight; }
const float getWeight() const { return _weight; }
float getWeight() const { return _weight; }
osg::Geometry* getGeometry() { return _geom.get(); }
const osg::Geometry* getGeometry() const { return _geom.get(); }
void setGeometry(osg::Geometry* geom) { _geom = geom; }

6
include/osgDB/DatabaseRevisions
View File

@@ -27,7 +27,7 @@ class OSGDB_EXPORT FileList : public osg::Object
public:
FileList();
FileList(const FileList& fileList, const osg::CopyOp=osg::CopyOp::SHALLOW_COPY);
FileList(const FileList& fileList, const osg::CopyOp & copyop=osg::CopyOp::SHALLOW_COPY);
META_Object(osgDB, FileList)
@@ -58,7 +58,7 @@ class OSGDB_EXPORT DatabaseRevision : public osg::Object
public:
DatabaseRevision();
DatabaseRevision(const DatabaseRevision& revision, const osg::CopyOp=osg::CopyOp::SHALLOW_COPY);
DatabaseRevision(const DatabaseRevision& revision, const osg::CopyOp & copyop=osg::CopyOp::SHALLOW_COPY);
META_Object(osgDB, DatabaseRevision)
@@ -99,7 +99,7 @@ class OSGDB_EXPORT DatabaseRevisions : public osg::Object
public:
DatabaseRevisions();
DatabaseRevisions(const DatabaseRevisions& revisions, const osg::CopyOp=osg::CopyOp::SHALLOW_COPY);
DatabaseRevisions(const DatabaseRevisions& revisions, const osg::CopyOp & copyop=osg::CopyOp::SHALLOW_COPY);
META_Object(osgDB, DatabaseRevisions)

33
include/osgGA/GUIEventAdapter
View File

@@ -31,7 +31,7 @@ struct PointerData : public osg::Referenced
y(0.0f),
yMin(-1.0f),
yMax(1.0f) {}
PointerData(osg::Object* obj, float in_x, float in_xMin, float in_xMax, float in_y, float in_yMin, float in_yMax):
object(obj),
x(in_x),
@@ -40,8 +40,9 @@ struct PointerData : public osg::Referenced
y(in_y),
yMin(in_yMin),
yMax(in_yMax) {}
PointerData(const PointerData& pd):
osg::Referenced(),
object(pd.object),
x(pd.x),
xMin(pd.xMin),
@@ -49,11 +50,11 @@ struct PointerData : public osg::Referenced
y(pd.y),
yMin(pd.yMin),
yMax(pd.yMax) {}
PointerData& operator = (const PointerData& pd)
{
if (&pd==this) return *this;
object = pd.object;
x = pd.x;
xMin = pd.xMin;
@@ -61,19 +62,19 @@ struct PointerData : public osg::Referenced
y = pd.y;
yMin = pd.yMin;
yMax = pd.yMax;
return *this;
}
osg::observer_ptr<osg::Object> object;
float x, xMin, xMax;
float y, yMin, yMax;
float getXnormalized() const { return (x-xMin)/(xMax-xMin)*2.0f-1.0f; }
float getYnormalized() const { return (y-yMin)/(yMax-yMin)*2.0f-1.0f; }
};
/** Event class for storing Keyboard, mouse and window events.
*/
class OSGGA_EXPORT GUIEventAdapter : public osg::Object
@@ -383,7 +384,7 @@ public:
class TouchData : public osg::Object {
public:
struct TouchPoint {
unsigned int id;
TouchPhase phase;
@@ -407,14 +408,14 @@ public:
typedef TouchSet::const_iterator const_iterator;
TouchData() : osg::Object() {}
TouchData(const TouchData& td, const osg::CopyOp& copyop):
osg::Object(td,copyop),
_touches(td._touches) {}
META_Object(osgGA, TouchData);
unsigned int getNumTouchPoints() const { return static_cast<unsigned int>(_touches.size()); }
@@ -533,7 +534,7 @@ public:
/** set mouse minimum x. */
void setXmin(float v) { _Xmin = v; }
/** get mouse minimum x. */
float getXmin() const { return _Xmin; }
@@ -570,7 +571,7 @@ public:
#if 1
inline float getXnormalized() const
{
return _pointerDataList.size()>=1 ?
return _pointerDataList.size()>=1 ?
_pointerDataList[_pointerDataList.size()-1]->getXnormalized():
2.0f*(getX()-getXmin())/(getXmax()-getXmin())-1.0f;
}
@@ -685,7 +686,7 @@ public:
TouchData* getTouchData() const { return _touchData.get(); }
bool isMultiTouchEvent() const { return (_touchData.valid()); }
typedef std::vector< osg::ref_ptr<PointerData> > PointerDataList;
void setPointerDataList(const PointerDataList& pdl) { _pointerDataList = pdl; }
PointerDataList& getPointerDataList() { return _pointerDataList; }
@@ -698,7 +699,7 @@ public:
PointerData* getPointerData(osg::Object* obj) { for(unsigned int i=0;i<_pointerDataList.size(); ++i) { if (_pointerDataList[i]->object==obj) return _pointerDataList[i].get(); } return 0; }
const PointerData* getPointerData(osg::Object* obj) const { for(unsigned int i=0;i<_pointerDataList.size(); ++i) { if (_pointerDataList[i]->object==obj) return _pointerDataList[i].get(); } return 0; }
void addPointerData(PointerData* pd) { _pointerDataList.push_back(pd); }
void copyPointerDataFrom(const osgGA::GUIEventAdapter& sourceEvent);
protected:

2
include/osgManipulator/Constraint
View File

@@ -38,7 +38,7 @@ class DraggerCallback : virtual public osg::Object
DraggerCallback():
osg::Object(true) {}
DraggerCallback(const DraggerCallback&, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY):
DraggerCallback(const DraggerCallback&, const osg::CopyOp& /*copyop*/ = osg::CopyOp::SHALLOW_COPY):
osg::Object(true) {}
META_Object(osgManipulator, DraggerCallback);

16
include/osgParticle/DomainOperator
View File

@@ -120,14 +120,14 @@ protected:
virtual ~DomainOperator() {}
DomainOperator& operator=( const DomainOperator& ) { return *this; }
virtual void handlePoint( const Domain& domain, Particle* P, double dt ) { ignore("Point"); }
virtual void handleLineSegment( const Domain& domain, Particle* P, double dt ) { ignore("LineSegment"); }
virtual void handleTriangle( const Domain& domain, Particle* P, double dt ) { ignore("Triangle"); }
virtual void handleRectangle( const Domain& domain, Particle* P, double dt ) { ignore("Rectangle"); }
virtual void handlePlane( const Domain& domain, Particle* P, double dt ) { ignore("Plane"); }
virtual void handleSphere( const Domain& domain, Particle* P, double dt ) { ignore("Sphere"); }
virtual void handleBox( const Domain& domain, Particle* P, double dt ) { ignore("Box"); }
virtual void handleDisk( const Domain& domain, Particle* P, double dt ) { ignore("Disk"); }
virtual void handlePoint( const Domain& /*domain*/, Particle* /*P*/, double /*dt*/ ) { ignore("Point"); }
virtual void handleLineSegment( const Domain& /*domain*/, Particle* /*P*/, double /*dt*/ ) { ignore("LineSegment"); }
virtual void handleTriangle( const Domain& /*domain*/, Particle* /*P*/, double /*dt*/ ) { ignore("Triangle"); }
virtual void handleRectangle( const Domain& /*domain*/, Particle* /*P*/, double /*dt*/ ) { ignore("Rectangle"); }
virtual void handlePlane( const Domain& /*domain*/, Particle* /*P*/, double /*dt*/ ) { ignore("Plane"); }
virtual void handleSphere( const Domain& /*domain*/, Particle* /*P*/, double /*dt*/ ) { ignore("Sphere"); }
virtual void handleBox( const Domain& /*domain*/, Particle* /*P*/, double /*dt*/ ) { ignore("Box"); }
virtual void handleDisk( const Domain& /*domain*/, Particle* /*P*/, double /*dt*/ ) { ignore("Disk"); }
inline void computeNewBasis( const osg::Vec3&, const osg::Vec3&, osg::Vec3&, osg::Vec3& );
inline void ignore( const std::string& func );

2
include/osgQt/QFontImplementation
View File

@@ -34,7 +34,7 @@ public:
virtual osgText::Glyph* getGlyph(const osgText::FontResolution& fontRes, unsigned int charcode);
virtual osgText::Glyph3D* getGlyph3D(unsigned int charcode) { return 0; }
virtual osgText::Glyph3D* getGlyph3D(unsigned int /*charcode*/) { return 0; }
virtual osg::Vec2 getKerning(unsigned int leftcharcode, unsigned int rightcharcode, osgText::KerningType kerningType);

2
include/osgSim/ShapeAttribute
View File

@@ -62,7 +62,7 @@ class OSGSIM_EXPORT ShapeAttribute
void setName(const std::string& name) { _name = name; }
/// Get the attribute data type.
const Type getType() const { return _type; }
Type getType() const { return _type; }
/// Get the attribute data as an int.
int getInt() const { return _integer; }

2
include/osgText/Font
View File

@@ -241,7 +241,7 @@ public:
Font* _facade;
virtual bool getVerticalSize(float & ascender, float & descender) const { return false; }
virtual bool getVerticalSize(float & /*ascender*/, float & /*descender*/) const { return false; }
};

2
include/osgVolume/Locator
View File

@@ -73,7 +73,7 @@ class OSGVOLUME_EXPORT Locator : public osg::Object
LocatorCallback(const LocatorCallback& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY): osg::Object(rhs,copyop) {}
META_Object(osgVolume, LocatorCallback);
virtual void locatorModified(Locator* locator) {};
virtual void locatorModified(Locator* /*locator*/) {};
protected:
virtual ~LocatorCallback() {}