Author: cjcollier
Date: 2007-12-20 19:15:55 -0500 (Thu, 20 Dec 2007)
New Revision: 91744

Modified:
   trunk/gtkglarea-sharp/AUTHORS
   trunk/gtkglarea-sharp/ChangeLog
   trunk/gtkglarea-sharp/configure.ac
   trunk/gtkglarea-sharp/examples/pick-object/PickWidget.cs
   trunk/gtkglarea-sharp/examples/rotate-buttons/OldTeapot.cs
   trunk/gtkglarea-sharp/examples/shapes/Teapot.cs
Log:
2007-12-20T1642  C.J. Adams-Collier  <[EMAIL PROTECTED]>

        Overview: Applied some patches supplied by Sam Hocevar

        * AUTHORS
        - added Sam Hocevar
        * configure.ac
        - put a $ in front of a variable :)
        * examples/shapes/Teapot.cs,
        examples/rotate-buttons/OldTeapot.cs
        - changed data structures to conform to new API



Modified: trunk/gtkglarea-sharp/AUTHORS
===================================================================
--- trunk/gtkglarea-sharp/AUTHORS       2007-12-20 23:50:54 UTC (rev 91743)
+++ trunk/gtkglarea-sharp/AUTHORS       2007-12-21 00:15:55 UTC (rev 91744)
@@ -2,3 +2,4 @@
 Alp Toker
 Remy Fenn
 Nick <[EMAIL PROTECTED]>
+Sam Hocevar

Modified: trunk/gtkglarea-sharp/ChangeLog
===================================================================
--- trunk/gtkglarea-sharp/ChangeLog     2007-12-20 23:50:54 UTC (rev 91743)
+++ trunk/gtkglarea-sharp/ChangeLog     2007-12-21 00:15:55 UTC (rev 91744)
@@ -1,3 +1,14 @@
+2007-12-20T1642  C.J. Adams-Collier  <[EMAIL PROTECTED]>
+
+       Overview: Applied some patches supplied by Sam Hocevar
+       
+       * AUTHORS
+       - added Sam Hocevar
+       * configure.ac
+       - put a $ in front of a variable :)
+       * examples/shapes/Teapot.cs, examples/rotate-buttons/OldTeapot.cs
+       - changed data structures to conform to new API
+
 2007-04-23T06:35  C.J. Adams-Collier  <[EMAIL PROTECTED]>
        * gtkglarea/Makefile.am
        - removed generated-stamp and generated/* from CLEANFILES

Modified: trunk/gtkglarea-sharp/configure.ac
===================================================================
--- trunk/gtkglarea-sharp/configure.ac  2007-12-20 23:50:54 UTC (rev 91743)
+++ trunk/gtkglarea-sharp/configure.ac  2007-12-21 00:15:55 UTC (rev 91744)
@@ -146,7 +146,7 @@
 dnl Find GAPI
 GAPI_REQUIRED_VERSION=1.9.0
 PKG_CHECK_MODULES(GAPI_DEPENDENCY,
-                  gapi-2.0 >= GAPI_REQUIRED_VERSION,
+                  gapi-2.0 >= $GAPI_REQUIRED_VERSION,
                  enable_gapi=yes,
                  enable_gapi=no
                  )

Modified: trunk/gtkglarea-sharp/examples/pick-object/PickWidget.cs
===================================================================
--- trunk/gtkglarea-sharp/examples/pick-object/PickWidget.cs    2007-12-20 
23:50:54 UTC (rev 91743)
+++ trunk/gtkglarea-sharp/examples/pick-object/PickWidget.cs    2007-12-21 
00:15:55 UTC (rev 91744)
@@ -90,13 +90,13 @@
                }
                
                struct hitStruct {
-                       public uint numNames;
+                       public int numNames;
                        public double minZ;
                        public double maxZ;
-                       public uint[] nameStack;
+                       public int[] nameStack;
                }
 
-               void processHits (int hits, uint[] buffer)
+                void processHits (int hits, int[] buffer)
                {
                        uint i, j=0;
                        uint names, minZ, maxZ, numberOfNames;
@@ -115,8 +115,8 @@
                                // Console.WriteLine("Hit occured between [{0} 
.. {1}]", hit.minZ, hit.maxZ);
                                
                                // Allocate some space for our hit names
-                               hit.nameStack = new uint[hit.numNames];
-                               
+                                hit.nameStack = new int[hit.numNames];
+
                                for(int k = 0; k < hit.numNames; k++){
                                        hit.nameStack[k] = buffer[j++];
                                        
@@ -177,7 +177,8 @@
                                }
                                
                                // Establish a buffer for selection mode values
-                               uint[] selectBuf = new uint[64];
+                                int[] selectBuf = new int[64];
+
                                // 
http://www.mevis.de/opengl/glSelectBuffer.html
                                gl.glSelectBuffer (64, selectBuf);
                                
@@ -238,4 +239,4 @@
                }           
            
        }
-}
\ No newline at end of file
+}

Modified: trunk/gtkglarea-sharp/examples/rotate-buttons/OldTeapot.cs
===================================================================
--- trunk/gtkglarea-sharp/examples/rotate-buttons/OldTeapot.cs  2007-12-20 
23:50:54 UTC (rev 91743)
+++ trunk/gtkglarea-sharp/examples/rotate-buttons/OldTeapot.cs  2007-12-21 
00:15:55 UTC (rev 91744)
@@ -78,12 +78,13 @@
                      {0.84, -1.5, 0.075}
                    };
 
-                 static float[,,] tex =
+                  static float[/*2*2*2*/] tex =
                    {
-                     { {0, 0},
-                       {1, 0}},
-                     { {0, 1},
-                       {1, 1}}
+                        0, 0,
+                        1, 0,
+
+                        0, 1,
+                        1, 1
                    };
 
                  /* *INDENT-ON* */
@@ -154,8 +155,8 @@
                                                                cachedS[i][pos] 
= s[I,J,K];
                                                        }                       
        
                                }
-                                               
-                               gl.glMap2f(gl.GL_MAP2_TEXTURE_COORD_2, 0, 1, 2, 
2, 0, 1, 4, 2, tex[0,0,0]);
+
+                                gl.glMap2f(gl.GL_MAP2_TEXTURE_COORD_2, 0, 1, 
2, 2, 0, 1, 4, 2, tex);
                                gl.glMap2f(gl.GL_MAP2_VERTEX_3, 0, 1, 3, 4, 0, 
1, 12, 4, cachedP[i]);
                                gl.glMapGrid2f(grid, 0.0f, 1.0f, grid, 0.0f, 
1.0f);
                                gl.glEvalMesh2(type, 0, grid, 0, grid);

Modified: trunk/gtkglarea-sharp/examples/shapes/Teapot.cs
===================================================================
--- trunk/gtkglarea-sharp/examples/shapes/Teapot.cs     2007-12-20 23:50:54 UTC 
(rev 91743)
+++ trunk/gtkglarea-sharp/examples/shapes/Teapot.cs     2007-12-21 00:15:55 UTC 
(rev 91744)
@@ -78,12 +78,13 @@
                      {0.84, -1.5, 0.075}
                    };
 
-                 static float[,,] tex =
+                  static float[/*2*2*2*/] tex =
                    {
-                     { {0, 0},
-                       {1, 0}},
-                     { {0, 1},
-                       {1, 1}}
+                       0, 0,
+                       1, 0,
+
+                       0, 1,
+                       1, 1
                    };
 
                  /* *INDENT-ON* */
@@ -155,7 +156,7 @@
                                                        }                       
        
                                }
                                                
-                               gl.glMap2f(gl.GL_MAP2_TEXTURE_COORD_2, 0, 1, 2, 
2, 0, 1, 4, 2, tex[0,0,0]);
+                                gl.glMap2f(gl.GL_MAP2_TEXTURE_COORD_2, 0, 1, 
2, 2, 0, 1, 4, 2, tex);
                                gl.glMap2f(gl.GL_MAP2_VERTEX_3, 0, 1, 3, 4, 0, 
1, 12, 4, cachedP[i]);
                                gl.glMapGrid2f(grid, 0.0f, 1.0f, grid, 0.0f, 
1.0f);
                                gl.glEvalMesh2(type, 0, grid, 0, grid);

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to