mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-09 09:30:09 +02:00
more constructor cleanup
This commit is contained in:
parent
7fb872c1d7
commit
f4d487464a
5 changed files with 3 additions and 46 deletions
|
@ -9,8 +9,7 @@
|
||||||
#include "ParticleTree.h"
|
#include "ParticleTree.h"
|
||||||
|
|
||||||
ParticleTree::ParticleTree(bool shouldReaverage) : Octree(shouldReaverage) {
|
ParticleTree::ParticleTree(bool shouldReaverage) : Octree(shouldReaverage) {
|
||||||
ParticleTreeElement* rootNode = createNewElement();
|
_rootNode = createNewElement();
|
||||||
_rootNode = rootNode;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ParticleTreeElement* ParticleTree::createNewElement(unsigned char * octalCode) {
|
ParticleTreeElement* ParticleTree::createNewElement(unsigned char * octalCode) {
|
||||||
|
|
|
@ -78,7 +78,6 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, co
|
||||||
}
|
}
|
||||||
|
|
||||||
ScriptEngine::~ScriptEngine() {
|
ScriptEngine::~ScriptEngine() {
|
||||||
//printf("ScriptEngine::~ScriptEngine()...\n");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScriptEngine::setIsAvatar(bool isAvatar) {
|
void ScriptEngine::setIsAvatar(bool isAvatar) {
|
||||||
|
|
|
@ -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
|
|
||||||
|
|
|
@ -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 <NodeList.h>
|
|
||||||
#include <OctreeSceneStats.h>
|
|
||||||
|
|
||||||
/// 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<QUuid, VoxelSceneStats> NodeToVoxelSceneStats;
|
|
||||||
typedef std::map<QUuid, VoxelSceneStats>::iterator NodeToVoxelSceneStatsIterator;
|
|
||||||
|
|
||||||
#endif /* defined(__hifi__VoxelSceneStats__) */
|
|
|
@ -20,7 +20,8 @@
|
||||||
|
|
||||||
// Voxel Specific operations....
|
// Voxel Specific operations....
|
||||||
|
|
||||||
VoxelTree::VoxelTree(bool shouldReaverage) : Octree(shouldReaverage) {
|
VoxelTree::VoxelTree(bool shouldReaverage) : Octree(shouldReaverage)
|
||||||
|
{
|
||||||
_rootNode = createNewElement();
|
_rootNode = createNewElement();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue