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

Fixes for Win32 build.

Browse Source
This commit is contained in:
Robert Osfield
2002-09-28 07:43:04 +00:00
parent 2a94879fcc
commit b57b0b16b9
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/osg/Array
View File

@@ -173,10 +173,9 @@ class TemplateIndexArray : public IndexArray, public std::vector<T>
virtual void accept(unsigned int index,ValueVisitor& vv) { vv.apply( (*this)[index] ); }
virtual void accept(unsigned int index,ConstValueVisitor& vv) const { vv.apply( (*this)[index] );}
virtual const GLvoid* getDataPointer() const { if (!std::vector<T>::empty()) return &front(); else return 0; }
virtual const GLvoid* getDataPointer() const { if (!empty()) return &front(); else return 0; }
virtual unsigned int getNumElements() const { return size(); }
virtual bool empty() const { return std::vector<T>::empty(); }
virtual unsigned int index(unsigned int pos) const { return (*this)[pos]; }
protected:

4
src/osg/IndexedGeometry.cpp
View File

@@ -372,7 +372,7 @@ void IndexedGeometry::drawImmediateMode(State& state)
{
if (texcoordPair.second.valid())
{
if (!texcoordPair.second->getNumElements()>0)
if (texcoordPair.second->getNumElements()>0)
{
drawTexCoordList.push_back(new DrawMultiTexCoord(GL_TEXTURE0+unit,texcoordPair.first.get(),texcoordPair.second.get(),
s_glMultiTexCoord1f,
@@ -403,7 +403,7 @@ void IndexedGeometry::drawImmediateMode(State& state)
{
if (texcoordPair.second.valid())
{
if (!texcoordPair.second->getNumElements()>0)
if (texcoordPair.second->getNumElements()>0)
{
drawTextCoord = new DrawTexCoord(texcoordPair.first.get(),texcoordPair.second.get());