1 files changed, 44 insertions, 32 deletions
diff --git a/menu_demo/menu.c b/menu_demo/menu.c
index 99a72a9..265c4d8 100644
--- a/menu_demo/menu.c
+++ b/menu_demo/menu.c
@@ -1,10 +1,13 @@
 #ifdef G_OS_WIN32
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
+  #define WIN32_LEAN_AND_MEAN 1
+  #include <windows.h>
 #endif
 
 #include <GL/gl.h>
 
+#include <stdlib.h>
+
+#include "menu.h"
 #include "button.h"
 
 #define MENU_MAX_BUTTONS 16
@@ -16,55 +19,64 @@ enum MenuState {
 };
 
 struct MenuStruct {
+  enum MenuState m_eMenuId;
+  int m_iButtonCount;
   struct ButtonStruct m_sButtons[MENU_MAX_BUTTONS];
 };
 
-int g_iState; // which menu state are we in
+struct MenuStruct  g_sMenuMain;    // definition of the main menu
+struct MenuStruct  g_sMenuStart;   // definition of the start menu
+struct MenuStruct  g_sMenuOptions; // definition of the options menu
+struct MenuStruct *g_pCurMenu;     // current menu
 
-struct MenuStruct g_sMenuMain;    // definition of the main menu
-struct MenuStruct g_sMenuStart;   // definition of the start menu
-struct MenuStruct g_sMenuOptions; // definition of the options menu
+int g_iWinWidth;
+int g_iWinHeight;
 
-void MenuMainRender(void)
+void MenuInit(int f_iWinWidth, int f_iWinHeight)
 {
+  // init menu props
+  g_iWinWidth  = f_iWinWidth;
+  g_iWinHeight = f_iWinHeight;
 
-} // MenuMainRender
+  // init main menu
+  g_sMenuMain.m_eMenuId = MENU_MAIN;
+  g_sMenuMain.m_sButtons[0].m_dWidth = 200;
+  g_sMenuMain.m_sButtons[0].m_dXPos  = 0;
+  g_sMenuMain.m_sButtons[0].m_dYPos  = 0;
+  g_sMenuMain.m_sButtons[0].m_iType  = BUTTON_CLICK;
 
+  g_sMenuMain.m_iButtonCount = 1;
 
-void MenuOptionsRender(void)
-{
-} // MenuMainRender
+  // init start menu
+  g_sMenuStart.m_eMenuId = MENU_START;
+  g_sMenuStart.m_iButtonCount = 0;
 
+  // init options menu
+  g_sMenuOptions.m_eMenuId = MENU_OPTIONS;
+  g_sMenuOptions.m_iButtonCount = 0;
 
-void MenuSelectionRender(void)
-{
-} // MenuMainRender
-
-
-void MenuInit(void)
-{
-  g_iState = MENU_MAIN;
+  // set pointer to the current menu
+  g_pCurMenu = &g_sMenuMain;
 
 } // InitMenu
 
 void MenuRender(void)
 {
-  glColor3d(1, 1, 1);
+  int i = 0;
 
-  switch (g_iState)
-  {
-    case MENU_MAIN:
-      MenuMainRender();
-      break;
+  glDisable(GL_DEPTH_TEST);
+  glEnable(GL_TEXTURE_2D);
+
+  glColor3d(1, 1, 1);
 
-    case MENU_START:
-      MenuOptionsRender();
-      break;
+  glPushMatrix();
 
-    case MENU_OPTIONS:
-      MenuSelectionRender();
-      break;
+    while (i < g_pCurMenu->m_iButtonCount)
+    {
+      ButtonRender(&g_pCurMenu->m_sButtons[i]);
+      i++;
+    }
 
-  }
+  glPopMatrix();
 
 } // Render