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

From Andre Garneau, warnings fixes fo VC++

Browse Source
This commit is contained in:
Robert Osfield
2007-05-17 10:59:05 +00:00
parent 8c10301d30
commit c7fc2e018e
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -80,6 +80,7 @@ INCLUDE_DIRECTORIES(
# Platform specific definitions
IF(WIN32)
ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS)
#needed for net plugin
SET (OSG_SOCKET_LIBS wsock32.lib)
# Both Cygwin and Msys need -DNOMINMAX ???

4
include/osg/BufferObject
View File

@@ -255,7 +255,7 @@ class OSG_EXPORT VertexBufferObject : public BufferObject
Array* getArray(unsigned int i) { return _bufferEntryArrayPairs[i].second; }
const Array* getArray(unsigned int i) const { return _bufferEntryArrayPairs[i].second; }
const GLvoid* getOffset(unsigned int i) const { return (const GLvoid*)(_bufferEntryArrayPairs[i].first.offset); }
const GLvoid* getOffset(unsigned int i) const { return (const GLvoid*)(((char *)0)+(_bufferEntryArrayPairs[i].first.offset)); }
virtual void compileBuffer(State& state) const;
@@ -291,7 +291,7 @@ class OSG_EXPORT ElementBufferObject : public BufferObject
DrawElements* getDrawElements(unsigned int i) { return _bufferEntryDrawElementsPairs[i].second; }
const DrawElements* getDrawElements(unsigned int i) const { return _bufferEntryDrawElementsPairs[i].second; }
const GLvoid* getOffset(unsigned int i) const { return (const GLvoid*)(_bufferEntryDrawElementsPairs[i].first.offset); }
const GLvoid* getOffset(unsigned int i) const { return (const GLvoid*)(((char *)0)+(_bufferEntryDrawElementsPairs[i].first.offset)); }
virtual void compileBuffer(State& state) const;

8
src/osgPlugins/ac/ac3d.cpp
View File

@@ -611,19 +611,19 @@ class PrimitiveBin : public osg::Referenced
protected:
bool isLineLoop() const
{
return _flags & SurfaceTypeLineLoop;
return (_flags & SurfaceTypeLineLoop)!=0;
}
bool isLineStrip() const
{
return _flags & SurfaceTypeLineStrip;
return (_flags & SurfaceTypeLineStrip)!=0;
}
bool isTwoSided() const
{
return _flags & SurfaceTwoSided;
return (_flags & SurfaceTwoSided)!=0;
}
bool isSmooth() const
{
return _flags & SurfaceShaded;
return (_flags & SurfaceShaded)!=0;
}
osg::ref_ptr<osg::Geode> _geode;

4
src/osgPlugins/osg/Sequence.cpp
View File

@@ -170,7 +170,7 @@ bool Sequence_readLocalData(Object& obj, Input& fr)
{
int sync ;
fr[1].getInt(sync) ;
sw.setSync((bool)sync) ;
sw.setSync(sync!=0) ;
iteratorAdvanced = true;
fr += 2;
}
@@ -181,7 +181,7 @@ bool Sequence_readLocalData(Object& obj, Input& fr)
{
int clearOnStop ;
fr[1].getInt(clearOnStop) ;
sw.setClearOnStop((bool)clearOnStop) ;
sw.setClearOnStop(clearOnStop!=0) ;
iteratorAdvanced = true;
fr += 2;
}