[csdOpenGL.NET-CVS] csdOpenGL/samples Makefile,1.1.1.1,1.2 gtkWidget.cs,1.1.1.1,1.2 triangle.cs,1.2,1.3

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

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

Modified Files:
	Makefile gtkWidget.cs triangle.cs 
Log Message:
active Gtk# Widget


Index: gtkWidget.cs
===================================================================
RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/gtkWidget.cs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** gtkWidget.cs	12 Jul 2004 17:17:38 -0000	1.1.1.1
--- gtkWidget.cs	17 Jul 2004 11:59:31 -0000	1.2
***************
*** 20,24 ****
      
      Debug.WriteLine( "Init Window" );
!     Gtk.Window window = new Gtk.Window( "Dreieck" );
      window.ReallocateRedraws = true;
      window.DeleteEvent += new DeleteEventHandler( OnDeleteEvent );
--- 20,24 ----
      
      Debug.WriteLine( "Init Window" );
!     Gtk.Window window = new Gtk.Window( "Gtk Triangle" );
      window.ReallocateRedraws = true;
      window.DeleteEvent += new DeleteEventHandler( OnDeleteEvent );
***************
*** 33,40 ****
      
      Table table = new Table( 10, 20, true );
!     table.Attach( glarea, 1, 20, 3, 7 );
      window.Add( table );
      
- //    window.Add (glarea);
      glarea.Show ();
      window.ShowAll ();
--- 33,39 ----
      
      Table table = new Table( 10, 20, true );
!     table.Attach( glarea, 1, 19, 1, 9 );
      window.Add( table );
      
      glarea.Show ();
      window.ShowAll ();
***************
*** 61,65 ****
    
    protected bool Animate () {
!     angle += 1.0f;
      glarea.QueueDraw ();
      return !stop;
--- 60,64 ----
    
    protected bool Animate () {
!     angle += 0.2f;
      glarea.QueueDraw ();
      return !stop;

Index: Makefile
===================================================================
RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile	12 Jul 2004 17:17:38 -0000	1.1.1.1
--- Makefile	17 Jul 2004 11:59:31 -0000	1.2
***************
*** 5,14 ****
  OPTS=$(DEBUG)
  LIBS=csdGL.dll csdMath.dll csdGLtools.dll
! MCS=$(CC) $(OPTS) -lib:/usr/mono/lib/gtk-sharp
  PACKAGE=csDragons
  
  LIBOPTS=$(foreach lib,$(LIBS),-r $(lib))
  
! all: $(LIBS) triangle.exe texture.exe
  
  csdGL.dll: libcsdGL.so
--- 5,14 ----
  OPTS=$(DEBUG)
  LIBS=csdGL.dll csdMath.dll csdGLtools.dll
! MCS=$(CC) $(OPTS) -lib:/usr/lib/mono/gtk-sharp
  PACKAGE=csDragons
  
  LIBOPTS=$(foreach lib,$(LIBS),-r $(lib))
  
! all: $(LIBS) triangle.exe texture.exe gtkWidget.exe
  
  csdGL.dll: libcsdGL.so
***************
*** 27,32 ****
  	ln -sf ../cbonding/libcsdGL.so .
  
  %.exe:%.cs 
! 	mcs -r:csdGL.dll -r:csdGLtools.dll -r:csdMath.dll -r:System.Drawing $^ -o $@
  
  clean:
--- 27,36 ----
  	ln -sf ../cbonding/libcsdGL.so .
  
+ gtkWidget.exe:gtkWidget.cs csdGL_Gtk.dll
+ 	$(MCS) -r:glib-sharp.dll -r:gtk-sharp.dll -r:csdGL_Gtk.dll -r:System.Drawing gtkWidget.cs -o $@
+ 
  %.exe:%.cs 
! 	$(MCS) -r:csdGL.dll -r:csdGLtools.dll -r:csdMath.dll -r:System.Drawing $^ -o $@
! 
  
  clean:

Index: triangle.cs
===================================================================
RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/triangle.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** triangle.cs	16 Jul 2004 15:02:29 -0000	1.2
--- triangle.cs	17 Jul 2004 11:59:31 -0000	1.3
***************
*** 22,26 ****
    protected void timerEvent( int value ) {
      draw();
!     ang += 1;
      if (ang>=360) ang = 0;    
      glutTimerFunc( 1, new cb1_glutTimerFunc( timerEvent ), value );
--- 22,26 ----
    protected void timerEvent( int value ) {
      draw();
!     ang += 0.2f;
      if (ang>=360) ang = 0;    
      glutTimerFunc( 1, new cb1_glutTimerFunc( timerEvent ), value );