diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 0240aa50b4..972c935f64 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -857,7 +857,7 @@ void Application::mouseMoveEvent(QMouseEvent* event) { const bool MAKE_SOUND_ON_VOXEL_HOVER = false; const bool MAKE_SOUND_ON_VOXEL_CLICK = true; -const float HOVER_VOXEL_FREQUENCY = 14080.f; +const float HOVER_VOXEL_FREQUENCY = 7040.f; const float HOVER_VOXEL_DECAY = 0.999f; void Application::mousePressEvent(QMouseEvent* event) { diff --git a/interface/src/Util.cpp b/interface/src/Util.cpp index f39dc91267..61b9b2d7ca 100644 --- a/interface/src/Util.cpp +++ b/interface/src/Util.cpp @@ -224,38 +224,53 @@ void noiseTest(int w, int h) { } void renderWorldBox() { - // Show edge of world + // Show edge of world + float red[] = {1, 0, 0}; + float green[] = {0, 1, 0}; + float blue[] = {0, 0, 1}; + float gray[] = {0.5, 0.5, 0.5}; + glDisable(GL_LIGHTING); - glColor4f(1.0, 1.0, 1.0, 1.0); glLineWidth(1.0); glBegin(GL_LINES); - glColor3f(1, 0, 0); + glColor3fv(red); glVertex3f(0, 0, 0); glVertex3f(TREE_SCALE, 0, 0); - glColor3f(0, 1, 0); + glColor3fv(green); glVertex3f(0, 0, 0); glVertex3f(0, TREE_SCALE, 0); - glColor3f(0, 0, 1); + glColor3fv(blue); glVertex3f(0, 0, 0); glVertex3f(0, 0, TREE_SCALE); + glColor3fv(gray); + glVertex3f(0, 0, TREE_SCALE); + glVertex3f(TREE_SCALE, 0, TREE_SCALE); + glVertex3f(TREE_SCALE, 0, TREE_SCALE); + glVertex3f(TREE_SCALE, 0, 0); glEnd(); - // Draw little marker dots along the axis + // Draw marker dots at very end glEnable(GL_LIGHTING); glPushMatrix(); glTranslatef(TREE_SCALE, 0, 0); - glColor3f(1, 0, 0); + glColor3fv(red); glutSolidSphere(0.125, 10, 10); glPopMatrix(); glPushMatrix(); glTranslatef(0, TREE_SCALE, 0); - glColor3f(0, 1, 0); + glColor3fv(green); glutSolidSphere(0.125, 10, 10); glPopMatrix(); glPushMatrix(); glTranslatef(0, 0, TREE_SCALE); - glColor3f(0, 0, 1); + glColor3fv(blue); glutSolidSphere(0.125, 10, 10); glPopMatrix(); + glPushMatrix(); + glColor3fv(gray); + glTranslatef(TREE_SCALE, 0, TREE_SCALE); + glutSolidSphere(0.125, 10, 10); + glPopMatrix(); + } double diffclock(timeval *clock1,timeval *clock2)