From 8d5ee616ac5ac81e6e7d2c39b727d24515b6cca8 Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Wed, 10 Apr 2013 16:58:53 -0700 Subject: [PATCH 1/4] Added a debug menu option --- interface/src/Menu.cpp | 1 + interface/src/main.cpp | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index a93c5b1a23..e199e07dd9 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -118,6 +118,7 @@ void Menu::render(int screenWidth, int screenHeight) { int mono = 0; glColor3f(0.9, 0.9, 0.9); int width = screenWidth; + glEnable(GL_LINE_SMOOTH); glBegin(GL_QUADS); { glVertex2f(0, MENU_Y_OFFSET); glVertex2f(width, MENU_Y_OFFSET); diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 35c52b6e95..d8eebe668f 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -897,15 +897,20 @@ int setMirror(int state) { } void initMenu() { - MenuColumn *menuColumnOptions, *menuColumnTools; + MenuColumn *menuColumnOptions, *menuColumnTools, *menuColumnDebug; + // Options menuColumnOptions = menu.addColumn("Options"); menuColumnOptions->addRow("Head", setHead); menuColumnOptions->addRow("Field", setField); menuColumnOptions->addRow("Noise", setNoise); - menuColumnOptions->addRow("Mirror", setMirror); + menuColumnOptions->addRow("Mirror", setMirror); + // Tools menuColumnTools = menu.addColumn("Tools"); menuColumnTools->addRow("Stats", setStats); - menuColumnTools->addRow("Menu", setMenu); + menuColumnTools->addRow("Menu", setMenu); + // Debug + menuColumnDebug = menu.addColumn("Debug"); + } void testPointToVoxel() From 8b54b528c3fa51e8ecb0a46798f4394681319514 Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Wed, 10 Apr 2013 17:35:53 -0700 Subject: [PATCH 2/4] Fixed Menu to hit very top of screen on Mac --- interface/src/Menu.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index e199e07dd9..b39db4278d 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -18,9 +18,13 @@ const int LINE_HEIGHT = 30; const int MENU_HEIGHT = 30; + +#ifdef _WIN32 const int MENU_Y_OFFSET = 8; // under windows we have 8 vertical pixels offset. In 2D an object with y=8, the object is displayed at y=0 // change the value in the other platforms (if required). - +#else +const int MENU_Y_OFFSET = 0; +#endif Menu::Menu() { currentColumn = -1; From 859903274dc7e36c2d8a5d995828f64fd37cd7fb Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Wed, 10 Apr 2013 17:48:09 -0700 Subject: [PATCH 3/4] Tweaks to menu to have right position under Mac, always on, slightly smaller font --- interface/src/Menu.cpp | 5 +++-- interface/src/MenuColumn.cpp | 2 +- interface/src/main.cpp | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index b39db4278d..31cb4e6a2a 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -20,8 +20,9 @@ const int LINE_HEIGHT = 30; const int MENU_HEIGHT = 30; #ifdef _WIN32 -const int MENU_Y_OFFSET = 8; // under windows we have 8 vertical pixels offset. In 2D an object with y=8, the object is displayed at y=0 - // change the value in the other platforms (if required). +const int MENU_Y_OFFSET = 8; // under windows we have 8 vertical pixels offset. + // In 2D an object with y=8, the object is displayed at y=0 + // change the value in the other platforms (if required). #else const int MENU_Y_OFFSET = 0; #endif diff --git a/interface/src/MenuColumn.cpp b/interface/src/MenuColumn.cpp index 98fa8a1d85..d3780b5710 100644 --- a/interface/src/MenuColumn.cpp +++ b/interface/src/MenuColumn.cpp @@ -128,7 +128,7 @@ void MenuColumn::render(int yOffset, int menuHeight, int lineHeight) { } glEnd(); } - float scale = 0.10; + float scale = 0.09; int mono = 0; int y = menuHeight + lineHeight / 2 ; char* rowName; diff --git a/interface/src/main.cpp b/interface/src/main.cpp index d8eebe668f..b5c4b27e0b 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -179,7 +179,7 @@ int mouseStartX, mouseStartY; // Mouse location at start of last down click int mousePressed = 0; // true if mouse has been pressed (clear when finished) Menu menu; // main menu -int menuOn = 0; // Whether to show onscreen menu +int menuOn = 1; // Whether to show onscreen menu // // Serial USB Variables @@ -1094,7 +1094,6 @@ void key(unsigned char k, int x, int y) #endif } -// if (k == 'm') headMirror = !headMirror; // move in the menu if (k == 'm') setMenu(-2); if (k == 'f') displayField = !displayField; From 34e5b670a2e8af1315414fdb3fdf3f9182a30684 Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Wed, 10 Apr 2013 18:01:18 -0700 Subject: [PATCH 4/4] Tweaked location and color of agents display for menu, removed audio start playback log --- interface/src/Audio.cpp | 2 +- interface/src/Menu.cpp | 4 +++- interface/src/main.cpp | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index d003de98cb..db69dcb380 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -243,7 +243,7 @@ int audioCallback (const void *inputBuffer, } else { if (!ringBuffer->isStarted()) { ringBuffer->setStarted(true); - printf("starting playback %3.1f msecs delayed \n", (usecTimestampNow() - usecTimestamp(&firstPlaybackTimer))/1000.0); + //printf("starting playback %3.1f msecs delayed \n", (usecTimestampNow() - usecTimestamp(&firstPlaybackTimer))/1000.0); } else { //printf("pushing buffer\n"); } diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 31cb4e6a2a..fe0efd97ab 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -118,10 +118,12 @@ bool Menu::mouseOver(int x, int y) { return overMenu; } +const float MENU_COLOR[3] = {0.75, 0.75, 0.75}; + void Menu::render(int screenWidth, int screenHeight) { float scale = 0.10; int mono = 0; - glColor3f(0.9, 0.9, 0.9); + glColor3fv(MENU_COLOR); int width = screenWidth; glEnable(GL_LINE_SMOOTH); glBegin(GL_QUADS); { diff --git a/interface/src/main.cpp b/interface/src/main.cpp index b5c4b27e0b..3953a657f1 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -836,8 +836,8 @@ void display(void) // Draw number of nearby people always glPointSize(1.0f); char agents[100]; - sprintf(agents, "Agents nearby: %ld\n", agentList.getAgents().size()); - drawtext(WIDTH-200,20, 0.10, 0, 1.0, 0, agents, 1, 1, 0); + sprintf(agents, "Agents: %ld\n", agentList.getAgents().size()); + drawtext(WIDTH-100,20, 0.10, 0, 1.0, 0, agents, 1, 0, 0); if (::paintOn) {