more Models->Entities renaming

2025-04-18 20:56:41 +02:00 · 2014-06-26 17:01:07 -07:00 · 2014-06-26 17:01:07 -07:00 · c4fe36b13d
commit c4fe36b13d
parent a60e66bcfd
25 changed files with 8 additions and 8 deletions
--- 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}")
--- 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"

--- a/assignment-client/src/entities/EntityNodeData.h
+++ b/assignment-client/src/entities/EntityNodeData.h
--- a/assignment-client/src/entities/EntityServer.cpp
+++ b/assignment-client/src/entities/EntityServer.cpp
--- a/assignment-client/src/entities/EntityServer.h
+++ b/assignment-client/src/entities/EntityServer.h
--- a/assignment-client/src/entities/EntityServerConsts.h
+++ b/assignment-client/src/entities/EntityServerConsts.h
--- 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}")
--- 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"
--- a/interface/src/entities/EntityTreeRenderer.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() {
--- a/interface/src/entities/EntityTreeRenderer.h
+++ b/interface/src/entities/EntityTreeRenderer.h
--- a/libraries/entities/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)

--- a/libraries/entities/src/EntityEditPacketSender.cpp
+++ b/libraries/entities/src/EntityEditPacketSender.cpp
--- a/libraries/entities/src/EntityEditPacketSender.h
+++ b/libraries/entities/src/EntityEditPacketSender.h
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
--- a/libraries/entities/src/EntityScriptingInterface.h
+++ b/libraries/entities/src/EntityScriptingInterface.h
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
--- a/libraries/entities/src/EntityTree.h
+++ b/libraries/entities/src/EntityTree.h
--- a/libraries/entities/src/EntityTreeElement.cpp
+++ b/libraries/entities/src/EntityTreeElement.cpp
--- a/libraries/entities/src/EntityTreeElement.h
+++ b/libraries/entities/src/EntityTreeElement.h
--- a/libraries/entities/src/EntityTreeHeadlessViewer.cpp
+++ b/libraries/entities/src/EntityTreeHeadlessViewer.cpp
--- a/libraries/entities/src/EntityTreeHeadlessViewer.h
+++ b/libraries/entities/src/EntityTreeHeadlessViewer.h
--- 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
--- 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})