[MLton-commit] r4113
Stephen Weeks
MLton@mlton.org
Tue, 18 Oct 2005 10:12:58 -0700
Another patch from John Reppy for OpenGL. This one makes sure that
glutInit gets called.
----------------------------------------------------------------------
U mlton/trunk/lib/opengl/atom.sml
U mlton/trunk/lib/opengl/hello.sml
U mlton/trunk/lib/opengl/points.sml
U mlton/trunk/lib/opengl/shortest.sml
U mlton/trunk/lib/opengl/solar.sml
U mlton/trunk/lib/opengl/spin_cube.sml
U mlton/trunk/lib/opengl/triangle.sml
----------------------------------------------------------------------
Modified: mlton/trunk/lib/opengl/atom.sml
===================================================================
--- mlton/trunk/lib/opengl/atom.sml 2005-10-18 05:44:47 UTC (rev 4112)
+++ mlton/trunk/lib/opengl/atom.sml 2005-10-18 17:12:55 UTC (rev 4113)
@@ -43,7 +43,7 @@
fun initialise () =
(
- glutInit;
+ glutInit();
glutInitDisplayMode (GLUT_DOUBLE + GLUT_RGBA);
glutInitWindowPosition 100 100;
glutInitWindowSize 250 250;
Modified: mlton/trunk/lib/opengl/hello.sml
===================================================================
--- mlton/trunk/lib/opengl/hello.sml 2005-10-18 05:44:47 UTC (rev 4112)
+++ mlton/trunk/lib/opengl/hello.sml 2005-10-18 17:12:55 UTC (rev 4113)
@@ -64,7 +64,7 @@
fun main () =
(
- glutInit;
+ glutInit();
glutInitDisplayMode (GLUT_SINGLE + GLUT_RGB);
glutInitWindowSize 200 200;
glutCreateWindow "Font Test";
Modified: mlton/trunk/lib/opengl/points.sml
===================================================================
--- mlton/trunk/lib/opengl/points.sml 2005-10-18 05:44:47 UTC (rev 4112)
+++ mlton/trunk/lib/opengl/points.sml 2005-10-18 17:12:55 UTC (rev 4113)
@@ -86,6 +86,7 @@
fun main () =
(
+ glutInit();
glutInitDisplayMode (GLUT_DOUBLE + GLUT_RGBA);
glutInitWindowSize 400 400;
glutCreateWindow "Animating rectangle";
@@ -101,4 +102,4 @@
val _ = main();
-
\ No newline at end of file
+
Modified: mlton/trunk/lib/opengl/shortest.sml
===================================================================
--- mlton/trunk/lib/opengl/shortest.sml 2005-10-18 05:44:47 UTC (rev 4112)
+++ mlton/trunk/lib/opengl/shortest.sml 2005-10-18 17:12:55 UTC (rev 4113)
@@ -9,7 +9,7 @@
fun main () =
(
- glutInit;
+ glutInit();
glutCreateWindow "Short Test";
glutDisplayFunc display;
print("Click the close icon to close the window.");
Modified: mlton/trunk/lib/opengl/solar.sml
===================================================================
--- mlton/trunk/lib/opengl/solar.sml 2005-10-18 05:44:47 UTC (rev 4112)
+++ mlton/trunk/lib/opengl/solar.sml 2005-10-18 17:12:55 UTC (rev 4113)
@@ -29,7 +29,7 @@
fun initialise () =
(
- glutInit;
+ glutInit();
glutInitDisplayMode (GLUT_DOUBLE + GLUT_RGB);
glutInitWindowSize 200 200;
glutCreateWindow "Solar";
Modified: mlton/trunk/lib/opengl/spin_cube.sml
===================================================================
--- mlton/trunk/lib/opengl/spin_cube.sml 2005-10-18 05:44:47 UTC (rev 4112)
+++ mlton/trunk/lib/opengl/spin_cube.sml 2005-10-18 17:12:55 UTC (rev 4113)
@@ -42,7 +42,7 @@
fun initialise () =
(
- glutInit;
+ glutInit();
glutInitDisplayMode (GLUT_DOUBLE+GLUT_RGB);
glutInitWindowSize 400 400;
glutCreateWindow "Spinning Cube";
Modified: mlton/trunk/lib/opengl/triangle.sml
===================================================================
--- mlton/trunk/lib/opengl/triangle.sml 2005-10-18 05:44:47 UTC (rev 4112)
+++ mlton/trunk/lib/opengl/triangle.sml 2005-10-18 17:12:55 UTC (rev 4113)
@@ -43,6 +43,7 @@
fun initialise () =
(
+ glutInit ();
glutInitDisplayMode(GLUT_DOUBLE + GLUT_RGBA);
glutInitWindowPosition 100 100;
glutInitWindowSize 250 250;
@@ -201,4 +202,4 @@
val _ = main();
-
\ No newline at end of file
+