Fixed warnings

This commit is contained in:
Robert Osfield
2010-12-17 11:46:42 +00:00
parent 348870d7ba
commit d8e3225cd8
4 changed files with 9 additions and 5 deletions

View File

@@ -78,7 +78,8 @@ static void ComputeNormal( GLUtesselator *tess, GLdouble norm[3] )
GLUvertex *v, *v1, *v2;
GLdouble c, tLen2, maxLen2;
GLdouble maxVal[3], minVal[3], d1[3], d2[3], tNorm[3];
GLUvertex *maxVert[3], *minVert[3];
GLUvertex *maxVert[3]={0,0,0};
GLUvertex *minVert[3]={0,0,0};
GLUvertex *vHead = &tess->mesh->vHead;
int i;

View File

@@ -37,8 +37,11 @@
// #include <GL/glu.h>
#include <osg/GLU>
#define GLAPIENTRY GL_APIENTRY
#ifndef GLAPIENTRY
#define GLAPIENTRY GL_APIENTRY
#endif
#include <setjmp.h>
#include "mesh.h"

View File

@@ -862,7 +862,7 @@ FltExportVisitor::writeUVList( int numVerts, const osg::Geometry& geom, unsigned
_fltOpt->getWriteResult().warn( warning.str() );
t2 = new osg::Vec2Array;
}
else if (static_cast<int>(t2->getNumElements()) < first + numVerts)
else if (t2->getNumElements() < first + numVerts)
{
std::ostringstream warning;
warning << "fltexp: Invalid number of texture coordinates for unit " << idx;

View File

@@ -1237,7 +1237,7 @@ osg::Vec2Array* ToVRML::buildUVArray(osg::TexEnv* tEnv, osg::Vec3Array* array) {
osg::ref_ptr < osg::TexEnv > texEnv = tEnv;
osg::Vec2Array* uvRet = NULL;
osg::TexEnv::Mode mode = texEnv->getMode();
// osg::TexEnv::Mode mode = texEnv->getMode();
//if (mode == osg::TexEnv::MODULATE) {
// std::cout << "I know" << std::endl;
//} else {