Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

repair first couple of false colorize methods

Browse source
This commit is contained in:
Stephen Birarda 2013-08-15 15:07:49 -07:00
parent f72f9d8735
commit cf5c53281b
4 changed files with 79 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
interface/src/Application.cpp
View file

@ -1116,62 +1116,58 @@ void Application::setRenderVoxels(bool voxelRender) {
void Application::doKillLocalVoxels() {
_wantToKillLocalVoxels = true;
}
void Application::doRandomizeVoxelColors() {
_voxels.randomizeVoxelColors();
}
void Application::doFalseRandomizeVoxelColors() {
_voxels.falseColorizeRandom();
}
void Application::doFalseRandomizeEveryOtherVoxelColors() {
_voxels.falseColorizeRandomEveryOther();
}
void Application::doFalseColorizeByDistance() {
loadViewFrustum(_myCamera, _viewFrustum);
_voxels.falseColorizeDistanceFromView(&_viewFrustum);
}
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) {
_myAvatar.setWantLowResMoving(!disableLowResMoving);
}
void Application::setWantsMonochrome(bool wantsMonochrome) {
_myAvatar.setWantColor(!wantsMonochrome);
}
void Application::disableDeltaSending(bool disableDeltaSending) {
_myAvatar.setWantDelta(!disableDeltaSending);
}
void Application::disableOcclusionCulling(bool disableOcclusionCulling) {
_myAvatar.setWantOcclusionCulling(!disableOcclusionCulling);
}
//
//void Application::doFalseRandomizeVoxelColors() {
// _voxels.falseColorizeRandom();
//}
//
//void Application::doFalseRandomizeEveryOtherVoxelColors() {
// _voxels.falseColorizeRandomEveryOther();
//}
//
//void Application::doFalseColorizeByDistance() {
// loadViewFrustum(_myCamera, _viewFrustum);
// _voxels.falseColorizeDistanceFromView(&_viewFrustum);
//}
//
//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) {
// _myAvatar.setWantLowResMoving(!disableLowResMoving);
//}
//
//void Application::setWantsMonochrome(bool wantsMonochrome) {
// _myAvatar.setWantColor(!wantsMonochrome);
//}
//
//void Application::disableDeltaSending(bool disableDeltaSending) {
// _myAvatar.setWantDelta(!disableDeltaSending);
//}
//
//void Application::disableOcclusionCulling(bool disableOcclusionCulling) {
// _myAvatar.setWantOcclusionCulling(!disableOcclusionCulling);
//}
const glm::vec3 Application::getMouseVoxelWorldCoordinates(const VoxelDetail _mouseVoxel) {
return glm::vec3((_mouseVoxel.x + _mouseVoxel.s / 2.f) * TREE_SCALE,

14
interface/src/Application.h
View file

@ -119,6 +119,7 @@ public:
Swatch* getSwatch() { return &_swatch; }
QMainWindow* getWindow() { return _window; }
VoxelSceneStats* getVoxelSceneStats() { return &_voxelSceneStats; }
ViewFrustum* getViewFrustum() { return &loadViewFrustum(_myCamera, _myFrustum); }
QNetworkAccessManager* getNetworkAccessManager() { return _networkAccessManager; }
GeometryCache* getGeometryCache() { return &_geometryCache; }
@ -158,19 +159,6 @@ private slots:
void setRenderVoxels(bool renderVoxels);
void doKillLocalVoxels();
void doRandomizeVoxelColors();
void doFalseRandomizeVoxelColors();
void doFalseRandomizeEveryOtherVoxelColors();
void doFalseColorizeByDistance();
void doFalseColorizeOccluded();
void doFalseColorizeOccludedV2();
void doFalseColorizeBySource();
void doFalseColorizeInView();
void doTrueVoxelColors();
void setWantsMonochrome(bool wantsMonochrome);
void disableLowResMoving(bool disableLowResMoving);
void disableDeltaSending(bool disableDeltaSending);
void disableOcclusionCulling(bool disableOcclusionCulling);
void decreaseVoxelSize();
void increaseVoxelSize();
void setListenModeNormal();

24
interface/src/Menu.cpp
View file

@ -269,17 +269,23 @@ Menu::Menu() :
Qt::CTRL | Qt::Key_K,
appInstance, SLOT(doKillLocalVoxels()));
addActionToQMenuAndActionHash(renderDebugMenu, MenuOption::RandomizeVoxelColors, Qt::CTRL | Qt::Key_R);
addActionToQMenuAndActionHash(renderDebugMenu,
MenuOption::RandomizeVoxelColors,
Qt::CTRL | Qt::Key_R,
appInstance->getVoxels(),
SLOT(randomizeVoxelColors()));
// renderDebugMenu->addAction("Randomize Voxel TRUE Colors", this, SLOT(doRandomizeVoxelColors()), Qt::CTRL | Qt::Key_R);
addActionToQMenuAndActionHash(renderDebugMenu,
MenuOption::FalseColorRandomly,
0,
appInstance->getVoxels(),
SLOT(falseColorizeRandom()));
addActionToQMenuAndActionHash(renderDebugMenu, MenuOption::FalseColorRandomly, NULL, NULL);
// renderDebugMenu->addAction("FALSE Color Voxels Randomly", this, SLOT(doFalseRandomizeVoxelColors()));
addActionToQMenuAndActionHash(renderDebugMenu, MenuOption::FalseColorEveryOtherVoxel, NULL, NULL);
// renderDebugMenu->addAction("FALSE Color Voxel Every Other Randomly", this, SLOT(doFalseRandomizeEveryOtherVoxelColors()));
addActionToQMenuAndActionHash(renderDebugMenu,
MenuOption::FalseColorEveryOtherVoxel,
0,
appInstance->getVoxels(),
SLOT(falseColorizeRandomEveryOther()));
addActionToQMenuAndActionHash(renderDebugMenu, MenuOption::FalseColorByDistance, NULL, NULL);

22
interface/src/VoxelSystem.h
View file

@ -57,17 +57,6 @@ public:
float getVoxelsColoredPerSecondAverage();
float getVoxelsBytesReadPerSecondAverage();
// Methods that recurse tree
void randomizeVoxelColors();
void falseColorizeRandom();
void trueColorize();
void falseColorizeInView(ViewFrustum* viewFrustum);
void falseColorizeDistanceFromView(ViewFrustum* viewFrustum);
void falseColorizeRandomEveryOther();
void falseColorizeOccluded();
void falseColorizeOccludedV2();
void falseColorizeBySource();
void killLocalVoxels();
virtual void removeOutOfView();
@ -100,6 +89,17 @@ public:
public slots:
void collectStatsForTreesAndVBOs();
// Methods that recurse tree
void randomizeVoxelColors();
void falseColorizeRandom();
void trueColorize();
void falseColorizeInView(ViewFrustum* viewFrustum);
void falseColorizeDistanceFromView(ViewFrustum* viewFrustum);
void falseColorizeRandomEveryOther();
void falseColorizeOccluded();
void falseColorizeOccludedV2();
void falseColorizeBySource();
protected:
float _treeScale;