summaryrefslogtreecommitdiffstats
path: root/progs/demos/geartrain.c
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-12-18 08:12:55 -0700
committerBrian Paul <brianp@vmware.com>2009-12-18 13:58:14 -0700
commit263f4322e7bfa03a6c025dbc2b280e7f60e2cab1 (patch)
tree25aeab0940d8440aa88893d90f7cce7ee6a5fa99 /progs/demos/geartrain.c
parentc8de081dc1f077a026a962244117ec69f0ba7055 (diff)
downloadexternal_mesa3d-263f4322e7bfa03a6c025dbc2b280e7f60e2cab1.zip
external_mesa3d-263f4322e7bfa03a6c025dbc2b280e7f60e2cab1.tar.gz
external_mesa3d-263f4322e7bfa03a6c025dbc2b280e7f60e2cab1.tar.bz2
progs/demos: fix glut initialization calls
Remove glutInitWindowPosition() calls to play nicer with window managers. Move glutInitWindowSize() calls before glutInit() so the the default window size can be overridden by the -geometry cmd line option.
Diffstat (limited to 'progs/demos/geartrain.c')
-rw-r--r--progs/demos/geartrain.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/progs/demos/geartrain.c b/progs/demos/geartrain.c
index 8fe405e..d2a195f 100644
--- a/progs/demos/geartrain.c
+++ b/progs/demos/geartrain.c
@@ -1049,19 +1049,18 @@ main (int argc, char *argv[])
{
char *file;
- if (argc < 2)
- file = "geartrain.dat";
- else
- file = argv[1];
-
- glutInit(&argc, argv);
- glutInitWindowPosition (0, 0);
glutInitWindowSize(640,480);
+ glutInit(&argc, argv);
glutInitDisplayMode (GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE );
if (glutCreateWindow ("Gear Train Simulation") == GL_FALSE)
exit (1);
+ if (argc < 2)
+ file = "geartrain.dat";
+ else
+ file = argv[1];
+
getdata (file);
process ();
init ();