()->getAvatar(id)->getPosition();
}
@@ -184,8 +178,8 @@ void PathPointer::editRenderState(const std::string& state, const QVariant& star
withWriteLock([&] {
auto renderState = _renderStates.find(state);
if (renderState != _renderStates.end()) {
- updateRenderStateOverlay(renderState->second->getStartID(), startProps);
- updateRenderStateOverlay(renderState->second->getEndID(), endProps);
+ updateRenderState(renderState->second->getStartID(), startProps);
+ updateRenderState(renderState->second->getEndID(), endProps);
QVariant startDim = startProps.toMap()["dimensions"];
if (startDim.isValid()) {
renderState->second->setStartDim(vec3FromVariant(startDim));
@@ -204,7 +198,7 @@ void PathPointer::editRenderState(const std::string& state, const QVariant& star
});
}
-void PathPointer::updateRenderStateOverlay(const OverlayID& id, const QVariant& props) {
+void PathPointer::updateRenderState(const QUuid& id, const QVariant& props) {
if (!id.isNull() && props.isValid()) {
QVariantMap propMap = props.toMap();
propMap.remove("visible");
diff --git a/interface/src/raypick/PathPointer.h b/interface/src/raypick/PathPointer.h
index 1aa4165c87..759d46842e 100644
--- a/interface/src/raypick/PathPointer.h
+++ b/interface/src/raypick/PathPointer.h
@@ -19,20 +19,20 @@
struct LockEndObject {
QUuid id { QUuid() };
- bool isOverlay { false };
+ bool isAvatar { false };
glm::mat4 offsetMat { glm::mat4() };
};
class StartEndRenderState {
public:
StartEndRenderState() {}
- StartEndRenderState(const OverlayID& startID, const OverlayID& endID);
+ StartEndRenderState(const QUuid& startID, const QUuid& endID);
virtual ~StartEndRenderState() = default;
- const OverlayID& getStartID() const { return _startID; }
- const OverlayID& getEndID() const { return _endID; }
- const bool& doesStartIgnoreRays() const { return _startIgnoreRays; }
- const bool& doesEndIgnoreRays() const { return _endIgnoreRays; }
+ const QUuid& getStartID() const { return _startID; }
+ const QUuid& getEndID() const { return _endID; }
+ const bool& doesStartIgnorePicks() const { return _startIgnorePicks; }
+ const bool& doesEndIgnorePicks() const { return _endIgnorePicks; }
void setStartDim(const glm::vec3& startDim) { _startDim = startDim; }
const glm::vec3& getStartDim() const { return _startDim; }
@@ -51,10 +51,10 @@ public:
bool isEnabled() const { return _enabled; }
protected:
- OverlayID _startID;
- OverlayID _endID;
- bool _startIgnoreRays;
- bool _endIgnoreRays;
+ QUuid _startID;
+ QUuid _endID;
+ bool _startIgnorePicks;
+ bool _endIgnorePicks;
glm::vec3 _startDim;
glm::vec3 _endDim;
@@ -82,7 +82,7 @@ public:
void editRenderState(const std::string& state, const QVariant& startProps, const QVariant& pathProps, const QVariant& endProps) override;
void setLength(float length) override;
- void setLockEndUUID(const QUuid& objectID, bool isOverlay, const glm::mat4& offsetMat = glm::mat4()) override;
+ void setLockEndUUID(const QUuid& objectID, bool isAvatar, const glm::mat4& offsetMat = glm::mat4()) override;
void updateVisuals(const PickResultPointer& prevRayPickResult) override;
diff --git a/libraries/entities-renderer/src/RenderableTextEntityItem.cpp b/libraries/entities-renderer/src/RenderableTextEntityItem.cpp
index d5f0843049..94ecf5d4eb 100644
--- a/libraries/entities-renderer/src/RenderableTextEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableTextEntityItem.cpp
@@ -199,7 +199,7 @@ void TextEntityRenderer::doRender(RenderArgs* args) {
geometryCache->bindSimpleProgram(batch, false, backgroundColor.a < 1.0f, false, false, false);
geometryCache->renderQuad(batch, minCorner, maxCorner, backgroundColor, _geometryID);
- // FIXME: Factor out textRenderer so that Text3DOverlay overlay parts can be grouped by pipeline for a gpu performance increase.
+ // FIXME: Factor out textRenderer so that text parts can be grouped by pipeline for a gpu performance increase.
float scale = _lineHeight / _textRenderer->getFontSize();
transformToTopLeft.setScale(scale); // Scale to have the correct line height
batch.setModelTransform(transformToTopLeft);
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 0f77bd6bc7..ad5c9660f4 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -945,12 +945,9 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
*/
/**jsdoc
- * The "Material" {@link Entities.EntityType|EntityType} modifies the existing materials on
- * {@link Entities.EntityType|Model} entities, {@link Entities.EntityType|Shape} entities (albedo only),
- * {@link Overlays.OverlayType|model overlays}, and avatars.
+ * The "Material" {@link Entities.EntityType|EntityType} modifies the existing materials on entities and avatars.
* It has properties in addition to the common {@link Entities.EntityProperties|EntityProperties}.
- * To apply a material to an entity or overlay, set the material entity's parentID property to the entity or
- * overlay's ID.
+ * To apply a material to an entity, set the material entity's parentID property to the entity ID.
* To apply a material to an avatar, set the material entity's parentID property to the avatar's session UUID.
* To apply a material to your avatar such that it persists across domains and log-ins, create the material as an avatar entity
* by setting the entityHostType parameter in {@link Entities.addEntity} to "avatar".
diff --git a/libraries/entities/src/EntityTypes.h b/libraries/entities/src/EntityTypes.h
index 8ad654c638..91b71513dc 100644
--- a/libraries/entities/src/EntityTypes.h
+++ b/libraries/entities/src/EntityTypes.h
@@ -84,8 +84,7 @@ public:
* {@link Entities.EntityProperties-Light|EntityProperties-Light} |
* "Zone" | A volume of lighting effects and avatar permissions. |
* {@link Entities.EntityProperties-Zone|EntityProperties-Zone} |
- * "Material" | Modifies the existing materials on Model entities, Shape entities,
- * {@link Overlays.OverlayType|model overlays}, and avatars. |
+ *
"Material" | Modifies the existing materials on entities and avatars. |
* {@link Entities.EntityProperties-Material|EntityProperties-Material} |
*
*
diff --git a/libraries/entities/src/LineEntityItem.cpp b/libraries/entities/src/LineEntityItem.cpp
index 12d1178690..acb5bc08f6 100644
--- a/libraries/entities/src/LineEntityItem.cpp
+++ b/libraries/entities/src/LineEntityItem.cpp
@@ -23,7 +23,6 @@
const int LineEntityItem::MAX_POINTS_PER_LINE = 70;
-
EntityItemPointer LineEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
EntityItemPointer entity(new LineEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
entity->setProperties(properties);
diff --git a/libraries/entities/src/MaterialEntityItem.cpp b/libraries/entities/src/MaterialEntityItem.cpp
index cec602a5e1..1baa0b213a 100644
--- a/libraries/entities/src/MaterialEntityItem.cpp
+++ b/libraries/entities/src/MaterialEntityItem.cpp
@@ -310,7 +310,7 @@ void MaterialEntityItem::removeMaterial() {
return;
}
- // Our parent could be an entity, an avatar, or an overlay
+ // Our parent could be an entity or an avatar
if (EntityTree::removeMaterialFromEntity(parentID, material, getParentMaterialName().toStdString())) {
return;
}
@@ -319,10 +319,6 @@ void MaterialEntityItem::removeMaterial() {
return;
}
- if (EntityTree::removeMaterialFromOverlay(parentID, material, getParentMaterialName().toStdString())) {
- return;
- }
-
// if a remove fails, our parent is gone, so we don't need to retry
}
@@ -349,7 +345,7 @@ void MaterialEntityItem::applyMaterial() {
graphics::MaterialLayer materialLayer = graphics::MaterialLayer(material, getPriority());
- // Our parent could be an entity, an avatar, or an overlay
+ // Our parent could be an entity or an avatar
if (EntityTree::addMaterialToEntity(parentID, materialLayer, getParentMaterialName().toStdString())) {
return;
}
@@ -358,10 +354,6 @@ void MaterialEntityItem::applyMaterial() {
return;
}
- if (EntityTree::addMaterialToOverlay(parentID, materialLayer, getParentMaterialName().toStdString())) {
- return;
- }
-
// if we've reached this point, we couldn't find our parent, so we need to try again later
_retryApply = true;
}
diff --git a/libraries/graphics-scripting/src/graphics-scripting/Forward.h b/libraries/graphics-scripting/src/graphics-scripting/Forward.h
index 104674eddc..90bd083d02 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/Forward.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/Forward.h
@@ -149,7 +149,7 @@ namespace scriptable {
// QVariantMap armature;
};
- // mixin class for Avatar/Entity/Overlay Rendering that expose their in-memory graphics::Meshes
+ // mixin class for Avatar + Entity Rendering that expose their in-memory graphics::Meshes
class ModelProvider {
public:
NestableType modelProviderType;
diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h
index 1ec60c4244..f99d6438e4 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h
@@ -38,13 +38,13 @@ public:
public slots:
/**jsdoc
- * Returns a model reference object associated with the specified UUID ({@link EntityID}, {@link OverlayID}, or {@link AvatarID}).
+ * Returns a model reference object associated with the specified UUID ({@link EntityID} or {@link AvatarID}).
*
* @function Graphics.getModel
* @param {UUID} entityID - The objectID of the model whose meshes are to be retrieved.
* @returns {Graphics.Model} the resulting Model object
*/
- scriptable::ScriptableModelPointer getModel(QUuid uuid);
+ scriptable::ScriptableModelPointer getModel(const QUuid& uuid);
/**jsdoc
* @function Graphics.updateModel
@@ -52,7 +52,7 @@ public slots:
* @param {Graphics.Model} model
* @returns {boolean}
*/
- bool updateModel(QUuid uuid, const scriptable::ScriptableModelPointer& model);
+ bool updateModel(const QUuid& uuid, const scriptable::ScriptableModelPointer& model);
/**jsdoc
* @function Graphics.canUpdateModel
@@ -61,7 +61,7 @@ public slots:
* @param {number} [partNumber=-1]
* @returns {boolean}
*/
- bool canUpdateModel(QUuid uuid, int meshIndex = -1, int partNumber = -1);
+ bool canUpdateModel(const QUuid& uuid, int meshIndex = -1, int partNumber = -1);
/**jsdoc
* @function Graphics.newModel
@@ -94,7 +94,7 @@ public slots:
QString exportModelToOBJ(const scriptable::ScriptableModel& in);
private:
- scriptable::ModelProviderPointer getModelProvider(QUuid uuid);
+ scriptable::ModelProviderPointer getModelProvider(const QUuid& uuid);
void jsThrowError(const QString& error);
scriptable::MeshPointer getMeshPointer(scriptable::ScriptableMeshPointer meshProxy);
scriptable::MeshPointer getMeshPointer(scriptable::ScriptableMesh& meshProxy);
diff --git a/libraries/pointers/src/Pick.h b/libraries/pointers/src/Pick.h
index 857a72caa8..2db8aa95f5 100644
--- a/libraries/pointers/src/Pick.h
+++ b/libraries/pointers/src/Pick.h
@@ -23,7 +23,6 @@
enum IntersectionType {
NONE = 0,
ENTITY,
- OVERLAY,
AVATAR,
HUD
};