X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=nanoWrap.cpp;h=3e88b0f8150d9c6a2b16dc5388ec49c16c0e525f;hb=472a91567501b466be9161d26025060306f869d2;hp=b46b4c796cf1dff53a3d1beea2b600141a8f48b4;hpb=ae8ec8d2041e425816c1f04421a12c17ade5e30e;p=nanogl.git

diff --git a/nanoWrap.cpp b/nanoWrap.cpp
index b46b4c7..3e88b0f 100644
--- a/nanoWrap.cpp
+++ b/nanoWrap.cpp
@@ -44,7 +44,14 @@ struct nanoState
 	GLboolean depth_test;
 	GLboolean dither;
 	GLboolean fog;
-	GLboolean lighti;
+	GLboolean light0;
+	GLboolean light1;
+	GLboolean light2;
+	GLboolean light3;
+	GLboolean light4;
+	GLboolean light5;
+	GLboolean light6;
+	GLboolean light7;
 	GLboolean lighting;
 	GLboolean line_smooth;
 	GLboolean matrix_palette_oes;
@@ -88,6 +95,13 @@ static struct nanoState nanoglInitState =
         GL_FALSE,
         GL_FALSE,
         GL_FALSE,
+        GL_FALSE,
+        GL_FALSE,
+        GL_FALSE,
+        GL_FALSE,
+        GL_FALSE,
+        GL_FALSE,
+        GL_FALSE,
         GL_TRUE,
         GL_FALSE,
         GL_FALSE,
@@ -166,7 +180,7 @@ static struct nanotmuState tmuInitState =
 
 static struct nanotmuState *activetmuState = &tmuState0;
 
-extern "C++" GlESInterface *glEsImpl;
+extern GlESInterface *glEsImpl;
 
 static GLenum wrapperPrimitiveMode = GL_QUADS;
 GLboolean useTexCoordArray         = GL_FALSE;
@@ -232,6 +246,8 @@ static GLushort *ptrIndexArray = NULL;
 
 static GLboolean arraysValid = GL_FALSE;
 
+static GLboolean skipnanogl;
+
 void InitGLStructs( )
 {
 	ptrVertexAttribArray     = vertexattribs;
@@ -317,7 +333,8 @@ void ResetNanoState( )
 
 	glEsImpl->glMatrixMode( nanoglState.matrixmode );
 
-	glEsImpl->glColor4f( currentVertexAttrib.red, currentVertexAttrib.green, currentVertexAttrib.blue, currentVertexAttrib.alpha );
+	glEsImpl->glColor4f( currentVertexAttrib.red/255.0f, currentVertexAttrib.green/255.0f,
+		 currentVertexAttrib.blue/255.0f, currentVertexAttrib.alpha/255.0f );
 
 	glEsImpl->glBlendFunc( nanoglState.sfactor, nanoglState.dfactor );
 
@@ -326,10 +343,13 @@ void ResetNanoState( )
 	glEsImpl->glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, activetmuState->texture_env_mode.value );
 
 	arraysValid = GL_FALSE;
+	skipnanogl = GL_FALSE;
 }
 
 void FlushOnStateChange( )
 {
+	if( skipnanogl )
+		return;
 	if ( delayedttmuchange )
 	{
 		delayedttmuchange = GL_FALSE;
@@ -487,7 +507,7 @@ void glEnd( void )
 		*ptrIndexArray++ = indexCount++;
 		*ptrIndexArray++ = indexCount++;
 		*ptrIndexArray++ = indexCount++;
-		int vcount = ( ( vertexCount - vertexMark ) - 3 );
+		int vcount       = ( ( vertexCount - vertexMark ) - 3 );
 		for ( int count = 0; count < vcount; count++ )
 		{
 			*ptrIndexArray++ = indexbase;
@@ -508,6 +528,11 @@ void glEnd( void )
 
 void glEnable( GLenum cap )
 {
+	if( skipnanogl )
+	{
+		glEsImpl->glEnable( cap );
+		return;
+	}
 	GLboolean statechanged = GL_FALSE;
 	switch ( cap )
 	{
@@ -576,15 +601,86 @@ void glEnable( GLenum cap )
 		break;
 	}
 	case GL_FOG:
-		//case GL_LIGHTi
+	{
+		if ( !nanoglState.fog )
 		{
-			if ( !nanoglState.fog )
-			{
-				nanoglState.fog = GL_TRUE;
-				statechanged    = GL_TRUE;
-			}
-			break;
+			nanoglState.fog = GL_TRUE;
+			statechanged    = GL_TRUE;
+		}
+		break;
+	}
+	case GL_LIGHT0:
+	{
+		if ( !nanoglState.light0 )
+		{
+			nanoglState.light0 = GL_TRUE;
+			statechanged       = GL_TRUE;
+		}
+		break;
+	}
+	case GL_LIGHT1:
+	{
+		if ( !nanoglState.light1 )
+		{
+			nanoglState.light1 = GL_TRUE;
+			statechanged       = GL_TRUE;
 		}
+		break;
+	}
+	case GL_LIGHT2:
+	{
+		if ( !nanoglState.light2 )
+		{
+			nanoglState.light2 = GL_TRUE;
+			statechanged       = GL_TRUE;
+		}
+		break;
+	}
+	case GL_LIGHT3:
+	{
+		if ( !nanoglState.light3 )
+		{
+			nanoglState.light3 = GL_TRUE;
+			statechanged       = GL_TRUE;
+		}
+		break;
+	}
+	case GL_LIGHT4:
+	{
+		if ( !nanoglState.light4 )
+		{
+			nanoglState.light4 = GL_TRUE;
+			statechanged       = GL_TRUE;
+		}
+		break;
+	}
+	case GL_LIGHT5:
+	{
+		if ( !nanoglState.light5 )
+		{
+			nanoglState.light5 = GL_TRUE;
+			statechanged       = GL_TRUE;
+		}
+		break;
+	}
+	case GL_LIGHT6:
+	{
+		if ( !nanoglState.light6 )
+		{
+			nanoglState.light6 = GL_TRUE;
+			statechanged       = GL_TRUE;
+		}
+		break;
+	}
+	case GL_LIGHT7:
+	{
+		if ( !nanoglState.light7 )
+		{
+			nanoglState.light7 = GL_TRUE;
+			statechanged       = GL_TRUE;
+		}
+		break;
+	}
 	case GL_LIGHTING:
 	{
 		if ( !nanoglState.lighting )
@@ -696,11 +792,11 @@ void glEnable( GLenum cap )
 	case GL_STENCIL_TEST:
 	{
 		return;
-		/*            if (!nanoglState.stencil_test)
+		if (!nanoglState.stencil_test)
                 {
                 nanoglState.stencil_test = GL_TRUE;
                 statechanged = GL_TRUE;
-                }*/
+                }
 		break;
 	}
 	case GL_TEXTURE_2D:
@@ -714,6 +810,17 @@ void glEnable( GLenum cap )
 		}
 		break;
 	}
+#if 0 // todo: implement cubemap texgen
+	case GL_TEXTURE_GEN_S:
+	case GL_TEXTURE_GEN_T:
+	case GL_TEXTURE_GEN_R:
+	case GL_TEXTURE_GEN_Q:
+	{
+		FlushOnStateChange( );
+		nanoglState.texgen = true;
+		return;
+	}
+#endif
 	default:
 		break;
 	}
@@ -727,6 +834,11 @@ void glEnable( GLenum cap )
 
 void glDisable( GLenum cap )
 {
+	if( skipnanogl )
+	{
+		glEsImpl->glDisable( cap );
+		return;
+	}
 	GLboolean statechanged = GL_FALSE;
 	switch ( cap )
 	{
@@ -795,15 +907,86 @@ void glDisable( GLenum cap )
 		break;
 	}
 	case GL_FOG:
-		//case GL_LIGHTi
+	{
+		if ( nanoglState.fog )
 		{
-			if ( nanoglState.fog )
-			{
-				nanoglState.fog = GL_FALSE;
-				statechanged    = GL_TRUE;
-			}
-			break;
+			nanoglState.fog = GL_FALSE;
+			statechanged    = GL_TRUE;
+		}
+		break;
+	}
+	case GL_LIGHT0:
+	{
+		if ( !nanoglState.light0 )
+		{
+			nanoglState.light0 = GL_FALSE;
+			statechanged       = GL_TRUE;
+		}
+		break;
+	}
+	case GL_LIGHT1:
+	{
+		if ( !nanoglState.light1 )
+		{
+			nanoglState.light1 = GL_FALSE;
+			statechanged       = GL_TRUE;
+		}
+		break;
+	}
+	case GL_LIGHT2:
+	{
+		if ( !nanoglState.light2 )
+		{
+			nanoglState.light2 = GL_FALSE;
+			statechanged       = GL_TRUE;
+		}
+		break;
+	}
+	case GL_LIGHT3:
+	{
+		if ( !nanoglState.light3 )
+		{
+			nanoglState.light3 = GL_FALSE;
+			statechanged       = GL_TRUE;
+		}
+		break;
+	}
+	case GL_LIGHT4:
+	{
+		if ( !nanoglState.light4 )
+		{
+			nanoglState.light4 = GL_FALSE;
+			statechanged       = GL_TRUE;
 		}
+		break;
+	}
+	case GL_LIGHT5:
+	{
+		if ( !nanoglState.light5 )
+		{
+			nanoglState.light5 = GL_FALSE;
+			statechanged       = GL_TRUE;
+		}
+		break;
+	}
+	case GL_LIGHT6:
+	{
+		if ( !nanoglState.light6 )
+		{
+			nanoglState.light6 = GL_FALSE;
+			statechanged       = GL_TRUE;
+		}
+		break;
+	}
+	case GL_LIGHT7:
+	{
+		if ( !nanoglState.light7 )
+		{
+			nanoglState.light7 = GL_FALSE;
+			statechanged       = GL_TRUE;
+		}
+		break;
+	}
 	case GL_LIGHTING:
 	{
 		if ( nanoglState.lighting )
@@ -915,11 +1098,11 @@ void glDisable( GLenum cap )
 	case GL_STENCIL_TEST:
 	{
 		return;
-		/*            if (nanoglState.stencil_test)
+		if (nanoglState.stencil_test)
                 {
                 nanoglState.stencil_test = GL_FALSE;
                 statechanged = GL_TRUE;
-                }*/
+                }
 		break;
 	}
 	case GL_TEXTURE_2D:
@@ -933,6 +1116,17 @@ void glDisable( GLenum cap )
 		}
 		break;
 	}
+#if 0
+	case GL_TEXTURE_GEN_S:
+	case GL_TEXTURE_GEN_T:
+	case GL_TEXTURE_GEN_R:
+	case GL_TEXTURE_GEN_Q:
+	{
+		FlushOnStateChange( );
+		nanoglState.texgen = false;
+		return;
+	}
+#endif
 	default:
 		break;
 	}
@@ -1017,6 +1211,50 @@ void glOrtho( GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat
 #endif
 }
 
+// Rikku2000: Light
+void glLightf( GLenum light, GLenum pname, GLfloat param )
+{
+	FlushOnStateChange( );
+
+	glEsImpl->glLightf( light, pname, param );
+}
+void glLightfv( GLenum light, GLenum pname, const GLfloat *params )
+{
+	FlushOnStateChange( );
+
+	glEsImpl->glLightfv( light, pname, params );
+}
+void glLightModelf( GLenum pname, GLfloat param )
+{
+	FlushOnStateChange( );
+
+	glEsImpl->glLightModelf( pname, param );
+}
+void glLightModelfv( GLenum pname, const GLfloat *params )
+{
+	FlushOnStateChange( );
+
+	glEsImpl->glLightModelfv( pname, params );
+}
+void glMaterialf( GLenum face, GLenum pname, GLfloat param )
+{
+	FlushOnStateChange( );
+
+	glEsImpl->glMaterialf( face, pname, param );
+}
+void glMaterialfv( GLenum face, GLenum pname, const GLfloat *params )
+{
+	FlushOnStateChange( );
+
+	glEsImpl->glMaterialfv( face, pname, params );
+}
+void glColorMaterial( GLenum face, GLenum mode )
+{
+	FlushOnStateChange( );
+
+	glEsImpl->glColorMaterial( face, mode );
+}
+
 void glMatrixMode( GLenum mode )
 {
 	if ( nanoglState.matrixmode == mode )
@@ -1155,7 +1393,7 @@ void glVertex3f( GLfloat x, GLfloat y, GLfloat z )
 	GLfloat *vert = (GLfloat *)ptrVertexAttribArray++;
 	*vert++       = x;
 	*vert++       = y;
-	*vert++ = z;
+	*vert++       = z;
 #if defined( __MULTITEXTURE_SUPPORT__ )
 	memcpy( vert, &currentVertexAttrib.red, 5 * sizeof( GLfloat ) );
 #else
@@ -1178,6 +1416,9 @@ void glColor4fv( const GLfloat *v )
 		currentVertexAttrib.blue  = (unsigned char)ClampTo255( v[2] * 255.0f );
 	}
 	currentVertexAttrib.alpha = (unsigned char)ClampTo255( v[3] * 255.0f );
+	if( skipnanogl )
+		glEsImpl->glColor4f( currentVertexAttrib.red/255.0f, currentVertexAttrib.green/255.0f,
+			 currentVertexAttrib.blue/255.0f, currentVertexAttrib.alpha/255.0f );
 }
 
 void glColor3ubv( const GLubyte *v )
@@ -1186,6 +1427,9 @@ void glColor3ubv( const GLubyte *v )
 	currentVertexAttrib.green = v[1];
 	currentVertexAttrib.blue  = v[2];
 	currentVertexAttrib.alpha = 255;
+	if( skipnanogl )
+		glEsImpl->glColor4f( currentVertexAttrib.red/255.0f, currentVertexAttrib.green/255.0f,
+			 currentVertexAttrib.blue/255.0f, currentVertexAttrib.alpha/255.0f );
 }
 
 void glColor4ubv( const GLubyte *v )
@@ -1204,6 +1448,9 @@ void glColor4ubv( const GLubyte *v )
 		currentVertexAttrib.blue  = v[2];
 	}
 	currentVertexAttrib.alpha = v[3];
+	if( skipnanogl )
+		glEsImpl->glColor4f( currentVertexAttrib.red/255.0f, currentVertexAttrib.green/255.0f,
+			 currentVertexAttrib.blue/255.0f, currentVertexAttrib.alpha/255.0f );
 }
 
 void glColor3fv( const GLfloat *v )
@@ -1212,6 +1459,9 @@ void glColor3fv( const GLfloat *v )
 	currentVertexAttrib.green = (unsigned char)ClampTo255( v[1] * 255.0f );
 	currentVertexAttrib.blue  = (unsigned char)ClampTo255( v[2] * 255.0f );
 	currentVertexAttrib.alpha = 255;
+	if( skipnanogl )
+		glEsImpl->glColor4f( currentVertexAttrib.red/255.0f, currentVertexAttrib.green/255.0f,
+			 currentVertexAttrib.blue/255.0f, currentVertexAttrib.alpha/255.0f );
 }
 
 //-- nicknekit: xash3d funcs --
@@ -1231,6 +1481,9 @@ void glColor4ub( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha )
 		currentVertexAttrib.blue  = blue;
 	}
 	currentVertexAttrib.alpha = alpha;
+	if( skipnanogl )
+		glEsImpl->glColor4f( currentVertexAttrib.red/255.0f, currentVertexAttrib.green/255.0f,
+			 currentVertexAttrib.blue/255.0f, currentVertexAttrib.alpha/255.0f );
 }
 
 void glColor3ub( GLubyte red, GLubyte green, GLubyte blue )
@@ -1239,6 +1492,9 @@ void glColor3ub( GLubyte red, GLubyte green, GLubyte blue )
 	currentVertexAttrib.green = green;
 	currentVertexAttrib.blue  = blue;
 	currentVertexAttrib.alpha = 255;
+	if( skipnanogl )
+		glEsImpl->glColor4f( currentVertexAttrib.red/255.0f, currentVertexAttrib.green/255.0f,
+			 currentVertexAttrib.blue/255.0f, currentVertexAttrib.alpha/255.0f );
 }
 
 void glNormal3fv( const GLfloat *v )
@@ -1284,14 +1540,18 @@ GLboolean glIsTexture( GLuint texture )
 	return glEsImpl->glIsTexture( texture );
 }
 
+// TODO: add native normal/reflection map texgen support
+
 void glTexGeni( GLenum coord, GLenum pname, GLint param )
 {
-	//for mirrors? not needed for original hl?
+	FlushOnStateChange();
+	//glEsImpl->glTexGeniOES( coord, pname, param );
 }
 
 void glTexGenfv( GLenum coord, GLenum pname, const GLfloat *params )
 {
-	//for mirrors? not needed for original hl?
+	FlushOnStateChange();
+	//glEsImpl->glTexGenfvOES( coord, pname, params );
 }
 
 //-- --//
@@ -1304,6 +1564,11 @@ void glHint( GLenum target, GLenum mode )
 
 void glBlendFunc( GLenum sfactor, GLenum dfactor )
 {
+	if( skipnanogl )
+	{
+		glEsImpl->glBlendFunc( sfactor, dfactor );
+		return;
+	}
 	if ( ( nanoglState.sfactor == sfactor ) && ( nanoglState.dfactor == dfactor ) )
 	{
 		return;
@@ -1348,6 +1613,11 @@ void glPushMatrix( void )
 
 void glTexEnvf( GLenum target, GLenum pname, GLfloat param )
 {
+	if( skipnanogl )
+	{
+		glEsImpl->glTexEnvf( target, pname, param );
+		return;
+	}
 	if ( target == GL_TEXTURE_ENV )
 	{
 		if ( pname == GL_TEXTURE_ENV_MODE )
@@ -1382,17 +1652,25 @@ void glVertex3fv( const GLfloat *v )
 
 void glDepthMask( GLboolean flag )
 {
+	if( !skipnanogl )
+	{
 	if ( nanoglState.depthmask == flag )
 	{
 		return;
 	}
 	nanoglState.depthmask = flag;
 	FlushOnStateChange( );
+	}
 	glEsImpl->glDepthMask( flag );
 }
 
 void glBindTexture( GLenum target, GLuint texture )
 {
+	if( skipnanogl )
+	{
+		glEsImpl->glBindTexture( target,texture );
+		return;
+	}
 	if ( activetmuState->boundtexture.value == texture )
 	{
 		return;
@@ -1478,6 +1756,11 @@ GLenum glGetError( void )
 
 void glActiveTexture( GLenum texture )
 {
+	if( skipnanogl )
+	{
+		glEsImpl->glActiveTexture( texture );
+		return;
+	}
 	if ( activetmu == texture )
 	{
 		return;
@@ -1504,6 +1787,11 @@ void glActiveTexture( GLenum texture )
 
 void glClientActiveTexture( GLenum texture )
 {
+	if( skipnanogl )
+	{
+		glEsImpl->glClientActiveTexture( texture );
+		return;
+	}
 	clientactivetmu = texture;
 }
 
@@ -1571,6 +1859,11 @@ struct ptrstate texture_coord_array;
 
 void glDrawElements( GLenum mode, GLsizei count, GLenum type, const GLvoid *indices )
 {
+	if( skipnanogl )
+	{
+		glEsImpl->glDrawElements( mode, count, type, indices );
+		return;
+	}
 	// ensure that all primitives specified between glBegin/glEnd pairs
 	// are rendered first, and that we have correct tmu in use..
 	FlushOnStateChange( );
@@ -1668,8 +1961,17 @@ void glDrawElements( GLenum mode, GLsizei count, GLenum type, const GLvoid *indi
 	glEsImpl->glDrawElements( mode, count, type, indices );
 }
 
+bool vboarray;
+
 void glEnableClientState( GLenum array )
 {
+	if( skipnanogl )
+	{
+		glEsImpl->glEnableClientState( array );
+		if( array == GL_VERTEX_ARRAY )
+			vboarray = true;
+		return;
+	}
 	struct nanotmuState *clientstate = NULL;
 	if ( clientactivetmu == GL_TEXTURE0 )
 	{
@@ -1725,6 +2027,13 @@ void glEnableClientState( GLenum array )
 }
 void glDisableClientState( GLenum array )
 {
+	if( skipnanogl )
+	{
+		glEsImpl->glDisableClientState( array );
+		if( array == GL_VERTEX_ARRAY )
+			vboarray = false;
+		return;
+	}
 	struct nanotmuState *clientstate = NULL;
 	if ( clientactivetmu == GL_TEXTURE0 )
 	{
@@ -1780,6 +2089,12 @@ void glDisableClientState( GLenum array )
 }
 void glVertexPointer( GLint size, GLenum type, GLsizei stride, const GLvoid *pointer )
 {
+
+	if( skipnanogl )
+	{
+		glEsImpl->glVertexPointer( size, type, stride, pointer );
+		return;
+	}
 	if ( tmuState0.vertex_array.size == size &&
 	     tmuState0.vertex_array.stride == stride &&
 	     tmuState0.vertex_array.type == type &&
@@ -1795,6 +2110,11 @@ void glVertexPointer( GLint size, GLenum type, GLsizei stride, const GLvoid *poi
 }
 void glTexCoordPointer( GLint size, GLenum type, GLsizei stride, const GLvoid *pointer )
 {
+	if( skipnanogl )
+	{
+		glEsImpl->glTexCoordPointer( size, type, stride, pointer );
+		return;
+	}
 	struct nanotmuState *clientstate = NULL;
 	if ( clientactivetmu == GL_TEXTURE0 )
 	{
@@ -1964,6 +2284,11 @@ void glFrontFace( GLenum mode )
 
 void glTexEnvi( GLenum target, GLenum pname, GLint param )
 {
+	if( skipnanogl )
+	{
+		glEsImpl->glTexEnvi( target, pname, param );
+		return;
+	}
 	if ( target == GL_TEXTURE_ENV )
 	{
 		if ( pname == GL_TEXTURE_ENV_MODE )
@@ -1991,12 +2316,18 @@ void glMultiTexCoord3fARB( GLenum a, GLfloat b, GLfloat c, GLfloat )
 	return glMultiTexCoord2fARB( a, b, c );
 }
 
-void glMultiTexCoord2f( GLenum, GLfloat, GLfloat )
+void glMultiTexCoord2f( GLenum a, GLfloat b, GLfloat c )
 {
+	glMultiTexCoord2fARB(a,b,c);
 }
 #endif
 void glDrawArrays( GLenum mode, GLint first, GLsizei count )
 {
+	if( skipnanogl )
+	{
+		glEsImpl->glDrawArrays( mode, first, count );
+		return;
+	}
 	// ensure that all primitives specified between glBegin/glEnd pairs
 	// are rendered first, and that we have correct tmu in use..
 	if ( mode == GL_QUADS )
@@ -2158,3 +2489,42 @@ void glRenderbufferStorage( GLenum target, GLenum internalformat, GLsizei width,
 	FlushOnStateChange( );
 	glEsImpl->glRenderbufferStorage( target, internalformat, width, height );
 }
+
+void glBindBufferARB( GLuint target, GLuint index )
+{
+	static int sindex;
+
+	if( index && !sindex && !skipnanogl )
+		FlushOnStateChange();
+	glEsImpl->glDisableClientState( GL_COLOR_ARRAY );
+	glEsImpl->glColor4f( currentVertexAttrib.red/255.0f, currentVertexAttrib.green/255.0f,
+		 currentVertexAttrib.blue/255.0f, currentVertexAttrib.alpha/255.0f );
+
+	skipnanogl = (!!index) || vboarray;
+	glEsImpl->glBindBuffer( target, index );
+	if( sindex && !index )
+	{
+		arraysValid = GL_FALSE;
+	}
+	sindex = index;
+}
+
+void glGenBuffersARB( GLuint count, GLuint *indexes )
+{
+	glEsImpl->glGenBuffers( count, indexes );
+}
+
+void glDeleteBuffersARB( GLuint count, GLuint *indexes )
+{
+	glEsImpl->glDeleteBuffers( count, indexes );
+}
+
+void glBufferDataARB( GLuint target, GLuint size, void *buffer, GLuint type )
+{
+	glEsImpl->glBufferData( target, size, buffer, type );
+}
+
+void glBufferSubDataARB( GLuint target, GLsizei offset, GLsizei size, void *buffer )
+{
+	glEsImpl->glBufferSubData( target, offset, size, buffer );
+}