move octree-server libs to assignment-client

assignment-client/CMakeLists.txt

@@ -30,9 +30,6 @@ link_hifi_library(octree ${TARGET_NAME} ${ROOT_DIR})
 link_hifi_library(voxels ${TARGET_NAME} ${ROOT_DIR})
 link_hifi_library(particles ${TARGET_NAME} ${ROOT_DIR})
 link_hifi_library(metavoxels ${TARGET_NAME} ${ROOT_DIR})
-link_hifi_library(octree-server ${TARGET_NAME} ${ROOT_DIR})
-link_hifi_library(particle-server ${TARGET_NAME} ${ROOT_DIR})
-link_hifi_library(voxel-server ${TARGET_NAME} ${ROOT_DIR})
 link_hifi_library(script-engine ${TARGET_NAME} ${ROOT_DIR})
 link_hifi_library(embedded-webserver ${TARGET_NAME} ${ROOT_DIR})
 

assignment-client/src/AssignmentFactory.cpp

@@ -8,15 +8,13 @@
 
 #include <PacketHeaders.h>
 
-#include <ParticleServer.h>
-
-#include <VoxelServer.h>
-
 #include "Agent.h"
 #include "AssignmentFactory.h"
 #include "audio/AudioMixer.h"
 #include "avatars/AvatarMixer.h"
 #include "metavoxels/MetavoxelServer.h"
+#include "particles/ParticleServer.h"
+#include "voxels/VoxelServer.h"
 
 ThreadedAssignment* AssignmentFactory::unpackAssignment(const QByteArray& packet) {
     QDataStream packetStream(packet);

assignment-client/src/particles/ParticleNodeData.h

@@ -10,9 +10,10 @@
 #ifndef __hifi__ParticleNodeData__
 #define __hifi__ParticleNodeData__
 
-#include <OctreeQueryNode.h>
 #include <PacketHeaders.h>
 
+#include "../octree/OctreeQueryNode.h"
+
 class ParticleNodeData : public OctreeQueryNode {
 public:
     ParticleNodeData() :

assignment-client/src/particles/ParticleServer.h

@@ -10,7 +10,7 @@
 #ifndef __particle_server__ParticleServer__
 #define __particle_server__ParticleServer__
 
-#include <OctreeServer.h>
+#include "../octree/OctreeServer.h"
 
 #include "Particle.h"
 #include "ParticleServerConsts.h"

assignment-client/src/voxels/VoxelNodeData.h

@@ -3,15 +3,16 @@
 //  hifi
 //
 //  Created by Stephen Birarda on 3/21/13.
-//
+//  Copyright (c) 2014 HighFidelity, Inc. All rights reserved.
 //
 
 #ifndef __hifi__VoxelNodeData__
 #define __hifi__VoxelNodeData__
 
-#include <OctreeQueryNode.h>
 #include <PacketHeaders.h>
 
+#include "../octree/OctreeQueryNode.h"
+
 class VoxelNodeData : public OctreeQueryNode {
 public:
     VoxelNodeData() : OctreeQueryNode() {  };

assignment-client/src/voxels/VoxelServer.h

@@ -17,8 +17,7 @@
 #include <ThreadedAssignment.h>
 #include <EnvironmentData.h>
 
-#include <OctreeServer.h>
-
+#include "../octree/OctreeServer.h"
 
 #include "VoxelServerConsts.h"
 

libraries/octree-server/CMakeLists.txt

@@ -1,36 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-set(ROOT_DIR ../..)
-set(MACRO_DIR ${ROOT_DIR}/cmake/macros)
-
-# setup for find modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules/")
-
-set(TARGET_NAME octree-server)
-
-find_package(Qt5Network REQUIRED)
-find_package(Qt5Widgets REQUIRED)
-
-include(${MACRO_DIR}/SetupHifiLibrary.cmake)
-
-setup_hifi_library(${TARGET_NAME} ${OPTIONAL_SRCS})
-
-qt5_use_modules(${TARGET_NAME} Network Widgets)
-
-include(${MACRO_DIR}/IncludeGLM.cmake)
-include_glm(${TARGET_NAME} ${ROOT_DIR})
-
-# link ZLIB
-find_package(ZLIB)
-include_directories(${ZLIB_INCLUDE_DIRS})
-target_link_libraries(${TARGET_NAME} ${ZLIB_LIBRARIES})
-
-# link in the shared library
-include(${MACRO_DIR}/LinkHifiLibrary.cmake)
-link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
-
-# link in the hifi octree library
-link_hifi_library(octree ${TARGET_NAME} ${ROOT_DIR})
-
-# link the embedded webserver
-link_hifi_library(embedded-webserver ${TARGET_NAME} ${ROOT_DIR})

libraries/particle-server/CMakeLists.txt

@@ -1,37 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-set(ROOT_DIR ../..)
-set(MACRO_DIR ${ROOT_DIR}/cmake/macros)
-
-# setup for find modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules/")
-
-set(TARGET_NAME particle-server)
-
-find_package(Qt5Widgets REQUIRED)
-
-include(${MACRO_DIR}/SetupHifiLibrary.cmake)
-
-setup_hifi_library(${TARGET_NAME} ${OPTIONAL_SRCS})
-
-qt5_use_modules(${TARGET_NAME} Widgets)
-
-# inluce GLM
-include(${MACRO_DIR}/IncludeGLM.cmake)
-include_glm(${TARGET_NAME} ${ROOT_DIR})
-
-# link in the shared library
-include(${MACRO_DIR}/LinkHifiLibrary.cmake)
-link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
-
-# link ZLIB
-find_package(ZLIB)
-include_directories(${ZLIB_INCLUDE_DIRS})
-target_link_libraries(${TARGET_NAME} ${ZLIB_LIBRARIES})
-
-link_hifi_library(octree ${TARGET_NAME} ${ROOT_DIR})
-link_hifi_library(octree-server ${TARGET_NAME} ${ROOT_DIR})
-link_hifi_library(particles ${TARGET_NAME} ${ROOT_DIR})
-
-# link in the embedded webserver
-link_hifi_library(embedded-webserver ${TARGET_NAME} ${ROOT_DIR})

libraries/voxel-server/CMakeLists.txt

@@ -1,37 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-set(ROOT_DIR ../..)
-set(MACRO_DIR ${ROOT_DIR}/cmake/macros)
-
-# setup for find modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules/")
-
-set(TARGET_NAME voxel-server)
-
-find_package(Qt5Widgets REQUIRED)
-
-include(${MACRO_DIR}/SetupHifiLibrary.cmake)
-
-setup_hifi_library(${TARGET_NAME} ${OPTIONAL_SRCS})
-
-qt5_use_modules(${TARGET_NAME} Widgets)
-
-include(${MACRO_DIR}/IncludeGLM.cmake)
-include_glm(${TARGET_NAME} ${ROOT_DIR})
-
-# link ZLIB
-find_package(ZLIB)
-include_directories(${ZLIB_INCLUDE_DIRS})
-target_link_libraries(${TARGET_NAME} ${ZLIB_LIBRARIES})
-
-# link in the shared library
-include(${MACRO_DIR}/LinkHifiLibrary.cmake)
-link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
-
-# link in the embedded webserver
-link_hifi_library(embedded-webserver ${TARGET_NAME} ${ROOT_DIR})
-
-# link in the hifi octree library
-link_hifi_library(octree ${TARGET_NAME} ${ROOT_DIR})
-link_hifi_library(octree-server ${TARGET_NAME} ${ROOT_DIR})
-link_hifi_library(voxels ${TARGET_NAME} ${ROOT_DIR})