Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-25 14:33:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup for code review

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
assignment-client/src/octree/OctreeQueryNode.cpp
View file

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

2
libraries/octree/src/Octree.h
View file

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

3
libraries/octree/src/OctreeRenderer.cpp
View file

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

1
libraries/shared/src/RenderArgs.h
View file

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

2
libraries/shared/src/ViewFrustum.h
View file

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