From 8938c1c38bd877cc6a5f0c047707d4a8d7cc84c0 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 1 May 2014 15:18:43 -0700 Subject: [PATCH] fixed bad particle reference --- interface/src/models/ModelTreeRenderer.cpp | 4 ++-- interface/src/models/ModelTreeRenderer.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/interface/src/models/ModelTreeRenderer.cpp b/interface/src/models/ModelTreeRenderer.cpp index e531c68ddc..0fa434622e 100644 --- a/interface/src/models/ModelTreeRenderer.cpp +++ b/interface/src/models/ModelTreeRenderer.cpp @@ -65,9 +65,9 @@ void ModelTreeRenderer::renderElement(OctreeElement* element, RenderArgs* args) const QList& modelItems = modelTreeElement->getModels(); - uint16_t numberOfParticles = modelItems.size(); + uint16_t numberOfModels = modelItems.size(); - for (uint16_t i = 0; i < numberOfParticles; i++) { + for (uint16_t i = 0; i < numberOfModels; i++) { const ModelItem& modelItem = modelItems[i]; // render modelItem aspoints glm::vec3 position = modelItem.getPosition() * (float)TREE_SCALE; diff --git a/interface/src/models/ModelTreeRenderer.h b/interface/src/models/ModelTreeRenderer.h index 2fe67ccad6..6c66350d8f 100644 --- a/interface/src/models/ModelTreeRenderer.h +++ b/interface/src/models/ModelTreeRenderer.h @@ -32,9 +32,9 @@ public: virtual ~ModelTreeRenderer(); virtual Octree* createTree() { return new ModelTree(true); } - virtual NodeType_t getMyNodeType() const { return NodeType::ParticleServer; } - virtual PacketType getMyQueryMessageType() const { return PacketTypeParticleQuery; } - virtual PacketType getExpectedPacketType() const { return PacketTypeParticleData; } + virtual NodeType_t getMyNodeType() const { return NodeType::ModelServer; } + virtual PacketType getMyQueryMessageType() const { return PacketTypeModelQuery; } + virtual PacketType getExpectedPacketType() const { return PacketTypeModelData; } virtual void renderElement(OctreeElement* element, RenderArgs* args); void update();