summaryrefslogtreecommitdiffstats
path: root/matchblox/menu/menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'matchblox/menu/menu.c')
-rw-r--r--matchblox/menu/menu.c38
1 files changed, 30 insertions, 8 deletions
diff --git a/matchblox/menu/menu.c b/matchblox/menu/menu.c
index a4a31c1..57dd8c0 100644
--- a/matchblox/menu/menu.c
+++ b/matchblox/menu/menu.c
@@ -156,23 +156,29 @@ void MenuBuild (void)
break;
case MENU_START:
- MenuAddLabel(50, 50, "Headtracking");
- MenuAddButton(150, 100, 64, 64, "On", BUTTON_RADIO, BUTTON_GROUP1, MenuEnableHT);
- MenuAddButton(350, 100, 64, 64, "Off", BUTTON_RADIO, BUTTON_GROUP1, MenuDisableHT);
+ MenuAddLabel(50, 30, "Headtracking");
+ MenuAddButton(150, 80, 64, 64, "On", BUTTON_RADIO, BUTTON_GROUP1, MenuEnableHT);
+ MenuAddButton(350, 80, 64, 64, "Off", BUTTON_RADIO, BUTTON_GROUP1, MenuDisableHT);
MenuEnableGroup(BUTTON_GROUP1);
MenuAddLabel(50, 150, "Stereo vision");
- MenuAddButton(150, 200, 64, 64, "On", BUTTON_RADIO, BUTTON_GROUP2, MenuEnableSV);
- MenuAddButton(350, 200, 64, 64, "Off", BUTTON_RADIO, BUTTON_GROUP2, MenuDisableSV);
+ MenuAddButton(150, 200, 64, 64, "On", BUTTON_RADIO, BUTTON_GROUP2, MenuEnableSV);
+ MenuAddButton(350, 200, 64, 64, "Off", BUTTON_RADIO, BUTTON_GROUP2, MenuDisableSV);
MenuEnableGroup(BUTTON_GROUP2);
+ MenuAddLabel(50, 270, "Box size");
+ MenuAddButton(30, 320, 64, 64, "Small", BUTTON_RADIO, BUTTON_GROUP3, MenuSetBoxSmall);
+ MenuAddButton(220, 320, 64, 64, "Medium", BUTTON_RADIO, BUTTON_GROUP3, MenuSetBoxMedium);
+ MenuAddButton(440, 320, 64, 64, "Large", BUTTON_RADIO, BUTTON_GROUP3, MenuSetBoxLarge);
+ MenuEnableGroup(BUTTON_GROUP3);
+
MenuAddButton(50, 400, 256, 64, "Back", BUTTON_CLICK, BUTTON_NO_GROUP, MenuPrev);
MenuAddButton(350, 400, 256, 64, "Next", BUTTON_CLICK, BUTTON_NO_GROUP, MenuPostMessageStart);
break;
case MENU_OPTIONS:
- MenuAddButton(200, 150, 250, 64, "Abort", BUTTON_CLICK, BUTTON_NO_GROUP, MenuPostMessageAbort);
- MenuAddButton(200, 250, 250, 64, "Recalibrate", BUTTON_CLICK, BUTTON_NO_GROUP, MenuPostMessageAbort);
+ MenuAddButton(150, 150, 400, 80, "Abort", BUTTON_CLICK, BUTTON_NO_GROUP, MenuPostMessageAbort);
+ MenuAddButton(150, 250, 400, 80, "Recalibrate", BUTTON_CLICK, BUTTON_NO_GROUP, MenuPostMessageRecalibrate);
MenuEnableGroup(BUTTON_GROUP1);
break;
}
@@ -328,6 +334,10 @@ void MenuProcessMessage(void)
{
MenuMouseClick(GLUT_LEFT_BUTTON, GLUT_UP, l_iXPos, l_iYPos);
}
+ else if (l_pMsg->btns & WIIMOTE_BUTTON_PLUS)
+ {
+ MenuPostMessagePause();
+ }
else
{
MenuMouseMove(l_iXPos, l_iYPos);
@@ -454,4 +464,16 @@ void MenuOff(void)
{
g_pCurMenu = &g_sMenuOff;
-} // MenuOff \ No newline at end of file
+} // MenuOff
+
+void MenuStart(void)
+{
+ g_pCurMenu = &g_sMenuStart;
+
+} // MenuStart
+
+void MenuOptions(void)
+{
+ g_pCurMenu = &g_sMenuOptions;
+
+} // MenuOptions \ No newline at end of file