From 8312e1642db0a0178997cb096684b14eb030aec9 Mon Sep 17 00:00:00 2001 From: wangyix Date: Mon, 9 Jun 2014 15:15:43 -0700 Subject: [PATCH 1/4] replaced takeFirst() with dequeue() for consistency --- assignment-client/src/octree/OctreeQueryNode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assignment-client/src/octree/OctreeQueryNode.cpp b/assignment-client/src/octree/OctreeQueryNode.cpp index 372f15a76b..3531c3f9cb 100644 --- a/assignment-client/src/octree/OctreeQueryNode.cpp +++ b/assignment-client/src/octree/OctreeQueryNode.cpp @@ -384,7 +384,7 @@ bool OctreeQueryNode::hasNextNackedPacket() const { const QByteArray* OctreeQueryNode::getNextNackedPacket() { if (!_nackedSequenceNumbers.isEmpty()) { // could return null if packet is not in the history - return _sentPacketHistory.getPacket(_nackedSequenceNumbers.takeFirst()); + return _sentPacketHistory.getPacket(_nackedSequenceNumbers.dequeue()); } return NULL; } From de61029f05923fb32f700037b2c815db51008431 Mon Sep 17 00:00:00 2001 From: wangyix Date: Mon, 9 Jun 2014 17:30:09 -0700 Subject: [PATCH 2/4] Added dev menu option to disable nack packets --- interface/src/Application.cpp | 6 +++++- interface/src/Menu.cpp | 2 ++ interface/src/Menu.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 574df09ee2..22fe5887fd 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2099,7 +2099,7 @@ void Application::updateMyAvatar(float deltaTime) { { quint64 now = usecTimestampNow(); quint64 sinceLastNack = now - _lastNackTime; - const quint64 TOO_LONG_SINCE_LAST_NACK = 250 * MSECS_PER_SECOND; + const quint64 TOO_LONG_SINCE_LAST_NACK = 1 * USECS_PER_SECOND; if (sinceLastNack > TOO_LONG_SINCE_LAST_NACK) { _lastNackTime = now; sendNack(); @@ -2109,6 +2109,10 @@ void Application::updateMyAvatar(float deltaTime) { void Application::sendNack() { + if (Menu::getInstance()->isOptionChecked(MenuOption::NackDisable)) { + return; + } + char packet[MAX_PACKET_SIZE]; NodeList* nodeList = NodeList::getInstance(); diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 9ab47cdeda..9381790a42 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -393,6 +393,8 @@ Menu::Menu() : addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::AlignForearmsWithWrists, 0, true); addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::AlternateIK, 0, false); + addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::NackDisable, 0, false); + addDisabledActionAndSeparator(developerMenu, "Testing"); QMenu* timingMenu = developerMenu->addMenu("Timing and Statistics Tools"); diff --git a/interface/src/Menu.h b/interface/src/Menu.h index f9af80119b..e1bbb382aa 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -373,6 +373,7 @@ namespace MenuOption { const QString MoveWithLean = "Move with Lean"; const QString MuteAudio = "Mute Microphone"; const QString MuteEnvironment = "Mute Environment"; + const QString NackDisable = "Disable NACK Packets"; const QString NameLocation = "Name this location"; const QString NewVoxelCullingMode = "New Voxel Culling Mode"; const QString OctreeStats = "Voxel and Particle Statistics"; From 4665df4d1fd9f314a1c743a92abb5efb7419cffb Mon Sep 17 00:00:00 2001 From: wangyix Date: Mon, 9 Jun 2014 17:41:20 -0700 Subject: [PATCH 3/4] nackdisable to disablenack --- interface/src/Application.cpp | 2 +- interface/src/Menu.cpp | 2 +- interface/src/Menu.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 22fe5887fd..3ed2d84df7 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2109,7 +2109,7 @@ void Application::updateMyAvatar(float deltaTime) { void Application::sendNack() { - if (Menu::getInstance()->isOptionChecked(MenuOption::NackDisable)) { + if (Menu::getInstance()->isOptionChecked(MenuOption::DisableNack)) { return; } diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 9381790a42..be5dd13d1c 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -393,7 +393,7 @@ Menu::Menu() : addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::AlignForearmsWithWrists, 0, true); addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::AlternateIK, 0, false); - addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::NackDisable, 0, false); + addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::DisableNack, 0, false); addDisabledActionAndSeparator(developerMenu, "Testing"); diff --git a/interface/src/Menu.h b/interface/src/Menu.h index e1bbb382aa..19e7ef98e2 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -320,6 +320,7 @@ namespace MenuOption { const QString DecreaseAvatarSize = "Decrease Avatar Size"; const QString DecreaseVoxelSize = "Decrease Voxel Size"; const QString DisableAutoAdjustLOD = "Disable Automatically Adjusting LOD"; + const QString DisableNack = "Disable NACK Packets"; const QString DisplayFrustum = "Display Frustum"; const QString DisplayHands = "Display Hands"; const QString DisplayHandTargets = "Display Hand Targets"; @@ -373,7 +374,6 @@ namespace MenuOption { const QString MoveWithLean = "Move with Lean"; const QString MuteAudio = "Mute Microphone"; const QString MuteEnvironment = "Mute Environment"; - const QString NackDisable = "Disable NACK Packets"; const QString NameLocation = "Name this location"; const QString NewVoxelCullingMode = "New Voxel Culling Mode"; const QString OctreeStats = "Voxel and Particle Statistics"; From ffda98fe0b160083f7ab3bea64811f8271350a9f Mon Sep 17 00:00:00 2001 From: wangyix Date: Mon, 9 Jun 2014 17:50:29 -0700 Subject: [PATCH 4/4] var name change again --- interface/src/Application.cpp | 2 +- interface/src/Menu.cpp | 2 +- interface/src/Menu.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 3ed2d84df7..3cfec3190e 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2109,7 +2109,7 @@ void Application::updateMyAvatar(float deltaTime) { void Application::sendNack() { - if (Menu::getInstance()->isOptionChecked(MenuOption::DisableNack)) { + if (Menu::getInstance()->isOptionChecked(MenuOption::DisableNackPackets)) { return; } diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index be5dd13d1c..42874ea02e 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -393,7 +393,7 @@ Menu::Menu() : addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::AlignForearmsWithWrists, 0, true); addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::AlternateIK, 0, false); - addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::DisableNack, 0, false); + addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::DisableNackPackets, 0, false); addDisabledActionAndSeparator(developerMenu, "Testing"); diff --git a/interface/src/Menu.h b/interface/src/Menu.h index 19e7ef98e2..03ffa0b848 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -320,7 +320,7 @@ namespace MenuOption { const QString DecreaseAvatarSize = "Decrease Avatar Size"; const QString DecreaseVoxelSize = "Decrease Voxel Size"; const QString DisableAutoAdjustLOD = "Disable Automatically Adjusting LOD"; - const QString DisableNack = "Disable NACK Packets"; + const QString DisableNackPackets = "Disable NACK Packets"; const QString DisplayFrustum = "Display Frustum"; const QString DisplayHands = "Display Hands"; const QString DisplayHandTargets = "Display Hand Targets";