cleanup for code review

This commit is contained in:
Andrew Meadows 2016-05-10 07:49:11 -07:00
parent 778820edb4
commit db9a4d6b8f
5 changed files with 2 additions and 11 deletions

View file

@ -271,10 +271,7 @@ void OctreeQueryNode::dumpOutOfView() {
int outOfView = 0;
OctreeElementBag tempBag;
ViewFrustum viewCopy;
{
QMutexLocker viewLocker(&_viewMutex);
viewCopy = _currentViewFrustum;
}
copyCurrentViewFrustum(viewCopy);
while (OctreeElementPointer elementToCheck = elementBag.extract()) {
if (elementToCheck->isInView(viewCopy)) {
tempBag.insert(elementToCheck);

View file

@ -109,8 +109,6 @@ public:
OctreeSceneStats* stats = IGNORE_SCENE_STATS,
JurisdictionMap* jurisdictionMap = IGNORE_JURISDICTION_MAP,
OctreeElementExtraEncodeData* extraEncodeData = NULL) :
viewFrustum(),
lastViewFrustum(),
lastViewFrustumSent(lastViewFrustumSent),
maxEncodeLevel(maxEncodeLevel),
maxLevelReached(0),

View file

@ -22,8 +22,7 @@
OctreeRenderer::OctreeRenderer() :
_tree(NULL),
_managedTree(false),
_viewFrustum()
_managedTree(false)
{
}

View file

@ -88,7 +88,6 @@ public:
gpu::Batch* batch = nullptr) :
_context(context),
_renderer(renderer),
_viewFrustums(),
_sizeScale(sizeScale),
_boundaryLevelAdjust(boundaryLevelAdjust),
_renderMode(renderMode),

View file

@ -17,8 +17,6 @@
#include <glm/glm.hpp>
#include <glm/gtc/quaternion.hpp>
//#include <GLMHelpers.h>
#include "AABox.h"
#include "AACube.h"
#include "CubeProjectedPolygon.h"