From d7764fdd65c512a1661dcf7a6e6d4e7cbb7b25fc Mon Sep 17 00:00:00 2001 From: Wilrik de Loose Date: Fri, 25 Apr 2008 09:41:19 +0000 Subject: Buttons fixed --- menu_demo/Debug/BuildLog.htm | Bin 7086 -> 7106 bytes menu_demo/Debug/main.obj | Bin 13555 -> 13541 bytes menu_demo/Debug/menu.obj | Bin 13547 -> 13544 bytes menu_demo/Debug/menu_demo.exe | Bin 520192 -> 524288 bytes menu_demo/Debug/menu_demo.ilk | Bin 1217312 -> 1245324 bytes menu_demo/Debug/menu_demo.pdb | Bin 2083840 -> 2108416 bytes menu_demo/Debug/mt.dep | 2 +- menu_demo/Debug/vc80.idb | Bin 125952 -> 125952 bytes menu_demo/Debug/vc80.pdb | Bin 61440 -> 61440 bytes menu_demo/bitmap.c | 22 ++++-- menu_demo/bitmap.h | 5 +- menu_demo/button.c | 104 ++++++++++++++------------- menu_demo/button.h | 8 +-- menu_demo/img/button_click_center.bmp | Bin 488 -> 4152 bytes menu_demo/img/button_click_center_hover.bmp | Bin 488 -> 4152 bytes menu_demo/img/button_click_left.bmp | Bin 21656 -> 32824 bytes menu_demo/img/button_click_left_hover.bmp | Bin 21656 -> 32824 bytes menu_demo/img/button_click_right.bmp | Bin 21656 -> 32824 bytes menu_demo/img/button_click_right_hover.bmp | Bin 21656 -> 32824 bytes menu_demo/img/button_radio.bmp | Bin 129656 -> 65592 bytes menu_demo/img/button_radio_hover.bmp | Bin 129656 -> 65592 bytes menu_demo/img/button_radio_pressed.bmp | Bin 129656 -> 65592 bytes menu_demo/img/images/photoshop/Wii_Radio.psd | Bin 0 -> 75465 bytes menu_demo/img/images/photoshop/button01.bmp | Bin 240056 -> 0 bytes menu_demo/img/images/photoshop/button01.psd | Bin 188279 -> 189311 bytes menu_demo/main.c | 2 +- menu_demo/menu.c | 2 +- menu_demo/menu_demo.ncb | Bin 7891968 -> 7891968 bytes menu_demo/menu_demo.suo | Bin 24576 -> 25600 bytes menu_demo/menu_demo.vcproj | 1 + 30 files changed, 83 insertions(+), 63 deletions(-) create mode 100644 menu_demo/img/images/photoshop/Wii_Radio.psd delete mode 100644 menu_demo/img/images/photoshop/button01.bmp diff --git a/menu_demo/Debug/BuildLog.htm b/menu_demo/Debug/BuildLog.htm index e8fdbeb..4666c1a 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 f85d870..de62d67 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 f352396..6728d6c 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 57aaeac..95a5e47 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 b17d0ca..85dd353 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 2a06f6d..d6a2e70 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 ec9910a..90d46d2 100644 --- a/menu_demo/Debug/mt.dep +++ b/menu_demo/Debug/mt.dep @@ -1 +1 @@ -Manifest resource last updated at 13:56:48,94 on 21-04-2008 +Manifest resource last updated at 11:38:14,45 on 25-04-2008 diff --git a/menu_demo/Debug/vc80.idb b/menu_demo/Debug/vc80.idb index 7936b0e..9e79823 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 6ade11b..dd798d7 100644 Binary files a/menu_demo/Debug/vc80.pdb and b/menu_demo/Debug/vc80.pdb differ diff --git a/menu_demo/bitmap.c b/menu_demo/bitmap.c index 83aacda..1739c11 100644 --- a/menu_demo/bitmap.c +++ b/menu_demo/bitmap.c @@ -21,9 +21,9 @@ #define BITMAP_IMAGE_SIZE 0x22 -struct ImageStruct BitmapLoad(char *filename) +struct BitmapStruct BitmapLoad(char *filename) { - struct ImageStruct l_sImage; + struct BitmapStruct l_sImage; GLuint texture; FILE *bitmap; @@ -64,11 +64,14 @@ struct ImageStruct BitmapLoad(char *filename) } else // depth == 32 bits { - gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, width, height, GL_BGRA, GL_UNSIGNED_BYTE, imagedata); + gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, width, height, GL_BGRA, GL_UNSIGNED_BYTE, imagedata);; } - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + //glPixelStorei(GL_UNPACK_ALIGNMENT, 1); + //glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL); + //glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); l_sImage.m_iImageId = texture; l_sImage.m_iWidth = width; @@ -87,3 +90,12 @@ struct ImageStruct BitmapLoad(char *filename) } + +void BitmapConvertWidth(struct BitmapStruct *f_sImage, double f_dHeight) +{ + double l_dRatio; + + l_dRatio = (double)f_sImage->m_iHeight / f_dHeight; + f_sImage->m_iWidth = (int)(f_sImage->m_iWidth / l_dRatio); + +} // ConvertButton diff --git a/menu_demo/bitmap.h b/menu_demo/bitmap.h index dc300b5..f86526b 100644 --- a/menu_demo/bitmap.h +++ b/menu_demo/bitmap.h @@ -1,12 +1,13 @@ #ifndef _CBITMAP_H #define _CBITMAP_H -struct ImageStruct { +struct BitmapStruct { int m_iImageId; int m_iWidth; int m_iHeight; }; -struct ImageStruct BitmapLoad(char *filename); +struct BitmapStruct BitmapLoad(char *filename); +void BitmapConvertWidth(struct BitmapStruct *f_sImage, double f_dHeight); #endif diff --git a/menu_demo/button.c b/menu_demo/button.c index cd5a561..e63143a 100644 --- a/menu_demo/button.c +++ b/menu_demo/button.c @@ -6,20 +6,22 @@ #include #include #include +#include #include "button.h" -struct ButtonStruct ButtonCreate(int f_dXPos, int f_dYPos, int f_dCenterWidth, int f_dHeight, char *f_pcTitle, int f_iType) +struct ButtonStruct ButtonCreate(int f_dXPos, int f_dYPos, int f_dWidth, int f_dHeight, char *f_pcTitle, int f_iType) { struct ButtonStruct l_sButton; // copy parameters - l_sButton.m_dXPos = f_dXPos; - l_sButton.m_dYPos = f_dYPos; - l_sButton.m_iType = f_iType; - l_sButton.m_dHeight = f_dHeight; + l_sButton.m_dXPos = f_dXPos; + l_sButton.m_dYPos = f_dYPos; + l_sButton.m_iType = f_iType; + l_sButton.m_dHeight = f_dHeight; + l_sButton.m_dWidth = f_dWidth; // copy title memcpy(l_sButton.m_pcTitle, f_pcTitle, sizeof(f_pcTitle)); @@ -27,8 +29,6 @@ struct ButtonStruct ButtonCreate(int f_dXPos, int f_dYPos, int f_dCenterWidth, i switch (f_iType) { case BUTTON_CLICK: - l_sButton.m_dCenterWidth = f_dCenterWidth; - l_sButton.m_piImgNormal[0] = BitmapLoad("img/button_click_left.bmp"); l_sButton.m_piImgNormal[1] = BitmapLoad("img/button_click_center.bmp"); l_sButton.m_piImgNormal[2] = BitmapLoad("img/button_click_right.bmp"); @@ -37,8 +37,17 @@ struct ButtonStruct ButtonCreate(int f_dXPos, int f_dYPos, int f_dCenterWidth, i l_sButton.m_piImgHover[1] = BitmapLoad("img/button_click_center_hover.bmp"); l_sButton.m_piImgHover[2] = BitmapLoad("img/button_click_right_hover.bmp"); - // calculate width of center image - l_sButton.m_dWidth = f_dCenterWidth + l_sButton.m_piImgNormal[0].m_iWidth + l_sButton.m_piImgNormal[2].m_iWidth; + BitmapConvertWidth(&l_sButton.m_piImgNormal[0], f_dHeight); + BitmapConvertWidth(&l_sButton.m_piImgNormal[1], f_dHeight); + BitmapConvertWidth(&l_sButton.m_piImgNormal[2], f_dHeight); + + BitmapConvertWidth(&l_sButton.m_piImgHover[0], f_dHeight); + BitmapConvertWidth(&l_sButton.m_piImgHover[1], f_dHeight); + BitmapConvertWidth(&l_sButton.m_piImgHover[2], f_dHeight); + + // calculate (center)width of image + l_sButton.m_dCenterWidth = max(f_dWidth - l_sButton.m_piImgNormal[0].m_iWidth - l_sButton.m_piImgNormal[2].m_iWidth, 0); + l_sButton.m_dWidth = l_sButton.m_dCenterWidth + l_sButton.m_piImgNormal[0].m_iWidth + l_sButton.m_piImgNormal[2].m_iWidth; break; case BUTTON_RADIO: @@ -46,9 +55,13 @@ struct ButtonStruct ButtonCreate(int f_dXPos, int f_dYPos, int f_dCenterWidth, i l_sButton.m_piImgHover[0] = BitmapLoad("img/button_radio_hover.bmp"); l_sButton.m_piImgPressed[0] = BitmapLoad("img/button_radio_pressed.bmp"); + BitmapConvertWidth(&l_sButton.m_piImgNormal[0], f_dHeight); + BitmapConvertWidth(&l_sButton.m_piImgHover[0], f_dHeight); + BitmapConvertWidth(&l_sButton.m_piImgPressed[0], f_dHeight); + l_sButton.m_dCenterWidth = 0; - l_sButton.m_dWidth = l_sButton.m_piImgNormal[0].m_iWidth; - l_sButton.m_dHeight = l_sButton.m_piImgNormal[0].m_iHeight; + l_sButton.m_dHeight = f_dHeight; + l_sButton.m_dWidth = f_dWidth; break; case BUTTON_LABEL: @@ -76,7 +89,7 @@ int ButtonGetType(struct ButtonStruct *f_sButton) void ButtonClickRender(struct ButtonStruct *f_sButton) { char l_pcTitle[BUTTON_MAX_TITLE]; - struct ImageStruct *l_sImgButton; + struct BitmapStruct *l_sImgButton; int l_iImgWidth, l_iImageIdLeft, l_iImageIdCenter, l_iImageIdRight; double l_dXOffset, l_dYOffset; @@ -89,24 +102,20 @@ void ButtonClickRender(struct ButtonStruct *f_sButton) double l_dXPos = f_sButton->m_dXPos; double l_dYPos = f_sButton->m_dYPos; - if (f_sButton->m_bPressed) - { + if (f_sButton->m_bPressed) { //l_dYCoordBot += l_dYCoordTop; //l_dYCoordTop -= l_dYCoordTop; glColor3d(0.8, 0.9, 1); } - else - { + else { glColor3d(1, 1, 1); } // get the right image struct - if (f_sButton->m_bHover) - { + if (f_sButton->m_bHover) { l_sImgButton = f_sButton->m_piImgHover; } - else - { + else { l_sImgButton = f_sButton->m_piImgNormal; } @@ -126,44 +135,42 @@ void ButtonClickRender(struct ButtonStruct *f_sButton) l_dXOffset = l_dXPos; l_dYOffset = l_dYPos; - glBegin(GL_QUADS); - glTexCoord2d(0, l_dYCoordTop); glVertex3d(l_dXOffset, l_dYOffset, 0); + glBegin(GL_TRIANGLE_STRIP); + glTexCoord2d(0, l_dYCoordTop); glVertex3d(l_dXOffset + 1, l_dYOffset, 0); glTexCoord2d(1, l_dYCoordTop); glVertex3d(l_dXOffset + l_iImgWidth, l_dYOffset, 0); + glTexCoord2d(0, l_dYCoordBot); glVertex3d(l_dXOffset + 1, l_dYOffset + l_dHeight, 0); glTexCoord2d(1, l_dYCoordBot); glVertex3d(l_dXOffset + l_iImgWidth, l_dYOffset + l_dHeight, 0); - glTexCoord2d(0, l_dYCoordBot); glVertex3d(l_dXOffset, l_dYOffset + l_dHeight, 0); glEnd(); - l_dXOffset += l_iImgWidth; + l_dXOffset = l_dXPos + l_iImgWidth + l_dCnWdt; + + // render right side of button + glBindTexture(GL_TEXTURE_2D, l_iImageIdRight); + + l_iImgWidth = l_sImgButton[2].m_iWidth; + + glBegin(GL_TRIANGLE_STRIP); + glTexCoord2d(0, l_dYCoordTop); glVertex3d(l_dXOffset - 1, l_dYOffset, 0); + glTexCoord2d(1, l_dYCoordTop); glVertex3d(l_dXOffset + l_iImgWidth, l_dYOffset, 0); + glTexCoord2d(0, l_dYCoordBot); glVertex3d(l_dXOffset - 1, l_dYOffset + l_dHeight, 0); + glTexCoord2d(1, l_dYCoordBot); glVertex3d(l_dXOffset + l_iImgWidth, l_dYOffset + l_dHeight, 0); + glEnd(); + + l_dXOffset = l_dXOffset - l_dCnWdt; // render center of button if (l_dCnWdt > 0) { glBindTexture(GL_TEXTURE_2D, l_iImageIdCenter); - l_iImgWidth = l_sImgButton[2].m_iWidth; - - glBegin(GL_QUADS); - glTexCoord2d(0, l_dYCoordTop); glVertex3d(l_dXOffset, l_dYOffset, 0); + glBegin(GL_TRIANGLE_STRIP); + glTexCoord2d(0, l_dYCoordTop); glVertex3d(l_dXOffset - 1, l_dYOffset, 0); glTexCoord2d(1, l_dYCoordTop); glVertex3d(l_dXOffset + l_dCnWdt, l_dYOffset, 0); + glTexCoord2d(0, l_dYCoordBot); glVertex3d(l_dXOffset - 1, l_dYOffset + l_dHeight, 0); glTexCoord2d(1, l_dYCoordBot); glVertex3d(l_dXOffset + l_dCnWdt, l_dYOffset + l_dHeight, 0); - glTexCoord2d(0, l_dYCoordBot); glVertex3d(l_dXOffset, l_dYOffset + l_dHeight, 0); glEnd(); } - l_dXOffset += l_dCnWdt; - - // render right side of button - glBindTexture(GL_TEXTURE_2D, l_iImageIdRight); - - l_iImgWidth = l_sImgButton[2].m_iWidth; - - glBegin(GL_QUADS); - glTexCoord2d(0, l_dYCoordTop); glVertex3d(l_dXOffset, l_dYOffset, 0); - glTexCoord2d(1, l_dYCoordTop); glVertex3d(l_dXOffset + l_iImgWidth, l_dYOffset, 0); - glTexCoord2d(1, l_dYCoordBot); glVertex3d(l_dXOffset + l_iImgWidth, l_dYOffset + l_dHeight, 0); - glTexCoord2d(0, l_dYCoordBot); glVertex3d(l_dXOffset, l_dYOffset + l_dHeight, 0); - glEnd(); - if (f_sButton->m_bPressed) { glColor3d(1, 1, 1); @@ -175,7 +182,7 @@ void ButtonClickRender(struct ButtonStruct *f_sButton) void ButtonRadioRender(struct ButtonStruct *f_sButton) { - struct ImageStruct *l_sImgButton; + struct BitmapStruct *l_sImgButton; int l_iImageId; // copy button attributes @@ -200,11 +207,11 @@ void ButtonRadioRender(struct ButtonStruct *f_sButton) // render left side of button glBindTexture(GL_TEXTURE_2D, l_iImageId); - glBegin(GL_QUADS); + glBegin(GL_TRIANGLE_STRIP); glTexCoord2d(0, 1); glVertex3d(l_dXPos, l_dYPos, 0); glTexCoord2d(1, 1); glVertex3d(l_dXPos + l_dWidth, l_dYPos, 0); - glTexCoord2d(1, 0); glVertex3d(l_dXPos + l_dWidth, l_dYPos + l_dHeight, 0); glTexCoord2d(0, 0); glVertex3d(l_dXPos, l_dYPos + l_dHeight, 0); + glTexCoord2d(1, 0); glVertex3d(l_dXPos + l_dWidth, l_dYPos + l_dHeight, 0); glEnd(); if (f_sButton->m_bPressed) @@ -212,11 +219,11 @@ void ButtonRadioRender(struct ButtonStruct *f_sButton) l_iImageId = f_sButton->m_piImgPressed[0].m_iImageId; glBindTexture(GL_TEXTURE_2D, l_iImageId); - glBegin(GL_QUADS); + glBegin(GL_TRIANGLE_STRIP); glTexCoord2d(0, 1); glVertex3d(l_dXPos, l_dYPos, 0); glTexCoord2d(1, 1); glVertex3d(l_dXPos + l_dWidth, l_dYPos, 0); - glTexCoord2d(1, 0); glVertex3d(l_dXPos + l_dWidth, l_dYPos + l_dHeight, 0); glTexCoord2d(0, 0); glVertex3d(l_dXPos, l_dYPos + l_dHeight, 0); + glTexCoord2d(1, 0); glVertex3d(l_dXPos + l_dWidth, l_dYPos + l_dHeight, 0); glEnd(); } @@ -266,7 +273,6 @@ void ButtonExit(struct ButtonStruct *f_sButton) void ButtonPress(struct ButtonStruct *f_sButton) { -// f_sButton->m_bPressed = TRUE; f_sButton->m_bPressed = !f_sButton->m_bPressed; } // ButtonPress diff --git a/menu_demo/button.h b/menu_demo/button.h index 3440092..454b77e 100644 --- a/menu_demo/button.h +++ b/menu_demo/button.h @@ -18,12 +18,12 @@ struct ButtonStruct { int m_iType; // button type // button caption/title - char m_pcTitle[BUTTON_MAX_TITLE]; + char m_pcTitle[BUTTON_MAX_TITLE]; // button images - struct ImageStruct m_piImgNormal[BUTTON_MAX_IMGS]; - struct ImageStruct m_piImgHover[BUTTON_MAX_IMGS]; - struct ImageStruct m_piImgPressed[BUTTON_MAX_IMGS]; + struct BitmapStruct m_piImgNormal[BUTTON_MAX_IMGS]; + struct BitmapStruct m_piImgHover[BUTTON_MAX_IMGS]; + struct BitmapStruct m_piImgPressed[BUTTON_MAX_IMGS]; }; enum ButtonType { diff --git a/menu_demo/img/button_click_center.bmp b/menu_demo/img/button_click_center.bmp index cc9b3d4..ea9a8ec 100644 Binary files a/menu_demo/img/button_click_center.bmp and b/menu_demo/img/button_click_center.bmp differ diff --git a/menu_demo/img/button_click_center_hover.bmp b/menu_demo/img/button_click_center_hover.bmp index 70d8bb0..b974b30 100644 Binary files a/menu_demo/img/button_click_center_hover.bmp and b/menu_demo/img/button_click_center_hover.bmp differ diff --git a/menu_demo/img/button_click_left.bmp b/menu_demo/img/button_click_left.bmp index 689d2ee..f5f69aa 100644 Binary files a/menu_demo/img/button_click_left.bmp and b/menu_demo/img/button_click_left.bmp differ diff --git a/menu_demo/img/button_click_left_hover.bmp b/menu_demo/img/button_click_left_hover.bmp index d301a4a..8695e9e 100644 Binary files a/menu_demo/img/button_click_left_hover.bmp and b/menu_demo/img/button_click_left_hover.bmp differ diff --git a/menu_demo/img/button_click_right.bmp b/menu_demo/img/button_click_right.bmp index bad3788..78a76c8 100644 Binary files a/menu_demo/img/button_click_right.bmp and b/menu_demo/img/button_click_right.bmp differ diff --git a/menu_demo/img/button_click_right_hover.bmp b/menu_demo/img/button_click_right_hover.bmp index bcc93aa..9ee8a2a 100644 Binary files a/menu_demo/img/button_click_right_hover.bmp and b/menu_demo/img/button_click_right_hover.bmp differ diff --git a/menu_demo/img/button_radio.bmp b/menu_demo/img/button_radio.bmp index 5ae06d4..0f6ae9b 100644 Binary files a/menu_demo/img/button_radio.bmp and b/menu_demo/img/button_radio.bmp differ diff --git a/menu_demo/img/button_radio_hover.bmp b/menu_demo/img/button_radio_hover.bmp index abf0017..2d2b594 100644 Binary files a/menu_demo/img/button_radio_hover.bmp and b/menu_demo/img/button_radio_hover.bmp differ diff --git a/menu_demo/img/button_radio_pressed.bmp b/menu_demo/img/button_radio_pressed.bmp index 6bfa30a..1589733 100644 Binary files a/menu_demo/img/button_radio_pressed.bmp and b/menu_demo/img/button_radio_pressed.bmp differ diff --git a/menu_demo/img/images/photoshop/Wii_Radio.psd b/menu_demo/img/images/photoshop/Wii_Radio.psd new file mode 100644 index 0000000..91a327d Binary files /dev/null and b/menu_demo/img/images/photoshop/Wii_Radio.psd differ diff --git a/menu_demo/img/images/photoshop/button01.bmp b/menu_demo/img/images/photoshop/button01.bmp deleted file mode 100644 index ca8ed3d..0000000 Binary files a/menu_demo/img/images/photoshop/button01.bmp and /dev/null differ diff --git a/menu_demo/img/images/photoshop/button01.psd b/menu_demo/img/images/photoshop/button01.psd index 882d77b..3f25140 100644 Binary files a/menu_demo/img/images/photoshop/button01.psd and b/menu_demo/img/images/photoshop/button01.psd differ diff --git a/menu_demo/main.c b/menu_demo/main.c index 37387d5..ce07a15 100644 --- a/menu_demo/main.c +++ b/menu_demo/main.c @@ -24,7 +24,7 @@ void init_gl(void) void render_scene(void) { glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - glClearColor(0.2, 1, 0.2, 1); + glClearColor(0, 0, 0, 0.5); MenuRender(); diff --git a/menu_demo/menu.c b/menu_demo/menu.c index c08540e..ce1a998 100644 --- a/menu_demo/menu.c +++ b/menu_demo/menu.c @@ -57,7 +57,7 @@ void MenuInit(int f_iWinWidth, int f_iWinHeight) // init main menu g_sMenuMain.m_eMenuId = MENU_MAIN; MenuAddButton(50, 50, 200, 100, "Start", BUTTON_CLICK); - MenuAddButton(200, 200, 180, 180, "Start", BUTTON_RADIO); + MenuAddButton(300, 50, 200, 200, "Start", BUTTON_RADIO); // init start menu g_sMenuStart.m_eMenuId = MENU_START; diff --git a/menu_demo/menu_demo.ncb b/menu_demo/menu_demo.ncb index fa09ce5..5134090 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 e89ac06..b0cd317 100644 Binary files a/menu_demo/menu_demo.suo and b/menu_demo/menu_demo.suo differ diff --git a/menu_demo/menu_demo.vcproj b/menu_demo/menu_demo.vcproj index d568978..7bc27a1 100644 --- a/menu_demo/menu_demo.vcproj +++ b/menu_demo/menu_demo.vcproj @@ -63,6 +63,7 @@ />