projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved glutTimerFunc in timer demo
[freeglut]
/
progs
/
demos
/
subwin
/
subwin.c
diff --git
a/progs/demos/subwin/subwin.c
b/progs/demos/subwin/subwin.c
index
df8ef62
..
22e28b0
100644
(file)
--- a/
progs/demos/subwin/subwin.c
+++ b/
progs/demos/subwin/subwin.c
@@
-85,7
+85,7
@@
resize(int width, int height)
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
- //gluOrtho2D(0, width, 0, height);
+ /*gluOrtho2D(0, width, 0, height);*/
glMatrixMode(GL_MODELVIEW);
glLoadIdentity() ;
glMatrixMode(GL_MODELVIEW);
glLoadIdentity() ;
@@
-104,8
+104,8
@@
static void display(void)
glColor3d(0.1,0.1,0.4);
if (win == mainwin) {
glColor3d(0.1,0.1,0.4);
if (win == mainwin) {
- shapesPrintf (2, 3, "Move The mounse into different windows");
- shapesPrintf (3, 3, "pressing keys will add to the string");
+ shapesPrintf (2, 3, "Move The mouse into different windows");
+ shapesPrintf (3, 3, "pressing keys will add to the string");
}
shapesPrintf (5, 3, "Window: %d", win);
shapesPrintf (6, 3, "String: %s", strings[win]);
}
shapesPrintf (5, 3, "Window: %d", win);
shapesPrintf (6, 3, "String: %s", strings[win]);
@@
-170,7
+170,7
@@
main(int argc, char *argv[])
glutInit(&argc, argv);
glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE);
glutInit(&argc, argv);
glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE);
- glutCreateWindow("OpenGLUT Sub Windows");
+ glutCreateWindow("FreeGLUT Sub Windows");
glutReshapeFunc(resize);
glutDisplayFunc(display);
glutReshapeFunc(resize);
glutDisplayFunc(display);
@@
-191,16
+191,16
@@
main(int argc, char *argv[])
glutKeyboardFunc(key);
glutSpecialFunc(special);
glutEntryFunc(entry);
glutKeyboardFunc(key);
glutSpecialFunc(special);
glutEntryFunc(entry);
- glClearColor(0.7,0.7,0.7,1);
+ glClearColor(0.7f,0.7f,0.7f,1);
winmax = sw1 > winmax ? sw1 : winmax;
winmax = sw1 > winmax ? sw1 : winmax;
- sw2=glutCreateSubWindow(mainwin,328,240,314,236);
+ sw2=glutCreateSubWindow(mainwin,322,240,314,236);
glutReshapeFunc(resize);
glutDisplayFunc(display);
glutKeyboardFunc(key);
glutSpecialFunc(special);
glutEntryFunc(entry);
glutReshapeFunc(resize);
glutDisplayFunc(display);
glutKeyboardFunc(key);
glutSpecialFunc(special);
glutEntryFunc(entry);
- glClearColor(0.7,0.7,0.7,1);
+ glClearColor(0.7f,0.7f,0.7f,1);
winmax = sw2 > winmax ? sw2 : winmax;
strings = malloc(sizeof(char *)*(winmax+1));
winmax = sw2 > winmax ? sw2 : winmax;
strings = malloc(sizeof(char *)*(winmax+1));