Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 11:28:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix monochrome option menu hook

Browse source
This commit is contained in:
Stephen Birarda 2013-08-15 15:23:26 -07:00
parent b4da77028b
commit c930d058b1
4 changed files with 10 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
interface/src/Application.cpp
View file

@ -1117,29 +1117,6 @@ void Application::doKillLocalVoxels() {
_wantToKillLocalVoxels = true; _wantToKillLocalVoxels = true;
} }
//
//void Application::doFalseColorizeInView() {
// loadViewFrustum(_myCamera, _viewFrustum);
// // we probably want to make sure the viewFrustum is initialized first
// _voxels.falseColorizeInView(&_viewFrustum);
//}
//
//void Application::doFalseColorizeOccluded() {
// CoverageMap::wantDebugging = true;
// _voxels.falseColorizeOccluded();
//}
//
//void Application::doFalseColorizeOccludedV2() {
// _voxels.falseColorizeOccludedV2();
//}
//
//void Application::doFalseColorizeBySource() {
// _voxels.falseColorizeBySource();
//}
//
//void Application::doTrueVoxelColors() {
// _voxels.trueColorize();
//}
// //
//void Application::disableLowResMoving(bool disableLowResMoving) { //void Application::disableLowResMoving(bool disableLowResMoving) {
// _myAvatar.setWantLowResMoving(!disableLowResMoving); // _myAvatar.setWantLowResMoving(!disableLowResMoving);

12
interface/src/Menu.cpp
View file

@ -323,12 +323,12 @@ Menu::Menu() :
appInstance->getVoxels(), appInstance->getVoxels(),
SLOT(trueColorize())); SLOT(trueColorize()));
addCheckableActionToQMenuAndActionHash(debugMenu,
addCheckableActionToQMenuAndActionHash(debugMenu, MenuOption::LowPassFilter); MenuOption::SendVoxelColors,
0,
addCheckableActionToQMenuAndActionHash(debugMenu, MenuOption::Monochrome, NULL, NULL); true,
appInstance->getAvatar(),
// debugMenu->addAction("Wants Monochrome", this, SLOT(setWantsMonochrome(bool)))->setCheckable(true); SLOT(setWantColor(bool)));
addCheckableActionToQMenuAndActionHash(debugMenu, MenuOption::DisableLowRes, NULL, NULL); addCheckableActionToQMenuAndActionHash(debugMenu, MenuOption::DisableLowRes, NULL, NULL);

3
interface/src/Menu.h
View file

@ -154,9 +154,7 @@ namespace MenuOption {
const QString Log = "Log"; const QString Log = "Log";
const QString LookAtIndicator = "Look-at Indicator"; const QString LookAtIndicator = "Look-at Indicator";
const QString LookAtVectors = "Look-at Vectors"; const QString LookAtVectors = "Look-at Vectors";
const QString LowPassFilter = "Low-pass Filter";
const QString Mirror = "Mirror"; const QString Mirror = "Mirror";
const QString Monochrome = "Monochrome";
const QString Oscilloscope = "Audio Oscilloscope"; const QString Oscilloscope = "Audio Oscilloscope";
const QString Pair = "Pair"; const QString Pair = "Pair";
const QString PasteVoxels = "Paste Voxels"; const QString PasteVoxels = "Paste Voxels";
@ -166,6 +164,7 @@ namespace MenuOption {
const QString ResetAvatarSize = "Reset Avatar Size"; const QString ResetAvatarSize = "Reset Avatar Size";
const QString ResetSwatchColors = "Reset Swatch Colors"; const QString ResetSwatchColors = "Reset Swatch Colors";
const QString RunTimingTests = "Run Timing Tests"; const QString RunTimingTests = "Run Timing Tests";
const QString SendVoxelColors = "Colored Voxels";
const QString SettingsAutosave = "Autosave"; const QString SettingsAutosave = "Autosave";
const QString SettingsLoad = "Load Settings"; const QString SettingsLoad = "Load Settings";
const QString SettingsSave = "Save Settings"; const QString SettingsSave = "Save Settings";

5
libraries/avatars/src/AvatarData.h
View file

@ -116,9 +116,8 @@ public:
bool getWantOcclusionCulling() const { return _wantOcclusionCulling; } bool getWantOcclusionCulling() const { return _wantOcclusionCulling; }
uint16_t getLeaderID() const { return _leaderID; } uint16_t getLeaderID() const { return _leaderID; }
void setWantColor(bool wantColor) { _wantColor = wantColor; }
void setWantDelta(bool wantDelta) { _wantDelta = wantDelta; } void setWantDelta(bool wantDelta) { _wantDelta = wantDelta; }
void setWantLowResMoving(bool wantLowResMoving) { _wantLowResMoving = wantLowResMoving; }
void setWantOcclusionCulling(bool wantOcclusionCulling) { _wantOcclusionCulling = wantOcclusionCulling; } void setWantOcclusionCulling(bool wantOcclusionCulling) { _wantOcclusionCulling = wantOcclusionCulling; }
void setHeadData(HeadData* headData) { _headData = headData; } void setHeadData(HeadData* headData) { _headData = headData; }
@ -126,6 +125,8 @@ public:
public slots: public slots:
void sendData(); void sendData();
void setWantLowResMoving(bool wantLowResMoving) { _wantLowResMoving = wantLowResMoving; }
void setWantColor(bool wantColor) { _wantColor = wantColor; }
protected: protected:
glm::vec3 _position; glm::vec3 _position;