From 9aed3d3cc64411e133d8311e7c346d202fb84fca Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 11 Jul 2013 10:37:28 -0700 Subject: [PATCH] enable delta sending by default --- interface/src/Application.cpp | 6 +++--- interface/src/Application.h | 2 +- libraries/avatars/src/AvatarData.cpp | 2 +- voxel-server/src/main.cpp | 4 +++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 6cde05397c..27acfc3d38 100755 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1235,8 +1235,8 @@ void Application::setWantsMonochrome(bool wantsMonochrome) { _myAvatar.setWantColor(!wantsMonochrome); } -void Application::setWantsDelta(bool wantsDelta) { - _myAvatar.setWantDelta(wantsDelta); +void Application::disableDeltaSending(bool disableDeltaSending) { + _myAvatar.setWantDelta(!disableDeltaSending); } void Application::disableOcclusionCulling(bool disableOcclusionCulling) { @@ -1626,7 +1626,7 @@ void Application::initMenu() { renderDebugMenu->addAction("Show TRUE Colors", this, SLOT(doTrueVoxelColors()), Qt::CTRL | Qt::Key_T); debugMenu->addAction("Wants Monochrome", this, SLOT(setWantsMonochrome(bool)))->setCheckable(true); - debugMenu->addAction("Wants View Delta Sending", this, SLOT(setWantsDelta(bool)))->setCheckable(true); + debugMenu->addAction("Disable Delta Sending", this, SLOT(disableDeltaSending(bool)))->setCheckable(true); (_shouldLowPassFilter = debugMenu->addAction("Test: LowPass filter"))->setCheckable(true); debugMenu->addAction("Disable Occlusion Culling", this, SLOT(disableOcclusionCulling(bool)), Qt::SHIFT | Qt::Key_C)->setCheckable(true); diff --git a/interface/src/Application.h b/interface/src/Application.h index eede6d8cb2..0b65cba6bb 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -136,7 +136,7 @@ private slots: void doTrueVoxelColors(); void doTreeStats(); void setWantsMonochrome(bool wantsMonochrome); - void setWantsDelta(bool wantsDelta); + void disableDeltaSending(bool disableDeltaSending); void disableOcclusionCulling(bool disableOcclusionCulling); void updateVoxelModeActions(); void decreaseVoxelSize(); diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 997d528a5e..7d3c35029c 100755 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -33,7 +33,7 @@ AvatarData::AvatarData(Node* owningNode) : _cameraFarClip(0.0f), _keyState(NO_KEY_DOWN), _wantColor(true), - _wantDelta(false), + _wantDelta(true), _wantOcclusionCulling(true), _headData(NULL), _handData(NULL) diff --git a/voxel-server/src/main.cpp b/voxel-server/src/main.cpp index e6d8342eb6..608712d8f6 100644 --- a/voxel-server/src/main.cpp +++ b/voxel-server/src/main.cpp @@ -151,7 +151,9 @@ void deepestLevelVoxelDistributor(NodeList* nodeList, } else { printf("elapsed time to send scene = %f seconds", elapsedSceneSend); } - printf(" [occlusionCulling: %s]\n", debug::valueOf(nodeData->getWantOcclusionCulling())); + printf(" [occlusionCulling:%s, wantDelta:%s, wantColor:%s ]\n", + debug::valueOf(nodeData->getWantOcclusionCulling()), debug::valueOf(wantDelta), + debug::valueOf(wantColor)); } nodeData->setLastTimeBagEmpty(now); }