From: Tim R. <ti...@us...> - 2004-11-05 15:45:57
|
Update of /cvsroot/csdopenglnet/csdOpenGL/samples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20295/samples Modified Files: gears.cs gtkAdvanced.cs gtkFrame.cs gtkGears.cs gtkTexture.cs gtkTriangle.cs gtkWidget.cs Log Message: Kai forced me to remove the Debug-calls Index: gtkAdvanced.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/gtkAdvanced.cs,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** gtkAdvanced.cs 11 Sep 2004 08:39:28 -0000 1.12 --- gtkAdvanced.cs 5 Nov 2004 15:45:37 -0000 1.13 *************** *** 6,10 **** using GtkSharp; using System; - using System.Diagnostics; public class GtkAdvanced : GL { --- 6,9 ---- *************** *** 30,40 **** public GtkAdvanced() { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvaned()" ); - - Debug.WriteLine( "Init Application" ); Application.Init(); - Debug.WriteLine( "Init Window" ); window = new Gtk.Window( "Gtk Frame" ); window.ReallocateRedraws = true; --- 29,34 ---- *************** *** 42,46 **** window.Resize( 640, 480 ); - Debug.WriteLine( "Init GtkGLArea" ); glarea = new GtkGLArea(); glarea.Events = Gdk.EventMask.PointerMotionMask | Gdk.EventMask.ButtonPressMask | Gdk.EventMask.ButtonReleaseMask; --- 36,39 ---- *************** *** 54,68 **** glarea.ButtonPressEvent += new ButtonPressEventHandler( OnButtonPress ); - Debug.WriteLine( "Init rotation entry fields" ); rotX_entry = new Entry(); rotX_entry.ActivatesDefault = true; rotY_entry = new Entry(); rotY_entry.ActivatesDefault = true; rotZ_entry = new Entry(); rotZ_entry.ActivatesDefault = true; - Debug.WriteLine( "Init speed entry fields" ); speedX_entry = new Entry(); speedX_entry.ActivatesDefault = true; speedY_entry = new Entry(); speedY_entry.ActivatesDefault = true; speedZ_entry = new Entry(); speedZ_entry.ActivatesDefault = true; - Debug.WriteLine( "Init Table-Layout rotTable" ); Table rotTable = new Table( 2, 3, false ); rotTable.Attach( new Label( "x-rotation: " ), 0, 1, 0, 1 ); --- 47,58 ---- *************** *** 73,77 **** rotTable.Attach( rotZ_entry, 1, 2, 2, 3 ); - Debug.WriteLine( "Init Table-Layout speedTable" ); Table speedTable = new Table( 2, 3, false ); speedTable.Attach( new Label( "x-speed: " ), 0, 1, 0, 1 ); --- 63,66 ---- *************** *** 82,86 **** speedTable.Attach( speedZ_entry, 1, 2, 2, 3 ); - Debug.WriteLine( "Init buttons" ); animate_tglbtn = new ToggleButton( "Animate" ); animate_tglbtn.Toggled += new EventHandler( OnButton ); --- 71,74 ---- *************** *** 93,97 **** window.Default = update_btn; - Debug.WriteLine( "Init Table-Layout buttonTable" ); Table buttonTable = new Table( 3, 1, true ); buttonTable.Attach( animate_tglbtn, 0, 1, 0, 1 ); --- 81,84 ---- *************** *** 99,103 **** buttonTable.Attach( update_btn, 0, 1, 2, 3 ); - Debug.WriteLine( "Init HBox-Layout hbox" ); HBox hbox = new HBox( false, 4 ); hbox.PackStart( rotTable, false, true, 5 ); --- 86,89 ---- *************** *** 105,114 **** hbox.PackEnd( buttonTable, false, true, 5 ); - Debug.WriteLine( "Init VBox-Layout vbox" ); VBox vbox = new VBox( false, 2 ); vbox.PackStart( glarea, true, true, 5 ); vbox.PackEnd( hbox, false, true, 5 ); - Debug.WriteLine( "Display Window" ); window.Add( vbox ); window.ShowAll(); --- 91,98 ---- *************** *** 116,135 **** setDefaults(); - Debug.WriteLine( "MainLoop" ); Application.Run (); - - Debug.WriteLine( "Exiting GtkAdvaned()" ); - Debug.Unindent(); - } protected void updateValues() { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.updateValues()" ); - bool p = animate; animate = false; - Debug.WriteLine( "Setting speed" ); try { speedX = System.Convert.ToSingle( speedX_entry.Text ); --- 100,110 ---- *************** *** 148,152 **** } - Debug.WriteLine( "Setting angle" ); try { rotX = System.Convert.ToSingle( rotX_entry.Text ); --- 123,126 ---- *************** *** 166,177 **** animate = p; - Debug.WriteLine( "Exiting GtkAdvanced.updateValues()" ); - Debug.Unindent(); } protected void setDefaults() { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.setDefaults()" ); - animate = false; rotX = 0.0f; --- 140,146 ---- *************** *** 181,228 **** speedY = 0.2f; speedZ = 0.5f; - - Debug.WriteLine( "Exiting GtkAdvanced.setDefaults()" ); - Debug.Unindent(); } protected bool Animate () { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.Animate()" ); - rotX += speedX; rotY += speedY; rotZ += speedZ; if ( (glarea!=null) && (!stop) ) glarea.QueueDraw (); - - Debug.WriteLine( "Entering GtkAdvanced.Animate() *" ); - Debug.Unindent(); - return animate; } protected void OnMap (object obj, MapEventArgs args) { - Debug.Indent(); - Debug.WriteLine( "Enering GtkAdvanced.OnMap( object, MapEventArgs )" ); - stop = false; - - Debug.WriteLine( "Exiting GtkAdvanced.OnMap( object, MapEventArgs )" ); - Debug.Unindent(); } protected void OnUnmap (object obj, UnmapEventArgs args) { - Debug.Indent(); - Debug.WriteLine( "Enering GtkAdvanced.OnUnmap( object, UnapEventArgs )" ); - stop = true; - - Debug.WriteLine( "Exiting GtkAdvanced.OnUnmap( object, UnapEventArgs )" ); - Debug.Unindent(); } protected virtual void OnExpose (object obj, ExposeEventArgs args) { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.OnExpose( object, ExposeEventArgs )" ); - if (glarea.MakeCurrent()) { glClearColor( 0, 0, 0, 0 ); --- 150,172 ---- *************** *** 242,255 **** glarea.SwapBuffers(); ! } else Debug.WriteLine( "MakeCurrent() failed" ); ! ! Debug.WriteLine( "Exiting GtkAdvanced.OnExpose( object, ExposeEventArgs )" ); ! Debug.Unindent(); } protected void OnMotionNotify( object obj, MotionNotifyEventArgs args) { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.OnMotionNotify( object, MotionNotifyEventArgs )" ); - if ( (args.Event.State==Gdk.ModifierType.Button1Mask) || (args.Event.State==Gdk.ModifierType.Button3Mask) ) { int w = 0; --- 186,193 ---- glarea.SwapBuffers(); ! } } protected void OnMotionNotify( object obj, MotionNotifyEventArgs args) { if ( (args.Event.State==Gdk.ModifierType.Button1Mask) || (args.Event.State==Gdk.ModifierType.Button3Mask) ) { int w = 0; *************** *** 259,267 **** if ( args.Event.State==Gdk.ModifierType.Button1Mask ) { if ( mouseX>=0.0 ) { - Debug.WriteLine( "y-rotation" ); rotY += ((float)(args.Event.X-mouseX)) * 360.0f / w; } else mouseX = args.Event.X; if ( mouseY>=0.0 ) { - Debug.WriteLine( "x-rotation" ); rotX += ((float)(args.Event.Y-mouseY)) * 360.0f / h; mouseY = args.Event.Y; --- 197,203 ---- *************** *** 271,275 **** if ( args.Event.State==Gdk.ModifierType.Button3Mask ) { if ( mouseX>=0.0 ) { - Debug.WriteLine( "y-rotation" ); rotZ += ((float)(args.Event.X-mouseX)) * 360.0f / w; } else mouseX = args.Event.X; --- 207,210 ---- *************** *** 279,313 **** } - - Debug.WriteLine( "Exiting GtkAdvanced.OnMotionNotify( object, MotionNotifyEventArgs )" ); - Debug.Unindent(); } protected void OnButtonPress( object obj, ButtonPressEventArgs args ) { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.OnButtonPress( object, ButtonPressEventArgs )" ); - mouseX = args.Event.X; mouseY = args.Event.Y; - - Debug.WriteLine( "Exiting GtkAdvanced.OnButtonPress( object, ButtonPressEventArgs )" ); - Debug.Unindent(); } protected void OnButtonRelease( object obj, ButtonReleaseEventArgs args ) { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.OnButtonRelease( object, ButtonReleaseEventArgs )" ); - mouseX = -1.0; mouseY = -1.0; - - Debug.WriteLine( "Exiting GtkAdvanced.OnButtonRelease( object, ButtonReleaseEventArgs )" ); - Debug.Unindent(); } protected virtual void draw() { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.draw()" ); - if (glarea.MakeCurrent()) { glTranslatef( -0.5f, -0.5f, 0.0f ); --- 214,230 ---- *************** *** 320,333 **** glVertex2f( 1.0f, 0.0f); glEnd(); ! } else Debug.WriteLine( "MakeCurrent() failed!" ); ! ! Debug.WriteLine( "Exiting GtkAdvanced.draw()" ); ! Debug.Unindent(); ! } protected virtual void OnConfigure (object obj, ConfigureEventArgs args) { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.OnConfigure( object, ConfigureEventArgs )" ); - if (glarea.MakeCurrent()) { glViewport(0, 0, glarea.Allocation.Width, glarea.Allocation.Height); --- 237,244 ---- glVertex2f( 1.0f, 0.0f); glEnd(); ! } ! } protected virtual void OnConfigure (object obj, ConfigureEventArgs args) { if (glarea.MakeCurrent()) { glViewport(0, 0, glarea.Allocation.Width, glarea.Allocation.Height); *************** *** 339,352 **** glMatrixMode( GL_MODELVIEW ); glLoadIdentity(); ! } else Debug.WriteLine( "MakeCurrent() failed" ); ! ! Debug.WriteLine( "Exiting GtkAdvanced.OnConfigure( object, ConfigureEventArgs )" ); ! Debug.Unindent(); } protected void OnRealized (object obj, EventArgs args) { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.OnRealized( object, EventArgs )" ); - if (glarea.MakeCurrent()) { glShadeModel( GL_SMOOTH ); --- 250,257 ---- glMatrixMode( GL_MODELVIEW ); glLoadIdentity(); ! } } protected void OnRealized (object obj, EventArgs args) { if (glarea.MakeCurrent()) { glShadeModel( GL_SMOOTH ); *************** *** 357,370 **** glDepthFunc( GL_LEQUAL ); glHint( GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST ); ! } else Debug.WriteLine( "MakeCurrent() failed" ); ! ! Debug.WriteLine( "Exiting GtkAdvanced.OnRealized( object, EventArgs )" ); ! Debug.Unindent(); } protected void OnButton( object obj, EventArgs args ) { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.OnButton( objec, EventArgs )" ); - if (obj==reset_btn) { setDefaults(); --- 262,269 ---- glDepthFunc( GL_LEQUAL ); glHint( GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST ); ! } } protected void OnButton( object obj, EventArgs args ) { if (obj==reset_btn) { setDefaults(); *************** *** 374,396 **** updateValues(); } - - Debug.WriteLine( "Exiting GtkAdvanced.OnButton( objec, EventArgs )" ); - Debug.Unindent(); } protected void OnDeleteEvent (object obj, DeleteEventArgs args) { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.OnDeleteEvent( object, DeleteEventArgs )" ); - Application.Quit (); - - Debug.WriteLine( "Exiting GtkAdvanced.OnDeleteEvent( object, DeleteEventArgs )" ); - Debug.Unindent(); } protected float rotX { ! get { Debug.WriteLine( "rotX->get" ); return propRotX; } set { - Debug.WriteLine( "rotX->set" ); propRotX = value; while (propRotX<0) propRotX += 360.0f; --- 273,285 ---- updateValues(); } } protected void OnDeleteEvent (object obj, DeleteEventArgs args) { Application.Quit (); } protected float rotX { ! get { return propRotX; } set { propRotX = value; while (propRotX<0) propRotX += 360.0f; *************** *** 402,408 **** protected float rotY { ! get { Debug.WriteLine( "rotY->get" ); return propRotY; } set { - Debug.WriteLine( "rotY->set" ); propRotY = value; while (propRotY<0) propRotY += 360.0f; --- 291,296 ---- protected float rotY { ! get { return propRotY; } set { propRotY = value; while (propRotY<0) propRotY += 360.0f; *************** *** 414,420 **** protected float rotZ { ! get { Debug.WriteLine( "rotZ->get" ); return propRotZ; } set { - Debug.WriteLine( "rotZ->set" ); propRotZ = value; while (propRotZ<0) propRotZ += 360.0f; --- 302,307 ---- protected float rotZ { ! get {return propRotZ; } set { propRotZ = value; while (propRotZ<0) propRotZ += 360.0f; *************** *** 426,432 **** protected float speedX { ! get { Debug.WriteLine( "speedX->get" ); return propSpeedX; } set { - Debug.WriteLine( "speedX->set" ); propSpeedX = value; while (propSpeedX<=-360.0f) propSpeedX += 360.0f; --- 313,318 ---- protected float speedX { ! get { return propSpeedX; } set { propSpeedX = value; while (propSpeedX<=-360.0f) propSpeedX += 360.0f; *************** *** 437,443 **** protected float speedY { ! get { Debug.WriteLine( "speedY->get" ); return propSpeedY; } set { - Debug.WriteLine( "speedY->set" ); propSpeedY = value; while (propSpeedY<=-360.0f) propSpeedY += 360.0f; --- 323,328 ---- protected float speedY { ! get { return propSpeedY; } set { propSpeedY = value; while (propSpeedY<=-360.0f) propSpeedY += 360.0f; *************** *** 448,454 **** protected float speedZ { ! get { Debug.WriteLine( "speedZ->get" ); return propSpeedZ; } set { - Debug.WriteLine( "speedZ->set" ); propSpeedZ = value; while (propSpeedZ<=-360.0f) propSpeedZ += 360.0f; --- 333,338 ---- protected float speedZ { ! get { return propSpeedZ; } set { propSpeedZ = value; while (propSpeedZ<=-360.0f) propSpeedZ += 360.0f; *************** *** 459,465 **** protected bool animate { ! get { Debug.WriteLine( "animate->get" ); return propAnimate; } set { - Debug.WriteLine( "animate->set" ); if ( value && !propAnimate ) GLib.Idle.Add (new IdleHandler (Animate)); propAnimate = value; --- 343,348 ---- protected bool animate { ! get { return propAnimate; } set { if ( value && !propAnimate ) GLib.Idle.Add (new IdleHandler (Animate)); propAnimate = value; *************** *** 471,476 **** public static void Main( string[] args) { - Debug.Listeners.Add( new TextWriterTraceListener( Console.Out ) ); - Debug.AutoFlush = true; GtkAdvanced gl = new GtkAdvanced(); } --- 354,357 ---- Index: gears.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/gears.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** gears.cs 20 Oct 2004 09:12:14 -0000 1.9 --- gears.cs 5 Nov 2004 15:45:37 -0000 1.10 *************** *** 1,5 **** using csDragons.OpenGL; using System; - using System.Diagnostics; public class Gears : GL { --- 1,4 ---- *************** *** 14,30 **** public Gears() { - Debug.Indent(); - Debug.WriteLine( "Entering Gears() "); - - Debug.WriteLine( "Initializiing GLUT" ); glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH ); glutInitWindowSize( 480, 480 ); glutCreateWindow("Gears"); - Debug.WriteLine( "Initialzing GL" ); initGL(); - Debug.WriteLine( "Initializing GLUT-CallBacks" ); - glutDisplayFunc( new cb0_glutDisplayFunc( draw ) ); glutKeyboardFunc( new cb0_glutKeyboardFunc( keyboard ) ); --- 13,22 ---- *************** *** 33,47 **** glutVisibilityFunc( new cb0_glutVisibilityFunc( visible ) ); - Debug.WriteLine( "Starting Main Loop" ); glutMainLoop(); - - Debug.WriteLine( "Exiting Gears() "); - Debug.Unindent(); } protected void visible( int state ) { - Debug.Indent(); - Debug.WriteLine( "Entering Gears.visible(int)" ); - if ( state==GLUT_VISIBLE ) { glutIdleFunc( new cb0_glutIdleFunc( redraw ) ); --- 25,32 ---- *************** *** 49,55 **** glutIdleFunc( new cb0_glutIdleFunc( dummy ) ); } - - Debug.WriteLine( "Exiting Gears.visible(int)" ); - Debug.Unindent(); } --- 34,37 ---- *************** *** 58,76 **** protected void redraw() { - Debug.Indent(); - Debug.WriteLine( "Entering Gears.redraw() "); - rotAng += 0.5f; glutPostRedisplay(); - - Debug.WriteLine( "Exiting Gears.redraw() "); - Debug.Unindent(); } protected void initGL() { - Debug.Indent(); - Debug.WriteLine( "Entering Gears.initGL() "); - - Debug.WriteLine( "Set defaults "); float[] pos = { 5.0f, 5.0f, 10.0f, 0.0f }; float[] red = { 0.8f, 0.1f, 0.0f, 1.0f }; --- 40,48 ---- *************** *** 90,94 **** /* gears */ - Debug.WriteLine( "Define Gears "); gear1 = glGenLists( 1 ); glNewList( gear1, GL_COMPILE ); --- 62,65 ---- *************** *** 110,123 **** glEnable( GL_NORMALIZE ); - - Debug.WriteLine( "Exiting Gears.initGL() "); - Debug.Unindent(); - } protected void reshape( int width, int height ) { - Debug.Indent(); - Debug.WriteLine( "Entering Gears.reshape(int,int) "); - if (height==0) height = 1; // prevent division by zero float h = ((float)height) / ((float)width); --- 81,87 ---- *************** *** 131,143 **** glLoadIdentity(); glTranslatef( 0.0f, 0.0f, -40.0f ); - - Debug.WriteLine( "Exiting Gears.reshape(int,int) "); - Debug.Unindent(); } protected void draw() { - Debug.Indent(); - Debug.WriteLine( "Entering Gears.draw() "); - glClear ( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); --- 95,101 ---- *************** *** 168,180 **** glutSwapBuffers(); - - Debug.WriteLine( "Exiting Gears.draw() "); - Debug.Unindent(); } protected void gear( double inner_radius, double outer_radius, double width, int teeth, double tooth_depth ) { - Debug.Indent(); - Debug.WriteLine( "Entering Gears.gear(double,double.double,int,double) "); - int i; double r0, r1, r2, angle, da, u, v, len; --- 126,132 ---- *************** *** 285,291 **** } glEnd(); - - Debug.WriteLine( "Exiting Gears.gear(double,double.double,int,double) "); - Debug.Unindent(); } --- 237,240 ---- *************** *** 295,300 **** public static void Main( string[] args) { - Debug.Listeners.Add( new TextWriterTraceListener( Console.Out ) ); - Debug.AutoFlush = true; new Gears(); } --- 244,247 ---- Index: gtkTriangle.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/gtkTriangle.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** gtkTriangle.cs 11 Sep 2004 08:39:28 -0000 1.3 --- gtkTriangle.cs 5 Nov 2004 15:45:37 -0000 1.4 *************** *** 5,9 **** using GtkSharp; using System; - using System.Diagnostics; public class GtkTest : GL { --- 5,8 ---- *************** *** 14,29 **** public GtkTest() { - Debug.Indent(); - Debug.WriteLine( "Enering GtkTest()" ); - - Debug.WriteLine( "Init Application" ); Application.Init(); - Debug.WriteLine( "Init Window" ); Gtk.Window window = new Gtk.Window( "Gtk Triangle" ); window.ReallocateRedraws = true; window.DeleteEvent += new DeleteEventHandler( OnDeleteEvent ); - Debug.WriteLine( "Init GtkGLArea" ); glarea = new GtkGLArea(); glarea.Realized += new EventHandler (OnRealized); --- 13,22 ---- *************** *** 40,48 **** window.ShowAll (); - Debug.WriteLine( "MainLoop" ); Application.Run (); - - Debug.WriteLine( "Exiting GtkTest()" ); - Debug.Unindent(); } --- 33,37 ---- *************** *** 115,120 **** public static void Main( string[] args) { - Debug.Listeners.Add( new TextWriterTraceListener( Console.Out ) ); - Debug.AutoFlush = true; GtkTest gl = new GtkTest(); } --- 104,107 ---- Index: gtkWidget.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/gtkWidget.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gtkWidget.cs 11 Sep 2004 08:39:28 -0000 1.4 --- gtkWidget.cs 5 Nov 2004 15:45:37 -0000 1.5 *************** *** 5,10 **** using GtkSharp; using System; - using System.Diagnostics; - public class GtkTest : GL { --- 5,8 ---- *************** *** 15,30 **** public GtkTest() { - Debug.Indent(); - Debug.WriteLine( "Enering GtkTest()" ); - - Debug.WriteLine( "Init Application" ); Application.Init(); - Debug.WriteLine( "Init Window" ); Gtk.Window window = new Gtk.Window( "Gtk Triangle" ); window.ReallocateRedraws = true; window.DeleteEvent += new DeleteEventHandler( OnDeleteEvent ); - Debug.WriteLine( "Init GtkGLArea" ); glarea = new GtkGLArea(); glarea.Realized += new EventHandler (OnRealized); --- 13,22 ---- *************** *** 41,49 **** window.ShowAll (); - Debug.WriteLine( "MainLoop" ); Application.Run (); - - Debug.WriteLine( "Exiting GtkTest()" ); - Debug.Unindent(); } --- 33,37 ---- *************** *** 116,121 **** public static void Main( string[] args) { - Debug.Listeners.Add( new TextWriterTraceListener( Console.Out ) ); - Debug.AutoFlush = true; GtkTest gl = new GtkTest(); } --- 104,107 ---- Index: gtkGears.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/gtkGears.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** gtkGears.cs 11 Sep 2004 08:39:28 -0000 1.5 --- gtkGears.cs 5 Nov 2004 15:45:37 -0000 1.6 *************** *** 5,9 **** using GtkSharp; using System; - using System.Diagnostics; public class GtkGears : GL { --- 5,8 ---- *************** *** 270,275 **** public static void Main( string[] args) { - Debug.Listeners.Add( new TextWriterTraceListener( Console.Out ) ); - Debug.AutoFlush = true; GtkGears gl = new GtkGears(); } --- 269,272 ---- Index: gtkTexture.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/gtkTexture.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** gtkTexture.cs 11 Sep 2004 08:39:28 -0000 1.3 --- gtkTexture.cs 5 Nov 2004 15:45:37 -0000 1.4 *************** *** 5,9 **** using GtkSharp; using System; - using System.Diagnostics; public class GtkTest : GL { --- 5,8 ---- *************** *** 15,25 **** public GtkTest() { - Debug.Indent(); - Debug.WriteLine( "Enering GtkTest()" ); - - Debug.WriteLine( "Init Application" ); Application.Init(); - Debug.WriteLine( "Init Window" ); Gtk.Window window = new Gtk.Window( "Gtk Triangle" ); window.Resize( 480, 480 ); --- 14,19 ---- *************** *** 27,31 **** window.DeleteEvent += new DeleteEventHandler( OnDeleteEvent ); - Debug.WriteLine( "Init GtkGLArea" ); glarea = new GtkGLArea(); glarea.Realized += new EventHandler (OnRealized); --- 21,24 ---- *************** *** 42,50 **** window.ShowAll (); - Debug.WriteLine( "MainLoop" ); Application.Run (); - - Debug.WriteLine( "Exiting GtkTest()" ); - Debug.Unindent(); } --- 35,39 ---- *************** *** 160,165 **** public static void Main( string[] args) { - Debug.Listeners.Add( new TextWriterTraceListener( Console.Out ) ); - Debug.AutoFlush = true; GtkTest gl = new GtkTest(); } --- 149,152 ---- Index: gtkFrame.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/gtkFrame.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** gtkFrame.cs 11 Sep 2004 08:39:28 -0000 1.9 --- gtkFrame.cs 5 Nov 2004 15:45:37 -0000 1.10 *************** *** 5,9 **** using GtkSharp; using System; - using System.Diagnostics; public class GtkFrame : GL { --- 5,8 ---- *************** *** 23,33 **** public GtkFrame() { - Debug.Indent(); - Debug.WriteLine( "Enering GtkFrame()" ); - - Debug.WriteLine( "Init Application" ); Application.Init(); - Debug.WriteLine( "Init Window" ); window = new Gtk.Window( "Gtk Frame" ); window.ReallocateRedraws = true; --- 22,27 ---- *************** *** 37,41 **** window.ShowAll(); - Debug.WriteLine( "Init GtkGLArea" ); glarea = new GtkGLArea(); glarea.Realized += new EventHandler (OnRealized); --- 31,34 ---- *************** *** 46,65 **** - Debug.WriteLine( "Init scaleRotX" ); scaleRotX = new VScale( 0.0, 359.9, 0.1 ); scaleRotX.ValuePos = PositionType.Bottom; scaleRotX.ValueChanged += new EventHandler( valueChanged ); - Debug.WriteLine( "Init scaleRotY" ); scaleRotY = new HScale( 0.0, 359.9, 0.1 ); scaleRotY.ValuePos = PositionType.Left; scaleRotY.ValueChanged += new EventHandler( valueChanged ); - Debug.WriteLine( "Init scaleRotZ" ); scaleRotZ = new VScale( 0.0, 359.5, 0.1 ); scaleRotZ.ValuePos = PositionType.Bottom; scaleRotZ.ValueChanged += new EventHandler( valueChanged ); - Debug.WriteLine( "Init HBox 1" ); HBox hbox1 = new HBox( false, 3 ); hbox1.PackStart( scaleRotX, false, true, 5 ); --- 39,54 ---- *************** *** 67,71 **** hbox1.PackEnd( scaleRotZ, false, true, 5 ); - Debug.WriteLine( "Init VBox 1" ); VBox vbox1 = new VBox( false, 2 ); vbox1.PackStart( hbox1, true, true, 5 ); --- 56,59 ---- *************** *** 75,83 **** window.ShowAll(); - Debug.WriteLine( "MainLoop" ); Application.Run (); - - Debug.WriteLine( "Exiting GtkFrame()" ); - Debug.Unindent(); } --- 63,67 ---- *************** *** 209,214 **** public static void Main( string[] args) { - Debug.Listeners.Add( new TextWriterTraceListener( Console.Out ) ); - Debug.AutoFlush = true; GtkFrame gl = new GtkFrame(); } --- 193,196 ---- |