From: Tim R. <ti...@us...> - 2004-07-30 11:58:47
|
Update of /cvsroot/csdopenglnet/csdOpenGL/samples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24270 Modified Files: gtkFrame.cs Log Message: there was a feedback which causes the kernel kill Index: gtkFrame.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/gtkFrame.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gtkFrame.cs 30 Jul 2004 11:17:02 -0000 1.4 --- gtkFrame.cs 30 Jul 2004 11:58:36 -0000 1.5 *************** *** 48,52 **** glarea.UnmapEvent += new UnmapEventHandler (OnUnmap); ! //fixedLayout.Put( glarea, 55, 55 ); Debug.WriteLine( "Init scaleRotX" ); --- 48,52 ---- glarea.UnmapEvent += new UnmapEventHandler (OnUnmap); ! fixedLayout.Put( glarea, 55, 10 ); Debug.WriteLine( "Init scaleRotX" ); *************** *** 141,152 **** protected virtual void draw() { ! glBegin( GL_TRIANGLES ); ! glColor3f( 1.0f, 0.0f, 0.0f ); ! glVertex2f( 0.0f, 0.0f); ! glColor3f( 0.0f, 1.0f, 0.0f ); ! glVertex2f( 0.5f, 1.0f); ! glColor3f( 0.0f, 0.0f, 1.0f ); ! glVertex2f( 1.0f, 0.0f); ! glEnd(); } --- 141,154 ---- protected virtual void draw() { ! if (glarea.MakeCurrent()) { ! glBegin( GL_TRIANGLES ); ! glColor3f( 1.0f, 0.0f, 0.0f ); ! glVertex2f( 0.0f, 0.0f); ! glColor3f( 0.0f, 1.0f, 0.0f ); ! glVertex2f( 0.5f, 1.0f); ! glColor3f( 0.0f, 0.0f, 1.0f ); ! glVertex2f( 1.0f, 0.0f); ! glEnd(); ! } } *************** *** 195,202 **** protected float rotX { ! get { return rotX; } set { propRotX = value; while (propRotX<0) propRotX += 360.0f; while (propRotX>=360.0f) propRotX -= 360.0f; if (glarea!=null) glarea.QueueDraw(); } --- 197,205 ---- protected float rotX { ! get { return propRotX; } set { propRotX = value; while (propRotX<0) propRotX += 360.0f; while (propRotX>=360.0f) propRotX -= 360.0f; + scaleRotX.Value = value; if (glarea!=null) glarea.QueueDraw(); } *************** *** 204,211 **** protected float rotY { ! get { return rotY; } set { propRotY = value; while (propRotY<0) propRotY += 360.0f; while (propRotY>=360.0f) propRotY -= 360.0f; if (glarea!=null) glarea.QueueDraw(); } --- 207,215 ---- protected float rotY { ! get { return propRotY; } set { propRotY = value; while (propRotY<0) propRotY += 360.0f; while (propRotY>=360.0f) propRotY -= 360.0f; + scaleRotY.Value = value; if (glarea!=null) glarea.QueueDraw(); } *************** *** 213,217 **** protected float rotZ { ! get { return rotZ; } set { propRotZ = value; while (propRotZ<0) propRotZ += 360.0f; --- 217,221 ---- protected float rotZ { ! get { return propRotZ; } set { propRotZ = value; while (propRotZ<0) propRotZ += 360.0f; |