[OpenGL# CVS] csdOpenGL/Cg Makefile,1.7,1.8 cgGL.xml,1.1,1.2 demo.cs,1.1,1.2

[Tim R. <ti...@us...>]

Update of /cvsroot/csdopenglnet/csdOpenGL/Cg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10447/Cg

Modified Files:
	Makefile cgGL.xml demo.cs 
Log Message:
bla


Index: Makefile
===================================================================
RCS file: /cvsroot/csdopenglnet/csdOpenGL/Cg/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile	5 Aug 2004 21:13:56 -0000	1.7
--- Makefile	6 Aug 2004 11:42:33 -0000	1.8
***************
*** 31,38 ****
  	ln -sf ../doxygen/cg_xml/cgGL_8h.xml .
  
  csdCgBase.cs: cg_8h.xml cg.xml
  	$(GEN) cg.xml        
  
! csdCgGLBase.cs: cgGL_8h.xml cgGL.xml
  	$(GEN) cgGL.xml        
  
--- 31,41 ----
  	ln -sf ../doxygen/cg_xml/cgGL_8h.xml .
  
+ gl_8h.xml:
+ 	ln -sf ../doxygen/xml/gl_8h.xml .
+ 
  csdCgBase.cs: cg_8h.xml cg.xml
  	$(GEN) cg.xml        
  
! csdCgGLBase.cs: cgGL_8h.xml cgGL.xml gl_8h.xml
  	$(GEN) cgGL.xml        
  

Index: cgGL.xml
===================================================================
RCS file: /cvsroot/csdopenglnet/csdOpenGL/Cg/cgGL.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cgGL.xml	6 Aug 2004 06:02:10 -0000	1.1
--- cgGL.xml	6 Aug 2004 11:42:33 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
    <TypeDefs>
      <File>cg_8h.xml</File>
+     <File>gl_8h.xml</File>
    </TypeDefs>
    <BaseTypes>
***************
*** 22,27 ****
      <Type>CGtype</Type>
    </BaseTypes>
-   <TypeDefs>
-   </TypeDefs>
    <IgnoreFunctions>
    </IgnoreFunctions>
--- 23,26 ----

Index: demo.cs
===================================================================
RCS file: /cvsroot/csdopenglnet/csdOpenGL/Cg/demo.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** demo.cs	5 Aug 2004 21:13:56 -0000	1.1
--- demo.cs	6 Aug 2004 11:42:33 -0000	1.2
***************
*** 32,35 ****
--- 32,40 ----
    
    protected void errorHandler() {
+     CGerror err = cgGetError();
+     Console.Write( "Cg error: " );
+     Console.Write( err );
+     Console.WriteLine( cgGetErrorString( err ) );
+     System.Environment.Exit( 3 );
    }
      
***************
*** 125,134 ****
        }
        
-       uint[] a3 = {3};
-       uint[] af = {GL_FLOAT};
-       uint[] a0 = {0};
-       
        IntPtr param = cgGetNamedParameter( vertexProgram, "Pobject" );
!       cgGLSetParameterPointer( param, a3, af, a0, P );
      }
      
--- 130,158 ----
        }
        
        IntPtr param = cgGetNamedParameter( vertexProgram, "Pobject" );
!       cgGLSetParameterPointer( param, 3, GL_FLOAT, 0, P );
!       
!       param = cgGetNamedParameter( vertexProgram, "Nobject" );
!       cgGLSetParameterPointer( param, 3, GL_FLOAT, 0, N );
!       
!       param = cgGetNamedParameter( vertexProgram, "TexUV" );
!       cgGLSetParameterPointer( param, 2, GL_FLOAT, 0, uv );
!       
!       param = cgGetNamedParameter( fragmentProgram, "diffuseMap" );
!       cgGLEnableTextureParameter( param );
!       
!       glDrawElements( GL_TRIANGLES, 3*nTris, GL_UNSIGNED_INT, indices );
!       
!       param = cgGetNamedParameter( vertexProgram, "Pobject" );
!       cgGLDisableClientState( param );
!       
!       param = cgGetNamedParameter( vertexProgram, "Nobject" );
!       cgGLDisableClientState( param );
!       
!       param = cgGetNamedParameter( vertexProgram, "TexUV" );
!       cgGLDisableClientState( param );
!       
!       param = cgGetNamedParameter( fragmentProgram, "diffuseMap" );
!       cgGLDisableClientState( param );
      }
      
***************
*** 212,221 ****
      
      glTexImage2D( GL_TEXTURE_2D, 0, 4, res, res, 0, GL_RGBA, GL_FLOAT, data );
!     cgGLSetTextureParameter( cgGetNamedParameter( fragmentProgram, "diffuseMap" ), h );
    }
    
    protected void keyboard( byte key, int x, int y ) {
!     Console.Write( "Key ==> " );
!     Console.WriteLine( key );
    }
    
--- 236,247 ----
      
      glTexImage2D( GL_TEXTURE_2D, 0, 4, res, res, 0, GL_RGBA, GL_FLOAT, data );
!     cgGLSetTextureParameter( cgGetNamedParameter( fragmentProgram, "diffuseMap" ), handle );
    }
    
    protected void keyboard( byte key, int x, int y ) {
!     if ( (key==(byte)'q') || (key==(byte)'Q') || (key==27) ) {
!       cgDestroyContext( context );
!       System.Environment.Exit(0);
!     }
    }