diff --git a/CMakeLists.txt b/CMakeLists.txt index 742c59ecea..526ba77653 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 2.8) project(hifi) -add_subdirectory(space) -add_subdirectory(avatar) -add_subdirectory(domain) -add_subdirectory(mixer) -add_subdirectory(voxel) +add_subdirectory(avatar-mixer) +add_subdirectory(audio-mixer) +add_subdirectory(domain-server) add_subdirectory(interface) add_subdirectory(injector) +add_subdirectory(space-server) +add_subdirectory(voxel-server) \ No newline at end of file diff --git a/LinkHifiShared.cmake b/LinkHifiShared.cmake deleted file mode 100644 index 3735589807..0000000000 --- a/LinkHifiShared.cmake +++ /dev/null @@ -1,15 +0,0 @@ -MACRO(LINK_HIFI_SHARED_LIBRARY TARGET) - if (NOT TARGET HifiShared) - add_subdirectory(../shared ../shared) - endif (NOT TARGET HifiShared) - - include_directories(../shared/src) - get_directory_property(HIFI_SHARED_LIBRARY DIRECTORY ../shared DEFINITION HIFI_SHARED_LIBRARY) - add_dependencies(${TARGET} ${HIFI_SHARED_LIBRARY}) - target_link_libraries(${TARGET} ${HIFI_SHARED_LIBRARY}) - - if (APPLE) - # link in required OS X framework - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework CoreServices") - endif (APPLE) -ENDMACRO(LINK_HIFI_SHARED_LIBRARY _target) \ No newline at end of file diff --git a/mixer/.gitignore b/audio-mixer/.gitignore similarity index 100% rename from mixer/.gitignore rename to audio-mixer/.gitignore diff --git a/audio-mixer/CMakeLists.txt b/audio-mixer/CMakeLists.txt new file mode 100644 index 0000000000..cbb5075232 --- /dev/null +++ b/audio-mixer/CMakeLists.txt @@ -0,0 +1,15 @@ +cmake_minimum_required(VERSION 2.8) +set(MACRO_DIR ../cmake/macros) + +set(TARGET_NAME audio-mixer) + +include(${MACRO_DIR}/SetupHifiProject.cmake) +setup_hifi_project(${TARGET_NAME}) + +# link the shared hifi library +include(${MACRO_DIR}/LinkHifiLibrary.cmake) +link_hifi_library(shared ${TARGET_NAME}) + +# link the threads library +find_package(Threads REQUIRED) +target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT}) \ No newline at end of file diff --git a/mixer/src/main.cpp b/audio-mixer/src/main.cpp similarity index 100% rename from mixer/src/main.cpp rename to audio-mixer/src/main.cpp diff --git a/avatar-mixer/CMakeLists.txt b/avatar-mixer/CMakeLists.txt new file mode 100644 index 0000000000..34a58879f6 --- /dev/null +++ b/avatar-mixer/CMakeLists.txt @@ -0,0 +1,15 @@ +cmake_minimum_required(VERSION 2.8) + +set(TARGET_NAME "avatar-mixer") + +# setup the project +include(../cmake/macros/SetupHifiProject.cmake) +setup_hifi_project(${TARGET_NAME}) + +# link the shared hifi library +include(../cmake/macros/LinkHifiLibrary.cmake) +link_hifi_library(shared ${TARGET_NAME}) + +# link the threads library +find_package(Threads REQUIRED) +target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT}) diff --git a/avatar/src/AvatarAgentData.cpp b/avatar-mixer/src/AvatarAgentData.cpp similarity index 100% rename from avatar/src/AvatarAgentData.cpp rename to avatar-mixer/src/AvatarAgentData.cpp diff --git a/avatar/src/AvatarAgentData.h b/avatar-mixer/src/AvatarAgentData.h similarity index 100% rename from avatar/src/AvatarAgentData.h rename to avatar-mixer/src/AvatarAgentData.h diff --git a/avatar/src/main.cpp b/avatar-mixer/src/main.cpp similarity index 100% rename from avatar/src/main.cpp rename to avatar-mixer/src/main.cpp diff --git a/avatar/CMakeLists.txt b/avatar/CMakeLists.txt deleted file mode 100644 index c75693302e..0000000000 --- a/avatar/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -cmake_minimum_required(VERSION 2.8) - -project(avatar) - -# grab the implemenation and header files -file(GLOB AVATAR_SRCS src/*.cpp src/*.h) - -# add the executable -add_executable(avatar ${AVATAR_SRCS}) - -# link the shared hifi library -include(../LinkHifiShared.cmake) -link_hifi_shared_library(avatar) - -# link the threads library -find_package(Threads REQUIRED) -target_link_libraries(avatar ${CMAKE_THREAD_LIBS_INIT}) diff --git a/cmake/macros/IncludeGLM.cmake b/cmake/macros/IncludeGLM.cmake new file mode 100644 index 0000000000..f77ad9e06d --- /dev/null +++ b/cmake/macros/IncludeGLM.cmake @@ -0,0 +1,5 @@ +MACRO(INCLUDE_GLM TARGET MACRO_DIR) + set(GLM_ROOT_DIR ${MACRO_DIR}/../../externals) + find_package(GLM REQUIRED) + include_directories(${GLM_INCLUDE_DIRS}) +ENDMACRO(INCLUDE_GLM _target _macro_dir) \ No newline at end of file diff --git a/cmake/macros/LinkHifiLibrary.cmake b/cmake/macros/LinkHifiLibrary.cmake new file mode 100644 index 0000000000..3239afbf83 --- /dev/null +++ b/cmake/macros/LinkHifiLibrary.cmake @@ -0,0 +1,22 @@ +MACRO(LINK_HIFI_LIBRARY LIBRARY TARGET) + if (NOT TARGET ${LIBRARY}) + add_subdirectory(../libraries/${LIBRARY} ../libraries/${LIBRARY}) + endif (NOT TARGET ${LIBRARY}) + + string(TOUPPER ${LIBRARY} UPPERCASED_LIBRARY_NAME) + set(HIFI_LIBRARY_PROPERTY "HIFI_${UPPERCASED_LIBRARY_NAME}_LIBRARY") + get_directory_property(HIFI_LIBRARY + DIRECTORY ../libraries/${LIBRARY} + DEFINITION ${HIFI_LIBRARY_PROPERTY}) + + include_directories(../libraries/${LIBRARY}/src) + + add_dependencies(${TARGET} ${LIBRARY}) + target_link_libraries(${TARGET} ${LIBRARY}) + + if (APPLE) + # currently the "shared" library requires CoreServices + # link in required OS X framework + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework CoreServices") + endif (APPLE) +ENDMACRO(LINK_HIFI_LIBRARY _library _target) \ No newline at end of file diff --git a/cmake/macros/SetupHifiProject.cmake b/cmake/macros/SetupHifiProject.cmake new file mode 100644 index 0000000000..3b6f130073 --- /dev/null +++ b/cmake/macros/SetupHifiProject.cmake @@ -0,0 +1,9 @@ +MACRO(SETUP_HIFI_PROJECT TARGET) + project(${TARGET}) + + # grab the implemenation and header files + file(GLOB TARGET_SRCS src/*.cpp src/*.h) + + # add the executable + add_executable(${TARGET} ${TARGET_SRCS}) +ENDMACRO(SETUP_HIFI_PROJECT _target) \ No newline at end of file diff --git a/interface/cmake/modules/FindGLM.cmake b/cmake/modules/FindGLM.cmake similarity index 100% rename from interface/cmake/modules/FindGLM.cmake rename to cmake/modules/FindGLM.cmake diff --git a/interface/cmake/modules/FindJack.cmake b/cmake/modules/FindJack.cmake similarity index 100% rename from interface/cmake/modules/FindJack.cmake rename to cmake/modules/FindJack.cmake diff --git a/interface/cmake/modules/FindLibrt.cmake b/cmake/modules/FindLibrt.cmake similarity index 100% rename from interface/cmake/modules/FindLibrt.cmake rename to cmake/modules/FindLibrt.cmake diff --git a/interface/cmake/modules/FindLodePNG.cmake b/cmake/modules/FindLodePNG.cmake similarity index 100% rename from interface/cmake/modules/FindLodePNG.cmake rename to cmake/modules/FindLodePNG.cmake diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt new file mode 100644 index 0000000000..6642fc090a --- /dev/null +++ b/domain-server/CMakeLists.txt @@ -0,0 +1,11 @@ +cmake_minimum_required(VERSION 2.8) +set(MACRO_DIR ../cmake/macros) + +set(TARGET_NAME domain-server) + +include(${MACRO_DIR}/SetupHifiProject.cmake) +setup_hifi_project(${TARGET_NAME}) + +# link the shared hifi library +include(${MACRO_DIR}/LinkHifiLibrary.cmake) +link_hifi_library(shared ${TARGET_NAME}) \ No newline at end of file diff --git a/domain/src/main.cpp b/domain-server/src/main.cpp similarity index 100% rename from domain/src/main.cpp rename to domain-server/src/main.cpp diff --git a/domain/CMakeLists.txt b/domain/CMakeLists.txt deleted file mode 100644 index 4a7f77910f..0000000000 --- a/domain/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -cmake_minimum_required(VERSION 2.8) - -project(domain) - -# grab the implementation / header files -file(GLOB DOMAIN_SRCS src/*.cpp src/*.h) - -# add an executable with the source files -add_executable(domain ${DOMAIN_SRCS}) - -# link the shared hifi library -include(../LinkHifiShared.cmake) -link_hifi_shared_library(domain) \ No newline at end of file diff --git a/interface/external/glm/core/_detail.hpp b/externals/glm/core/_detail.hpp similarity index 100% rename from interface/external/glm/core/_detail.hpp rename to externals/glm/core/_detail.hpp diff --git a/interface/external/glm/core/_fixes.hpp b/externals/glm/core/_fixes.hpp similarity index 100% rename from interface/external/glm/core/_fixes.hpp rename to externals/glm/core/_fixes.hpp diff --git a/interface/external/glm/core/_swizzle.hpp b/externals/glm/core/_swizzle.hpp similarity index 100% rename from interface/external/glm/core/_swizzle.hpp rename to externals/glm/core/_swizzle.hpp diff --git a/interface/external/glm/core/_swizzle_func.hpp b/externals/glm/core/_swizzle_func.hpp similarity index 100% rename from interface/external/glm/core/_swizzle_func.hpp rename to externals/glm/core/_swizzle_func.hpp diff --git a/interface/external/glm/core/_vectorize.hpp b/externals/glm/core/_vectorize.hpp similarity index 100% rename from interface/external/glm/core/_vectorize.hpp rename to externals/glm/core/_vectorize.hpp diff --git a/interface/external/glm/core/dummy.cpp b/externals/glm/core/dummy.cpp similarity index 100% rename from interface/external/glm/core/dummy.cpp rename to externals/glm/core/dummy.cpp diff --git a/interface/external/glm/core/func_common.hpp b/externals/glm/core/func_common.hpp similarity index 100% rename from interface/external/glm/core/func_common.hpp rename to externals/glm/core/func_common.hpp diff --git a/interface/external/glm/core/func_common.inl b/externals/glm/core/func_common.inl similarity index 100% rename from interface/external/glm/core/func_common.inl rename to externals/glm/core/func_common.inl diff --git a/interface/external/glm/core/func_exponential.hpp b/externals/glm/core/func_exponential.hpp similarity index 100% rename from interface/external/glm/core/func_exponential.hpp rename to externals/glm/core/func_exponential.hpp diff --git a/interface/external/glm/core/func_exponential.inl b/externals/glm/core/func_exponential.inl similarity index 100% rename from interface/external/glm/core/func_exponential.inl rename to externals/glm/core/func_exponential.inl diff --git a/interface/external/glm/core/func_geometric.hpp b/externals/glm/core/func_geometric.hpp similarity index 100% rename from interface/external/glm/core/func_geometric.hpp rename to externals/glm/core/func_geometric.hpp diff --git a/interface/external/glm/core/func_geometric.inl b/externals/glm/core/func_geometric.inl similarity index 100% rename from interface/external/glm/core/func_geometric.inl rename to externals/glm/core/func_geometric.inl diff --git a/interface/external/glm/core/func_integer.hpp b/externals/glm/core/func_integer.hpp similarity index 100% rename from interface/external/glm/core/func_integer.hpp rename to externals/glm/core/func_integer.hpp diff --git a/interface/external/glm/core/func_integer.inl b/externals/glm/core/func_integer.inl similarity index 100% rename from interface/external/glm/core/func_integer.inl rename to externals/glm/core/func_integer.inl diff --git a/interface/external/glm/core/func_matrix.hpp b/externals/glm/core/func_matrix.hpp similarity index 100% rename from interface/external/glm/core/func_matrix.hpp rename to externals/glm/core/func_matrix.hpp diff --git a/interface/external/glm/core/func_matrix.inl b/externals/glm/core/func_matrix.inl similarity index 100% rename from interface/external/glm/core/func_matrix.inl rename to externals/glm/core/func_matrix.inl diff --git a/interface/external/glm/core/func_noise.hpp b/externals/glm/core/func_noise.hpp similarity index 100% rename from interface/external/glm/core/func_noise.hpp rename to externals/glm/core/func_noise.hpp diff --git a/interface/external/glm/core/func_noise.inl b/externals/glm/core/func_noise.inl similarity index 100% rename from interface/external/glm/core/func_noise.inl rename to externals/glm/core/func_noise.inl diff --git a/interface/external/glm/core/func_packing.hpp b/externals/glm/core/func_packing.hpp similarity index 100% rename from interface/external/glm/core/func_packing.hpp rename to externals/glm/core/func_packing.hpp diff --git a/interface/external/glm/core/func_packing.inl b/externals/glm/core/func_packing.inl similarity index 100% rename from interface/external/glm/core/func_packing.inl rename to externals/glm/core/func_packing.inl diff --git a/interface/external/glm/core/func_trigonometric.hpp b/externals/glm/core/func_trigonometric.hpp similarity index 100% rename from interface/external/glm/core/func_trigonometric.hpp rename to externals/glm/core/func_trigonometric.hpp diff --git a/interface/external/glm/core/func_trigonometric.inl b/externals/glm/core/func_trigonometric.inl similarity index 100% rename from interface/external/glm/core/func_trigonometric.inl rename to externals/glm/core/func_trigonometric.inl diff --git a/interface/external/glm/core/func_vector_relational.hpp b/externals/glm/core/func_vector_relational.hpp similarity index 100% rename from interface/external/glm/core/func_vector_relational.hpp rename to externals/glm/core/func_vector_relational.hpp diff --git a/interface/external/glm/core/func_vector_relational.inl b/externals/glm/core/func_vector_relational.inl similarity index 100% rename from interface/external/glm/core/func_vector_relational.inl rename to externals/glm/core/func_vector_relational.inl diff --git a/interface/external/glm/core/hint.hpp b/externals/glm/core/hint.hpp similarity index 100% rename from interface/external/glm/core/hint.hpp rename to externals/glm/core/hint.hpp diff --git a/interface/external/glm/core/intrinsic_common.hpp b/externals/glm/core/intrinsic_common.hpp similarity index 100% rename from interface/external/glm/core/intrinsic_common.hpp rename to externals/glm/core/intrinsic_common.hpp diff --git a/interface/external/glm/core/intrinsic_common.inl b/externals/glm/core/intrinsic_common.inl similarity index 100% rename from interface/external/glm/core/intrinsic_common.inl rename to externals/glm/core/intrinsic_common.inl diff --git a/interface/external/glm/core/intrinsic_exponential.hpp b/externals/glm/core/intrinsic_exponential.hpp similarity index 100% rename from interface/external/glm/core/intrinsic_exponential.hpp rename to externals/glm/core/intrinsic_exponential.hpp diff --git a/interface/external/glm/core/intrinsic_exponential.inl b/externals/glm/core/intrinsic_exponential.inl similarity index 100% rename from interface/external/glm/core/intrinsic_exponential.inl rename to externals/glm/core/intrinsic_exponential.inl diff --git a/interface/external/glm/core/intrinsic_geometric.hpp b/externals/glm/core/intrinsic_geometric.hpp similarity index 100% rename from interface/external/glm/core/intrinsic_geometric.hpp rename to externals/glm/core/intrinsic_geometric.hpp diff --git a/interface/external/glm/core/intrinsic_geometric.inl b/externals/glm/core/intrinsic_geometric.inl similarity index 100% rename from interface/external/glm/core/intrinsic_geometric.inl rename to externals/glm/core/intrinsic_geometric.inl diff --git a/interface/external/glm/core/intrinsic_matrix.hpp b/externals/glm/core/intrinsic_matrix.hpp similarity index 100% rename from interface/external/glm/core/intrinsic_matrix.hpp rename to externals/glm/core/intrinsic_matrix.hpp diff --git a/interface/external/glm/core/intrinsic_matrix.inl b/externals/glm/core/intrinsic_matrix.inl similarity index 100% rename from interface/external/glm/core/intrinsic_matrix.inl rename to externals/glm/core/intrinsic_matrix.inl diff --git a/interface/external/glm/core/intrinsic_trigonometric.hpp b/externals/glm/core/intrinsic_trigonometric.hpp similarity index 100% rename from interface/external/glm/core/intrinsic_trigonometric.hpp rename to externals/glm/core/intrinsic_trigonometric.hpp diff --git a/interface/external/glm/core/intrinsic_trigonometric.inl b/externals/glm/core/intrinsic_trigonometric.inl similarity index 100% rename from interface/external/glm/core/intrinsic_trigonometric.inl rename to externals/glm/core/intrinsic_trigonometric.inl diff --git a/interface/external/glm/core/intrinsic_vector_relational.hpp b/externals/glm/core/intrinsic_vector_relational.hpp similarity index 100% rename from interface/external/glm/core/intrinsic_vector_relational.hpp rename to externals/glm/core/intrinsic_vector_relational.hpp diff --git a/interface/external/glm/core/intrinsic_vector_relational.inl b/externals/glm/core/intrinsic_vector_relational.inl similarity index 100% rename from interface/external/glm/core/intrinsic_vector_relational.inl rename to externals/glm/core/intrinsic_vector_relational.inl diff --git a/interface/external/glm/core/setup.hpp b/externals/glm/core/setup.hpp similarity index 100% rename from interface/external/glm/core/setup.hpp rename to externals/glm/core/setup.hpp diff --git a/interface/external/glm/core/type.hpp b/externals/glm/core/type.hpp similarity index 100% rename from interface/external/glm/core/type.hpp rename to externals/glm/core/type.hpp diff --git a/interface/external/glm/core/type_float.hpp b/externals/glm/core/type_float.hpp similarity index 100% rename from interface/external/glm/core/type_float.hpp rename to externals/glm/core/type_float.hpp diff --git a/interface/external/glm/core/type_gentype.hpp b/externals/glm/core/type_gentype.hpp similarity index 100% rename from interface/external/glm/core/type_gentype.hpp rename to externals/glm/core/type_gentype.hpp diff --git a/interface/external/glm/core/type_gentype.inl b/externals/glm/core/type_gentype.inl similarity index 100% rename from interface/external/glm/core/type_gentype.inl rename to externals/glm/core/type_gentype.inl diff --git a/interface/external/glm/core/type_half.hpp b/externals/glm/core/type_half.hpp similarity index 100% rename from interface/external/glm/core/type_half.hpp rename to externals/glm/core/type_half.hpp diff --git a/interface/external/glm/core/type_half.inl b/externals/glm/core/type_half.inl similarity index 100% rename from interface/external/glm/core/type_half.inl rename to externals/glm/core/type_half.inl diff --git a/interface/external/glm/core/type_int.hpp b/externals/glm/core/type_int.hpp similarity index 100% rename from interface/external/glm/core/type_int.hpp rename to externals/glm/core/type_int.hpp diff --git a/interface/external/glm/core/type_mat.hpp b/externals/glm/core/type_mat.hpp similarity index 100% rename from interface/external/glm/core/type_mat.hpp rename to externals/glm/core/type_mat.hpp diff --git a/interface/external/glm/core/type_mat.inl b/externals/glm/core/type_mat.inl similarity index 100% rename from interface/external/glm/core/type_mat.inl rename to externals/glm/core/type_mat.inl diff --git a/interface/external/glm/core/type_mat2x2.hpp b/externals/glm/core/type_mat2x2.hpp similarity index 100% rename from interface/external/glm/core/type_mat2x2.hpp rename to externals/glm/core/type_mat2x2.hpp diff --git a/interface/external/glm/core/type_mat2x2.inl b/externals/glm/core/type_mat2x2.inl similarity index 100% rename from interface/external/glm/core/type_mat2x2.inl rename to externals/glm/core/type_mat2x2.inl diff --git a/interface/external/glm/core/type_mat2x3.hpp b/externals/glm/core/type_mat2x3.hpp similarity index 100% rename from interface/external/glm/core/type_mat2x3.hpp rename to externals/glm/core/type_mat2x3.hpp diff --git a/interface/external/glm/core/type_mat2x3.inl b/externals/glm/core/type_mat2x3.inl similarity index 100% rename from interface/external/glm/core/type_mat2x3.inl rename to externals/glm/core/type_mat2x3.inl diff --git a/interface/external/glm/core/type_mat2x4.hpp b/externals/glm/core/type_mat2x4.hpp similarity index 100% rename from interface/external/glm/core/type_mat2x4.hpp rename to externals/glm/core/type_mat2x4.hpp diff --git a/interface/external/glm/core/type_mat2x4.inl b/externals/glm/core/type_mat2x4.inl similarity index 100% rename from interface/external/glm/core/type_mat2x4.inl rename to externals/glm/core/type_mat2x4.inl diff --git a/interface/external/glm/core/type_mat3x2.hpp b/externals/glm/core/type_mat3x2.hpp similarity index 100% rename from interface/external/glm/core/type_mat3x2.hpp rename to externals/glm/core/type_mat3x2.hpp diff --git a/interface/external/glm/core/type_mat3x2.inl b/externals/glm/core/type_mat3x2.inl similarity index 100% rename from interface/external/glm/core/type_mat3x2.inl rename to externals/glm/core/type_mat3x2.inl diff --git a/interface/external/glm/core/type_mat3x3.hpp b/externals/glm/core/type_mat3x3.hpp similarity index 100% rename from interface/external/glm/core/type_mat3x3.hpp rename to externals/glm/core/type_mat3x3.hpp diff --git a/interface/external/glm/core/type_mat3x3.inl b/externals/glm/core/type_mat3x3.inl similarity index 100% rename from interface/external/glm/core/type_mat3x3.inl rename to externals/glm/core/type_mat3x3.inl diff --git a/interface/external/glm/core/type_mat3x4.hpp b/externals/glm/core/type_mat3x4.hpp similarity index 100% rename from interface/external/glm/core/type_mat3x4.hpp rename to externals/glm/core/type_mat3x4.hpp diff --git a/interface/external/glm/core/type_mat3x4.inl b/externals/glm/core/type_mat3x4.inl similarity index 100% rename from interface/external/glm/core/type_mat3x4.inl rename to externals/glm/core/type_mat3x4.inl diff --git a/interface/external/glm/core/type_mat4x2.hpp b/externals/glm/core/type_mat4x2.hpp similarity index 100% rename from interface/external/glm/core/type_mat4x2.hpp rename to externals/glm/core/type_mat4x2.hpp diff --git a/interface/external/glm/core/type_mat4x2.inl b/externals/glm/core/type_mat4x2.inl similarity index 100% rename from interface/external/glm/core/type_mat4x2.inl rename to externals/glm/core/type_mat4x2.inl diff --git a/interface/external/glm/core/type_mat4x3.hpp b/externals/glm/core/type_mat4x3.hpp similarity index 100% rename from interface/external/glm/core/type_mat4x3.hpp rename to externals/glm/core/type_mat4x3.hpp diff --git a/interface/external/glm/core/type_mat4x3.inl b/externals/glm/core/type_mat4x3.inl similarity index 100% rename from interface/external/glm/core/type_mat4x3.inl rename to externals/glm/core/type_mat4x3.inl diff --git a/interface/external/glm/core/type_mat4x4.hpp b/externals/glm/core/type_mat4x4.hpp similarity index 100% rename from interface/external/glm/core/type_mat4x4.hpp rename to externals/glm/core/type_mat4x4.hpp diff --git a/interface/external/glm/core/type_mat4x4.inl b/externals/glm/core/type_mat4x4.inl similarity index 100% rename from interface/external/glm/core/type_mat4x4.inl rename to externals/glm/core/type_mat4x4.inl diff --git a/interface/external/glm/core/type_size.hpp b/externals/glm/core/type_size.hpp similarity index 100% rename from interface/external/glm/core/type_size.hpp rename to externals/glm/core/type_size.hpp diff --git a/interface/external/glm/core/type_vec.hpp b/externals/glm/core/type_vec.hpp similarity index 100% rename from interface/external/glm/core/type_vec.hpp rename to externals/glm/core/type_vec.hpp diff --git a/interface/external/glm/core/type_vec.inl b/externals/glm/core/type_vec.inl similarity index 100% rename from interface/external/glm/core/type_vec.inl rename to externals/glm/core/type_vec.inl diff --git a/interface/external/glm/core/type_vec1.hpp b/externals/glm/core/type_vec1.hpp similarity index 100% rename from interface/external/glm/core/type_vec1.hpp rename to externals/glm/core/type_vec1.hpp diff --git a/interface/external/glm/core/type_vec1.inl b/externals/glm/core/type_vec1.inl similarity index 100% rename from interface/external/glm/core/type_vec1.inl rename to externals/glm/core/type_vec1.inl diff --git a/interface/external/glm/core/type_vec2.hpp b/externals/glm/core/type_vec2.hpp similarity index 100% rename from interface/external/glm/core/type_vec2.hpp rename to externals/glm/core/type_vec2.hpp diff --git a/interface/external/glm/core/type_vec2.inl b/externals/glm/core/type_vec2.inl similarity index 100% rename from interface/external/glm/core/type_vec2.inl rename to externals/glm/core/type_vec2.inl diff --git a/interface/external/glm/core/type_vec3.hpp b/externals/glm/core/type_vec3.hpp similarity index 100% rename from interface/external/glm/core/type_vec3.hpp rename to externals/glm/core/type_vec3.hpp diff --git a/interface/external/glm/core/type_vec3.inl b/externals/glm/core/type_vec3.inl similarity index 100% rename from interface/external/glm/core/type_vec3.inl rename to externals/glm/core/type_vec3.inl diff --git a/interface/external/glm/core/type_vec4.hpp b/externals/glm/core/type_vec4.hpp similarity index 100% rename from interface/external/glm/core/type_vec4.hpp rename to externals/glm/core/type_vec4.hpp diff --git a/interface/external/glm/core/type_vec4.inl b/externals/glm/core/type_vec4.inl similarity index 100% rename from interface/external/glm/core/type_vec4.inl rename to externals/glm/core/type_vec4.inl diff --git a/interface/external/glm/ext.hpp b/externals/glm/ext.hpp similarity index 100% rename from interface/external/glm/ext.hpp rename to externals/glm/ext.hpp diff --git a/interface/external/glm/glm.hpp b/externals/glm/glm.hpp similarity index 100% rename from interface/external/glm/glm.hpp rename to externals/glm/glm.hpp diff --git a/interface/external/glm/gtc/half_float.hpp b/externals/glm/gtc/half_float.hpp similarity index 100% rename from interface/external/glm/gtc/half_float.hpp rename to externals/glm/gtc/half_float.hpp diff --git a/interface/external/glm/gtc/half_float.inl b/externals/glm/gtc/half_float.inl similarity index 100% rename from interface/external/glm/gtc/half_float.inl rename to externals/glm/gtc/half_float.inl diff --git a/interface/external/glm/gtc/matrix_access.hpp b/externals/glm/gtc/matrix_access.hpp similarity index 100% rename from interface/external/glm/gtc/matrix_access.hpp rename to externals/glm/gtc/matrix_access.hpp diff --git a/interface/external/glm/gtc/matrix_access.inl b/externals/glm/gtc/matrix_access.inl similarity index 100% rename from interface/external/glm/gtc/matrix_access.inl rename to externals/glm/gtc/matrix_access.inl diff --git a/interface/external/glm/gtc/matrix_integer.hpp b/externals/glm/gtc/matrix_integer.hpp similarity index 100% rename from interface/external/glm/gtc/matrix_integer.hpp rename to externals/glm/gtc/matrix_integer.hpp diff --git a/interface/external/glm/gtc/matrix_inverse.hpp b/externals/glm/gtc/matrix_inverse.hpp similarity index 100% rename from interface/external/glm/gtc/matrix_inverse.hpp rename to externals/glm/gtc/matrix_inverse.hpp diff --git a/interface/external/glm/gtc/matrix_inverse.inl b/externals/glm/gtc/matrix_inverse.inl similarity index 100% rename from interface/external/glm/gtc/matrix_inverse.inl rename to externals/glm/gtc/matrix_inverse.inl diff --git a/interface/external/glm/gtc/matrix_transform.hpp b/externals/glm/gtc/matrix_transform.hpp similarity index 100% rename from interface/external/glm/gtc/matrix_transform.hpp rename to externals/glm/gtc/matrix_transform.hpp diff --git a/interface/external/glm/gtc/matrix_transform.inl b/externals/glm/gtc/matrix_transform.inl similarity index 100% rename from interface/external/glm/gtc/matrix_transform.inl rename to externals/glm/gtc/matrix_transform.inl diff --git a/interface/external/glm/gtc/noise.hpp b/externals/glm/gtc/noise.hpp similarity index 100% rename from interface/external/glm/gtc/noise.hpp rename to externals/glm/gtc/noise.hpp diff --git a/interface/external/glm/gtc/noise.inl b/externals/glm/gtc/noise.inl similarity index 100% rename from interface/external/glm/gtc/noise.inl rename to externals/glm/gtc/noise.inl diff --git a/interface/external/glm/gtc/quaternion.hpp b/externals/glm/gtc/quaternion.hpp similarity index 100% rename from interface/external/glm/gtc/quaternion.hpp rename to externals/glm/gtc/quaternion.hpp diff --git a/interface/external/glm/gtc/quaternion.inl b/externals/glm/gtc/quaternion.inl similarity index 100% rename from interface/external/glm/gtc/quaternion.inl rename to externals/glm/gtc/quaternion.inl diff --git a/interface/external/glm/gtc/random.hpp b/externals/glm/gtc/random.hpp similarity index 100% rename from interface/external/glm/gtc/random.hpp rename to externals/glm/gtc/random.hpp diff --git a/interface/external/glm/gtc/random.inl b/externals/glm/gtc/random.inl similarity index 100% rename from interface/external/glm/gtc/random.inl rename to externals/glm/gtc/random.inl diff --git a/interface/external/glm/gtc/swizzle.hpp b/externals/glm/gtc/swizzle.hpp similarity index 100% rename from interface/external/glm/gtc/swizzle.hpp rename to externals/glm/gtc/swizzle.hpp diff --git a/interface/external/glm/gtc/swizzle.inl b/externals/glm/gtc/swizzle.inl similarity index 100% rename from interface/external/glm/gtc/swizzle.inl rename to externals/glm/gtc/swizzle.inl diff --git a/interface/external/glm/gtc/type_precision.hpp b/externals/glm/gtc/type_precision.hpp similarity index 100% rename from interface/external/glm/gtc/type_precision.hpp rename to externals/glm/gtc/type_precision.hpp diff --git a/interface/external/glm/gtc/type_precision.inl b/externals/glm/gtc/type_precision.inl similarity index 100% rename from interface/external/glm/gtc/type_precision.inl rename to externals/glm/gtc/type_precision.inl diff --git a/interface/external/glm/gtc/type_ptr.hpp b/externals/glm/gtc/type_ptr.hpp similarity index 100% rename from interface/external/glm/gtc/type_ptr.hpp rename to externals/glm/gtc/type_ptr.hpp diff --git a/interface/external/glm/gtc/type_ptr.inl b/externals/glm/gtc/type_ptr.inl similarity index 100% rename from interface/external/glm/gtc/type_ptr.inl rename to externals/glm/gtc/type_ptr.inl diff --git a/interface/external/glm/gtx/associated_min_max.hpp b/externals/glm/gtx/associated_min_max.hpp similarity index 100% rename from interface/external/glm/gtx/associated_min_max.hpp rename to externals/glm/gtx/associated_min_max.hpp diff --git a/interface/external/glm/gtx/associated_min_max.inl b/externals/glm/gtx/associated_min_max.inl similarity index 100% rename from interface/external/glm/gtx/associated_min_max.inl rename to externals/glm/gtx/associated_min_max.inl diff --git a/interface/external/glm/gtx/bit.hpp b/externals/glm/gtx/bit.hpp similarity index 100% rename from interface/external/glm/gtx/bit.hpp rename to externals/glm/gtx/bit.hpp diff --git a/interface/external/glm/gtx/bit.inl b/externals/glm/gtx/bit.inl similarity index 100% rename from interface/external/glm/gtx/bit.inl rename to externals/glm/gtx/bit.inl diff --git a/interface/external/glm/gtx/closest_point.hpp b/externals/glm/gtx/closest_point.hpp similarity index 100% rename from interface/external/glm/gtx/closest_point.hpp rename to externals/glm/gtx/closest_point.hpp diff --git a/interface/external/glm/gtx/closest_point.inl b/externals/glm/gtx/closest_point.inl similarity index 100% rename from interface/external/glm/gtx/closest_point.inl rename to externals/glm/gtx/closest_point.inl diff --git a/interface/external/glm/gtx/color_cast.hpp b/externals/glm/gtx/color_cast.hpp similarity index 100% rename from interface/external/glm/gtx/color_cast.hpp rename to externals/glm/gtx/color_cast.hpp diff --git a/interface/external/glm/gtx/color_cast.inl b/externals/glm/gtx/color_cast.inl similarity index 100% rename from interface/external/glm/gtx/color_cast.inl rename to externals/glm/gtx/color_cast.inl diff --git a/interface/external/glm/gtx/color_space.hpp b/externals/glm/gtx/color_space.hpp similarity index 100% rename from interface/external/glm/gtx/color_space.hpp rename to externals/glm/gtx/color_space.hpp diff --git a/interface/external/glm/gtx/color_space.inl b/externals/glm/gtx/color_space.inl similarity index 100% rename from interface/external/glm/gtx/color_space.inl rename to externals/glm/gtx/color_space.inl diff --git a/interface/external/glm/gtx/color_space_YCoCg.hpp b/externals/glm/gtx/color_space_YCoCg.hpp similarity index 100% rename from interface/external/glm/gtx/color_space_YCoCg.hpp rename to externals/glm/gtx/color_space_YCoCg.hpp diff --git a/interface/external/glm/gtx/color_space_YCoCg.inl b/externals/glm/gtx/color_space_YCoCg.inl similarity index 100% rename from interface/external/glm/gtx/color_space_YCoCg.inl rename to externals/glm/gtx/color_space_YCoCg.inl diff --git a/interface/external/glm/gtx/compatibility.hpp b/externals/glm/gtx/compatibility.hpp similarity index 100% rename from interface/external/glm/gtx/compatibility.hpp rename to externals/glm/gtx/compatibility.hpp diff --git a/interface/external/glm/gtx/compatibility.inl b/externals/glm/gtx/compatibility.inl similarity index 100% rename from interface/external/glm/gtx/compatibility.inl rename to externals/glm/gtx/compatibility.inl diff --git a/interface/external/glm/gtx/component_wise.hpp b/externals/glm/gtx/component_wise.hpp similarity index 100% rename from interface/external/glm/gtx/component_wise.hpp rename to externals/glm/gtx/component_wise.hpp diff --git a/interface/external/glm/gtx/component_wise.inl b/externals/glm/gtx/component_wise.inl similarity index 100% rename from interface/external/glm/gtx/component_wise.inl rename to externals/glm/gtx/component_wise.inl diff --git a/interface/external/glm/gtx/constants.hpp b/externals/glm/gtx/constants.hpp similarity index 100% rename from interface/external/glm/gtx/constants.hpp rename to externals/glm/gtx/constants.hpp diff --git a/interface/external/glm/gtx/constants.inl b/externals/glm/gtx/constants.inl similarity index 100% rename from interface/external/glm/gtx/constants.inl rename to externals/glm/gtx/constants.inl diff --git a/interface/external/glm/gtx/epsilon.hpp b/externals/glm/gtx/epsilon.hpp similarity index 100% rename from interface/external/glm/gtx/epsilon.hpp rename to externals/glm/gtx/epsilon.hpp diff --git a/interface/external/glm/gtx/epsilon.inl b/externals/glm/gtx/epsilon.inl similarity index 100% rename from interface/external/glm/gtx/epsilon.inl rename to externals/glm/gtx/epsilon.inl diff --git a/interface/external/glm/gtx/euler_angles.hpp b/externals/glm/gtx/euler_angles.hpp similarity index 100% rename from interface/external/glm/gtx/euler_angles.hpp rename to externals/glm/gtx/euler_angles.hpp diff --git a/interface/external/glm/gtx/euler_angles.inl b/externals/glm/gtx/euler_angles.inl similarity index 100% rename from interface/external/glm/gtx/euler_angles.inl rename to externals/glm/gtx/euler_angles.inl diff --git a/interface/external/glm/gtx/extend.hpp b/externals/glm/gtx/extend.hpp similarity index 100% rename from interface/external/glm/gtx/extend.hpp rename to externals/glm/gtx/extend.hpp diff --git a/interface/external/glm/gtx/extend.inl b/externals/glm/gtx/extend.inl similarity index 100% rename from interface/external/glm/gtx/extend.inl rename to externals/glm/gtx/extend.inl diff --git a/interface/external/glm/gtx/extented_min_max.hpp b/externals/glm/gtx/extented_min_max.hpp similarity index 100% rename from interface/external/glm/gtx/extented_min_max.hpp rename to externals/glm/gtx/extented_min_max.hpp diff --git a/interface/external/glm/gtx/extented_min_max.inl b/externals/glm/gtx/extented_min_max.inl similarity index 100% rename from interface/external/glm/gtx/extented_min_max.inl rename to externals/glm/gtx/extented_min_max.inl diff --git a/interface/external/glm/gtx/fast_exponential.hpp b/externals/glm/gtx/fast_exponential.hpp similarity index 100% rename from interface/external/glm/gtx/fast_exponential.hpp rename to externals/glm/gtx/fast_exponential.hpp diff --git a/interface/external/glm/gtx/fast_exponential.inl b/externals/glm/gtx/fast_exponential.inl similarity index 100% rename from interface/external/glm/gtx/fast_exponential.inl rename to externals/glm/gtx/fast_exponential.inl diff --git a/interface/external/glm/gtx/fast_square_root.hpp b/externals/glm/gtx/fast_square_root.hpp similarity index 100% rename from interface/external/glm/gtx/fast_square_root.hpp rename to externals/glm/gtx/fast_square_root.hpp diff --git a/interface/external/glm/gtx/fast_square_root.inl b/externals/glm/gtx/fast_square_root.inl similarity index 100% rename from interface/external/glm/gtx/fast_square_root.inl rename to externals/glm/gtx/fast_square_root.inl diff --git a/interface/external/glm/gtx/fast_trigonometry.hpp b/externals/glm/gtx/fast_trigonometry.hpp similarity index 100% rename from interface/external/glm/gtx/fast_trigonometry.hpp rename to externals/glm/gtx/fast_trigonometry.hpp diff --git a/interface/external/glm/gtx/fast_trigonometry.inl b/externals/glm/gtx/fast_trigonometry.inl similarity index 100% rename from interface/external/glm/gtx/fast_trigonometry.inl rename to externals/glm/gtx/fast_trigonometry.inl diff --git a/interface/external/glm/gtx/gradient_paint.hpp b/externals/glm/gtx/gradient_paint.hpp similarity index 100% rename from interface/external/glm/gtx/gradient_paint.hpp rename to externals/glm/gtx/gradient_paint.hpp diff --git a/interface/external/glm/gtx/gradient_paint.inl b/externals/glm/gtx/gradient_paint.inl similarity index 100% rename from interface/external/glm/gtx/gradient_paint.inl rename to externals/glm/gtx/gradient_paint.inl diff --git a/interface/external/glm/gtx/handed_coordinate_space.hpp b/externals/glm/gtx/handed_coordinate_space.hpp similarity index 100% rename from interface/external/glm/gtx/handed_coordinate_space.hpp rename to externals/glm/gtx/handed_coordinate_space.hpp diff --git a/interface/external/glm/gtx/handed_coordinate_space.inl b/externals/glm/gtx/handed_coordinate_space.inl similarity index 100% rename from interface/external/glm/gtx/handed_coordinate_space.inl rename to externals/glm/gtx/handed_coordinate_space.inl diff --git a/interface/external/glm/gtx/inertia.hpp b/externals/glm/gtx/inertia.hpp similarity index 100% rename from interface/external/glm/gtx/inertia.hpp rename to externals/glm/gtx/inertia.hpp diff --git a/interface/external/glm/gtx/inertia.inl b/externals/glm/gtx/inertia.inl similarity index 100% rename from interface/external/glm/gtx/inertia.inl rename to externals/glm/gtx/inertia.inl diff --git a/interface/external/glm/gtx/int_10_10_10_2.hpp b/externals/glm/gtx/int_10_10_10_2.hpp similarity index 100% rename from interface/external/glm/gtx/int_10_10_10_2.hpp rename to externals/glm/gtx/int_10_10_10_2.hpp diff --git a/interface/external/glm/gtx/int_10_10_10_2.inl b/externals/glm/gtx/int_10_10_10_2.inl similarity index 100% rename from interface/external/glm/gtx/int_10_10_10_2.inl rename to externals/glm/gtx/int_10_10_10_2.inl diff --git a/interface/external/glm/gtx/integer.hpp b/externals/glm/gtx/integer.hpp similarity index 100% rename from interface/external/glm/gtx/integer.hpp rename to externals/glm/gtx/integer.hpp diff --git a/interface/external/glm/gtx/integer.inl b/externals/glm/gtx/integer.inl similarity index 100% rename from interface/external/glm/gtx/integer.inl rename to externals/glm/gtx/integer.inl diff --git a/interface/external/glm/gtx/intersect.hpp b/externals/glm/gtx/intersect.hpp similarity index 100% rename from interface/external/glm/gtx/intersect.hpp rename to externals/glm/gtx/intersect.hpp diff --git a/interface/external/glm/gtx/intersect.inl b/externals/glm/gtx/intersect.inl similarity index 100% rename from interface/external/glm/gtx/intersect.inl rename to externals/glm/gtx/intersect.inl diff --git a/interface/external/glm/gtx/log_base.hpp b/externals/glm/gtx/log_base.hpp similarity index 100% rename from interface/external/glm/gtx/log_base.hpp rename to externals/glm/gtx/log_base.hpp diff --git a/interface/external/glm/gtx/log_base.inl b/externals/glm/gtx/log_base.inl similarity index 100% rename from interface/external/glm/gtx/log_base.inl rename to externals/glm/gtx/log_base.inl diff --git a/interface/external/glm/gtx/matrix_cross_product.hpp b/externals/glm/gtx/matrix_cross_product.hpp similarity index 100% rename from interface/external/glm/gtx/matrix_cross_product.hpp rename to externals/glm/gtx/matrix_cross_product.hpp diff --git a/interface/external/glm/gtx/matrix_cross_product.inl b/externals/glm/gtx/matrix_cross_product.inl similarity index 100% rename from interface/external/glm/gtx/matrix_cross_product.inl rename to externals/glm/gtx/matrix_cross_product.inl diff --git a/interface/external/glm/gtx/matrix_interpolation.hpp b/externals/glm/gtx/matrix_interpolation.hpp similarity index 100% rename from interface/external/glm/gtx/matrix_interpolation.hpp rename to externals/glm/gtx/matrix_interpolation.hpp diff --git a/interface/external/glm/gtx/matrix_interpolation.inl b/externals/glm/gtx/matrix_interpolation.inl similarity index 100% rename from interface/external/glm/gtx/matrix_interpolation.inl rename to externals/glm/gtx/matrix_interpolation.inl diff --git a/interface/external/glm/gtx/matrix_major_storage.hpp b/externals/glm/gtx/matrix_major_storage.hpp similarity index 100% rename from interface/external/glm/gtx/matrix_major_storage.hpp rename to externals/glm/gtx/matrix_major_storage.hpp diff --git a/interface/external/glm/gtx/matrix_major_storage.inl b/externals/glm/gtx/matrix_major_storage.inl similarity index 100% rename from interface/external/glm/gtx/matrix_major_storage.inl rename to externals/glm/gtx/matrix_major_storage.inl diff --git a/interface/external/glm/gtx/matrix_operation.hpp b/externals/glm/gtx/matrix_operation.hpp similarity index 100% rename from interface/external/glm/gtx/matrix_operation.hpp rename to externals/glm/gtx/matrix_operation.hpp diff --git a/interface/external/glm/gtx/matrix_operation.inl b/externals/glm/gtx/matrix_operation.inl similarity index 100% rename from interface/external/glm/gtx/matrix_operation.inl rename to externals/glm/gtx/matrix_operation.inl diff --git a/interface/external/glm/gtx/matrix_query.hpp b/externals/glm/gtx/matrix_query.hpp similarity index 100% rename from interface/external/glm/gtx/matrix_query.hpp rename to externals/glm/gtx/matrix_query.hpp diff --git a/interface/external/glm/gtx/matrix_query.inl b/externals/glm/gtx/matrix_query.inl similarity index 100% rename from interface/external/glm/gtx/matrix_query.inl rename to externals/glm/gtx/matrix_query.inl diff --git a/interface/external/glm/gtx/mixed_product.hpp b/externals/glm/gtx/mixed_product.hpp similarity index 100% rename from interface/external/glm/gtx/mixed_product.hpp rename to externals/glm/gtx/mixed_product.hpp diff --git a/interface/external/glm/gtx/mixed_product.inl b/externals/glm/gtx/mixed_product.inl similarity index 100% rename from interface/external/glm/gtx/mixed_product.inl rename to externals/glm/gtx/mixed_product.inl diff --git a/interface/external/glm/gtx/multiple.hpp b/externals/glm/gtx/multiple.hpp similarity index 100% rename from interface/external/glm/gtx/multiple.hpp rename to externals/glm/gtx/multiple.hpp diff --git a/interface/external/glm/gtx/multiple.inl b/externals/glm/gtx/multiple.inl similarity index 100% rename from interface/external/glm/gtx/multiple.inl rename to externals/glm/gtx/multiple.inl diff --git a/interface/external/glm/gtx/noise.hpp b/externals/glm/gtx/noise.hpp similarity index 100% rename from interface/external/glm/gtx/noise.hpp rename to externals/glm/gtx/noise.hpp diff --git a/interface/external/glm/gtx/noise.inl b/externals/glm/gtx/noise.inl similarity index 100% rename from interface/external/glm/gtx/noise.inl rename to externals/glm/gtx/noise.inl diff --git a/interface/external/glm/gtx/norm.hpp b/externals/glm/gtx/norm.hpp similarity index 100% rename from interface/external/glm/gtx/norm.hpp rename to externals/glm/gtx/norm.hpp diff --git a/interface/external/glm/gtx/norm.inl b/externals/glm/gtx/norm.inl similarity index 100% rename from interface/external/glm/gtx/norm.inl rename to externals/glm/gtx/norm.inl diff --git a/interface/external/glm/gtx/normal.hpp b/externals/glm/gtx/normal.hpp similarity index 100% rename from interface/external/glm/gtx/normal.hpp rename to externals/glm/gtx/normal.hpp diff --git a/interface/external/glm/gtx/normal.inl b/externals/glm/gtx/normal.inl similarity index 100% rename from interface/external/glm/gtx/normal.inl rename to externals/glm/gtx/normal.inl diff --git a/interface/external/glm/gtx/normalize_dot.hpp b/externals/glm/gtx/normalize_dot.hpp similarity index 100% rename from interface/external/glm/gtx/normalize_dot.hpp rename to externals/glm/gtx/normalize_dot.hpp diff --git a/interface/external/glm/gtx/normalize_dot.inl b/externals/glm/gtx/normalize_dot.inl similarity index 100% rename from interface/external/glm/gtx/normalize_dot.inl rename to externals/glm/gtx/normalize_dot.inl diff --git a/interface/external/glm/gtx/number_precision.hpp b/externals/glm/gtx/number_precision.hpp similarity index 100% rename from interface/external/glm/gtx/number_precision.hpp rename to externals/glm/gtx/number_precision.hpp diff --git a/interface/external/glm/gtx/number_precision.inl b/externals/glm/gtx/number_precision.inl similarity index 100% rename from interface/external/glm/gtx/number_precision.inl rename to externals/glm/gtx/number_precision.inl diff --git a/interface/external/glm/gtx/ocl_type.hpp b/externals/glm/gtx/ocl_type.hpp similarity index 100% rename from interface/external/glm/gtx/ocl_type.hpp rename to externals/glm/gtx/ocl_type.hpp diff --git a/interface/external/glm/gtx/ocl_type.inl b/externals/glm/gtx/ocl_type.inl similarity index 100% rename from interface/external/glm/gtx/ocl_type.inl rename to externals/glm/gtx/ocl_type.inl diff --git a/interface/external/glm/gtx/optimum_pow.hpp b/externals/glm/gtx/optimum_pow.hpp similarity index 100% rename from interface/external/glm/gtx/optimum_pow.hpp rename to externals/glm/gtx/optimum_pow.hpp diff --git a/interface/external/glm/gtx/optimum_pow.inl b/externals/glm/gtx/optimum_pow.inl similarity index 100% rename from interface/external/glm/gtx/optimum_pow.inl rename to externals/glm/gtx/optimum_pow.inl diff --git a/interface/external/glm/gtx/orthonormalize.hpp b/externals/glm/gtx/orthonormalize.hpp similarity index 100% rename from interface/external/glm/gtx/orthonormalize.hpp rename to externals/glm/gtx/orthonormalize.hpp diff --git a/interface/external/glm/gtx/orthonormalize.inl b/externals/glm/gtx/orthonormalize.inl similarity index 100% rename from interface/external/glm/gtx/orthonormalize.inl rename to externals/glm/gtx/orthonormalize.inl diff --git a/interface/external/glm/gtx/perpendicular.hpp b/externals/glm/gtx/perpendicular.hpp similarity index 100% rename from interface/external/glm/gtx/perpendicular.hpp rename to externals/glm/gtx/perpendicular.hpp diff --git a/interface/external/glm/gtx/perpendicular.inl b/externals/glm/gtx/perpendicular.inl similarity index 100% rename from interface/external/glm/gtx/perpendicular.inl rename to externals/glm/gtx/perpendicular.inl diff --git a/interface/external/glm/gtx/polar_coordinates.hpp b/externals/glm/gtx/polar_coordinates.hpp similarity index 100% rename from interface/external/glm/gtx/polar_coordinates.hpp rename to externals/glm/gtx/polar_coordinates.hpp diff --git a/interface/external/glm/gtx/polar_coordinates.inl b/externals/glm/gtx/polar_coordinates.inl similarity index 100% rename from interface/external/glm/gtx/polar_coordinates.inl rename to externals/glm/gtx/polar_coordinates.inl diff --git a/interface/external/glm/gtx/projection.hpp b/externals/glm/gtx/projection.hpp similarity index 100% rename from interface/external/glm/gtx/projection.hpp rename to externals/glm/gtx/projection.hpp diff --git a/interface/external/glm/gtx/projection.inl b/externals/glm/gtx/projection.inl similarity index 100% rename from interface/external/glm/gtx/projection.inl rename to externals/glm/gtx/projection.inl diff --git a/interface/external/glm/gtx/quaternion.hpp b/externals/glm/gtx/quaternion.hpp similarity index 100% rename from interface/external/glm/gtx/quaternion.hpp rename to externals/glm/gtx/quaternion.hpp diff --git a/interface/external/glm/gtx/quaternion.inl b/externals/glm/gtx/quaternion.inl similarity index 100% rename from interface/external/glm/gtx/quaternion.inl rename to externals/glm/gtx/quaternion.inl diff --git a/interface/external/glm/gtx/random.hpp b/externals/glm/gtx/random.hpp similarity index 100% rename from interface/external/glm/gtx/random.hpp rename to externals/glm/gtx/random.hpp diff --git a/interface/external/glm/gtx/random.inl b/externals/glm/gtx/random.inl similarity index 100% rename from interface/external/glm/gtx/random.inl rename to externals/glm/gtx/random.inl diff --git a/interface/external/glm/gtx/raw_data.hpp b/externals/glm/gtx/raw_data.hpp similarity index 100% rename from interface/external/glm/gtx/raw_data.hpp rename to externals/glm/gtx/raw_data.hpp diff --git a/interface/external/glm/gtx/raw_data.inl b/externals/glm/gtx/raw_data.inl similarity index 100% rename from interface/external/glm/gtx/raw_data.inl rename to externals/glm/gtx/raw_data.inl diff --git a/interface/external/glm/gtx/reciprocal.hpp b/externals/glm/gtx/reciprocal.hpp similarity index 100% rename from interface/external/glm/gtx/reciprocal.hpp rename to externals/glm/gtx/reciprocal.hpp diff --git a/interface/external/glm/gtx/reciprocal.inl b/externals/glm/gtx/reciprocal.inl similarity index 100% rename from interface/external/glm/gtx/reciprocal.inl rename to externals/glm/gtx/reciprocal.inl diff --git a/interface/external/glm/gtx/rotate_vector.hpp b/externals/glm/gtx/rotate_vector.hpp similarity index 100% rename from interface/external/glm/gtx/rotate_vector.hpp rename to externals/glm/gtx/rotate_vector.hpp diff --git a/interface/external/glm/gtx/rotate_vector.inl b/externals/glm/gtx/rotate_vector.inl similarity index 100% rename from interface/external/glm/gtx/rotate_vector.inl rename to externals/glm/gtx/rotate_vector.inl diff --git a/interface/external/glm/gtx/simd_mat4.hpp b/externals/glm/gtx/simd_mat4.hpp similarity index 100% rename from interface/external/glm/gtx/simd_mat4.hpp rename to externals/glm/gtx/simd_mat4.hpp diff --git a/interface/external/glm/gtx/simd_mat4.inl b/externals/glm/gtx/simd_mat4.inl similarity index 100% rename from interface/external/glm/gtx/simd_mat4.inl rename to externals/glm/gtx/simd_mat4.inl diff --git a/interface/external/glm/gtx/simd_vec4.hpp b/externals/glm/gtx/simd_vec4.hpp similarity index 100% rename from interface/external/glm/gtx/simd_vec4.hpp rename to externals/glm/gtx/simd_vec4.hpp diff --git a/interface/external/glm/gtx/simd_vec4.inl b/externals/glm/gtx/simd_vec4.inl similarity index 100% rename from interface/external/glm/gtx/simd_vec4.inl rename to externals/glm/gtx/simd_vec4.inl diff --git a/interface/external/glm/gtx/spline.hpp b/externals/glm/gtx/spline.hpp similarity index 100% rename from interface/external/glm/gtx/spline.hpp rename to externals/glm/gtx/spline.hpp diff --git a/interface/external/glm/gtx/spline.inl b/externals/glm/gtx/spline.inl similarity index 100% rename from interface/external/glm/gtx/spline.inl rename to externals/glm/gtx/spline.inl diff --git a/interface/external/glm/gtx/std_based_type.hpp b/externals/glm/gtx/std_based_type.hpp similarity index 100% rename from interface/external/glm/gtx/std_based_type.hpp rename to externals/glm/gtx/std_based_type.hpp diff --git a/interface/external/glm/gtx/std_based_type.inl b/externals/glm/gtx/std_based_type.inl similarity index 100% rename from interface/external/glm/gtx/std_based_type.inl rename to externals/glm/gtx/std_based_type.inl diff --git a/interface/external/glm/gtx/string_cast.hpp b/externals/glm/gtx/string_cast.hpp similarity index 100% rename from interface/external/glm/gtx/string_cast.hpp rename to externals/glm/gtx/string_cast.hpp diff --git a/interface/external/glm/gtx/string_cast.inl b/externals/glm/gtx/string_cast.inl similarity index 100% rename from interface/external/glm/gtx/string_cast.inl rename to externals/glm/gtx/string_cast.inl diff --git a/interface/external/glm/gtx/transform.hpp b/externals/glm/gtx/transform.hpp similarity index 100% rename from interface/external/glm/gtx/transform.hpp rename to externals/glm/gtx/transform.hpp diff --git a/interface/external/glm/gtx/transform.inl b/externals/glm/gtx/transform.inl similarity index 100% rename from interface/external/glm/gtx/transform.inl rename to externals/glm/gtx/transform.inl diff --git a/interface/external/glm/gtx/transform2.hpp b/externals/glm/gtx/transform2.hpp similarity index 100% rename from interface/external/glm/gtx/transform2.hpp rename to externals/glm/gtx/transform2.hpp diff --git a/interface/external/glm/gtx/transform2.inl b/externals/glm/gtx/transform2.inl similarity index 100% rename from interface/external/glm/gtx/transform2.inl rename to externals/glm/gtx/transform2.inl diff --git a/interface/external/glm/gtx/ulp.hpp b/externals/glm/gtx/ulp.hpp similarity index 100% rename from interface/external/glm/gtx/ulp.hpp rename to externals/glm/gtx/ulp.hpp diff --git a/interface/external/glm/gtx/ulp.inl b/externals/glm/gtx/ulp.inl similarity index 100% rename from interface/external/glm/gtx/ulp.inl rename to externals/glm/gtx/ulp.inl diff --git a/interface/external/glm/gtx/unsigned_int.hpp b/externals/glm/gtx/unsigned_int.hpp similarity index 100% rename from interface/external/glm/gtx/unsigned_int.hpp rename to externals/glm/gtx/unsigned_int.hpp diff --git a/interface/external/glm/gtx/unsigned_int.inl b/externals/glm/gtx/unsigned_int.inl similarity index 100% rename from interface/external/glm/gtx/unsigned_int.inl rename to externals/glm/gtx/unsigned_int.inl diff --git a/interface/external/glm/gtx/vec1.hpp b/externals/glm/gtx/vec1.hpp similarity index 100% rename from interface/external/glm/gtx/vec1.hpp rename to externals/glm/gtx/vec1.hpp diff --git a/interface/external/glm/gtx/vec1.inl b/externals/glm/gtx/vec1.inl similarity index 100% rename from interface/external/glm/gtx/vec1.inl rename to externals/glm/gtx/vec1.inl diff --git a/interface/external/glm/gtx/vector_access.hpp b/externals/glm/gtx/vector_access.hpp similarity index 100% rename from interface/external/glm/gtx/vector_access.hpp rename to externals/glm/gtx/vector_access.hpp diff --git a/interface/external/glm/gtx/vector_access.inl b/externals/glm/gtx/vector_access.inl similarity index 100% rename from interface/external/glm/gtx/vector_access.inl rename to externals/glm/gtx/vector_access.inl diff --git a/interface/external/glm/gtx/vector_angle.hpp b/externals/glm/gtx/vector_angle.hpp similarity index 100% rename from interface/external/glm/gtx/vector_angle.hpp rename to externals/glm/gtx/vector_angle.hpp diff --git a/interface/external/glm/gtx/vector_angle.inl b/externals/glm/gtx/vector_angle.inl similarity index 100% rename from interface/external/glm/gtx/vector_angle.inl rename to externals/glm/gtx/vector_angle.inl diff --git a/interface/external/glm/gtx/vector_query.hpp b/externals/glm/gtx/vector_query.hpp similarity index 100% rename from interface/external/glm/gtx/vector_query.hpp rename to externals/glm/gtx/vector_query.hpp diff --git a/interface/external/glm/gtx/vector_query.inl b/externals/glm/gtx/vector_query.inl similarity index 100% rename from interface/external/glm/gtx/vector_query.inl rename to externals/glm/gtx/vector_query.inl diff --git a/interface/external/glm/gtx/verbose_operator.hpp b/externals/glm/gtx/verbose_operator.hpp similarity index 100% rename from interface/external/glm/gtx/verbose_operator.hpp rename to externals/glm/gtx/verbose_operator.hpp diff --git a/interface/external/glm/gtx/verbose_operator.inl b/externals/glm/gtx/verbose_operator.inl similarity index 100% rename from interface/external/glm/gtx/verbose_operator.inl rename to externals/glm/gtx/verbose_operator.inl diff --git a/interface/external/glm/gtx/wrap.hpp b/externals/glm/gtx/wrap.hpp similarity index 100% rename from interface/external/glm/gtx/wrap.hpp rename to externals/glm/gtx/wrap.hpp diff --git a/interface/external/glm/gtx/wrap.inl b/externals/glm/gtx/wrap.inl similarity index 100% rename from interface/external/glm/gtx/wrap.inl rename to externals/glm/gtx/wrap.inl diff --git a/interface/external/glm/virtrev/xstream.hpp b/externals/glm/virtrev/xstream.hpp similarity index 100% rename from interface/external/glm/virtrev/xstream.hpp rename to externals/glm/virtrev/xstream.hpp diff --git a/injector/CMakeLists.txt b/injector/CMakeLists.txt index ffb352124b..ee106b3fc0 100644 --- a/injector/CMakeLists.txt +++ b/injector/CMakeLists.txt @@ -9,8 +9,8 @@ file(GLOB INJECTOR_SRCS src/*.cpp src/*.h) add_executable(injector ${INJECTOR_SRCS}) # link the shared hifi library -include(../LinkHifiShared.cmake) -link_hifi_shared_library(injector) +include(../cmake/macros/LinkHifiLibrary.cmake) +link_hifi_library(shared injector) # link the threads library find_package(Threads REQUIRED) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index c4729061fa..c16ab3c939 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -1,14 +1,14 @@ cmake_minimum_required(VERSION 2.8) +set(TARGET_NAME interface) +project(${TARGET_NAME}) + # setup for find modules -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/") +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/") set(GLM_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external) set(LODEPNG_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/LodePNG) set(PORTAUDIO_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/portaudio) -project(interface) - - if (APPLE) set(GL_HEADERS "#include \n#include ") else (APPLE) @@ -21,6 +21,11 @@ if (WIN32) set(GL_HEADERS "#define GLEW_STATIC\n#define FREEGLUT_STATIC\n#define FREEGLUT_LIB_PRAGMAS 0\n#include \n#include \n#include \n#include ") endif (WIN32) +# set up the external glm library +set(MACRO_DIR ../cmake/macros) +include(${MACRO_DIR}/IncludeGLM.cmake) +include_glm(${TARGET_NAME} ${MACRO_DIR}) + # create the InterfaceConfig.h file based on GL_HEADERS above configure_file(InterfaceConfig.h.in ${PROJECT_BINARY_DIR}/includes/InterfaceConfig.h) @@ -45,11 +50,14 @@ if (APPLE) endif (APPLE) # create the executable, make it a bundle on OS X -add_executable(interface MACOSX_BUNDLE ${INTERFACE_SRCS}) +add_executable(${TARGET_NAME} MACOSX_BUNDLE ${INTERFACE_SRCS}) # link in the hifi shared library -include(../LinkHifiShared.cmake) -link_hifi_shared_library(interface) +include(${MACRO_DIR}/LinkHifiLibrary.cmake) +link_hifi_library(shared ${TARGET_NAME}) + +# link in the hifi voxels library +link_hifi_library(voxels ${TARGET_NAME}) # find required libraries find_package(GLM REQUIRED) @@ -67,7 +75,7 @@ if (NOT APPLE) find_package(OpenGL REQUIRED) find_package(GLUT REQUIRED) include_directories(${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}) - target_link_libraries(interface ${OPENGL_LIBRARY}) + target_link_libraries(${TARGET_NAME} ${OPENGL_LIBRARY}) else (NOT APPLE) # link in required OS X frameworks and include the right GL headers find_library(AudioToolbox AudioToolbox) @@ -77,13 +85,13 @@ else (NOT APPLE) find_library(Carbon Carbon) find_library(GLUT GLUT) find_library(OpenGL OpenGL) - target_link_libraries(interface ${AudioToolbox} ${AudioUnit} ${CoreAudio} + target_link_libraries(${TARGET_NAME} ${AudioToolbox} ${AudioUnit} ${CoreAudio} ${CoreServices} ${Carbon} ${GLUT} ${OpenGL}) endif (NOT APPLE) # link target to external libraries if (WIN32) - target_link_libraries(interface + target_link_libraries(${TARGET_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/external/glut/Release/glew32.lib ${CMAKE_CURRENT_SOURCE_DIR}/external/glut/Release/freeglut.lib ${CMAKE_CURRENT_SOURCE_DIR}/external/glut/Release/pthread_lib.lib @@ -91,7 +99,7 @@ if (WIN32) wsock32.lib ) else (WIN32) - target_link_libraries(interface ${LODEPNG_LIBRARY}) + target_link_libraries(${TARGET_NAME} ${LODEPNG_LIBRARY}) # include PortAudio as external project include(ExternalProject) @@ -106,7 +114,7 @@ else (WIN32) ) # make PortAudio a dependency of the interface executable - add_dependencies(interface portaudio) + add_dependencies(${TARGET_NAME} portaudio) # include the PortAudio headers ExternalProject_Get_Property(portaudio source_dir) @@ -114,7 +122,7 @@ else (WIN32) # link the PortAudio library ExternalProject_Get_Property(portaudio binary_dir) - target_link_libraries(interface ${binary_dir}/lib/.libs/libportaudio.a) + target_link_libraries(${TARGET_NAME} ${binary_dir}/lib/.libs/libportaudio.a) # link required libraries on UNIX if (UNIX AND NOT APPLE) @@ -123,7 +131,7 @@ else (WIN32) find_package(ALSA) find_package(Jack) - target_link_libraries(interface + target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT_LIBRARIES} ${JACK_LIBRARIES} @@ -134,7 +142,7 @@ else (WIN32) endif (WIN32) # install command for OS X bundle -INSTALL(TARGETS interface +INSTALL(TARGETS ${TARGET_NAME} BUNDLE DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/install COMPONENT Runtime RUNTIME DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/install COMPONENT Runtime ) diff --git a/interface/src/Camera.cpp b/interface/src/Camera.cpp index c71e02ebc0..5a6899467c 100755 --- a/interface/src/Camera.cpp +++ b/interface/src/Camera.cpp @@ -1,9 +1,9 @@ -//----------------------------------------------------------- +//--------------------------------------------------------------------- // -// Created by Jeffrey Ventrella and added as a utility -// class for High Fidelity Code base, April 2013 +// Created by Jeffrey Ventrella for High Fidelity. +// Copyright (c) 2013 High Fidelity, Inc. All rights reserved. // -//----------------------------------------------------------- +//--------------------------------------------------------------------- #include "Camera.h" #include "Util.h" @@ -30,8 +30,9 @@ void Camera::update() { double radian = ( yaw / 180.0 ) * PIE; + //these need to be checked to make sure they correspond to the cordinate system. double x = distance * -sin( radian ); - double z = distance * cos( radian ); + double z = distance * cos( radian ); double y = up; position = targetPosition + glm::vec3( x, y, z ); diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp index cc7d0dd8cc..600dc3f0ca 100644 --- a/interface/src/Head.cpp +++ b/interface/src/Head.cpp @@ -15,6 +15,8 @@ #include #include #include "Head.h" +#include +#include using namespace std; @@ -42,9 +44,8 @@ unsigned int iris_texture_height = 256; -//--------------------------------------------------- -Head::Head() -{ + +Head::Head() { initializeAvatar(); //position = glm::vec3(0,0,0); @@ -112,14 +113,21 @@ Head::Head() DEBUG_otherAvatarListTimer[o] = 0.0f; DEBUG_otherAvatarListPosition[o] = glm::vec3( 0.0f, 0.0f, 0.0f ); } + + //-------------------------------------------------- + // test... just slam them into random positions... + //-------------------------------------------------- + DEBUG_otherAvatarListPosition[ 0 ] = glm::vec3( 0.0, 0.1, 2.0 ); + DEBUG_otherAvatarListPosition[ 1 ] = glm::vec3( 4.0, 0.1, 2.0 ); + DEBUG_otherAvatarListPosition[ 2 ] = glm::vec3( 2.0, 0.1, 2.0 ); + DEBUG_otherAvatarListPosition[ 3 ] = glm::vec3( 1.0, 0.1, -4.0 ); + DEBUG_otherAvatarListPosition[ 4 ] = glm::vec3( -2.0, 0.1, -2.0 ); } -//--------------------------------------------------- -Head::Head(const Head &otherHead) -{ +Head::Head(const Head &otherHead) { initializeAvatar(); position = otherHead.position; @@ -173,25 +181,17 @@ Head::Head(const Head &otherHead) - -//--------------------------------------------------- -Head::~Head() -{ - if (sphere != NULL) - { +Head::~Head() { + if (sphere != NULL) { gluDeleteQuadric(sphere); } } -//--------------------------------------------------- -Head* Head::clone() const -{ +Head* Head::clone() const { return new Head(*this); } -//--------------------------------------------------- -void Head::reset() -{ +void Head::reset() { Pitch = Yaw = Roll = 0; leanForward = leanSideways = 0; } @@ -242,36 +242,51 @@ void Head::UpdatePos(float frametime, SerialInterface * serialInterface, int hea } } -//--------------------------------------------------- void Head::addLean(float x, float z) { // Add Body lean as impulse leanSideways += x; leanForward += z; } -//------------------------------------ + void Head::setLeanForward(float dist){ leanForward = dist; } -//------------------------------------- void Head::setLeanSideways(float dist){ leanSideways = dist; } -//---------------------------------- void Head::simulate(float deltaTime) { //------------------------------------- // DEBUG - other avatars... //------------------------------------- - closeEnoughToInteract = 2.0f; + closeEnoughToInteract = 0.5f; closestOtherAvatar = -1; float closestDistance = 10000.0f; + + + /* + AgentList * agentList = AgentList::getInstance(); + for(std::vector::iterator agent = agentList->getAgents().begin(); + agent != agentList->getAgents().end(); + agent++) { + if (( agent->getLinkedData() != NULL && ( agent->getType() == AGENT_TYPE_INTERFACE ) )) { + Head *agentHead = (Head *)agent->getLinkedData(); + + // when this is working, I will grab the position here... + //glm::vec3 pos = agentHead->getPos(); + + } + } + */ + for (int o=0; orender(1); @@ -653,8 +656,7 @@ void Head::renderHead( int faceToFace, int isMine ) // Ears glPushMatrix(); glTranslatef(1.0, 0, 0); - for(side = 0; side < 2; side++) - { + for(side = 0; side < 2; side++) { glPushMatrix(); glScalef(0.3, 0.65, .65); glutSolidSphere(0.5, 30, 30); @@ -675,8 +677,7 @@ void Head::renderHead( int faceToFace, int isMine ) glPushMatrix(); glTranslatef(-interBrowDistance/2.0,0.4,0.45); - for(side = 0; side < 2; side++) - { + for(side = 0; side < 2; side++) { glColor3fv(browColor); glPushMatrix(); glTranslatef(0, 0.35 + browAudioLift, 0); @@ -774,18 +775,13 @@ void Head::renderHead( int faceToFace, int isMine ) -//--------------------------------------------------------- -void Head::setHandMovement( glm::vec3 movement ) -{ +void Head::setHandMovement( glm::vec3 movement ) { handBeingMoved = true; movedHandOffset = movement; } - -//----------------------------------------- -void Head::initializeAvatar() -{ +void Head::initializeAvatar() { //avatar.position = glm::vec3( 0.0, 0.0, 0.0 ); avatar.velocity = glm::vec3( 0.0, 0.0, 0.0 ); avatar.thrust = glm::vec3( 0.0, 0.0, 0.0 ); @@ -793,14 +789,13 @@ void Head::initializeAvatar() closestOtherAvatar = 0; - avatar.yaw = -90.0; - avatar.pitch = 0.0; - avatar.roll = 0.0; + bodyYaw = -90.0; + bodyPitch = 0.0; + bodyRoll = 0.0; - avatar.yawDelta = 0.0; + bodyYawDelta = 0.0; - for (int b=0; b 0.0f ) - { + if ( length > 0.0f ) { glm::vec3 springDirection = springVector / length; float force = ( length - avatar.bone[b].length ) * springForce * deltaTime; @@ -991,35 +965,24 @@ void Head::updateAvatarSprings( float deltaTime ) avatar.bone[b].springyVelocity += ( avatar.bone[b].position - avatar.bone[b].springyPosition ) * springToBodyTightness * deltaTime; - float decay = 1.0 - springVelocityDecay * deltaTime; - if ( decay > 0.0 ) - { + if ( decay > 0.0 ) { avatar.bone[b].springyVelocity *= decay; } - else - { + else { avatar.bone[b].springyVelocity = glm::vec3( 0.0f, 0.0f, 0.0f ); } - avatar.bone[b].springyPosition += avatar.bone[b].springyVelocity; } } - - -//---------------------- -float Head::getBodyYaw() -{ - return avatar.yaw; +float Head::getBodyYaw() { + return bodyYaw; } - -//-------------------------------------- -glm::vec3 Head::getHeadLookatDirection() -{ +glm::vec3 Head::getHeadLookatDirection() { return glm::vec3 ( avatar.orientation.getFront().x, @@ -1028,9 +991,7 @@ glm::vec3 Head::getHeadLookatDirection() ); } -//------------------------------------------- -glm::vec3 Head::getHeadLookatDirectionUp() -{ +glm::vec3 Head::getHeadLookatDirectionUp() { return glm::vec3 ( avatar.orientation.getUp().x, @@ -1039,9 +1000,7 @@ glm::vec3 Head::getHeadLookatDirectionUp() ); } -//------------------------------------------- -glm::vec3 Head::getHeadLookatDirectionRight() -{ +glm::vec3 Head::getHeadLookatDirectionRight() { return glm::vec3 ( avatar.orientation.getRight().x, @@ -1050,10 +1009,7 @@ glm::vec3 Head::getHeadLookatDirectionRight() ); } - -//------------------------------- -glm::vec3 Head::getHeadPosition() -{ +glm::vec3 Head::getHeadPosition() { return glm::vec3 ( avatar.bone[ AVATAR_BONE_HEAD ].position.x, @@ -1063,10 +1019,7 @@ glm::vec3 Head::getHeadPosition() } - -//------------------------------- -glm::vec3 Head::getBodyPosition() -{ +glm::vec3 Head::getBodyPosition() { return glm::vec3 ( avatar.bone[ AVATAR_BONE_PELVIS_SPINE ].position.x, @@ -1076,27 +1029,26 @@ glm::vec3 Head::getBodyPosition() } - -//----------------------------- -void Head::updateHandMovement() -{ +void Head::updateHandMovement() { glm::vec3 transformedHandMovement; - - transformedHandMovement.x - = glm::dot( movedHandOffset.x, -(float)avatar.orientation.getRight().x ) - + glm::dot( movedHandOffset.y, -(float)avatar.orientation.getRight().y ) - + glm::dot( movedHandOffset.z, -(float)avatar.orientation.getRight().z ); - - transformedHandMovement.y - = glm::dot( movedHandOffset.x, -(float)avatar.orientation.getUp().x ) - + glm::dot( movedHandOffset.y, -(float)avatar.orientation.getUp().y ) - + glm::dot( movedHandOffset.z, -(float)avatar.orientation.getUp().z ); - - transformedHandMovement.z - = glm::dot( movedHandOffset.x, -(float)avatar.orientation.getFront().x ) - + glm::dot( movedHandOffset.y, -(float)avatar.orientation.getFront().y ) - + glm::dot( movedHandOffset.z, -(float)avatar.orientation.getFront().z ); - + + transformedHandMovement + = avatar.orientation.getRight() * -movedHandOffset.x + + avatar.orientation.getUp() * -movedHandOffset.y + + avatar.orientation.getFront() * -movedHandOffset.y * 0.4; + + //if holding hands, add a pull to the hand... + if ( usingSprings ) { + if ( closestOtherAvatar != -1 ) { + glm::vec3 handShakePull( DEBUG_otherAvatarListPosition[ closestOtherAvatar ]); + handShakePull -= avatar.bone[ AVATAR_BONE_RIGHT_HAND ].position; + + handShakePull *= 0.3; + + transformedHandMovement += handShakePull; + } + } + avatar.bone[ AVATAR_BONE_RIGHT_HAND ].position += transformedHandMovement; glm::vec3 armVector = avatar.bone[ AVATAR_BONE_RIGHT_HAND ].position; armVector -= avatar.bone[ AVATAR_BONE_RIGHT_SHOULDER ].position; @@ -1108,15 +1060,14 @@ void Head::updateHandMovement() //------------------------------------------------------------------------------- // if right hand is being dragged beyond maximum arm length... - //------------------------------------------------------------------------------- - if ( distance > avatar.maxArmLength ) - { + //------------------------------------------------------------------------------- + if ( distance > avatar.maxArmLength ) { //------------------------------------------------------------------------------- // reset right hand to be constrained to maximum arm length //------------------------------------------------------------------------------- avatar.bone[ AVATAR_BONE_RIGHT_HAND ].position = avatar.bone[ AVATAR_BONE_RIGHT_SHOULDER ].position; glm::vec3 armNormal = armVector / distance; - armVector = armNormal * (float)avatar.maxArmLength; + armVector = armNormal * avatar.maxArmLength; distance = avatar.maxArmLength; glm::vec3 constrainedPosition = avatar.bone[ AVATAR_BONE_RIGHT_SHOULDER ].position; constrainedPosition += armVector; @@ -1128,8 +1079,8 @@ void Head::updateHandMovement() //----------------------------------------------------------------------------- glm::vec3 newElbowPosition = avatar.bone[ AVATAR_BONE_RIGHT_SHOULDER ].position; newElbowPosition += armVector * (float)ONE_HALF; - glm::vec3 perpendicular = glm::vec3( -armVector.y, armVector.x, armVector.z ); - newElbowPosition += perpendicular * (float)( ( 1.0 - ( avatar.maxArmLength / distance ) ) * ONE_HALF ); + glm::vec3 perpendicular = glm::cross( avatar.orientation.getFront(), armVector ); + newElbowPosition += perpendicular * ( 1.0 - ( avatar.maxArmLength / distance ) ) * ONE_HALF; avatar.bone[ AVATAR_BONE_RIGHT_UPPER_ARM ].position = newElbowPosition; //----------------------------------------------------------------------------- @@ -1144,25 +1095,20 @@ void Head::updateHandMovement() - -//----------------------------------------- void Head::renderBody() { //----------------------------------------- // Render bone positions as spheres //----------------------------------------- - for (int b=0; b IDLE_SIMULATE_MSECS) - { + if (diffclock(&lastTimeIdle, &check) > IDLE_SIMULATE_MSECS) { // If mouse is being dragged, update hand movement in the avatar - if ( mousePressed == 1 ) - { - float xOffset = ( mouseX - mouseStartX ) / (double)WIDTH; - float yOffset = ( mouseY - mouseStartY ) / (double)HEIGHT; - + if ( mousePressed == 1 ) { + + float xOffset = ( mouseX - mouseStartX ) / ( WIDTH * ONE_HALF ); + float yOffset = ( mouseY - mouseStartY ) / ( HEIGHT * ONE_HALF ); + float leftRight = xOffset; float downUp = yOffset; float backFront = 0.0; diff --git a/shared/CMakeLists.txt b/libraries/shared/CMakeLists.txt similarity index 66% rename from shared/CMakeLists.txt rename to libraries/shared/CMakeLists.txt index 455405d476..00b99b69db 100644 --- a/shared/CMakeLists.txt +++ b/libraries/shared/CMakeLists.txt @@ -1,31 +1,28 @@ cmake_minimum_required(VERSION 2.8) -project(shared) +set(TARGET_NAME shared) +project(${TARGET_NAME}) # grab the implemenation and header files file(GLOB HIFI_SHARED_SRCS src/*.h src/*.cpp) # create a library and set the property so it can be referenced later -add_library(HifiShared ${HIFI_SHARED_SRCS}) -set(HIFI_SHARED_LIBRARY HifiShared) +add_library(${TARGET_NAME} ${HIFI_SHARED_SRCS}) +set(HIFI_SHARED_LIBRARY ${TARGET_NAME}) set(EXTERNAL_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external) if (WIN32) # include headers for external libraries and InterfaceConfig. include_directories(${EXTERNAL_ROOT_DIR}) -endif (WIN32) - -if (NOT WIN32) +else (WIN32) find_package(CURL REQUIRED) include_directories(${CURL_INCLUDE_DIRS}) - # link target to common, external libraries - target_link_libraries(HifiShared ${CURL_LIBRARY}) -endif (NOT WIN32) + target_link_libraries(${TARGET_NAME} ${CURL_LIBRARY}) +endif (WIN32) # link required libraries on UNIX if (UNIX AND NOT APPLE) find_package(Threads REQUIRED) - - target_link_libraries(HifiShared ${CMAKE_THREAD_LIBS_INIT}) + target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT}) endif (UNIX AND NOT APPLE) \ No newline at end of file diff --git a/shared/external/pthread.h b/libraries/shared/external/pthread.h similarity index 100% rename from shared/external/pthread.h rename to libraries/shared/external/pthread.h diff --git a/shared/external/sched.h b/libraries/shared/external/sched.h similarity index 100% rename from shared/external/sched.h rename to libraries/shared/external/sched.h diff --git a/shared/src/Agent.cpp b/libraries/shared/src/Agent.cpp similarity index 100% rename from shared/src/Agent.cpp rename to libraries/shared/src/Agent.cpp diff --git a/shared/src/Agent.h b/libraries/shared/src/Agent.h similarity index 100% rename from shared/src/Agent.h rename to libraries/shared/src/Agent.h diff --git a/shared/src/AgentData.cpp b/libraries/shared/src/AgentData.cpp similarity index 100% rename from shared/src/AgentData.cpp rename to libraries/shared/src/AgentData.cpp diff --git a/shared/src/AgentData.h b/libraries/shared/src/AgentData.h similarity index 100% rename from shared/src/AgentData.h rename to libraries/shared/src/AgentData.h diff --git a/shared/src/AgentList.cpp b/libraries/shared/src/AgentList.cpp similarity index 100% rename from shared/src/AgentList.cpp rename to libraries/shared/src/AgentList.cpp diff --git a/shared/src/AgentList.h b/libraries/shared/src/AgentList.h similarity index 100% rename from shared/src/AgentList.h rename to libraries/shared/src/AgentList.h diff --git a/shared/src/AgentTypes.h b/libraries/shared/src/AgentTypes.h similarity index 100% rename from shared/src/AgentTypes.h rename to libraries/shared/src/AgentTypes.h diff --git a/shared/src/AngleUtils.h b/libraries/shared/src/AngleUtils.h similarity index 100% rename from shared/src/AngleUtils.h rename to libraries/shared/src/AngleUtils.h diff --git a/shared/src/AudioRingBuffer.cpp b/libraries/shared/src/AudioRingBuffer.cpp similarity index 100% rename from shared/src/AudioRingBuffer.cpp rename to libraries/shared/src/AudioRingBuffer.cpp diff --git a/shared/src/AudioRingBuffer.h b/libraries/shared/src/AudioRingBuffer.h similarity index 100% rename from shared/src/AudioRingBuffer.h rename to libraries/shared/src/AudioRingBuffer.h diff --git a/shared/src/CounterStats.cpp b/libraries/shared/src/CounterStats.cpp similarity index 88% rename from shared/src/CounterStats.cpp rename to libraries/shared/src/CounterStats.cpp index 7dbab0add6..050ee6159b 100644 --- a/shared/src/CounterStats.cpp +++ b/libraries/shared/src/CounterStats.cpp @@ -33,17 +33,17 @@ // int sampleAt; -void CounterStatHistory::recordSample(long int thisCount) { +void CounterStatHistory::recordSample(long thisCount) { timeval now; gettimeofday(&now,NULL); double nowSeconds = (now.tv_usec/1000000.0)+(now.tv_sec); this->recordSample(nowSeconds,thisCount); } -void CounterStatHistory::recordSample(double thisTime, long int thisCount) { +void CounterStatHistory::recordSample(double thisTime, long thisCount) { // how much did we change since last sample? - long int thisDelta = thisCount - this->lastCount; + long thisDelta = thisCount - this->lastCount; double elapsed = thisTime - this->lastTime; // record the latest values @@ -74,12 +74,12 @@ void CounterStatHistory::recordSample(double thisTime, long int thisCount) { } -long int CounterStatHistory::getRunningAverage() { +long CounterStatHistory::getRunningAverage() { // before we calculate our running average, always "reset" the current count, with the current time // this will flush out old data, if we haven't been adding any new data. this->recordSample(this->currentCount); - long int runningTotal = 0; + long runningTotal = 0; double minTime = this->timeSamples[0]; double maxTime = this->timeSamples[0]; @@ -90,6 +90,6 @@ long int CounterStatHistory::getRunningAverage() { } double elapsedTime = maxTime-minTime; - long int runningAverage = runningTotal/elapsedTime; + long runningAverage = runningTotal/elapsedTime; return runningAverage; } diff --git a/libraries/shared/src/CounterStats.h b/libraries/shared/src/CounterStats.h new file mode 100644 index 0000000000..7d698d0970 --- /dev/null +++ b/libraries/shared/src/CounterStats.h @@ -0,0 +1,77 @@ +// +// CounterStats.h +// hifi +// +// Created by Brad Hefta-Gaub on 3/29/13. +// +// Poor-man's counter stats collector class. Useful for collecting running averages +// and other stats for countable things. +// +// + +#ifndef __hifi__CounterStats__ +#define __hifi__CounterStats__ + +#include +#include +#include + +// TIME_FRAME should be SAMPLES_TO_KEEP * TIME_BETWEEN_SAMPLES +#define COUNTETSTATS_SAMPLES_TO_KEEP 50 +#define COUNTETSTATS_TIME_BETWEEN_SAMPLES 0.1 +#define COUNTETSTATS_TIME_FRAME (COUNTETSTATS_SAMPLES_TO_KEEP*COUNTETSTATS_TIME_BETWEEN_SAMPLES) + +class CounterStatHistory { +public: + std::string name; + + CounterStatHistory(std::string myName): + currentCount(0), currentDelta(0),currentTime(0.0), + lastCount(0),lastTime(0.0), + totalTime(0.0), + sampleAt(-1), sampleCount(0), name(myName) {}; + + CounterStatHistory(): + currentCount(0), currentDelta(0),currentTime(0.0), + lastCount(0),lastTime(0.0), + totalTime(0.0), + sampleAt(-1), sampleCount(0) {}; + + CounterStatHistory(std::string myName, double initialTime, long initialCount) : + currentCount(initialCount), currentDelta(0), currentTime(initialTime), + lastCount(initialCount),lastTime(initialTime), + totalTime(initialTime), + sampleAt(-1), sampleCount(0), name(myName) {}; + + void recordSample(long thisCount); + void recordSample(double thisTime, long thisCount); + long getRunningAverage(); + + long getAverage() { + return currentCount/totalTime; + }; + + double getTotalTime() { + return totalTime; + }; + long getCount() { + return currentCount; + }; +private: + long currentCount; + long currentDelta; + double currentTime; + + long lastCount; + double lastTime; + + double totalTime; + + long countSamples[COUNTETSTATS_SAMPLES_TO_KEEP]; + long deltaSamples[COUNTETSTATS_SAMPLES_TO_KEEP]; + double timeSamples[COUNTETSTATS_SAMPLES_TO_KEEP]; + int sampleAt; + int sampleCount; +}; + +#endif /* defined(__hifi__CounterStat__) */ diff --git a/shared/src/FloodFill.h b/libraries/shared/src/FloodFill.h similarity index 100% rename from shared/src/FloodFill.h rename to libraries/shared/src/FloodFill.h diff --git a/shared/src/OctalCode.cpp b/libraries/shared/src/OctalCode.cpp similarity index 100% rename from shared/src/OctalCode.cpp rename to libraries/shared/src/OctalCode.cpp diff --git a/shared/src/OctalCode.h b/libraries/shared/src/OctalCode.h similarity index 100% rename from shared/src/OctalCode.h rename to libraries/shared/src/OctalCode.h diff --git a/shared/src/PacketHeaders.h b/libraries/shared/src/PacketHeaders.h similarity index 100% rename from shared/src/PacketHeaders.h rename to libraries/shared/src/PacketHeaders.h diff --git a/shared/src/PerfStat.cpp b/libraries/shared/src/PerfStat.cpp similarity index 100% rename from shared/src/PerfStat.cpp rename to libraries/shared/src/PerfStat.cpp diff --git a/shared/src/PerfStat.h b/libraries/shared/src/PerfStat.h similarity index 100% rename from shared/src/PerfStat.h rename to libraries/shared/src/PerfStat.h diff --git a/shared/src/Radix2InplaceSort.h b/libraries/shared/src/Radix2InplaceSort.h similarity index 100% rename from shared/src/Radix2InplaceSort.h rename to libraries/shared/src/Radix2InplaceSort.h diff --git a/shared/src/Radix2IntegerScanner.h b/libraries/shared/src/Radix2IntegerScanner.h similarity index 100% rename from shared/src/Radix2IntegerScanner.h rename to libraries/shared/src/Radix2IntegerScanner.h diff --git a/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp similarity index 100% rename from shared/src/SharedUtil.cpp rename to libraries/shared/src/SharedUtil.cpp diff --git a/shared/src/SharedUtil.h b/libraries/shared/src/SharedUtil.h similarity index 100% rename from shared/src/SharedUtil.h rename to libraries/shared/src/SharedUtil.h diff --git a/shared/src/StdDev.cpp b/libraries/shared/src/StdDev.cpp similarity index 100% rename from shared/src/StdDev.cpp rename to libraries/shared/src/StdDev.cpp diff --git a/shared/src/StdDev.h b/libraries/shared/src/StdDev.h similarity index 100% rename from shared/src/StdDev.h rename to libraries/shared/src/StdDev.h diff --git a/shared/src/Syssocket.h b/libraries/shared/src/Syssocket.h similarity index 100% rename from shared/src/Syssocket.h rename to libraries/shared/src/Syssocket.h diff --git a/shared/src/Systime.cpp b/libraries/shared/src/Systime.cpp similarity index 100% rename from shared/src/Systime.cpp rename to libraries/shared/src/Systime.cpp diff --git a/shared/src/Systime.h b/libraries/shared/src/Systime.h similarity index 100% rename from shared/src/Systime.h rename to libraries/shared/src/Systime.h diff --git a/shared/src/UDPSocket.cpp b/libraries/shared/src/UDPSocket.cpp similarity index 100% rename from shared/src/UDPSocket.cpp rename to libraries/shared/src/UDPSocket.cpp diff --git a/shared/src/UDPSocket.h b/libraries/shared/src/UDPSocket.h similarity index 100% rename from shared/src/UDPSocket.h rename to libraries/shared/src/UDPSocket.h diff --git a/shared/src/UrlReader.cpp b/libraries/shared/src/UrlReader.cpp similarity index 100% rename from shared/src/UrlReader.cpp rename to libraries/shared/src/UrlReader.cpp diff --git a/shared/src/UrlReader.h b/libraries/shared/src/UrlReader.h similarity index 100% rename from shared/src/UrlReader.h rename to libraries/shared/src/UrlReader.h diff --git a/libraries/voxels/CMakeLists.txt b/libraries/voxels/CMakeLists.txt new file mode 100644 index 0000000000..376d652d00 --- /dev/null +++ b/libraries/voxels/CMakeLists.txt @@ -0,0 +1,22 @@ +cmake_minimum_required(VERSION 2.8) + +set(MACRO_DIR ../../cmake/macros) + +# setup for find modules +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules/") + +set(TARGET_NAME voxels) + +project(${TARGET_NAME}) + +# set up the external glm library +include(${MACRO_DIR}/IncludeGLM.cmake) +include_glm(${TARGET_NAME} ${MACRO_DIR}) + +# grab the implemenation and header files +file(GLOB HIFI_VOXELS_SRCS src/*.h src/*.cpp) + +# create a library and set the property so it can be referenced later +add_library(${TARGET_NAME} ${HIFI_VOXELS_SRCS}) +include_directories(${TARGET_NAME} ../shared/src) +set(HIFI_VOXELS_LIBRARY ${TARGET_NAME}) \ No newline at end of file diff --git a/shared/src/MarkerNode.cpp b/libraries/voxels/src/MarkerNode.cpp similarity index 100% rename from shared/src/MarkerNode.cpp rename to libraries/voxels/src/MarkerNode.cpp diff --git a/shared/src/MarkerNode.h b/libraries/voxels/src/MarkerNode.h similarity index 100% rename from shared/src/MarkerNode.h rename to libraries/voxels/src/MarkerNode.h diff --git a/shared/src/VoxelNode.cpp b/libraries/voxels/src/VoxelNode.cpp similarity index 100% rename from shared/src/VoxelNode.cpp rename to libraries/voxels/src/VoxelNode.cpp diff --git a/shared/src/VoxelNode.h b/libraries/voxels/src/VoxelNode.h similarity index 100% rename from shared/src/VoxelNode.h rename to libraries/voxels/src/VoxelNode.h diff --git a/shared/src/VoxelTree.cpp b/libraries/voxels/src/VoxelTree.cpp similarity index 100% rename from shared/src/VoxelTree.cpp rename to libraries/voxels/src/VoxelTree.cpp diff --git a/shared/src/VoxelTree.h b/libraries/voxels/src/VoxelTree.h similarity index 100% rename from shared/src/VoxelTree.h rename to libraries/voxels/src/VoxelTree.h diff --git a/mixer/CMakeLists.txt b/mixer/CMakeLists.txt deleted file mode 100644 index 8c429b35e5..0000000000 --- a/mixer/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -cmake_minimum_required(VERSION 2.8) - -project(mixer) - -# grab the implemenation and header files -file(GLOB MIXER_SRCS src/*.cpp src/*.h) - -# add the mixer executable -add_executable(mixer ${MIXER_SRCS}) - -# link the shared hifi library -include(../LinkHifiShared.cmake) -link_hifi_shared_library(mixer) - -# link the threads library -find_package(Threads REQUIRED) -target_link_libraries(mixer ${CMAKE_THREAD_LIBS_INIT}) \ No newline at end of file diff --git a/shared/src/CounterStats.h b/shared/src/CounterStats.h deleted file mode 100644 index 29481461b6..0000000000 --- a/shared/src/CounterStats.h +++ /dev/null @@ -1,79 +0,0 @@ -// -// CounterStats.h -// hifi -// -// Created by Brad Hefta-Gaub on 3/29/13. -// -// Poor-man's counter stats collector class. Useful for collecting running averages -// and other stats for countable things. -// -// - -#ifndef __hifi__CounterStats__ -#define __hifi__CounterStats__ - -#include -#include -#include - -// TIME_FRAME should be SAMPLES_TO_KEEP * TIME_BETWEEN_SAMPLES -#define COUNTETSTATS_SAMPLES_TO_KEEP 50 -#define COUNTETSTATS_TIME_BETWEEN_SAMPLES 0.1 -#define COUNTETSTATS_TIME_FRAME (COUNTETSTATS_SAMPLES_TO_KEEP*COUNTETSTATS_TIME_BETWEEN_SAMPLES) - -class CounterStatHistory { - -private: - long int currentCount; - long int currentDelta; - double currentTime; - - long int lastCount; - double lastTime; - - double totalTime; - - long int countSamples[COUNTETSTATS_SAMPLES_TO_KEEP]; - long int deltaSamples[COUNTETSTATS_SAMPLES_TO_KEEP]; - double timeSamples[COUNTETSTATS_SAMPLES_TO_KEEP]; - int sampleAt; - int sampleCount; - -public: - std::string name; - - CounterStatHistory(std::string myName): - currentCount(0), currentDelta(0),currentTime(0.0), - lastCount(0),lastTime(0.0), - totalTime(0.0), - sampleAt(-1),sampleCount(0), name(myName) {}; - - CounterStatHistory(): - currentCount(0), currentDelta(0),currentTime(0.0), - lastCount(0),lastTime(0.0), - totalTime(0.0), - sampleAt(-1),sampleCount(0) {}; - - CounterStatHistory(std::string myName, double initialTime, long int initialCount) : - currentCount(initialCount), currentDelta(0), currentTime(initialTime), - lastCount(initialCount),lastTime(initialTime), - totalTime(initialTime), - sampleAt(-1), sampleCount(0), name(myName) {}; - - void recordSample(long int thisCount); - void recordSample(double thisTime, long int thisCount); - long int getRunningAverage(); - - long int getAverage() { - return currentCount/totalTime; - }; - - double getTotalTime() { - return totalTime; - }; - long int getCount() { - return currentCount; - }; -}; - -#endif /* defined(__hifi__CounterStat__) */ diff --git a/space-server/CMakeLists.txt b/space-server/CMakeLists.txt new file mode 100644 index 0000000000..c7ee39ef22 --- /dev/null +++ b/space-server/CMakeLists.txt @@ -0,0 +1,11 @@ +cmake_minimum_required(VERSION 2.8) + +set(TARGET_NAME space-server) + +set(MACRO_DIR ../cmake/macros) +include(${MACRO_DIR}/SetupHifiProject.cmake) + +setup_hifi_project(${TARGET_NAME}) + +include(${MACRO_DIR}/LinkHifiLibrary.cmake) +link_hifi_library(shared ${TARGET_NAME}) \ No newline at end of file diff --git a/space/example.data.txt b/space-server/example.data.txt similarity index 100% rename from space/example.data.txt rename to space-server/example.data.txt diff --git a/space/src/TreeNode.cpp b/space-server/src/TreeNode.cpp similarity index 100% rename from space/src/TreeNode.cpp rename to space-server/src/TreeNode.cpp diff --git a/space/src/TreeNode.h b/space-server/src/TreeNode.h similarity index 100% rename from space/src/TreeNode.h rename to space-server/src/TreeNode.h diff --git a/space/src/main.cpp b/space-server/src/main.cpp similarity index 100% rename from space/src/main.cpp rename to space-server/src/main.cpp diff --git a/space/CMakeLists.txt b/space/CMakeLists.txt deleted file mode 100644 index 0cd910a42f..0000000000 --- a/space/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -cmake_minimum_required(VERSION 2.8) - -project(space) - -file(GLOB SPACE_SRCS src/*.cpp src/*.h) - -add_executable(space ${SPACE_SRCS}) - -include(../LinkHifiShared.cmake) -link_hifi_shared_library(space) \ No newline at end of file diff --git a/voxel-server/CMakeLists.txt b/voxel-server/CMakeLists.txt new file mode 100644 index 0000000000..eaac46fc9f --- /dev/null +++ b/voxel-server/CMakeLists.txt @@ -0,0 +1,15 @@ +cmake_minimum_required(VERSION 2.8) + +set(TARGET_NAME voxel-server) + +set(MACRO_DIR ../cmake/macros) +include(${MACRO_DIR}/SetupHifiProject.cmake) + +setup_hifi_project(${TARGET_NAME}) + +# link in the shared library +include(${MACRO_DIR}/LinkHifiLibrary.cmake) +link_hifi_library(shared ${TARGET_NAME}) + +# link in the hifi voxels library +link_hifi_library(voxels ${TARGET_NAME}) \ No newline at end of file diff --git a/voxel/src/VoxelAgentData.cpp b/voxel-server/src/VoxelAgentData.cpp similarity index 100% rename from voxel/src/VoxelAgentData.cpp rename to voxel-server/src/VoxelAgentData.cpp diff --git a/voxel/src/VoxelAgentData.h b/voxel-server/src/VoxelAgentData.h similarity index 100% rename from voxel/src/VoxelAgentData.h rename to voxel-server/src/VoxelAgentData.h diff --git a/voxel/src/main.cpp b/voxel-server/src/main.cpp similarity index 99% rename from voxel/src/main.cpp rename to voxel-server/src/main.cpp index c3ab221b01..d012f23995 100644 --- a/voxel/src/main.cpp +++ b/voxel-server/src/main.cpp @@ -6,7 +6,6 @@ // Copyright (c) 2012 High Fidelity, Inc. All rights reserved. // - #include #include #include diff --git a/voxel/CMakeLists.txt b/voxel/CMakeLists.txt deleted file mode 100644 index 627dafdfcd..0000000000 --- a/voxel/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -cmake_minimum_required(VERSION 2.8) - -project(voxel) - -file(GLOB VOXEL_SRCS src/*.cpp src/*.h) - -add_executable(voxel ${VOXEL_SRCS}) - -include(../LinkHifiShared.cmake) -link_hifi_shared_library(voxel) \ No newline at end of file