projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_7_branch'
[mesa.git]
/
progs
/
demos
/
geartrain.c
diff --git
a/progs/demos/geartrain.c
b/progs/demos/geartrain.c
index e6567dd6470159ca9470582b57e320649cf32a91..00b6e78b724000f098b84b8e2041b18ac2037f30 100644
(file)
--- a/
progs/demos/geartrain.c
+++ b/
progs/demos/geartrain.c
@@
-1060,19
+1060,18
@@
main (int argc, char *argv[])
{
char *file;
{
char *file;
- if (argc < 2)
- file = "geartrain.dat";
- else
- file = argv[1];
-
- glutInit(&argc, argv);
- glutInitWindowPosition (0, 0);
glutInitWindowSize(640,480);
glutInitWindowSize(640,480);
+ glutInit(&argc, argv);
glutInitDisplayMode (GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE );
if (glutCreateWindow ("Gear Train Simulation") == GL_FALSE)
exit (1);
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 ();
getdata (file);
process ();
init ();