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

Warning fixes for Win32.

Browse Source
This commit is contained in:
Robert Osfield 2003-09-16 19:56:19 +00:00
parent 96388cee67
commit c342b29a04
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/slideshow3D/SlideEventHandler.h
View File

@ -52,7 +52,7 @@ public:
bool nextLayer();
bool previousLayer();
void setAutoSteppingActive(bool flag) { _autoSteppingActive = true; }
void setAutoSteppingActive(bool flag = true) { _autoSteppingActive = flag; }
bool getAutoSteppingActive() const { return _autoSteppingActive; }
void setTimeDelayBetweenSlides(double dt) { _timePerSlide = dt; }

2
include/osgProducer/KeyboardMouseCallback
View File

@ -16,6 +16,8 @@
#include <OpenThreads/Mutex>
#include <osgProducer/Export> // To disable MSVC warnings
#include <Producer/RenderSurface> // For definition of KeySymbol
#include <Producer/KeyboardMouse>

8
include/osgUtil/Statistics
View File

@ -122,10 +122,10 @@ class Statistics : public osg::Drawable::PrimitiveFunctor
}
virtual void vertex(float,float,float) { vertex(); }
virtual void vertex(const osg::Vec3&) { vertex(); }
virtual void vertex(const osg::Vec2& vert) { vertex(); }
virtual void vertex(const osg::Vec4& vert) { vertex(); }
virtual void vertex(float x,float y) { vertex(); }
virtual void vertex(float x,float y,float z,float w) { vertex(); }
virtual void vertex(const osg::Vec2&) { vertex(); }
virtual void vertex(const osg::Vec4&) { vertex(); }
virtual void vertex(float,float) { vertex(); }
virtual void vertex(float,float,float,float) { vertex(); }
virtual void end()
{

2
src/osgPlugins/flt/flt2osg.cpp
View File

@ -1299,7 +1299,7 @@ void ConvertFromFLT::setTexture ( FaceRecord *rec, SFace *pSFace, osg::StateSet
//use scale_rgb and scale_alpha of osg::TexEnvCombine to make this effect
// Julian Ortiz, June 18th 2003.
flt::AttrData *detailTextureAttrData;
flt::AttrData *detailTextureAttrData = NULL;
if (pSFace->iDetailTexturePattern != -1) {
int nIndex2 = (int)pSFace->iDetailTexturePattern;
detailTextureAttrData = pTexturePool->getTexture(nIndex2,rec->getFlightVersion());

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

@ -165,7 +165,7 @@ Lwo2::ReadFile( const string& filename )
unsigned char
Lwo2::_read_char()
{
char c;
char c = 0;
if (_fin.is_open())
{
_fin.read(&c, 1);

2
src/osgPlugins/txp/trpage_write.h
View File

@ -59,7 +59,7 @@ public:
inline void AddStripStat(int val) { stripStat[MIN(14,val)]++; totalStripTri += val; totalTri += val; numStrip++;}
inline void AddFanStat(int val) { fanStat[MIN(14,val)]++; totalFanTri += val; totalTri += val; numFan++;}
inline void AddBagStat(int val) { totalBagTri += val; totalTri += val;}
inline void AddQuadStat(int val) { totalQuad++; }
inline void AddQuadStat(int val) { totalQuad += val; }
};
/* Geometry Helper