From b965d850d5f47651a5890cbfc8b6dc7aef57422a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 22 Jan 2014 16:26:28 -0800 Subject: [PATCH] move node interest add for JL to JL --- libraries/octree/src/JurisdictionListener.cpp | 3 +++ libraries/particles/src/ParticlesScriptingInterface.cpp | 1 - libraries/voxels/src/VoxelsScriptingInterface.cpp | 4 ---- libraries/voxels/src/VoxelsScriptingInterface.h | 4 +--- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/libraries/octree/src/JurisdictionListener.cpp b/libraries/octree/src/JurisdictionListener.cpp index 6ed039f0bd..d8686debad 100644 --- a/libraries/octree/src/JurisdictionListener.cpp +++ b/libraries/octree/src/JurisdictionListener.cpp @@ -23,6 +23,9 @@ JurisdictionListener::JurisdictionListener(NODE_TYPE type, PacketSenderNotify* n connect(NodeList::getInstance(), &NodeList::nodeKilled, this, &JurisdictionListener::nodeKilled); //qDebug("JurisdictionListener::JurisdictionListener(NODE_TYPE type=%c)", type); + + // tell our NodeList we want to hear about nodes with our node type + NodeList::getInstance()->addNodeTypeToInterestSet(type); } void JurisdictionListener::nodeKilled(SharedNodePointer node) { diff --git a/libraries/particles/src/ParticlesScriptingInterface.cpp b/libraries/particles/src/ParticlesScriptingInterface.cpp index d52ed5ba13..14388b6ac4 100644 --- a/libraries/particles/src/ParticlesScriptingInterface.cpp +++ b/libraries/particles/src/ParticlesScriptingInterface.cpp @@ -13,7 +13,6 @@ ParticlesScriptingInterface::ParticlesScriptingInterface() : _nextCreatorTokenID(0), _particleTree(NULL) { - NodeList::getInstance()->addNodeTypeToInterestSet(NODE_TYPE_PARTICLE_SERVER); } diff --git a/libraries/voxels/src/VoxelsScriptingInterface.cpp b/libraries/voxels/src/VoxelsScriptingInterface.cpp index 40c6ff8d1d..3f4e19f60a 100644 --- a/libraries/voxels/src/VoxelsScriptingInterface.cpp +++ b/libraries/voxels/src/VoxelsScriptingInterface.cpp @@ -8,10 +8,6 @@ #include "VoxelsScriptingInterface.h" -VoxelsScriptingInterface::VoxelsScriptingInterface() { - NodeList::getInstance()->addNodeTypeToInterestSet(NODE_TYPE_VOXEL_SERVER); -} - void VoxelsScriptingInterface::queueVoxelAdd(PACKET_TYPE addPacketType, VoxelDetail& addVoxelDetails) { getVoxelPacketSender()->queueVoxelEditMessages(addPacketType, 1, &addVoxelDetails); } diff --git a/libraries/voxels/src/VoxelsScriptingInterface.h b/libraries/voxels/src/VoxelsScriptingInterface.h index 500a0cbc5d..97bdfb2c59 100644 --- a/libraries/voxels/src/VoxelsScriptingInterface.h +++ b/libraries/voxels/src/VoxelsScriptingInterface.h @@ -19,9 +19,7 @@ /// handles scripting of voxel commands from JS passed to assigned clients class VoxelsScriptingInterface : public OctreeScriptingInterface { Q_OBJECT -public: - VoxelsScriptingInterface(); - +public: VoxelEditPacketSender* getVoxelPacketSender() { return (VoxelEditPacketSender*)getPacketSender(); } virtual NODE_TYPE getServerNodeType() const { return NODE_TYPE_VOXEL_SERVER; }