From c4fe36b13de8fb8f4bc39047ec8bddbeda205ff7 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 26 Jun 2014 17:01:07 -0700 Subject: [PATCH] more Models->Entities renaming --- assignment-client/CMakeLists.txt | 2 +- assignment-client/src/AssignmentFactory.cpp | 2 +- assignment-client/src/{models => entities}/EntityNodeData.h | 0 assignment-client/src/{models => entities}/EntityServer.cpp | 0 assignment-client/src/{models => entities}/EntityServer.h | 0 assignment-client/src/{models => entities}/EntityServerConsts.h | 0 interface/CMakeLists.txt | 2 +- interface/src/Application.h | 2 +- .../ModelTreeRenderer.cpp => entities/EntityTreeRenderer.cpp} | 2 +- .../ModelTreeRenderer.h => entities/EntityTreeRenderer.h} | 0 libraries/{models => entities}/CMakeLists.txt | 2 +- libraries/{models => entities}/src/EntityEditPacketSender.cpp | 0 libraries/{models => entities}/src/EntityEditPacketSender.h | 0 libraries/{models => entities}/src/EntityItem.cpp | 0 libraries/{models => entities}/src/EntityItem.h | 0 libraries/{models => entities}/src/EntityScriptingInterface.cpp | 0 libraries/{models => entities}/src/EntityScriptingInterface.h | 0 libraries/{models => entities}/src/EntityTree.cpp | 0 libraries/{models => entities}/src/EntityTree.h | 0 libraries/{models => entities}/src/EntityTreeElement.cpp | 0 libraries/{models => entities}/src/EntityTreeElement.h | 0 libraries/{models => entities}/src/EntityTreeHeadlessViewer.cpp | 0 libraries/{models => entities}/src/EntityTreeHeadlessViewer.h | 0 libraries/script-engine/CMakeLists.txt | 2 +- tests/octree/CMakeLists.txt | 2 +- 25 files changed, 8 insertions(+), 8 deletions(-) rename assignment-client/src/{models => entities}/EntityNodeData.h (100%) rename assignment-client/src/{models => entities}/EntityServer.cpp (100%) rename assignment-client/src/{models => entities}/EntityServer.h (100%) rename assignment-client/src/{models => entities}/EntityServerConsts.h (100%) rename interface/src/{models/ModelTreeRenderer.cpp => entities/EntityTreeRenderer.cpp} (99%) rename interface/src/{models/ModelTreeRenderer.h => entities/EntityTreeRenderer.h} (100%) rename libraries/{models => entities}/CMakeLists.txt (97%) rename libraries/{models => entities}/src/EntityEditPacketSender.cpp (100%) rename libraries/{models => entities}/src/EntityEditPacketSender.h (100%) rename libraries/{models => entities}/src/EntityItem.cpp (100%) rename libraries/{models => entities}/src/EntityItem.h (100%) rename libraries/{models => entities}/src/EntityScriptingInterface.cpp (100%) rename libraries/{models => entities}/src/EntityScriptingInterface.h (100%) rename libraries/{models => entities}/src/EntityTree.cpp (100%) rename libraries/{models => entities}/src/EntityTree.h (100%) rename libraries/{models => entities}/src/EntityTreeElement.cpp (100%) rename libraries/{models => entities}/src/EntityTreeElement.h (100%) rename libraries/{models => entities}/src/EntityTreeHeadlessViewer.cpp (100%) rename libraries/{models => entities}/src/EntityTreeHeadlessViewer.h (100%) diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt index 873ae761ca..16b62ba5b2 100644 --- a/assignment-client/CMakeLists.txt +++ b/assignment-client/CMakeLists.txt @@ -30,7 +30,7 @@ link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(fbx ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(particles ${TARGET_NAME} "${ROOT_DIR}") -link_hifi_library(models ${TARGET_NAME} "${ROOT_DIR}") +link_hifi_library(entities ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(metavoxels ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(animation ${TARGET_NAME} "${ROOT_DIR}") diff --git a/assignment-client/src/AssignmentFactory.cpp b/assignment-client/src/AssignmentFactory.cpp index 851e65c96a..d5efcba8ae 100644 --- a/assignment-client/src/AssignmentFactory.cpp +++ b/assignment-client/src/AssignmentFactory.cpp @@ -16,7 +16,7 @@ #include "audio/AudioMixer.h" #include "avatars/AvatarMixer.h" #include "metavoxels/MetavoxelServer.h" -#include "models/EntityServer.h" +#include "entities/EntityServer.h" #include "particles/ParticleServer.h" #include "voxels/VoxelServer.h" diff --git a/assignment-client/src/models/EntityNodeData.h b/assignment-client/src/entities/EntityNodeData.h similarity index 100% rename from assignment-client/src/models/EntityNodeData.h rename to assignment-client/src/entities/EntityNodeData.h diff --git a/assignment-client/src/models/EntityServer.cpp b/assignment-client/src/entities/EntityServer.cpp similarity index 100% rename from assignment-client/src/models/EntityServer.cpp rename to assignment-client/src/entities/EntityServer.cpp diff --git a/assignment-client/src/models/EntityServer.h b/assignment-client/src/entities/EntityServer.h similarity index 100% rename from assignment-client/src/models/EntityServer.h rename to assignment-client/src/entities/EntityServer.h diff --git a/assignment-client/src/models/EntityServerConsts.h b/assignment-client/src/entities/EntityServerConsts.h similarity index 100% rename from assignment-client/src/models/EntityServerConsts.h rename to assignment-client/src/entities/EntityServerConsts.h diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index cf203c41d9..c7b12b5896 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -124,7 +124,7 @@ link_hifi_library(fbx ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(metavoxels ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(particles ${TARGET_NAME} "${ROOT_DIR}") -link_hifi_library(models ${TARGET_NAME} "${ROOT_DIR}") +link_hifi_library(entities ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(avatars ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(audio ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(animation ${TARGET_NAME} "${ROOT_DIR}") diff --git a/interface/src/Application.h b/interface/src/Application.h index 1a961ff7ba..439c0cb08d 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -63,7 +63,7 @@ #include "devices/PrioVR.h" #include "devices/SixenseManager.h" #include "devices/Visage.h" -#include "models/ModelTreeRenderer.h" // rename to "models/EntityTreeRenderer.h" +#include "models/EntityTreeRenderer.h" #include "particles/ParticleTreeRenderer.h" #include "renderer/AmbientOcclusionEffect.h" #include "renderer/GeometryCache.h" diff --git a/interface/src/models/ModelTreeRenderer.cpp b/interface/src/entities/EntityTreeRenderer.cpp similarity index 99% rename from interface/src/models/ModelTreeRenderer.cpp rename to interface/src/entities/EntityTreeRenderer.cpp index c4013307ab..0d8c594e65 100644 --- a/interface/src/models/ModelTreeRenderer.cpp +++ b/interface/src/entities/EntityTreeRenderer.cpp @@ -15,7 +15,7 @@ #include "InterfaceConfig.h" #include "Menu.h" -#include "ModelTreeRenderer.h" // rename to "EntityTreeRenderer.h" +#include "EntityTreeRenderer.h" EntityTreeRenderer::EntityTreeRenderer() : OctreeRenderer() { diff --git a/interface/src/models/ModelTreeRenderer.h b/interface/src/entities/EntityTreeRenderer.h similarity index 100% rename from interface/src/models/ModelTreeRenderer.h rename to interface/src/entities/EntityTreeRenderer.h diff --git a/libraries/models/CMakeLists.txt b/libraries/entities/CMakeLists.txt similarity index 97% rename from libraries/models/CMakeLists.txt rename to libraries/entities/CMakeLists.txt index 06578371cc..8740c4dba1 100644 --- a/libraries/models/CMakeLists.txt +++ b/libraries/entities/CMakeLists.txt @@ -10,7 +10,7 @@ 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 models) +set(TARGET_NAME entities) find_package(Qt5Widgets REQUIRED) diff --git a/libraries/models/src/EntityEditPacketSender.cpp b/libraries/entities/src/EntityEditPacketSender.cpp similarity index 100% rename from libraries/models/src/EntityEditPacketSender.cpp rename to libraries/entities/src/EntityEditPacketSender.cpp diff --git a/libraries/models/src/EntityEditPacketSender.h b/libraries/entities/src/EntityEditPacketSender.h similarity index 100% rename from libraries/models/src/EntityEditPacketSender.h rename to libraries/entities/src/EntityEditPacketSender.h diff --git a/libraries/models/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp similarity index 100% rename from libraries/models/src/EntityItem.cpp rename to libraries/entities/src/EntityItem.cpp diff --git a/libraries/models/src/EntityItem.h b/libraries/entities/src/EntityItem.h similarity index 100% rename from libraries/models/src/EntityItem.h rename to libraries/entities/src/EntityItem.h diff --git a/libraries/models/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp similarity index 100% rename from libraries/models/src/EntityScriptingInterface.cpp rename to libraries/entities/src/EntityScriptingInterface.cpp diff --git a/libraries/models/src/EntityScriptingInterface.h b/libraries/entities/src/EntityScriptingInterface.h similarity index 100% rename from libraries/models/src/EntityScriptingInterface.h rename to libraries/entities/src/EntityScriptingInterface.h diff --git a/libraries/models/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp similarity index 100% rename from libraries/models/src/EntityTree.cpp rename to libraries/entities/src/EntityTree.cpp diff --git a/libraries/models/src/EntityTree.h b/libraries/entities/src/EntityTree.h similarity index 100% rename from libraries/models/src/EntityTree.h rename to libraries/entities/src/EntityTree.h diff --git a/libraries/models/src/EntityTreeElement.cpp b/libraries/entities/src/EntityTreeElement.cpp similarity index 100% rename from libraries/models/src/EntityTreeElement.cpp rename to libraries/entities/src/EntityTreeElement.cpp diff --git a/libraries/models/src/EntityTreeElement.h b/libraries/entities/src/EntityTreeElement.h similarity index 100% rename from libraries/models/src/EntityTreeElement.h rename to libraries/entities/src/EntityTreeElement.h diff --git a/libraries/models/src/EntityTreeHeadlessViewer.cpp b/libraries/entities/src/EntityTreeHeadlessViewer.cpp similarity index 100% rename from libraries/models/src/EntityTreeHeadlessViewer.cpp rename to libraries/entities/src/EntityTreeHeadlessViewer.cpp diff --git a/libraries/models/src/EntityTreeHeadlessViewer.h b/libraries/entities/src/EntityTreeHeadlessViewer.h similarity index 100% rename from libraries/models/src/EntityTreeHeadlessViewer.h rename to libraries/entities/src/EntityTreeHeadlessViewer.h diff --git a/libraries/script-engine/CMakeLists.txt b/libraries/script-engine/CMakeLists.txt index d0d05df286..c5166181bf 100644 --- a/libraries/script-engine/CMakeLists.txt +++ b/libraries/script-engine/CMakeLists.txt @@ -26,7 +26,7 @@ link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(fbx ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(particles ${TARGET_NAME} "${ROOT_DIR}") -link_hifi_library(models ${TARGET_NAME} "${ROOT_DIR}") +link_hifi_library(entities ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(animation ${TARGET_NAME} "${ROOT_DIR}") # link ZLIB diff --git a/tests/octree/CMakeLists.txt b/tests/octree/CMakeLists.txt index 92a201825e..81e66aa3df 100644 --- a/tests/octree/CMakeLists.txt +++ b/tests/octree/CMakeLists.txt @@ -34,7 +34,7 @@ link_hifi_library(animation ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(fbx ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(networking ${TARGET_NAME} ${ROOT_DIR}) -link_hifi_library(models ${TARGET_NAME} ${ROOT_DIR}) +link_hifi_library(entities ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(octree ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(particles ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})