From 2bb23e67db0e2a23d480126f4e0fc753fa0cde35 Mon Sep 17 00:00:00 2001 From: Wilrik de Loose Date: Thu, 17 Apr 2008 13:54:49 +0000 Subject: Kleine button update. --- menu_demo/Debug/BuildLog.htm | Bin 7086 -> 7078 bytes menu_demo/Debug/main.obj | Bin 13527 -> 13527 bytes menu_demo/Debug/menu.obj | Bin 12620 -> 12620 bytes menu_demo/Debug/menu_demo.exe | Bin 520192 -> 520192 bytes menu_demo/Debug/menu_demo.ilk | Bin 1216652 -> 1223132 bytes menu_demo/Debug/menu_demo.pdb | Bin 2100224 -> 2100224 bytes menu_demo/Debug/mt.dep | 2 +- menu_demo/Debug/vc80.idb | Bin 125952 -> 125952 bytes menu_demo/Debug/vc80.pdb | Bin 69632 -> 69632 bytes menu_demo/img/button_click_center_hover.bmp | Bin 0 -> 250 bytes menu_demo/img/button_click_left_hover.bmp | Bin 0 -> 3778 bytes menu_demo/img/button_click_right_hover.bmp | Bin 0 -> 3778 bytes menu_demo/menu.c | 36 ++++++++++++++-------------- menu_demo/menu_demo.ncb | Bin 7891968 -> 7891968 bytes menu_demo/menu_demo.suo | Bin 20992 -> 20992 bytes 15 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 menu_demo/img/button_click_center_hover.bmp create mode 100644 menu_demo/img/button_click_left_hover.bmp create mode 100644 menu_demo/img/button_click_right_hover.bmp diff --git a/menu_demo/Debug/BuildLog.htm b/menu_demo/Debug/BuildLog.htm index 7f8a7b8..d51a82d 100644 Binary files a/menu_demo/Debug/BuildLog.htm and b/menu_demo/Debug/BuildLog.htm differ diff --git a/menu_demo/Debug/main.obj b/menu_demo/Debug/main.obj index 8903e96..3c8ba3d 100644 Binary files a/menu_demo/Debug/main.obj and b/menu_demo/Debug/main.obj differ diff --git a/menu_demo/Debug/menu.obj b/menu_demo/Debug/menu.obj index 778e34a..6efb995 100644 Binary files a/menu_demo/Debug/menu.obj and b/menu_demo/Debug/menu.obj differ diff --git a/menu_demo/Debug/menu_demo.exe b/menu_demo/Debug/menu_demo.exe index 098e87c..2b07479 100644 Binary files a/menu_demo/Debug/menu_demo.exe and b/menu_demo/Debug/menu_demo.exe differ diff --git a/menu_demo/Debug/menu_demo.ilk b/menu_demo/Debug/menu_demo.ilk index 2dd334b..4293966 100644 Binary files a/menu_demo/Debug/menu_demo.ilk and b/menu_demo/Debug/menu_demo.ilk differ diff --git a/menu_demo/Debug/menu_demo.pdb b/menu_demo/Debug/menu_demo.pdb index 47c70fd..c394ffd 100644 Binary files a/menu_demo/Debug/menu_demo.pdb and b/menu_demo/Debug/menu_demo.pdb differ diff --git a/menu_demo/Debug/mt.dep b/menu_demo/Debug/mt.dep index 419dc51..d002e7a 100644 --- a/menu_demo/Debug/mt.dep +++ b/menu_demo/Debug/mt.dep @@ -1 +1 @@ -Manifest resource last updated at 15:25:11,03 on 17-04-2008 +Manifest resource last updated at 15:54:12,92 on 17-04-2008 diff --git a/menu_demo/Debug/vc80.idb b/menu_demo/Debug/vc80.idb index 3ed2827..21ceed3 100644 Binary files a/menu_demo/Debug/vc80.idb and b/menu_demo/Debug/vc80.idb differ diff --git a/menu_demo/Debug/vc80.pdb b/menu_demo/Debug/vc80.pdb index 21f28dd..d4df68e 100644 Binary files a/menu_demo/Debug/vc80.pdb and b/menu_demo/Debug/vc80.pdb differ diff --git a/menu_demo/img/button_click_center_hover.bmp b/menu_demo/img/button_click_center_hover.bmp new file mode 100644 index 0000000..94fe28d Binary files /dev/null and b/menu_demo/img/button_click_center_hover.bmp differ diff --git a/menu_demo/img/button_click_left_hover.bmp b/menu_demo/img/button_click_left_hover.bmp new file mode 100644 index 0000000..16e00d2 Binary files /dev/null and b/menu_demo/img/button_click_left_hover.bmp differ diff --git a/menu_demo/img/button_click_right_hover.bmp b/menu_demo/img/button_click_right_hover.bmp new file mode 100644 index 0000000..9db52b9 Binary files /dev/null and b/menu_demo/img/button_click_right_hover.bmp differ diff --git a/menu_demo/menu.c b/menu_demo/menu.c index 9159d13..9a3c081 100644 --- a/menu_demo/menu.c +++ b/menu_demo/menu.c @@ -80,26 +80,26 @@ void MenuRender(void) glDisable(GL_DEPTH_TEST); glEnable(GL_TEXTURE_2D); - glColor3d(1, 1, 1); - - glMatrixMode(GL_PROJECTION); - glPushMatrix(); - - glLoadIdentity(); - glOrtho(0, (GLfloat)g_iWinWidth, (GLfloat)g_iWinHeight, 0, 0, 1); - glMatrixMode(GL_MODELVIEW); - - // render the buttons on the current menu + glColor3d(1, 1, 1); + + glMatrixMode(GL_PROJECTION); + glPushMatrix(); + + glLoadIdentity(); + glOrtho(0, (GLfloat)g_iWinWidth, (GLfloat)g_iWinHeight, 0, 0, 1); + glMatrixMode(GL_MODELVIEW); + + // render the buttons on the current menu while (i < g_pCurMenu->m_iButtonCount) { ButtonRender(&g_pCurMenu->m_sButtons[i]); i++; - } - - //restore the previous projection matrix - glMatrixMode(GL_PROJECTION); - - glPopMatrix(); + } + + //restore the previous projection matrix + glMatrixMode(GL_PROJECTION); + + glPopMatrix(); glMatrixMode(GL_MODELVIEW); } // MenuRender @@ -120,8 +120,8 @@ void MenuMouseHandle(int f_iGlutButton, int f_iGlutState, int f_iXPos, int f_iYP // f_iGlutState // # GLUT_DOWN // # GLUT_UP - - // check if any button needs attention from the mouse + + // check if any button needs attention from the mouse while (i < g_pCurMenu->m_iButtonCount) { l_dXPos = g_pCurMenu->m_sButtons[i].m_dXPos; diff --git a/menu_demo/menu_demo.ncb b/menu_demo/menu_demo.ncb index 1962c12..7bbfe19 100644 Binary files a/menu_demo/menu_demo.ncb and b/menu_demo/menu_demo.ncb differ diff --git a/menu_demo/menu_demo.suo b/menu_demo/menu_demo.suo index 31ed2a0..692ce8c 100644 Binary files a/menu_demo/menu_demo.suo and b/menu_demo/menu_demo.suo differ -- cgit v0.12