Update of /cvsroot/plib/plib/src/ssg
In directory usw-pr-cvs1:/tmp/cvs-serv26440
Modified Files:
ssgLoadBGL.cxx
Log Message:
Due to int versus GLenum problems, it did not compile for some people.
Patch by Simon Fowler
Index: ssgLoadBGL.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadBGL.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ssgLoadBGL.cxx 20 Jun 2002 20:07:52 -0000 1.8
+++ ssgLoadBGL.cxx 10 Jul 2002 10:10:38 -0000 1.9
@@ -536,7 +536,7 @@
//===========================================================================
-static int createTriangIndices(ssgIndexArray *ixarr,
+static GLenum createTriangIndices(ssgIndexArray *ixarr,
int numverts, const sgVec3 s_norm)
{
sgVec3 v1, v2, cross;
@@ -670,7 +670,7 @@
#endif
ssgIndexArray *strips = new ssgIndexArray(3* (numverts-2));
ssgIndexArray *idx_array;
- int ret;
+ GLenum ret;
if ( (up != 0 ) && (down != 0)) {
numverts = _ssgTriangulate(vertex_array_, ixarr, numverts, strips);
numverts *= 3;
@@ -704,10 +704,10 @@
//===========================================================================
-static int readTexIndices(FILE *fp, int numverts, const sgVec3 s_norm, bool flip_y)
+static GLenum readTexIndices(FILE *fp, int numverts, const sgVec3 s_norm, bool flip_y)
{
if(numverts <= 0)
- return false;
+ return GL_FALSE;
ssgIndexArray *curr_index_ = new ssgIndexArray();
@@ -795,10 +795,10 @@
//===========================================================================
-static int readIndices(FILE* fp, int numverts, const sgVec3 s_norm)
+static GLenum readIndices(FILE* fp, int numverts, const sgVec3 s_norm)
{
if(numverts <= 0)
- return false;
+ return GL_FALSE;
ssgIndexArray *curr_index_ = new ssgIndexArray();
@@ -1822,7 +1822,7 @@
flip_y = ulStrEqual( texture_extension, "BMP" ) != 0 ;
}
- int type = readTexIndices(fp, numverts, v, flip_y);
+ GLenum type = readTexIndices(fp, numverts, v, flip_y);
if(!has_normals_)
{
@@ -1870,7 +1870,7 @@
flip_y = ulStrEqual( texture_extension, "BMP" ) != 0 ;
}
- int type = readTexIndices(fp, numverts, v, flip_y);
+ GLenum type = readTexIndices(fp, numverts, v, flip_y);
if(!has_normals_)
{
@@ -1909,7 +1909,7 @@
readVector(fp, v);
// Read vertex indices
- int type = readIndices(fp, numverts, v);
+ GLenum type = readIndices(fp, numverts, v);
if(!has_normals_)
{
@@ -1952,7 +1952,7 @@
ulEndianReadLittle32(fp);
#endif
// Read vertex indices
- int type = readIndices(fp, numverts, v);
+ GLenum type = readIndices(fp, numverts, v);
if(!has_normals_)
{
|
