diff options
| author | Wilrik de Loose <wilrik@wilrik.nl> | 2008-04-16 12:14:49 (GMT) |
|---|---|---|
| committer | Wilrik de Loose <wilrik@wilrik.nl> | 2008-04-16 12:14:49 (GMT) |
| commit | b5f2b48d84b34de1bf78964b8481b6717ca6e00e (patch) | |
| tree | bf341b34d36878be07eaeca248f4492a15935d83 | |
| parent | f64df83770bdf1471036ed0ee600c57e0d4755b5 (diff) | |
| download | 2iv55-b5f2b48d84b34de1bf78964b8481b6717ca6e00e.zip 2iv55-b5f2b48d84b34de1bf78964b8481b6717ca6e00e.tar.gz 2iv55-b5f2b48d84b34de1bf78964b8481b6717ca6e00e.tar.bz2 | |
gl veranderd naar GL.
| -rw-r--r-- | menu_demo/Debug/BuildLog.htm | bin | 6960 -> 6120 bytes | |||
| -rw-r--r-- | menu_demo/Debug/main.obj | bin | 14638 -> 14367 bytes | |||
| -rw-r--r-- | menu_demo/Debug/vc80.idb | bin | 216064 -> 216064 bytes | |||
| -rw-r--r-- | menu_demo/Debug/vc80.pdb | bin | 69632 -> 69632 bytes | |||
| -rw-r--r-- | menu_demo/bitmap.h | 6 | ||||
| -rw-r--r-- | menu_demo/button.c | 2 | ||||
| -rw-r--r-- | menu_demo/button.h | 6 | ||||
| -rw-r--r-- | menu_demo/main.c | 3 | ||||
| -rw-r--r-- | menu_demo/menu.c | 4 |
9 files changed, 8 insertions, 13 deletions
diff --git a/menu_demo/Debug/BuildLog.htm b/menu_demo/Debug/BuildLog.htm Binary files differindex 8bfe1cd..6c29a62 100644 --- a/menu_demo/Debug/BuildLog.htm +++ b/menu_demo/Debug/BuildLog.htm diff --git a/menu_demo/Debug/main.obj b/menu_demo/Debug/main.obj Binary files differindex 457d114..8b5dfa7 100644 --- a/menu_demo/Debug/main.obj +++ b/menu_demo/Debug/main.obj diff --git a/menu_demo/Debug/vc80.idb b/menu_demo/Debug/vc80.idb Binary files differindex ac3e2e5..291fda5 100644 --- a/menu_demo/Debug/vc80.idb +++ b/menu_demo/Debug/vc80.idb diff --git a/menu_demo/Debug/vc80.pdb b/menu_demo/Debug/vc80.pdb Binary files differindex 098e6e4..16d2fff 100644 --- a/menu_demo/Debug/vc80.pdb +++ b/menu_demo/Debug/vc80.pdb diff --git a/menu_demo/bitmap.h b/menu_demo/bitmap.h index 8eb7680..53dd206 100644 --- a/menu_demo/bitmap.h +++ b/menu_demo/bitmap.h @@ -1,12 +1,6 @@ #ifndef _CBITMAP_H
#define _CBITMAP_H
-struct ButtonStruct {
- double m_dXPos;
- double m_dYPos;
- int m_iType;
-};
-
void load_image(char *filename);
#endif
\ No newline at end of file diff --git a/menu_demo/button.c b/menu_demo/button.c index 13a499c..f9397f1 100644 --- a/menu_demo/button.c +++ b/menu_demo/button.c @@ -7,7 +7,7 @@ #include "bitmap.h"
-enum MenuState {
+enum ButtonType {
MENU_MAIN,
MENU_START,
MENU_OPTIONS
diff --git a/menu_demo/button.h b/menu_demo/button.h index 2249f32..27f57a4 100644 --- a/menu_demo/button.h +++ b/menu_demo/button.h @@ -1,6 +1,10 @@ #ifndef _CBUTTON_H
#define _CBUTTON_H
-
+struct ButtonStruct {
+ double m_dXPos;
+ double m_dYPos;
+ int m_iType;
+};
#endif
\ No newline at end of file diff --git a/menu_demo/main.c b/menu_demo/main.c index 5b8f4fb..4d40126 100644 --- a/menu_demo/main.c +++ b/menu_demo/main.c @@ -52,14 +52,11 @@ void init_gl(void) void render_scene(void)
{
- int lalala;
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glClearColor(1, 1, 1, 0);
MenuRender();
- lalala = glutLayerGet(GLUT_OVERLAY_POSSIBLE);
-
glutSwapBuffers();
}
diff --git a/menu_demo/menu.c b/menu_demo/menu.c index 8f9b4a4..876bdd5 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 {
- int i;
+ struct ButtonStruct[10];
};
int g_iState; // which menu are we in
|