Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 16:36:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed :: prefix for local variables

Browse source
This commit is contained in:
Philip Rosedale 2013-04-23 11:21:36 -07:00
parent 2ef45e8512
commit 7aea9d1e61
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
interface/src/main.cpp
View file

@ -817,7 +817,7 @@ void display(void)
//-------------------------------------------------------- //--------------------------------------------------------
// camera settings // camera settings
//-------------------------------------------------------- //--------------------------------------------------------
if ( lookingInMirror ) { if ( ::lookingInMirror ) {
//----------------------------------------------- //-----------------------------------------------
// set the camera to looking at my own face // set the camera to looking at my own face
//----------------------------------------------- //-----------------------------------------------
@ -910,7 +910,7 @@ void display(void)
drawGroundPlaneGrid( 5.0f, 9 ); drawGroundPlaneGrid( 5.0f, 9 );
// Draw cloud of dots // Draw cloud of dots
if (!lookingInMirror) cloud.render(); if (!::lookingInMirror) cloud.render();
// Draw voxels // Draw voxels
if ( showingVoxels ) if ( showingVoxels )
@ -932,16 +932,16 @@ void display(void)
} }
} }
if ( !lookingInMirror ) balls.render(); if ( !::lookingInMirror ) balls.render();
// Render the world box // Render the world box
if (!lookingInMirror && statsOn) render_world_box(); if (!::lookingInMirror && statsOn) render_world_box();
// brad's frustum for debugging // brad's frustum for debugging
if (::frustumOn) renderViewFrustum(::viewFrustum); if (::frustumOn) renderViewFrustum(::viewFrustum);
//Render my own avatar //Render my own avatar
myAvatar.render(lookingInMirror); myAvatar.render(::lookingInMirror);
} }
glPopMatrix(); glPopMatrix();
@ -959,7 +959,7 @@ void display(void)
if (audioScope.getState()) audioScope.render(); if (audioScope.getState()) audioScope.render();
#endif #endif
if (displayHeadMouse && !lookingInMirror && statsOn) { if (displayHeadMouse && !::lookingInMirror && statsOn) {
// Display small target box at center or head mouse target that can also be used to measure LOD // Display small target box at center or head mouse target that can also be used to measure LOD
glColor3f(1.0, 1.0, 1.0); glColor3f(1.0, 1.0, 1.0);
glDisable(GL_LINE_SMOOTH); glDisable(GL_LINE_SMOOTH);
@ -1055,7 +1055,7 @@ int setValue(int state, bool *value) {
} }
int setHead(int state) { int setHead(int state) {
return setValue(state, &lookingInMirror); return setValue(state, &::lookingInMirror);
} }
int setField(int state) { int setField(int state) {
@ -1193,7 +1193,7 @@ void initMenu() {
MenuColumn *menuColumnOptions, *menuColumnTools, *menuColumnDebug, *menuColumnFrustum; MenuColumn *menuColumnOptions, *menuColumnTools, *menuColumnDebug, *menuColumnFrustum;
// Options // Options
menuColumnOptions = menu.addColumn("Options"); menuColumnOptions = menu.addColumn("Options");
menuColumnOptions->addRow("(H)ead", setHead); menuColumnOptions->addRow("Mirror (h)", setHead);
menuColumnOptions->addRow("Field (f)", setField); menuColumnOptions->addRow("Field (f)", setField);
menuColumnOptions->addRow("(N)oise", setNoise); menuColumnOptions->addRow("(N)oise", setNoise);
menuColumnOptions->addRow("(V)oxels", setVoxels); menuColumnOptions->addRow("(V)oxels", setVoxels);
@ -1404,9 +1404,9 @@ void key(unsigned char k, int x, int y)
} }
if (k == 'h') { if (k == 'h') {
lookingInMirror = !lookingInMirror; ::lookingInMirror = !::lookingInMirror;
#ifndef _WIN32 #ifndef _WIN32
audio.setMixerLoopbackFlag(lookingInMirror); audio.setMixerLoopbackFlag(::lookingInMirror);
#endif #endif
} }