csdopenglnet-cvs

[Kai R. <kre...@us...>]

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

Modified Files:
	demo.cs 
Log Message:
tippfehler


Index: demo.cs
===================================================================
RCS file: /cvsroot/csdopenglnet/csdOpenGL/Cg/demo.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** demo.cs	6 Aug 2004 11:42:33 -0000	1.2
--- demo.cs	6 Aug 2004 12:13:34 -0000	1.3
***************
*** 18,21 ****
--- 18,22 ----
      
    public Demo() {
+     Console.WriteLine( "Constructor" );
      glutInitDisplayMode( GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH );
      glutInitWindowSize( res, res );
***************
*** 40,43 ****
--- 41,45 ----
      
    protected void draw() {
+     Console.WriteLine( "draw" );
      if (!haveLoadedPrograms) {
        ChooseProfiles();
***************
*** 90,93 ****
--- 92,96 ----
  
    protected void DrawGeometry() {
+     Console.WriteLine( "DrawGeometry" );
      int nu = 30;
      int nv = 30;
***************
*** 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 );
      }
      
--- 133,170 ----
        }
        
+       Console.WriteLine( "1" );
        IntPtr param = cgGetNamedParameter( vertexProgram, "Pobject" );
        cgGLSetParameterPointer( param, 3, GL_FLOAT, 0, P );
        
+       Console.WriteLine( "2" );
        param = cgGetNamedParameter( vertexProgram, "Nobject" );
        cgGLSetParameterPointer( param, 3, GL_FLOAT, 0, N );
        
+       Console.WriteLine( "3" );
        param = cgGetNamedParameter( vertexProgram, "TexUV" );
        cgGLSetParameterPointer( param, 2, GL_FLOAT, 0, uv );
        
+       Console.WriteLine( "4" );
        param = cgGetNamedParameter( fragmentProgram, "diffuseMap" );
        cgGLEnableTextureParameter( param );
        
+       Console.WriteLine( "5" );
        glDrawElements( GL_TRIANGLES, 3*nTris, GL_UNSIGNED_INT, indices );
        
+       Console.WriteLine( "6" );
        param = cgGetNamedParameter( vertexProgram, "Pobject" );
        cgGLDisableClientState( param );
        
+       Console.WriteLine( "7" );
        param = cgGetNamedParameter( vertexProgram, "Nobject" );
        cgGLDisableClientState( param );
        
+       Console.WriteLine( "8" );
        param = cgGetNamedParameter( vertexProgram, "TexUV" );
        cgGLDisableClientState( param );
        
!       Console.WriteLine( "9" );
!       param = cgGetNamedParameter(fragmentProgram, "diffuseMap");
!       cgGLDisableTextureParameter(param);
      }
      
***************
*** 160,163 ****
--- 172,176 ----
    
    protected void parametricEval( float u, float v, int pp, int np ) {
+     Console.WriteLine( "parametricEval" );
      double theta = System.Math.PI * u;
      double phi = 2.0 * System.Math.PI * v;
***************
*** 173,176 ****
--- 186,190 ----
    
    protected void ChooseProfiles() {
+     Console.WriteLine( "ChooseProfiles" );
      if ( CG_TRUE==cgGLIsProfileSupported( CGprofile.CG_PROFILE_ARBVP1 ) ) {
        vertexProfile = CGprofile.CG_PROFILE_ARBVP1;
***************
*** 193,196 ****
--- 207,211 ----
    
    protected void LoadCgPrograms() {
+     Console.WriteLine( "LoadCgPrograms" );
      Debug.Assert( CG_TRUE==cgIsContext( context ) );
      
***************
*** 206,209 ****
--- 221,225 ----
    
    protected void LoadTextures() {
+     Console.WriteLine( "LoadTextures" );
      uint handle ;
      uint[] h = new uint[1];
***************
*** 246,250 ****
    }
    
!   public static void Main( string[] args) {
      Demo demo = new Demo();
    }
--- 262,266 ----
    }
    
!   public static void Main( string[] argss) {
      Demo demo = new Demo();
    }