diff options
Diffstat (limited to 'tests/glbook/Common')
-rw-r--r-- | tests/glbook/Common/esShapes.c | 8 | ||||
-rw-r--r-- | tests/glbook/Common/esUtil.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/glbook/Common/esShapes.c b/tests/glbook/Common/esShapes.c index aecd37ce..6a8ab7ad 100644 --- a/tests/glbook/Common/esShapes.c +++ b/tests/glbook/Common/esShapes.c @@ -52,11 +52,11 @@ /// if it is not NULL ) as a GL_TRIANGLE_STRIP // int ESUTIL_API esGenSphere ( int numSlices, float radius, GLfloat **vertices, GLfloat **normals, - GLfloat **texCoords, GLuint **indices ) + GLfloat **texCoords, GLushort **indices ) { int i; int j; - int numParallels = numSlices / 2; + int numParallels = numSlices; int numVertices = ( numParallels + 1 ) * ( numSlices + 1 ); int numIndices = numParallels * numSlices * 6; float angleStep = (2.0f * ES_PI) / ((float) numSlices); @@ -72,7 +72,7 @@ int ESUTIL_API esGenSphere ( int numSlices, float radius, GLfloat **vertices, GL *texCoords = malloc ( sizeof(GLfloat) * 2 * numVertices ); if ( indices != NULL ) - *indices = malloc ( sizeof(GLuint) * numIndices ); + *indices = malloc ( sizeof(GLushort) * numIndices ); for ( i = 0; i < numParallels + 1; i++ ) { @@ -108,7 +108,7 @@ int ESUTIL_API esGenSphere ( int numSlices, float radius, GLfloat **vertices, GL // Generate the indices if ( indices != NULL ) { - GLuint *indexBuf = (*indices); + GLushort *indexBuf = (*indices); for ( i = 0; i < numParallels ; i++ ) { for ( j = 0; j < numSlices; j++ ) diff --git a/tests/glbook/Common/esUtil.h b/tests/glbook/Common/esUtil.h index 1ff236de..c468b430 100644 --- a/tests/glbook/Common/esUtil.h +++ b/tests/glbook/Common/esUtil.h @@ -185,7 +185,7 @@ GLuint ESUTIL_API esLoadProgram ( const char *vertShaderSrc, const char *fragSha /// if it is not NULL ) as a GL_TRIANGLE_STRIP
//
int ESUTIL_API esGenSphere ( int numSlices, float radius, GLfloat **vertices, GLfloat **normals,
- GLfloat **texCoords, GLuint **indices );
+ GLfloat **texCoords, GLushort **indices );
//
/// \brief Generates geometry for a cube. Allocates memory for the vertex data and stores
|