From f4d487464a2df051edae4911d2575a23303cd338 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Sun, 9 Mar 2014 00:01:47 -0800 Subject: [PATCH] more constructor cleanup --- libraries/particles/src/ParticleTree.cpp | 3 +-- libraries/script-engine/src/ScriptEngine.cpp | 1 - libraries/voxels/src/VoxelSceneStats.cpp | 14 ---------- libraries/voxels/src/VoxelSceneStats.h | 28 -------------------- libraries/voxels/src/VoxelTree.cpp | 3 ++- 5 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 libraries/voxels/src/VoxelSceneStats.cpp delete mode 100644 libraries/voxels/src/VoxelSceneStats.h diff --git a/libraries/particles/src/ParticleTree.cpp b/libraries/particles/src/ParticleTree.cpp index a254305789..57f6a6e665 100644 --- a/libraries/particles/src/ParticleTree.cpp +++ b/libraries/particles/src/ParticleTree.cpp @@ -9,8 +9,7 @@ #include "ParticleTree.h" ParticleTree::ParticleTree(bool shouldReaverage) : Octree(shouldReaverage) { - ParticleTreeElement* rootNode = createNewElement(); - _rootNode = rootNode; + _rootNode = createNewElement(); } ParticleTreeElement* ParticleTree::createNewElement(unsigned char * octalCode) { diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index f29b4e471d..04916687fb 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -78,7 +78,6 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, co } ScriptEngine::~ScriptEngine() { - //printf("ScriptEngine::~ScriptEngine()...\n"); } void ScriptEngine::setIsAvatar(bool isAvatar) { diff --git a/libraries/voxels/src/VoxelSceneStats.cpp b/libraries/voxels/src/VoxelSceneStats.cpp deleted file mode 100644 index 2f486a2fa4..0000000000 --- a/libraries/voxels/src/VoxelSceneStats.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// -// VoxelSceneStats.cpp -// hifi -// -// Created by Brad Hefta-Gaub on 7/18/13. -// Copyright (c) 2013 High Fidelity, Inc. All rights reserved. -// -// - -#include "VoxelSceneStats.h" - - -// currently an alias for OctreeSceneStats - diff --git a/libraries/voxels/src/VoxelSceneStats.h b/libraries/voxels/src/VoxelSceneStats.h deleted file mode 100644 index bea563563c..0000000000 --- a/libraries/voxels/src/VoxelSceneStats.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// VoxelSceneStats.h -// hifi -// -// Created by Brad Hefta-Gaub on 7/18/13. -// Copyright (c) 2013 High Fidelity, Inc. All rights reserved. -// -// - -#ifndef __hifi__VoxelSceneStats__ -#define __hifi__VoxelSceneStats__ - -#include -#include - -/// Collects statistics for calculating and sending a scene from a voxel server to an interface client -class VoxelSceneStats : public OctreeSceneStats { - - // currently an alias for OctreeSceneStats - -}; - -/// Map between node IDs and their reported VoxelSceneStats. Typically used by classes that need to know which nodes sent -/// which voxel stats -typedef std::map NodeToVoxelSceneStats; -typedef std::map::iterator NodeToVoxelSceneStatsIterator; - -#endif /* defined(__hifi__VoxelSceneStats__) */ diff --git a/libraries/voxels/src/VoxelTree.cpp b/libraries/voxels/src/VoxelTree.cpp index ea784b2e16..4c756c2257 100644 --- a/libraries/voxels/src/VoxelTree.cpp +++ b/libraries/voxels/src/VoxelTree.cpp @@ -20,7 +20,8 @@ // Voxel Specific operations.... -VoxelTree::VoxelTree(bool shouldReaverage) : Octree(shouldReaverage) { +VoxelTree::VoxelTree(bool shouldReaverage) : Octree(shouldReaverage) +{ _rootNode = createNewElement(); }