diff options
| author | Oliver Schinagl <oliver@schinagl.nl> | 2008-04-16 12:45:15 (GMT) |
|---|---|---|
| committer | Oliver Schinagl <oliver@schinagl.nl> | 2008-04-16 12:45:15 (GMT) |
| commit | 3068aaf73f84ac8eafc45f4e73397f8ed3859185 (patch) | |
| tree | 0bc7063ffc0bb9d1e073f5c12ed980dc134db693 | |
| parent | b5f2b48d84b34de1bf78964b8481b6717ca6e00e (diff) | |
| download | 2iv55-3068aaf73f84ac8eafc45f4e73397f8ed3859185.zip 2iv55-3068aaf73f84ac8eafc45f4e73397f8ed3859185.tar.gz 2iv55-3068aaf73f84ac8eafc45f4e73397f8ed3859185.tar.bz2 | |
fixed errors/typos etc to make it crossplatform compatible
| -rw-r--r-- | menu_demo/bitmap.h | 2 | ||||
| -rw-r--r-- | menu_demo/button.c | 4 | ||||
| -rw-r--r-- | menu_demo/button.h | 2 | ||||
| -rw-r--r-- | menu_demo/main.c | 47 | ||||
| -rw-r--r-- | menu_demo/main.h | 13 | ||||
| -rw-r--r-- | menu_demo/menu.c | 4 | ||||
| -rw-r--r-- | menu_demo/menu.h | 2 |
7 files changed, 34 insertions, 40 deletions
diff --git a/menu_demo/bitmap.h b/menu_demo/bitmap.h index 53dd206..9aeeba6 100644 --- a/menu_demo/bitmap.h +++ b/menu_demo/bitmap.h @@ -3,4 +3,4 @@ void load_image(char *filename);
-#endif
\ No newline at end of file +#endif
diff --git a/menu_demo/button.c b/menu_demo/button.c index f9397f1..499570b 100644 --- a/menu_demo/button.c +++ b/menu_demo/button.c @@ -3,7 +3,7 @@ #include <windows.h>
#endif
-#include <gl\gl.h>
+#include <GL/gl.h>
#include "bitmap.h"
@@ -11,4 +11,4 @@ enum ButtonType { MENU_MAIN,
MENU_START,
MENU_OPTIONS
-};
\ No newline at end of file +};
diff --git a/menu_demo/button.h b/menu_demo/button.h index 27f57a4..a59d062 100644 --- a/menu_demo/button.h +++ b/menu_demo/button.h @@ -7,4 +7,4 @@ struct ButtonStruct { int m_iType;
};
-#endif
\ No newline at end of file +#endif
diff --git a/menu_demo/main.c b/menu_demo/main.c index 4d40126..0592c57 100644 --- a/menu_demo/main.c +++ b/menu_demo/main.c @@ -3,30 +3,16 @@ #include <windows.h>
#endif
-#include <gl\gl.h>
+#include <stdlib.h>
-#include "glut.h"
-#include "main.h"
-#include "menu.h"
-
-int main(int argc, char **argv)
-{
- glutInit(&argc, argv);
- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
- glutInitWindowSize(SCREEN_WIDTH, SCREEN_HEIGHT);
- glutCreateWindow("Menu demo");
- glutDisplayFunc(render_scene);
- glutIdleFunc(render_scene);
- glutKeyboardFunc(process_normal_keys);
- glutSpecialFunc(process_special_keys);
+#include <GL/gl.h>
+#include <GL/glut.h>
- init_gl();
- MenuInit();
+#include "menu.h"
- glutMainLoop();
+#define SCREEN_WIDTH 640
+#define SCREEN_HEIGHT 480
- return 0;
-}
void init_gl(void)
{
@@ -73,3 +59,24 @@ void process_special_keys(int key, int x, int y) // do sumting
}
}
+
+int main(int argc, char **argv)
+{
+ glutInit(&argc, argv);
+ glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
+ glutInitWindowSize(SCREEN_WIDTH, SCREEN_HEIGHT);
+ glutCreateWindow("Menu demo");
+ glutDisplayFunc(render_scene);
+ glutIdleFunc(render_scene);
+ glutKeyboardFunc(process_normal_keys);
+ glutSpecialFunc(process_special_keys);
+
+ init_gl();
+ MenuInit();
+
+ glutMainLoop();
+
+ return 0;
+}
+
+
diff --git a/menu_demo/main.h b/menu_demo/main.h deleted file mode 100644 index 07419c0..0000000 --- a/menu_demo/main.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _CMAIN_H
-#define _CMAIN_H
-
-#define SCREEN_WIDTH 640
-#define SCREEN_HEIGHT 480
-
-void render_scene(void);
-void process_normal_keys(unsigned char key, int x, int y);
-void process_special_keys(int key, int x, int y);
-void init_gl(void);
-int main(int argc, char **argv);
-
-#endif
\ No newline at end of file diff --git a/menu_demo/menu.c b/menu_demo/menu.c index 876bdd5..d1db8f8 100644 --- a/menu_demo/menu.c +++ b/menu_demo/menu.c @@ -3,7 +3,7 @@ #include <windows.h>
#endif
-#include <GL\gl.h>
+#include <GL/gl.h>
#include "button.h"
@@ -14,7 +14,7 @@ enum MenuState { };
struct MenuStruct {
- struct ButtonStruct[10];
+ struct ButtonStruct button[10];
};
int g_iState; // which menu are we in
diff --git a/menu_demo/menu.h b/menu_demo/menu.h index b51123b..562d9d0 100644 --- a/menu_demo/menu.h +++ b/menu_demo/menu.h @@ -5,4 +5,4 @@ void MenuInit(void); int MenuGetState(void);
void MenuRender(void);
-#endif
\ No newline at end of file +#endif
|