csdopenglnet-cvs

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

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

Modified Files:
	gtkAdvanced.cs 
Log Message:
tada


Index: gtkAdvanced.cs
===================================================================
RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/gtkAdvanced.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gtkAdvanced.cs	31 Jul 2004 12:24:42 -0000	1.2
--- gtkAdvanced.cs	31 Jul 2004 12:48:22 -0000	1.3
***************
*** 13,16 ****
--- 13,20 ----
    protected Entry rotY_entry;
    protected Entry rotZ_entry;
+   protected Entry speedX_entry;
+   protected Entry speedY_entry;
+   protected Entry speedZ_entry;
+   
  
    public GtkAdvanced() {
***************
*** 34,56 ****
      rotY_entry = new Entry();
      rotZ_entry = new Entry();
          
!     Debug.WriteLine( "Init Table-Layout table1" );
!     Table table1 = new Table( 2, 3, false );
!     table1.Attach( new Label( "x-rotation: " ), 0, 1, 0, 1 );
!     table1.Attach( rotX_entry, 1, 2, 0, 1 );
!     table1.Attach( new Label( "y-rotation: " ), 0, 1, 1, 2 );
!     table1.Attach( rotY_entry, 1, 2, 1, 2 );
!     table1.Attach( new Label( "z-rotation: " ), 0, 1, 2, 3 );
!     table1.Attach( rotZ_entry, 1, 2, 2, 3 );
      
!     Debug.WriteLine( "Init Table-Layout table2" );
      
      Debug.WriteLine( "Init HBox-Layout hbox" );
!     HBox hbox = new HBox( false, 2 );
!     hbox.PackStart( table1, 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 );
      
--- 38,79 ----
      rotY_entry = new Entry();
      rotZ_entry = new Entry();
+     
+     Debug.WriteLine( "Init speed entry fields" );
+     speedX_entry = new Entry();
+     speedY_entry = new Entry();
+     speedZ_entry = new Entry();
          
!     Debug.WriteLine( "Init Table-Layout rotTable" );
!     Table rotTable = new Table( 2, 3, false );
!     rotTable.Attach( new Label( "x-rotation: " ), 0, 1, 0, 1 );
!     rotTable.Attach( rotX_entry, 1, 2, 0, 1 );
!     rotTable.Attach( new Label( "y-rotation: " ), 0, 1, 1, 2 );
!     rotTable.Attach( rotY_entry, 1, 2, 1, 2 );
!     rotTable.Attach( new Label( "z-rotation: " ), 0, 1, 2, 3 );
!     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 );
!     speedTable.Attach( speedX_entry, 1, 2, 0, 1 );
!     speedTable.Attach( new Label( "y-speed: " ), 0, 1, 1, 2 );
!     speedTable.Attach( speedY_entry, 1, 2, 1, 2 );
!     speedTable.Attach( new Label( "z-speed: " ), 0, 1, 2, 3 );
!     speedTable.Attach( speedZ_entry, 1, 2, 2, 3 );
!     
!     Debug.WriteLine( "Init Table-Layout buttonTable" );
!     Table buttonTable = new Table( 2, 1, true );
!     buttonTable.Attach( new ToggleButton( "Animate" ), 0, 1, 0, 1 );
!     buttonTable.Attach( new Button( "Reset" ), 0, 1, 1, 2 );
      
      Debug.WriteLine( "Init HBox-Layout hbox" );
!     HBox hbox = new HBox( false, 4 );
!     hbox.PackStart( rotTable, false, true, 5 );
!     hbox.PackStart( speedTable, false, true, 5 );
!     hbox.PackEnd( buttonTable, false, true, 5 );
      
      Debug.WriteLine( "Init VBox-Layout vbox" );
      VBox vbox = new VBox( false, 2 );
!     vbox.PackStart( new Button( "GL" ), true, true, 5 );
      vbox.PackEnd( hbox, false, true, 5 );