diff --git a/libraries/voxel-server-library/src/VoxelServer.cpp b/libraries/voxel-server-library/src/VoxelServer.cpp index 6408d356a5..4f0140d892 100644 --- a/libraries/voxel-server-library/src/VoxelServer.cpp +++ b/libraries/voxel-server-library/src/VoxelServer.cpp @@ -12,6 +12,9 @@ #include "VoxelServerConsts.h" #include "VoxelNodeData.h" +const char* VOXEL_SERVER_NAME = "Voxel"; +const char* VOXEL_SERVER_LOGGING_TARGET_NAME = "voxel-server"; +const char* LOCAL_VOXELS_PERSIST_FILE = "resources/voxels.svo"; VoxelServer::VoxelServer(const unsigned char* dataBuffer, int numBytes) : OctreeServer(dataBuffer, numBytes) { // nothing special to do here... @@ -29,20 +32,6 @@ Octree* VoxelServer::createTree() { return new VoxelTree(true); } -unsigned char VoxelServer::getMyNodeType() { - return NODE_TYPE_VOXEL_SERVER; -} - -const char* VOXEL_SERVER_LOGGING_TARGET_NAME = "voxel-server"; -const char* VoxelServer::getMyLoggingServerTargetName() { - return VOXEL_SERVER_LOGGING_TARGET_NAME; -} - -const char* LOCAL_VOXELS_PERSIST_FILE = "resources/voxels.svo"; -const char* VoxelServer::getMyDefaultPersistFilename() { - return LOCAL_VOXELS_PERSIST_FILE; -} - bool VoxelServer::hasSpecialPacketToSend() { bool shouldSendEnvironments = _sendEnvironments && shouldDo(ENVIRONMENT_SEND_INTERVAL_USECS, OCTREE_SEND_INTERVAL_USECS); return shouldSendEnvironments; diff --git a/libraries/voxel-server-library/src/VoxelServer.h b/libraries/voxel-server-library/src/VoxelServer.h index aaaa68c01e..e374ca01ad 100644 --- a/libraries/voxel-server-library/src/VoxelServer.h +++ b/libraries/voxel-server-library/src/VoxelServer.h @@ -37,9 +37,12 @@ public: // Subclasses must implement these methods virtual OctreeQueryNode* createOctreeQueryNode(Node* newNode); virtual Octree* createTree(); - virtual unsigned char getMyNodeType(); - virtual const char* getMyLoggingServerTargetName(); - virtual const char* getMyDefaultPersistFilename(); + virtual unsigned char getMyNodeType() const { return NODE_TYPE_VOXEL_SERVER; } + virtual PACKET_TYPE getMyQueryMessageType() const { return PACKET_TYPE_VOXEL_QUERY; } + virtual const char* getMyServerName() const { return VOXEL_SERVER_NAME; } + virtual const char* getMyLoggingServerTargetName() const { return VOXEL_SERVER_LOGGING_TARGET_NAME; } + virtual const char* getMyDefaultPersistFilename() const { return LOCAL_VOXELS_PERSIST_FILE; } + virtual bool hasSpecialPacketToSend(); virtual int sendSpecialPacket(Node* node); diff --git a/libraries/voxel-server-library/src/VoxelServerConsts.h b/libraries/voxel-server-library/src/VoxelServerConsts.h index e6973812f9..ce6fd86a32 100644 --- a/libraries/voxel-server-library/src/VoxelServerConsts.h +++ b/libraries/voxel-server-library/src/VoxelServerConsts.h @@ -9,6 +9,10 @@ #ifndef __voxel_server__VoxelServerConsts__ #define __voxel_server__VoxelServerConsts__ +extern const char* VOXEL_SERVER_NAME; +extern const char* VOXEL_SERVER_LOGGING_TARGET_NAME; +extern const char* LOCAL_VOXELS_PERSIST_FILE; + const int ENVIRONMENT_SEND_INTERVAL_USECS = 1000000; #endif // __voxel_server__VoxelServerConsts__