From 2832c334822a7d6332c8954162344de116fd6015 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 26 Feb 2014 21:38:28 -0800 Subject: [PATCH] fixed div by zero --- assignment-client/src/octree/OctreeServer.cpp | 9 --------- assignment-client/src/octree/OctreeServer.h | 4 +++- examples/seeingVoxelsExample.js | 4 ++-- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp index 7bf5c12a22..e823722857 100644 --- a/assignment-client/src/octree/OctreeServer.cpp +++ b/assignment-client/src/octree/OctreeServer.cpp @@ -703,12 +703,3 @@ void OctreeServer::run() { silentNodeTimer->start(NODE_SILENCE_THRESHOLD_USECS / 1000); } - -int OctreeServer::getPacketsPerClientPerInterval() const { - int totalEvenly = getPacketsTotalPerInterval() / getCurrentClientCount(); - if (totalEvenly < 1) { - totalEvenly = 1; - } - int packetsPerClientPerInterval = std::min(_packetsPerClientPerInterval, totalEvenly); - return packetsPerClientPerInterval; -} diff --git a/assignment-client/src/octree/OctreeServer.h b/assignment-client/src/octree/OctreeServer.h index 4a412d19b3..b5d8f6fb67 100644 --- a/assignment-client/src/octree/OctreeServer.h +++ b/assignment-client/src/octree/OctreeServer.h @@ -43,7 +43,9 @@ public: Octree* getOctree() { return _tree; } JurisdictionMap* getJurisdiction() { return _jurisdiction; } - int getPacketsPerClientPerInterval() const; + int getPacketsPerClientPerInterval() const { return std::min(_packetsPerClientPerInterval, + std::max(1, getPacketsTotalPerInterval() / std::max(1, getCurrentClientCount()))); } + int getPacketsPerClientPerSecond() const { return getPacketsPerClientPerInterval() * INTERVALS_PER_SECOND; } int getPacketsTotalPerInterval() const { return _packetsTotalPerInterval; } int getPacketsTotalPerSecond() const { return getPacketsTotalPerInterval() * INTERVALS_PER_SECOND; } diff --git a/examples/seeingVoxelsExample.js b/examples/seeingVoxelsExample.js index 98445990a8..93f605755f 100644 --- a/examples/seeingVoxelsExample.js +++ b/examples/seeingVoxelsExample.js @@ -21,10 +21,10 @@ var orientation = Quat.fromPitchYawRoll(0, yaw, 0); function init() { if (isLocal) { - MyAvatar.position = {x: 10, y: 0, z: 10}; + MyAvatar.position = {x: 5000, y: 500, z: 5000}; MyAvatar.orientation = orientation; } else { - VoxelViewer.setPosition({x: 10, y: 0, z: 10}); + VoxelViewer.setPosition({x: 5000, y: 500, z: 5000}); VoxelViewer.setOrientation(orientation); VoxelViewer.queryOctree(); Agent.isAvatar = true;