From f4fe2bb7549b414dd98d9679e13647d8f8f86b2a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 5 Feb 2014 16:04:23 -0800 Subject: [PATCH] move octree-server libs to assignment-client --- assignment-client/CMakeLists.txt | 3 -- assignment-client/src/AssignmentFactory.cpp | 6 +-- .../octree}/OctreeInboundPacketProcessor.cpp | 0 .../octree}/OctreeInboundPacketProcessor.h | 0 .../src/octree}/OctreeQueryNode.cpp | 0 .../src/octree}/OctreeQueryNode.h | 0 .../src/octree}/OctreeSendThread.cpp | 0 .../src/octree}/OctreeSendThread.h | 0 .../src/octree}/OctreeServer.cpp | 0 .../src/octree}/OctreeServer.h | 0 .../src/octree}/OctreeServerConsts.h | 0 .../src/particles}/ParticleNodeData.h | 3 +- .../src/particles}/ParticleServer.cpp | 0 .../src/particles}/ParticleServer.h | 2 +- .../src/particles}/ParticleServerConsts.h | 0 .../src/voxels}/VoxelNodeData.h | 5 ++- .../src/voxels}/VoxelServer.cpp | 0 .../src/voxels}/VoxelServer.h | 3 +- .../src/voxels}/VoxelServerConsts.h | 0 libraries/octree-server/CMakeLists.txt | 36 ------------------ libraries/particle-server/CMakeLists.txt | 37 ------------------- libraries/voxel-server/CMakeLists.txt | 37 ------------------- 22 files changed, 9 insertions(+), 123 deletions(-) rename {libraries/octree-server/src => assignment-client/src/octree}/OctreeInboundPacketProcessor.cpp (100%) rename {libraries/octree-server/src => assignment-client/src/octree}/OctreeInboundPacketProcessor.h (100%) rename {libraries/octree-server/src => assignment-client/src/octree}/OctreeQueryNode.cpp (100%) rename {libraries/octree-server/src => assignment-client/src/octree}/OctreeQueryNode.h (100%) rename {libraries/octree-server/src => assignment-client/src/octree}/OctreeSendThread.cpp (100%) rename {libraries/octree-server/src => assignment-client/src/octree}/OctreeSendThread.h (100%) rename {libraries/octree-server/src => assignment-client/src/octree}/OctreeServer.cpp (100%) rename {libraries/octree-server/src => assignment-client/src/octree}/OctreeServer.h (100%) rename {libraries/octree-server/src => assignment-client/src/octree}/OctreeServerConsts.h (100%) rename {libraries/particle-server/src => assignment-client/src/particles}/ParticleNodeData.h (95%) rename {libraries/particle-server/src => assignment-client/src/particles}/ParticleServer.cpp (100%) rename {libraries/particle-server/src => assignment-client/src/particles}/ParticleServer.h (97%) rename {libraries/particle-server/src => assignment-client/src/particles}/ParticleServerConsts.h (100%) rename {libraries/voxel-server/src => assignment-client/src/voxels}/VoxelNodeData.h (79%) rename {libraries/voxel-server/src => assignment-client/src/voxels}/VoxelServer.cpp (100%) rename {libraries/voxel-server/src => assignment-client/src/voxels}/VoxelServer.h (98%) rename {libraries/voxel-server/src => assignment-client/src/voxels}/VoxelServerConsts.h (100%) delete mode 100644 libraries/octree-server/CMakeLists.txt delete mode 100644 libraries/particle-server/CMakeLists.txt delete mode 100644 libraries/voxel-server/CMakeLists.txt diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt index 51a91621da..60b9d75338 100644 --- a/assignment-client/CMakeLists.txt +++ b/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}) diff --git a/assignment-client/src/AssignmentFactory.cpp b/assignment-client/src/AssignmentFactory.cpp index 5bf0417f22..cde5666ab9 100644 --- a/assignment-client/src/AssignmentFactory.cpp +++ b/assignment-client/src/AssignmentFactory.cpp @@ -8,15 +8,13 @@ #include -#include - -#include - #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); diff --git a/libraries/octree-server/src/OctreeInboundPacketProcessor.cpp b/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp similarity index 100% rename from libraries/octree-server/src/OctreeInboundPacketProcessor.cpp rename to assignment-client/src/octree/OctreeInboundPacketProcessor.cpp diff --git a/libraries/octree-server/src/OctreeInboundPacketProcessor.h b/assignment-client/src/octree/OctreeInboundPacketProcessor.h similarity index 100% rename from libraries/octree-server/src/OctreeInboundPacketProcessor.h rename to assignment-client/src/octree/OctreeInboundPacketProcessor.h diff --git a/libraries/octree-server/src/OctreeQueryNode.cpp b/assignment-client/src/octree/OctreeQueryNode.cpp similarity index 100% rename from libraries/octree-server/src/OctreeQueryNode.cpp rename to assignment-client/src/octree/OctreeQueryNode.cpp diff --git a/libraries/octree-server/src/OctreeQueryNode.h b/assignment-client/src/octree/OctreeQueryNode.h similarity index 100% rename from libraries/octree-server/src/OctreeQueryNode.h rename to assignment-client/src/octree/OctreeQueryNode.h diff --git a/libraries/octree-server/src/OctreeSendThread.cpp b/assignment-client/src/octree/OctreeSendThread.cpp similarity index 100% rename from libraries/octree-server/src/OctreeSendThread.cpp rename to assignment-client/src/octree/OctreeSendThread.cpp diff --git a/libraries/octree-server/src/OctreeSendThread.h b/assignment-client/src/octree/OctreeSendThread.h similarity index 100% rename from libraries/octree-server/src/OctreeSendThread.h rename to assignment-client/src/octree/OctreeSendThread.h diff --git a/libraries/octree-server/src/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp similarity index 100% rename from libraries/octree-server/src/OctreeServer.cpp rename to assignment-client/src/octree/OctreeServer.cpp diff --git a/libraries/octree-server/src/OctreeServer.h b/assignment-client/src/octree/OctreeServer.h similarity index 100% rename from libraries/octree-server/src/OctreeServer.h rename to assignment-client/src/octree/OctreeServer.h diff --git a/libraries/octree-server/src/OctreeServerConsts.h b/assignment-client/src/octree/OctreeServerConsts.h similarity index 100% rename from libraries/octree-server/src/OctreeServerConsts.h rename to assignment-client/src/octree/OctreeServerConsts.h diff --git a/libraries/particle-server/src/ParticleNodeData.h b/assignment-client/src/particles/ParticleNodeData.h similarity index 95% rename from libraries/particle-server/src/ParticleNodeData.h rename to assignment-client/src/particles/ParticleNodeData.h index 4ab16cb33a..450767613e 100644 --- a/libraries/particle-server/src/ParticleNodeData.h +++ b/assignment-client/src/particles/ParticleNodeData.h @@ -10,9 +10,10 @@ #ifndef __hifi__ParticleNodeData__ #define __hifi__ParticleNodeData__ -#include #include +#include "../octree/OctreeQueryNode.h" + class ParticleNodeData : public OctreeQueryNode { public: ParticleNodeData() : diff --git a/libraries/particle-server/src/ParticleServer.cpp b/assignment-client/src/particles/ParticleServer.cpp similarity index 100% rename from libraries/particle-server/src/ParticleServer.cpp rename to assignment-client/src/particles/ParticleServer.cpp diff --git a/libraries/particle-server/src/ParticleServer.h b/assignment-client/src/particles/ParticleServer.h similarity index 97% rename from libraries/particle-server/src/ParticleServer.h rename to assignment-client/src/particles/ParticleServer.h index 1c1e3b5be9..345ebe86e3 100644 --- a/libraries/particle-server/src/ParticleServer.h +++ b/assignment-client/src/particles/ParticleServer.h @@ -10,7 +10,7 @@ #ifndef __particle_server__ParticleServer__ #define __particle_server__ParticleServer__ -#include +#include "../octree/OctreeServer.h" #include "Particle.h" #include "ParticleServerConsts.h" diff --git a/libraries/particle-server/src/ParticleServerConsts.h b/assignment-client/src/particles/ParticleServerConsts.h similarity index 100% rename from libraries/particle-server/src/ParticleServerConsts.h rename to assignment-client/src/particles/ParticleServerConsts.h diff --git a/libraries/voxel-server/src/VoxelNodeData.h b/assignment-client/src/voxels/VoxelNodeData.h similarity index 79% rename from libraries/voxel-server/src/VoxelNodeData.h rename to assignment-client/src/voxels/VoxelNodeData.h index 54ef9da5b6..c24bfad6ce 100644 --- a/libraries/voxel-server/src/VoxelNodeData.h +++ b/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 #include +#include "../octree/OctreeQueryNode.h" + class VoxelNodeData : public OctreeQueryNode { public: VoxelNodeData() : OctreeQueryNode() { }; diff --git a/libraries/voxel-server/src/VoxelServer.cpp b/assignment-client/src/voxels/VoxelServer.cpp similarity index 100% rename from libraries/voxel-server/src/VoxelServer.cpp rename to assignment-client/src/voxels/VoxelServer.cpp diff --git a/libraries/voxel-server/src/VoxelServer.h b/assignment-client/src/voxels/VoxelServer.h similarity index 98% rename from libraries/voxel-server/src/VoxelServer.h rename to assignment-client/src/voxels/VoxelServer.h index 183224b2a7..526a3b2c54 100644 --- a/libraries/voxel-server/src/VoxelServer.h +++ b/assignment-client/src/voxels/VoxelServer.h @@ -17,8 +17,7 @@ #include #include -#include - +#include "../octree/OctreeServer.h" #include "VoxelServerConsts.h" diff --git a/libraries/voxel-server/src/VoxelServerConsts.h b/assignment-client/src/voxels/VoxelServerConsts.h similarity index 100% rename from libraries/voxel-server/src/VoxelServerConsts.h rename to assignment-client/src/voxels/VoxelServerConsts.h diff --git a/libraries/octree-server/CMakeLists.txt b/libraries/octree-server/CMakeLists.txt deleted file mode 100644 index 64c73a4bd4..0000000000 --- a/libraries/octree-server/CMakeLists.txt +++ /dev/null @@ -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}) diff --git a/libraries/particle-server/CMakeLists.txt b/libraries/particle-server/CMakeLists.txt deleted file mode 100644 index 9c63645e8d..0000000000 --- a/libraries/particle-server/CMakeLists.txt +++ /dev/null @@ -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}) \ No newline at end of file diff --git a/libraries/voxel-server/CMakeLists.txt b/libraries/voxel-server/CMakeLists.txt deleted file mode 100644 index 594d037767..0000000000 --- a/libraries/voxel-server/CMakeLists.txt +++ /dev/null @@ -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}) \ No newline at end of file