From 8aa6bf727a2a893294ff2591571466c7444fcd7d Mon Sep 17 00:00:00 2001
From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Date: Sun, 7 Feb 2021 22:33:14 -0500
Subject: [PATCH 01/10] Menu Bar reorganization

Menu Bar reorganization
-Add a new "Transform" menu
-Reorder the 4 menus: Edit - Select - Transform - Tools
-Redistribute the menu items
---
 .../create/entityList/html/entityList.html    | 87 ++++++++++---------
 1 file changed, 45 insertions(+), 42 deletions(-)
diff --git a/scripts/system/create/entityList/html/entityList.html b/scripts/system/create/entityList/html/entityList.html
index 93585c7338..1ea41ad8ef 100644
--- a/scripts/system/create/entityList/html/entityList.html
+++ b/scripts/system/create/entityList/html/entityList.html
@@ -25,9 +25,10 @@
     </head>
     <body onload='loaded();' id="entity-list-body">
         <div id="entity-list-menubar">
-            <input type="button" class="normal" id="selection" value="Select&#9662;" />
             <input type="button" class="normal" id="actions" value="Edit&#9662;" />
-            <input type="button" class="normal" id="tools" value="Tools&#9662;" />            
+            <input type="button" class="normal" id="selection" value="Select&#9662;" />
+            <input type="button" class="normal" id="transform" value="Transform&#9662;" />            
+            <input type="button" class="normal" id="tools" value="Tools&#9662;" />
         </div>
         <div id="entity-list-header">
             <input type="button" class="glyph" id="refresh" value="F" />
@@ -146,35 +147,22 @@
                 </div>
             </button>
             <div class="menu-separator"></div>
-            <button class="menu-button" id="moveEntitySelectionToAvatar" >
+            <button class="menu-button" id="exportSelectedEntities" >
                 <div class = "menu-item">
-                    <div class = "menu-item-caption">Move Selected Entities to Avatar</div>
+                    <div class = "menu-item-caption">Export Selected Entities</div>
                     <div class = "menu-item-shortcut"></div>
                 </div>
             </button>
-            <div class="menu-separator"></div>
-            <button class="menu-button" id="rotateAsTheNextClickedSurface" >
+            <button class="menu-button" id="importEntitiesFromFile" >
                 <div class = "menu-item">
-                    <div class = "menu-item-caption">Snap To Next Clicked Surface</div>
-                    <div class = "menu-item-shortcut">0</div>
+                    <div class = "menu-item-caption">Import Entities (.json) From a File</div>
+                    <div class = "menu-item-shortcut"></div>
                 </div>
             </button>
-            <button class="menu-button" id="quickRotate90x" >
+            <button class="menu-button" id="importEntitiesFromUrl" >
                 <div class = "menu-item">
-                    <div class = "menu-item-caption">Rotate 90&deg; on X axis</div>
-                    <div class = "menu-item-shortcut">7</div>
-                </div>
-            </button>
-            <button class="menu-button" id="quickRotate90y" >
-                <div class = "menu-item">
-                    <div class = "menu-item-caption">Rotate 90&deg; on Y axis</div>
-                    <div class = "menu-item-shortcut">8</div>
-                </div>
-            </button>
-            <button class="menu-button" id="quickRotate90z" >
-                <div class = "menu-item">
-                    <div class = "menu-item-caption">Rotate 90&deg; on Z axis</div>
-                    <div class = "menu-item-shortcut">9</div>
+                    <div class = "menu-item-caption">Import Entities (.json) From a URL</div>
+                    <div class = "menu-item-shortcut"></div>
                 </div>
             </button>
         </div>
@@ -242,6 +230,40 @@
                 </div>
             </button>
         </div>
+        <div class="entity-list-menu" id="transform-menu" >
+            <button class="menu-button" id="moveEntitySelectionToAvatar" >
+                <div class = "menu-item">
+                    <div class = "menu-item-caption">Move Selected Entities to Avatar</div>
+                    <div class = "menu-item-shortcut"></div>
+                </div>
+            </button>
+            <div class="menu-separator"></div>
+            <button class="menu-button" id="rotateAsTheNextClickedSurface" >
+                <div class = "menu-item">
+                    <div class = "menu-item-caption">Snap To Next Clicked Surface</div>
+                    <div class = "menu-item-shortcut">0</div>
+                </div>
+            </button>
+            <div class="menu-separator"></div>            
+            <button class="menu-button" id="quickRotate90x" >
+                <div class = "menu-item">
+                    <div class = "menu-item-caption">Rotate 90&deg; on X axis</div>
+                    <div class = "menu-item-shortcut">7</div>
+                </div>
+            </button>
+            <button class="menu-button" id="quickRotate90y" >
+                <div class = "menu-item">
+                    <div class = "menu-item-caption">Rotate 90&deg; on Y axis</div>
+                    <div class = "menu-item-shortcut">8</div>
+                </div>
+            </button>
+            <button class="menu-button" id="quickRotate90z" >
+                <div class = "menu-item">
+                    <div class = "menu-item-caption">Rotate 90&deg; on Z axis</div>
+                    <div class = "menu-item-shortcut">9</div>
+                </div>
+            </button>        
+        </div>
         <div class="entity-list-menu" id="tools-menu" >
             <button class="menu-button" id="setCameraFocusToSelection" >
                 <div class = "menu-item">
@@ -261,25 +283,6 @@
                     <div class = "menu-item-caption">Toggle Local/World Mode</div>
                     <div class = "menu-item-shortcut">T</div>
                 </div>
-            </button>
-            <div class="menu-separator"></div>
-            <button class="menu-button" id="exportSelectedEntities" >
-                <div class = "menu-item">
-                    <div class = "menu-item-caption">Export Selected Entities</div>
-                    <div class = "menu-item-shortcut"></div>
-                </div>
-            </button>
-            <button class="menu-button" id="importEntitiesFromFile" >
-                <div class = "menu-item">
-                    <div class = "menu-item-caption">Import Entities (.json) From a File</div>
-                    <div class = "menu-item-shortcut"></div>
-                </div>
-            </button>
-            <button class="menu-button" id="importEntitiesFromUrl" >
-                <div class = "menu-item">
-                    <div class = "menu-item-caption">Import Entities (.json) From a URL</div>
-                    <div class = "menu-item-shortcut"></div>
-                </div>
             </button>            
             <div class="menu-separator"></div>
             <button class="menu-button" id="gridActivator" >

From 174ddb59576be00aa704fad7343d11dfc995cee2 Mon Sep 17 00:00:00 2001
From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Date: Sun, 7 Feb 2021 22:34:05 -0500
Subject: [PATCH 02/10] Menu Bar reorganization

Menu Bar reorganization
-Add a new "Transform" menu
-Reorder the 4 menus: Edit - Select - Transform - Tools
-Redistribute the menu items
---
 .../system/create/entityList/html/js/entityList.js    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scripts/system/create/entityList/html/js/entityList.js b/scripts/system/create/entityList/html/js/entityList.js
index 96366d7183..18e1506598 100644
--- a/scripts/system/create/entityList/html/js/entityList.js
+++ b/scripts/system/create/entityList/html/js/entityList.js
@@ -226,9 +226,10 @@ let elEntityTable,
     elToggleVisible,
     elActionsMenu,
     elSelectionMenu,
-    elToolsMenu,    
+    elTransformMenu,
+    elToolsMenu,
     elMenuBackgroundOverlay,
-    elHmdMultiSelect, 
+    elHmdMultiSelect,
     elHmdCopy,
     elHmdCut,
     elHmdPaste,
@@ -313,6 +314,7 @@ function loaded() {
         elHmdMultiSelect = document.getElementById("hmdmultiselect");
         elActionsMenu = document.getElementById("actions");
         elSelectionMenu = document.getElementById("selection");
+        elTransformMenu = document.getElementById("transform");
         elToolsMenu = document.getElementById("tools");
         elMenuBackgroundOverlay = document.getElementById("menuBackgroundOverlay");
         elHmdCopy = document.getElementById("hmdcopy");
@@ -395,6 +397,10 @@ function loaded() {
             document.getElementById("menuBackgroundOverlay").style.display = "block";
             document.getElementById("selection-menu").style.display = "block";
         };
+        elTransformMenu.onclick = function() {
+            document.getElementById("menuBackgroundOverlay").style.display = "block";
+            document.getElementById("transform-menu").style.display = "block";
+        };        
         elToolsMenu.onclick = function() {
             document.getElementById("menuBackgroundOverlay").style.display = "block";
             document.getElementById("tools-menu").style.display = "block";
@@ -1850,6 +1856,7 @@ function loaded() {
         document.getElementById("menuBackgroundOverlay").style.display = "none";
         document.getElementById("selection-menu").style.display = "none";
         document.getElementById("actions-menu").style.display = "none";
+        document.getElementById("transform-menu").style.display = "none";
         document.getElementById("tools-menu").style.display = "none";
     }
 

From 3cbd0be069ee9983f5cdeb7c0378598c3ef26ab7 Mon Sep 17 00:00:00 2001
From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Date: Wed, 10 Feb 2021 22:28:07 -0500
Subject: [PATCH 03/10] CSS for menu reorganization

CSS for menu reorganization
---
 scripts/system/html/css/edit-style.css | 40 ++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/scripts/system/html/css/edit-style.css b/scripts/system/html/css/edit-style.css
index 07af2e5d83..efbb531124 100644
--- a/scripts/system/html/css/edit-style.css
+++ b/scripts/system/html/css/edit-style.css
@@ -1364,10 +1364,46 @@ div#grid-section, body#entity-list-body {
 }
 #entity-list-menubar {
     margin: 0px -8px 6px -8px;
-    padding: 0px 8px 0px 8px;
+    padding: 0px 9px 0px 9px;
     border: none;
     background-color: #000;
-    background: linear-gradient(#343434 20%, #000 100%);
+    background: linear-gradient(#343434 30%, #000 100%);
+}
+input[type=button].entity-list-menutitle {
+    font-family: FiraSans-SemiBold;
+    font-size: 15px;
+    text-transform: none;
+    vertical-align: top;
+    height: 28px;
+    min-width: 30px;
+    padding: 0px 8px;
+    margin-right: 6px;
+    border-radius: 5px;
+    border: none;
+    color: #fff;
+    background-color: #000;
+    background: linear-gradient(#343434 30%, #000 100%);
+    cursor: pointer;
+}
+input[type=button].entity-list-menutitle:enabled:hover {
+    background: linear-gradient(#000, #000);
+    border: none;
+}
+input[type=button].entity-list-menutitle:active {
+    background: linear-gradient(#343434, #343434);
+}
+input[type=button].entity-list-menutitle:disabled {
+    color: #252525;
+    background: linear-gradient(#575757 30%, #252525 100%);
+}
+input[type=button].entity-list-menutitle[pressed=pressed] {
+    color: #00b4ef;
+}
+input[type=button].entity-list-menutitle:focus {
+  outline: none;
+  color: #000000;
+  background: linear-gradient(#c0c0c0, #c0c0c0);
+  border-radius: 5px 5px 0px 0px;
 }
 .icon-input-radius input {
     position: relative;

From 55753abf5117970d9d94d8b05f69e3e321e5901b Mon Sep 17 00:00:00 2001
From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Date: Wed, 10 Feb 2021 22:29:08 -0500
Subject: [PATCH 04/10] CSS for menu reorganization

CSS for menu reorganization
---
 scripts/system/create/entityList/html/entityList.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/system/create/entityList/html/entityList.html b/scripts/system/create/entityList/html/entityList.html
index 1ea41ad8ef..e054ca121b 100644
--- a/scripts/system/create/entityList/html/entityList.html
+++ b/scripts/system/create/entityList/html/entityList.html
@@ -25,10 +25,10 @@
     </head>
     <body onload='loaded();' id="entity-list-body">
         <div id="entity-list-menubar">
-            <input type="button" class="normal" id="actions" value="Edit&#9662;" />
-            <input type="button" class="normal" id="selection" value="Select&#9662;" />
-            <input type="button" class="normal" id="transform" value="Transform&#9662;" />            
-            <input type="button" class="normal" id="tools" value="Tools&#9662;" />
+            <input type="button" class="entity-list-menutitle" id="actions" value="Edit&#9662;" />
+            <input type="button" class="entity-list-menutitle" id="selection" value="Select&#9662;" />
+            <input type="button" class="entity-list-menutitle" id="transform" value="Transform&#9662;" />
+            <input type="button" class="entity-list-menutitle" id="tools" value="Tools&#9662;" />
         </div>
         <div id="entity-list-header">
             <input type="button" class="glyph" id="refresh" value="F" />

From 6ffb848596fb0ba9b5bbee886b0f21d192e912ab Mon Sep 17 00:00:00 2001
From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Date: Wed, 10 Feb 2021 23:30:18 -0500
Subject: [PATCH 05/10] Added a new column URL

Added a new column URL (full path & filename)
Searchable only if visible
Requested from Issue #977
---
 .../create/entityList/html/js/entityList.js     | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/scripts/system/create/entityList/html/js/entityList.js b/scripts/system/create/entityList/html/js/entityList.js
index 18e1506598..cd33bdd29c 100644
--- a/scripts/system/create/entityList/html/js/entityList.js
+++ b/scripts/system/create/entityList/html/js/entityList.js
@@ -155,7 +155,15 @@ const COLUMNS = {
         propertyID: "lastEdited",
         initialWidth: 0.38,
         defaultSortOrder: DESCENDING_SORT,
-    },    
+    },
+    urlWithPath: {
+        columnHeader: "URL",
+        dropdownLabel: "URL",
+        propertyID: "urlWithPath",
+        initialWidth: 0.54,
+        initiallyShown: false,
+        defaultSortOrder: ASCENDING_SORT,
+    },
 };
 
 const FILTER_TYPES = [
@@ -935,13 +943,14 @@ function loaded() {
                 entityData.forEach(function(entity) {
                     let type = entity.type;
                     let filename = getFilename(entity.url);
-            
+                    
                     let entityData = {
                         id: entity.id,
                         name: entity.name,
                         type: type,
                         url: entity.certificateID === "" ? filename : "<i>" + CERTIFIED_PLACEHOLDER + "</i>",
                         fullUrl: entity.certificateID === "" ? filename : CERTIFIED_PLACEHOLDER,
+                        urlWithPath: entity.certificateID === "" ? entity.url : "<i>" + CERTIFIED_PLACEHOLDER + "</i>",
                         locked: entity.locked,
                         visible: entity.visible,
                         certificateID: entity.certificateID,
@@ -981,11 +990,13 @@ function loaded() {
                         let searchFilter = searchTerm === '' || (e.name.toLowerCase().indexOf(searchTerm) > -1 ||
                                                                  e.type.toLowerCase().indexOf(searchTerm) > -1 ||
                                                                  e.fullUrl.toLowerCase().indexOf(searchTerm) > -1 ||
+                                                                 (e.urlWithPath.toLowerCase().indexOf(searchTerm) > -1 && 
+                                                                 columnsByID["urlWithPath"].elTh.style.visibility === "visible")||
                                                                  e.id.toLowerCase().indexOf(searchTerm) > -1);
                         return typeFilter && searchFilter;
                     });
                 });
-                
+
                 PROFILE("sort", function() {
                     let isAscendingSort = currentSortOrder === ASCENDING_SORT;
                     let isDefaultSort = currentSortOrder === COLUMNS[currentSortColumnID].defaultSortOrder;

From b296fff197746970ec4713c28f4aa16c1174df61 Mon Sep 17 00:00:00 2001
From: HifiExperiments <thingsandstuffblog@gmail.com>
Date: Wed, 10 Feb 2021 21:45:53 -0800
Subject: [PATCH 06/10] add text alignment property

---
 .../src/RenderableTextEntityItem.cpp          |   3 +-
 .../src/RenderableTextEntityItem.h            |   1 +
 .../entities/src/EntityItemProperties.cpp     |  30 ++++-
 libraries/entities/src/EntityItemProperties.h |   2 +
 libraries/entities/src/EntityPropertyFlags.h  |   1 +
 libraries/entities/src/TextEntityItem.cpp     |  22 +++-
 libraries/entities/src/TextEntityItem.h       |   5 +-
 libraries/networking/src/udt/PacketHeaders.h  |   1 +
 libraries/octree/src/OctreePacketData.h       |   2 +
 libraries/render-utils/src/TextRenderer3D.cpp |   6 +-
 libraries/render-utils/src/TextRenderer3D.h   |   3 +-
 libraries/render-utils/src/text/Font.cpp      | 118 ++++++++++++------
 libraries/render-utils/src/text/Font.h        |   7 +-
 libraries/shared/src/TextAlignment.cpp        |  25 ++++
 libraries/shared/src/TextAlignment.h          |  40 ++++++
 libraries/shared/src/TextEffect.h             |   2 +-
 .../create/assets/data/createAppTooltips.json |   3 +
 .../html/js/entityProperties.js               |  10 ++
 18 files changed, 232 insertions(+), 49 deletions(-)
 create mode 100644 libraries/shared/src/TextAlignment.cpp
 create mode 100644 libraries/shared/src/TextAlignment.h

diff --git a/libraries/entities-renderer/src/RenderableTextEntityItem.cpp b/libraries/entities-renderer/src/RenderableTextEntityItem.cpp
index 04ad86c7e1..64b0536cfc 100644
--- a/libraries/entities-renderer/src/RenderableTextEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableTextEntityItem.cpp
@@ -121,6 +121,7 @@ void TextEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPointe
     _effect = entity->getTextEffect();
     _effectColor = toGlm(entity->getTextEffectColor());
     _effectThickness = entity->getTextEffectThickness();
+    _alignment = entity->getAlignment();
     updateTextRenderItem();
 }
 
@@ -341,7 +342,7 @@ void entities::TextPayload::render(RenderArgs* args) {
     glm::vec2 bounds = glm::vec2(dimensions.x - (textRenderable->_leftMargin + textRenderable->_rightMargin), dimensions.y - (textRenderable->_topMargin + textRenderable->_bottomMargin));
     textRenderer->draw(batch, textRenderable->_leftMargin / scale, -textRenderable->_topMargin / scale, bounds / scale, scale,
                        textRenderable->_text, textRenderable->_font, textColor, effectColor, textRenderable->_effectThickness, textRenderable->_effect,
-                       textRenderable->_unlit, forward);
+                       textRenderable->_alignment, textRenderable->_unlit, forward);
 }
 
 namespace render {
diff --git a/libraries/entities-renderer/src/RenderableTextEntityItem.h b/libraries/entities-renderer/src/RenderableTextEntityItem.h
index 51651d98ba..2d6e832828 100644
--- a/libraries/entities-renderer/src/RenderableTextEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableTextEntityItem.h
@@ -67,6 +67,7 @@ private:
     glm::vec3 _dimensions;
 
     QString _font { "" };
+    TextAlignment _alignment { TextAlignment::LEFT };
     TextEffect _effect { TextEffect::NO_EFFECT };
     glm::vec3 _effectColor { 0 };
     float _effectThickness { 0.0f };
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index ff55137a03..7c9cecd9cb 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -309,7 +309,6 @@ void EntityItemProperties::setScreenshareFromString(const QString& mode) {
     }
 }
 
-
 inline void addTextEffect(QHash<QString, TextEffect>& lookup, TextEffect effect) { lookup[TextEffectHelpers::getNameForTextEffect(effect)] = effect; }
 const QHash<QString, TextEffect> stringToTextEffectLookup = [] {
     QHash<QString, TextEffect> toReturn;
@@ -328,6 +327,23 @@ void EntityItemProperties::setTextEffectFromString(const QString& effect) {
     }
 }
 
+inline void addTextAlignment(QHash<QString, TextAlignment>& lookup, TextAlignment alignment) { lookup[TextAlignmentHelpers::getNameForTextAlignment(alignment)] = alignment; }
+const QHash<QString, TextAlignment> stringToTextAlignmentLookup = [] {
+    QHash<QString, TextAlignment> toReturn;
+    addTextAlignment(toReturn, TextAlignment::LEFT);
+    addTextAlignment(toReturn, TextAlignment::CENTER);
+    addTextAlignment(toReturn, TextAlignment::RIGHT);
+    return toReturn;
+}();
+QString EntityItemProperties::getAlignmentAsString() const { return TextAlignmentHelpers::getNameForTextAlignment(_alignment); }
+void EntityItemProperties::setAlignmentFromString(const QString& alignment) {
+    auto textAlignmentItr = stringToTextAlignmentLookup.find(alignment.toLower());
+    if (textAlignmentItr != stringToTextAlignmentLookup.end()) {
+        _alignment = textAlignmentItr.value();
+        _alignmentChanged = true;
+    }
+}
+
 QString getCollisionGroupAsString(uint16_t group) {
     switch (group) {
         case USER_COLLISION_GROUP_DYNAMIC:
@@ -563,6 +579,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_TEXT_EFFECT, textEffect);
     CHECK_PROPERTY_CHANGE(PROP_TEXT_EFFECT_COLOR, textEffectColor);
     CHECK_PROPERTY_CHANGE(PROP_TEXT_EFFECT_THICKNESS, textEffectThickness);
+    CHECK_PROPERTY_CHANGE(PROP_TEXT_ALIGNMENT, alignment);
 
     // Zone
     changedProperties += _keyLight.getChangedProperties();
@@ -1332,6 +1349,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
  * @property {Entities.TextEffect} textEffect="none" - The effect that is applied to the text.
  * @property {Color} textEffectColor=255,255,255 - The color of the effect.
  * @property {number} textEffectThickness=0.2 - The magnitude of the text effect, range <code>0.0</code> &ndash; <code>0.5</code>.
+ * @property {Entities.TextAlignment} alignment="left" - How the text is aligned against its background.
  * @property {BillboardMode} billboardMode="none" - Whether the entity is billboarded to face the camera.
  * @property {boolean} faceCamera - <code>true</code> if <code>billboardMode</code> is <code>"yaw"</code>, <code>false</code>
  *     if it isn't. Setting this property to <code>false</code> sets the <code>billboardMode</code> to <code>"none"</code>.
@@ -1783,6 +1801,7 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
         COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_TEXT_EFFECT, textEffect, getTextEffectAsString());
         COPY_PROPERTY_TO_QSCRIPTVALUE_TYPED(PROP_TEXT_EFFECT_COLOR, textEffectColor, u8vec3Color);
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_TEXT_EFFECT_THICKNESS, textEffectThickness);
+        COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_TEXT_ALIGNMENT, alignment, getAlignmentAsString());
     }
 
     // Zones only
@@ -2167,6 +2186,7 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
     COPY_PROPERTY_FROM_QSCRIPTVALUE_ENUM(textEffect, TextEffect);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(textEffectColor, u8vec3Color, setTextEffectColor);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(textEffectThickness, float, setTextEffectThickness);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE_ENUM(alignment, Alignment);
 
     // Zone
     _keyLight.copyFromScriptValue(object, _defaultSettings);
@@ -2459,6 +2479,7 @@ void EntityItemProperties::merge(const EntityItemProperties& other) {
     COPY_PROPERTY_IF_CHANGED(textEffect);
     COPY_PROPERTY_IF_CHANGED(textEffectColor);
     COPY_PROPERTY_IF_CHANGED(textEffectThickness);
+    COPY_PROPERTY_IF_CHANGED(alignment);
 
     // Zone
     _keyLight.merge(other._keyLight);
@@ -2826,6 +2847,7 @@ bool EntityItemProperties::getPropertyInfo(const QString& propertyName, EntityPr
         ADD_PROPERTY_TO_MAP(PROP_TEXT_EFFECT, TextEffect, textEffect, TextEffect);
         ADD_PROPERTY_TO_MAP(PROP_TEXT_EFFECT_COLOR, TextEffectColor, textEffectColor, u8vec3Color);
         ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_TEXT_EFFECT_THICKNESS, TextEffectThickness, textEffectThickness, float, 0.0, 0.5);
+        ADD_PROPERTY_TO_MAP(PROP_TEXT_ALIGNMENT, Alignment, alignment, TextAlignment);
 
         // Zone
         { // Keylight
@@ -3266,6 +3288,7 @@ OctreeElement::AppendState EntityItemProperties::encodeEntityEditPacket(PacketTy
                 APPEND_ENTITY_PROPERTY(PROP_TEXT_EFFECT, (uint32_t)properties.getTextEffect());
                 APPEND_ENTITY_PROPERTY(PROP_TEXT_EFFECT_COLOR, properties.getTextEffectColor());
                 APPEND_ENTITY_PROPERTY(PROP_TEXT_EFFECT_THICKNESS, properties.getTextEffectThickness());
+                APPEND_ENTITY_PROPERTY(PROP_TEXT_ALIGNMENT, (uint32_t)properties.getAlignment());
             }
 
             if (properties.getType() == EntityTypes::Zone) {
@@ -3753,6 +3776,7 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_TEXT_EFFECT, TextEffect, setTextEffect);
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_TEXT_EFFECT_COLOR, u8vec3Color, setTextEffectColor);
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_TEXT_EFFECT_THICKNESS, float, setTextEffectThickness);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_TEXT_ALIGNMENT, TextAlignment, setAlignment);
     }
 
     if (properties.getType() == EntityTypes::Zone) {
@@ -4154,6 +4178,7 @@ void EntityItemProperties::markAllChanged() {
     _textEffectChanged = true;
     _textEffectColorChanged = true;
     _textEffectThicknessChanged = true;
+    _alignmentChanged = true;
 
     // Zone
     _keyLight.markAllChanged();
@@ -4766,6 +4791,9 @@ QList<QString> EntityItemProperties::listChangedProperties() {
     if (textEffectThicknessChanged()) {
         out += "textEffectThickness";
     }
+    if (alignmentChanged()) {
+        out += "alignment";
+    }
 
     // Zone
     getKeyLight().listChangedProperties(out);
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index f7fde73430..5a7a78b255 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -67,6 +67,7 @@
 #include "WebInputMode.h"
 #include "GizmoType.h"
 #include "TextEffect.h"
+#include "TextAlignment.h"
 
 const quint64 UNKNOWN_CREATED_TIME = 0;
 
@@ -327,6 +328,7 @@ public:
     DEFINE_PROPERTY_REF_ENUM(PROP_TEXT_EFFECT, TextEffect, textEffect, TextEffect, TextEffect::NO_EFFECT);
     DEFINE_PROPERTY_REF(PROP_TEXT_EFFECT_COLOR, TextEffectColor, textEffectColor, u8vec3Color, TextEntityItem::DEFAULT_TEXT_COLOR);
     DEFINE_PROPERTY(PROP_TEXT_EFFECT_THICKNESS, TextEffectThickness, textEffectThickness, float, TextEntityItem::DEFAULT_TEXT_EFFECT_THICKNESS);
+    DEFINE_PROPERTY_REF_ENUM(PROP_TEXT_ALIGNMENT, Alignment, alignment, TextAlignment, TextAlignment::LEFT);
 
     // Zone
     DEFINE_PROPERTY_GROUP(KeyLight, keyLight, KeyLightPropertyGroup);
diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index 93bb8a89a7..d9b7029c44 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -252,6 +252,7 @@ enum EntityPropertyList {
     PROP_TEXT_EFFECT = PROP_DERIVED_12,
     PROP_TEXT_EFFECT_COLOR = PROP_DERIVED_13,
     PROP_TEXT_EFFECT_THICKNESS = PROP_DERIVED_14,
+    PROP_TEXT_ALIGNMENT = PROP_DERIVED_15,
 
     // Zone
     // Keylight
diff --git a/libraries/entities/src/TextEntityItem.cpp b/libraries/entities/src/TextEntityItem.cpp
index a996319463..ad917f976d 100644
--- a/libraries/entities/src/TextEntityItem.cpp
+++ b/libraries/entities/src/TextEntityItem.cpp
@@ -70,6 +70,7 @@ EntityItemProperties TextEntityItem::getProperties(const EntityPropertyFlags& de
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(textEffect, getTextEffect);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(textEffectColor, getTextEffectColor);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(textEffectThickness, getTextEffectThickness);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(alignment, getAlignment);
     return properties;
 }
 
@@ -98,7 +99,8 @@ bool TextEntityItem::setSubClassProperties(const EntityItemProperties& propertie
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(textEffect, setTextEffect);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(textEffectColor, setTextEffectColor);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(textEffectThickness, setTextEffectThickness);
-    
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(alignment, setAlignment);
+
     return somethingChanged;
 }
 
@@ -134,6 +136,7 @@ int TextEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
     READ_ENTITY_PROPERTY(PROP_TEXT_EFFECT, TextEffect, setTextEffect);
     READ_ENTITY_PROPERTY(PROP_TEXT_EFFECT_COLOR, glm::u8vec3, setTextEffectColor);
     READ_ENTITY_PROPERTY(PROP_TEXT_EFFECT_THICKNESS, float, setTextEffectThickness);
+    READ_ENTITY_PROPERTY(PROP_TEXT_ALIGNMENT, TextAlignment, setAlignment);
 
     return bytesRead;
 }
@@ -159,6 +162,7 @@ EntityPropertyFlags TextEntityItem::getEntityProperties(EncodeBitstreamParams& p
     requestedProperties += PROP_TEXT_EFFECT;
     requestedProperties += PROP_TEXT_EFFECT_COLOR;
     requestedProperties += PROP_TEXT_EFFECT_THICKNESS;
+    requestedProperties += PROP_TEXT_ALIGNMENT;
 
     return requestedProperties;
 }
@@ -194,6 +198,7 @@ void TextEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBits
     APPEND_ENTITY_PROPERTY(PROP_TEXT_EFFECT, (uint32_t)getTextEffect());
     APPEND_ENTITY_PROPERTY(PROP_TEXT_EFFECT_COLOR, getTextEffectColor());
     APPEND_ENTITY_PROPERTY(PROP_TEXT_EFFECT_THICKNESS, getTextEffectThickness());
+    APPEND_ENTITY_PROPERTY(PROP_TEXT_ALIGNMENT, (uint32_t)getAlignment());
 }
 
 glm::vec3 TextEntityItem::getRaycastDimensions() const {
@@ -471,8 +476,21 @@ float TextEntityItem::getTextEffectThickness() const {
     });
 }
 
+void TextEntityItem::setAlignment(TextAlignment value) {
+    withWriteLock([&] {
+        _needsRenderUpdate |= _alignment != value;
+        _alignment = value;
+    });
+}
+
+TextAlignment TextEntityItem::getAlignment() const {
+    return resultWithReadLock<TextAlignment>([&] {
+        return _alignment;
+    });
+}
+
 PulsePropertyGroup TextEntityItem::getPulseProperties() const {
     return resultWithReadLock<PulsePropertyGroup>([&] {
         return _pulseProperties;
     });
-}
\ No newline at end of file
+}
diff --git a/libraries/entities/src/TextEntityItem.h b/libraries/entities/src/TextEntityItem.h
index 91496708f6..7998721100 100644
--- a/libraries/entities/src/TextEntityItem.h
+++ b/libraries/entities/src/TextEntityItem.h
@@ -15,7 +15,6 @@
 #include "EntityItem.h"
 
 #include "PulsePropertyGroup.h"
-#include "TextEffect.h"
 
 class TextEntityItem : public EntityItem {
 public:
@@ -114,6 +113,9 @@ public:
     float getTextEffectThickness() const;
     void setTextEffectThickness(float value);
 
+    TextAlignment getAlignment() const;
+    void setAlignment(TextAlignment value);
+
     PulsePropertyGroup getPulseProperties() const;
 
 private:
@@ -133,6 +135,7 @@ private:
     bool _unlit;
 
     QString _font;
+    TextAlignment _alignment;
     TextEffect _effect;
     glm::u8vec3 _effectColor;
     float _effectThickness;
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index fc74f4459c..bbab6535fd 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -283,6 +283,7 @@ enum class EntityVersion : PacketVersion {
     ZoneOcclusion,
     ModelBlendshapes,
     TransparentWeb,
+    TextAlignment,
 
     // Add new versions above here
     NUM_PACKET_TYPE,
diff --git a/libraries/octree/src/OctreePacketData.h b/libraries/octree/src/OctreePacketData.h
index 2050dd1487..583f090942 100644
--- a/libraries/octree/src/OctreePacketData.h
+++ b/libraries/octree/src/OctreePacketData.h
@@ -41,6 +41,7 @@
 #include "PulseMode.h"
 #include "GizmoType.h"
 #include "TextEffect.h"
+#include "TextAlignment.h"
 
 #include "OctreeConstants.h"
 #include "OctreeElement.h"
@@ -278,6 +279,7 @@ public:
     static int unpackDataFromBytes(const unsigned char* dataBytes, PulseMode& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
     static int unpackDataFromBytes(const unsigned char* dataBytes, GizmoType& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
     static int unpackDataFromBytes(const unsigned char* dataBytes, TextEffect& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
+    static int unpackDataFromBytes(const unsigned char* dataBytes, TextAlignment& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
     static int unpackDataFromBytes(const unsigned char* dataBytes, glm::vec2& result);
     static int unpackDataFromBytes(const unsigned char* dataBytes, glm::vec3& result);
     static int unpackDataFromBytes(const unsigned char* dataBytes, glm::u8vec3& result);
diff --git a/libraries/render-utils/src/TextRenderer3D.cpp b/libraries/render-utils/src/TextRenderer3D.cpp
index 264ff409a6..76d8374fb7 100644
--- a/libraries/render-utils/src/TextRenderer3D.cpp
+++ b/libraries/render-utils/src/TextRenderer3D.cpp
@@ -43,18 +43,18 @@ float TextRenderer3D::getFontSize() const {
 void TextRenderer3D::draw(gpu::Batch& batch, float x, float y, const glm::vec2& bounds,
                           const QString& str, const glm::vec4& color, bool unlit, bool forward) {
     if (_font) {
-        _font->drawString(batch, _drawInfo, str, color, glm::vec3(0.0f), 0, TextEffect::NO_EFFECT, { x, y }, bounds, 1.0f, unlit, forward);
+        _font->drawString(batch, _drawInfo, str, color, glm::vec3(0.0f), 0, TextEffect::NO_EFFECT, TextAlignment::LEFT, { x, y }, bounds, 1.0f, unlit, forward);
     }
 }
 
 void TextRenderer3D::draw(gpu::Batch& batch, float x, float y, const glm::vec2& bounds, float scale,
                           const QString& str, const QString& font, const glm::vec4& color, const glm::vec3& effectColor,
-                          float effectThickness, TextEffect effect, bool unlit, bool forward) {
+                          float effectThickness, TextEffect effect, TextAlignment alignment, bool unlit, bool forward) {
     if (font != _family) {
         _family = font;
         _font = Font::load(_family);
     }
     if (_font) {
-        _font->drawString(batch, _drawInfo, str, color, effectColor, effectThickness, effect, { x, y }, bounds, scale, unlit, forward);
+        _font->drawString(batch, _drawInfo, str, color, effectColor, effectThickness, effect, alignment, { x, y }, bounds, scale, unlit, forward);
     }
 }
\ No newline at end of file
diff --git a/libraries/render-utils/src/TextRenderer3D.h b/libraries/render-utils/src/TextRenderer3D.h
index 3a88ed555c..edccf1429c 100644
--- a/libraries/render-utils/src/TextRenderer3D.h
+++ b/libraries/render-utils/src/TextRenderer3D.h
@@ -17,6 +17,7 @@
 
 #include "text/Font.h"
 #include "TextEffect.h"
+#include "TextAlignment.h"
 #include "FontFamilies.h"
 
 class TextRenderer3D {
@@ -30,7 +31,7 @@ public:
               const QString& str, const glm::vec4& color, bool unlit, bool forward);
     void draw(gpu::Batch& batch, float x, float y, const glm::vec2& bounds, float scale,
               const QString& str, const QString& font, const glm::vec4& color, const glm::vec3& effectColor,
-              float effectThickness, TextEffect effect, bool unlit, bool forward);
+              float effectThickness, TextEffect effect, TextAlignment alignment, bool unlit, bool forward);
 
 private:
     TextRenderer3D(const char* family);
diff --git a/libraries/render-utils/src/text/Font.cpp b/libraries/render-utils/src/text/Font.cpp
index 425e4f2da5..7147c10872 100644
--- a/libraries/render-utils/src/text/Font.cpp
+++ b/libraries/render-utils/src/text/Font.cpp
@@ -65,7 +65,6 @@ struct QuadBuilder {
         vertices[3] = TextureVertex(min + size,
                                     texMin + glm::vec2(texSize.x, 0.0f), bounds);
     }
-
 };
 
 Font::Pointer Font::load(QIODevice& fontFile) {
@@ -303,7 +302,18 @@ void Font::setupGPU() {
     }
 }
 
-void Font::buildVertices(Font::DrawInfo& drawInfo, const QString& str, const glm::vec2& origin, const glm::vec2& bounds, float scale, bool enlargeForShadows) {
+inline QuadBuilder adjustedQuadBuilderForAlignmentMode(const Glyph& glyph, glm::vec2 advance, float scale, float enlargeForShadows,
+                                                TextAlignment alignment, float rightSpacing) {
+    if (alignment == TextAlignment::RIGHT) {
+        advance.x += rightSpacing;
+    } else if (alignment == TextAlignment::CENTER) {
+        advance.x += 0.5f * rightSpacing;
+    }
+    return QuadBuilder(glyph, advance, scale, enlargeForShadows);
+}
+
+void Font::buildVertices(Font::DrawInfo& drawInfo, const QString& str, const glm::vec2& origin, const glm::vec2& bounds, float scale, bool enlargeForShadows,
+                         TextAlignment alignment) {
     drawInfo.verticesBuffer = std::make_shared<gpu::Buffer>();
     drawInfo.indicesBuffer = std::make_shared<gpu::Buffer>();
     drawInfo.indexCount = 0;
@@ -314,15 +324,17 @@ void Font::buildVertices(Font::DrawInfo& drawInfo, const QString& str, const glm
     drawInfo.origin = origin;
 
     float enlargedBoundsX = bounds.x - 0.5f * DOUBLE_MAX_OFFSET_PIXELS * float(enlargeForShadows);
+    float rightEdge = origin.x + enlargedBoundsX;
 
     // Top left of text
     glm::vec2 advance = origin;
+    std::vector<std::pair<Glyph, vec2>> glyphsAndCorners;
     foreach(const QString& token, tokenizeForWrapping(str)) {
         bool isNewLine = (token == QString('\n'));
         bool forceNewLine = false;
 
         // Handle wrapping
-        if (!isNewLine && (bounds.x != -1) && (advance.x + computeExtent(token).x > origin.x + enlargedBoundsX)) {
+        if (!isNewLine && (bounds.x != -1) && (advance.x + computeExtent(token).x > rightEdge)) {
             // We are out of the x bound, force new line
             forceNewLine = true;
         }
@@ -347,38 +359,8 @@ void Font::buildVertices(Font::DrawInfo& drawInfo, const QString& str, const glm
         if (!isNewLine) {
             for (auto c : token) {
                 auto glyph = _glyphs[c];
-                quint16 verticesOffset = numVertices;
 
-                QuadBuilder qd(glyph, advance - glm::vec2(0.0f, _ascent), scale, enlargeForShadows);
-                drawInfo.verticesBuffer->append(qd);
-                numVertices += VERTICES_PER_QUAD;
-
-                // Sam's recommended triangle slices
-                // Triangle tri1 = { v0, v1, v3 };
-                // Triangle tri2 = { v1, v2, v3 };
-                // NOTE: Random guy on the internet's recommended triangle slices
-                // Triangle tri1 = { v0, v1, v2 };
-                // Triangle tri2 = { v2, v3, v0 };
-
-                // The problem here being that the 4 vertices are { ll, lr, ul, ur }, a Z pattern
-                // Additionally, you want to ensure that the shared side vertices are used sequentially
-                // to improve cache locality
-                //
-                //  2 -- 3
-                //  |    |
-                //  |    |
-                //  0 -- 1
-                //
-                //  { 0, 1, 2 } -> { 2, 1, 3 }
-                quint16 indices[NUMBER_OF_INDICES_PER_QUAD];
-                indices[0] = verticesOffset + 0;
-                indices[1] = verticesOffset + 1;
-                indices[2] = verticesOffset + 2;
-                indices[3] = verticesOffset + 2;
-                indices[4] = verticesOffset + 1;
-                indices[5] = verticesOffset + 3;
-                drawInfo.indicesBuffer->append(sizeof(indices), (const gpu::Byte*)indices);
-                drawInfo.indexCount += NUMBER_OF_INDICES_PER_QUAD;
+                glyphsAndCorners.emplace_back(glyph, advance - glm::vec2(0.0f, _ascent));
 
                 // Advance by glyph size
                 advance.x += glyph.d;
@@ -388,10 +370,71 @@ void Font::buildVertices(Font::DrawInfo& drawInfo, const QString& str, const glm
             advance.x += _spaceWidth;
         }
     }
+
+    std::vector<QuadBuilder> quadBuilders;
+    quadBuilders.reserve(glyphsAndCorners.size());
+    {
+        int i = glyphsAndCorners.size() - 1;
+        while (i >= 0) {
+            auto nextGlyphAndCorner = glyphsAndCorners[i];
+            float rightSpacing = rightEdge - (nextGlyphAndCorner.second.x + nextGlyphAndCorner.first.d);
+            quadBuilders.push_back(adjustedQuadBuilderForAlignmentMode(nextGlyphAndCorner.first, nextGlyphAndCorner.second, scale, enlargeForShadows,
+                                                                       alignment, rightSpacing));
+            i--;
+            while (i >= 0) {
+                auto prevGlyphAndCorner = glyphsAndCorners[i];
+                // We're to the right of the last character we checked, which means we're on a previous line, so we need to
+                // recalculate the spacing, so we exit this loop
+                if (prevGlyphAndCorner.second.x >= nextGlyphAndCorner.second.x) {
+                    break;
+                }
+
+                quadBuilders.push_back(adjustedQuadBuilderForAlignmentMode(prevGlyphAndCorner.first, prevGlyphAndCorner.second, scale, enlargeForShadows,
+                                                                           alignment, rightSpacing));
+
+                nextGlyphAndCorner = prevGlyphAndCorner;
+                i--;
+            }
+        }
+    }
+
+    // The quadBuilders is backwards now because we looped over the glyphs backwards to adjust their alignment
+    for (int i = quadBuilders.size() - 1; i >= 0; i--) {
+        quint16 verticesOffset = numVertices;
+        drawInfo.verticesBuffer->append(quadBuilders[i]);
+        numVertices += VERTICES_PER_QUAD;
+
+        // Sam's recommended triangle slices
+        // Triangle tri1 = { v0, v1, v3 };
+        // Triangle tri2 = { v1, v2, v3 };
+        // NOTE: Random guy on the internet's recommended triangle slices
+        // Triangle tri1 = { v0, v1, v2 };
+        // Triangle tri2 = { v2, v3, v0 };
+
+        // The problem here being that the 4 vertices are { ll, lr, ul, ur }, a Z pattern
+        // Additionally, you want to ensure that the shared side vertices are used sequentially
+        // to improve cache locality
+        //
+        //  2 -- 3
+        //  |    |
+        //  |    |
+        //  0 -- 1
+        //
+        //  { 0, 1, 2 } -> { 2, 1, 3 }
+        quint16 indices[NUMBER_OF_INDICES_PER_QUAD];
+        indices[0] = verticesOffset + 0;
+        indices[1] = verticesOffset + 1;
+        indices[2] = verticesOffset + 2;
+        indices[3] = verticesOffset + 2;
+        indices[4] = verticesOffset + 1;
+        indices[5] = verticesOffset + 3;
+        drawInfo.indicesBuffer->append(sizeof(indices), (const gpu::Byte*)indices);
+        drawInfo.indexCount += NUMBER_OF_INDICES_PER_QUAD;
+    }
 }
 
 void Font::drawString(gpu::Batch& batch, Font::DrawInfo& drawInfo, const QString& str, const glm::vec4& color,
-                      const glm::vec3& effectColor, float effectThickness, TextEffect effect,
+                      const glm::vec3& effectColor, float effectThickness, TextEffect effect, TextAlignment alignment,
                       const glm::vec2& origin, const glm::vec2& bounds, float scale, bool unlit, bool forward) {
     if (!_loaded || str == "") {
         return;
@@ -401,11 +444,12 @@ void Font::drawString(gpu::Batch& batch, Font::DrawInfo& drawInfo, const QString
     const int SHADOW_EFFECT = (int)TextEffect::SHADOW_EFFECT;
 
     // If we're switching to or from shadow effect mode, we need to rebuild the vertices
-    if (str != drawInfo.string || bounds != drawInfo.bounds || origin != drawInfo.origin ||
+    if (str != drawInfo.string || bounds != drawInfo.bounds || origin != drawInfo.origin || alignment != _alignment ||
             (drawInfo.params.effect != textEffect && (textEffect == SHADOW_EFFECT || drawInfo.params.effect == SHADOW_EFFECT)) ||
             (textEffect == SHADOW_EFFECT && scale != _scale)) {
         _scale = scale;
-        buildVertices(drawInfo, str, origin, bounds, scale, textEffect == SHADOW_EFFECT);
+        _alignment = alignment;
+        buildVertices(drawInfo, str, origin, bounds, scale, textEffect == SHADOW_EFFECT, alignment);
     }
 
     setupGPU();
diff --git a/libraries/render-utils/src/text/Font.h b/libraries/render-utils/src/text/Font.h
index c75f0f746f..322e96439e 100644
--- a/libraries/render-utils/src/text/Font.h
+++ b/libraries/render-utils/src/text/Font.h
@@ -14,6 +14,7 @@
 
 #include "Glyph.h"
 #include "TextEffect.h"
+#include "TextAlignment.h"
 #include <gpu/Batch.h>
 #include <gpu/Pipeline.h>
 
@@ -58,7 +59,7 @@ public:
 
     // Render string to batch
     void drawString(gpu::Batch& batch, DrawInfo& drawInfo, const QString& str, const glm::vec4& color,
-                    const glm::vec3& effectColor, float effectThickness, TextEffect effect, 
+                    const glm::vec3& effectColor, float effectThickness, TextEffect effect, TextAlignment alignment,
                     const glm::vec2& origin, const glm::vec2& bound, float scale, bool unlit, bool forward);
 
     static Pointer load(const QString& family);
@@ -76,7 +77,8 @@ private:
     glm::vec2 computeTokenExtent(const QString& str) const;
 
     const Glyph& getGlyph(const QChar& c) const;
-    void buildVertices(DrawInfo& drawInfo, const QString& str, const glm::vec2& origin, const glm::vec2& bounds, float scale, bool enlargeForShadows);
+    void buildVertices(DrawInfo& drawInfo, const QString& str, const glm::vec2& origin, const glm::vec2& bounds, float scale, bool enlargeForShadows,
+                       TextAlignment alignment);
 
     void setupGPU();
 
@@ -96,6 +98,7 @@ private:
     float _spaceWidth { 0.0f };
 
     float _scale { 0.0f };
+    TextAlignment _alignment;
 
     bool _loaded { true };
 
diff --git a/libraries/shared/src/TextAlignment.cpp b/libraries/shared/src/TextAlignment.cpp
new file mode 100644
index 0000000000..533234f1da
--- /dev/null
+++ b/libraries/shared/src/TextAlignment.cpp
@@ -0,0 +1,25 @@
+//
+//  Created by HifiExperiments on 2/9/21
+//  Copyright 2021 Vircadia contributors.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "TextAlignment.h"
+
+const char* textAlignmentNames[] = {
+    "left",
+    "center",
+    "right"
+};
+
+static const size_t TEXT_ALIGNMENT_NAMES = (sizeof(textAlignmentNames) / sizeof(textAlignmentNames[0]));
+
+QString TextAlignmentHelpers::getNameForTextAlignment(TextAlignment alignment) {
+    if (((int)alignment <= 0) || ((int)alignment >= (int)TEXT_ALIGNMENT_NAMES)) {
+        alignment = (TextAlignment)0;
+    }
+
+    return textAlignmentNames[(int)alignment];
+}
\ No newline at end of file
diff --git a/libraries/shared/src/TextAlignment.h b/libraries/shared/src/TextAlignment.h
new file mode 100644
index 0000000000..829b07dc36
--- /dev/null
+++ b/libraries/shared/src/TextAlignment.h
@@ -0,0 +1,40 @@
+//
+//  Created by HifiExperiments on 2/9/21
+//  Copyright 2021 Vircadia contributors.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_TextAlignment_h
+#define hifi_TextAlignment_h
+
+#include "QString"
+
+/**jsdoc
+ * <p>A {@link Entities.EntityProperties-Text|Text} entity may use one of the following alignments:</p>
+ * <table>
+ *   <thead>
+ *     <tr><th>Value</th><th>Description</th></tr>
+ *   </thead>
+ *   <tbody>
+ *     <tr><td><code>"left"</code></td><td>Text is aligned to the left side.</td></tr>
+ *     <tr><td><code>"center"</code></td><td>Text is centered.</td></tr>
+ *     <tr><td><code>"right"</code></td><td>Text is aligned to the right side.</td></tr>
+ *   </tbody>
+ * </table>
+ * @typedef {string} Entities.TextAlignment
+ */
+
+enum class TextAlignment {
+    LEFT = 0,
+    CENTER,
+    RIGHT
+};
+
+class TextAlignmentHelpers {
+public:
+    static QString getNameForTextAlignment(TextAlignment alignment);
+};
+
+#endif // hifi_TextAlignment_h
\ No newline at end of file
diff --git a/libraries/shared/src/TextEffect.h b/libraries/shared/src/TextEffect.h
index 91bd5ec60c..3e205f72fe 100644
--- a/libraries/shared/src/TextEffect.h
+++ b/libraries/shared/src/TextEffect.h
@@ -20,7 +20,7 @@
  *   <tbody>
  *     <tr><td><code>"none"</code></td><td>No effect.</td></tr>
  *     <tr><td><code>"outline"</code></td><td>An outline effect.</td></tr>
- *     <tr><td><code>"outlineFill"</code></td><td>An outline effect, with fill.</td></tr>
+ *     <tr><td><code>"outline fill"</code></td><td>An outline effect, with fill.</td></tr>
  *     <tr><td><code>"shadow"</code></td><td>A shadow effect.</td></tr>
  *   </tbody>
  * </table>
diff --git a/scripts/system/create/assets/data/createAppTooltips.json b/scripts/system/create/assets/data/createAppTooltips.json
index 478793ab78..561133c258 100644
--- a/scripts/system/create/assets/data/createAppTooltips.json
+++ b/scripts/system/create/assets/data/createAppTooltips.json
@@ -38,6 +38,9 @@
     "textEffectThickness": {
         "tooltip": "The magnitude of the text effect."
     },
+    "textAlignment": {
+        "tooltip": "How the text is aligned within its left and right bounds."
+    },
     "textBillboardMode": {
         "tooltip": "If enabled, determines how the entity will face the camera.",
         "jsPropertyName": "billboardMode"
diff --git a/scripts/system/create/entityProperties/html/js/entityProperties.js b/scripts/system/create/entityProperties/html/js/entityProperties.js
index f3f92a887e..932f9e03e7 100644
--- a/scripts/system/create/entityProperties/html/js/entityProperties.js
+++ b/scripts/system/create/entityProperties/html/js/entityProperties.js
@@ -229,6 +229,16 @@ const GROUPS = [
                 decimals: 2,
                 propertyID: "textEffectThickness",
             },
+            {
+                label: "Alignment",
+                type: "dropdown",
+                options: {
+                    left: "Left",
+                    center: "Center",
+                    right: "Right"
+                },
+                propertyID: "textAlignment",
+            },
             {
                 label: "Billboard Mode",
                 type: "dropdown",

From 56fa4698da5c791ac07b5061d1d62b493a864983 Mon Sep 17 00:00:00 2001
From: HifiExperiments <thingsandstuffblog@gmail.com>
Date: Thu, 11 Feb 2021 19:01:51 -0800
Subject: [PATCH 07/10] potential fix for offset soft attachments

---
 .../avatars-renderer/src/avatars-renderer/SkeletonModel.cpp      | 1 -
 libraries/render-utils/src/Model.cpp                             | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
index 15ff09d13d..5ac808d3fb 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
@@ -33,7 +33,6 @@ SkeletonModel::SkeletonModel(Avatar* owningAvatar, QObject* parent) :
 {
     // SkeletonModels, and by extention Avatars, use Dual Quaternion skinning.
     _useDualQuaternionSkinning = true;
-    _forceOffset = true;
 
     // Avatars all cast shadow
     setCanCastShadow(true);
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 1c9fdc50d6..95857a603d 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -151,6 +151,7 @@ void Model::setOffset(const glm::vec3& offset) {
     // if someone manually sets our offset, then we are no longer snapped to center
     _snapModelToRegistrationPoint = false;
     _snappedToRegistrationPoint = false;
+    _forceOffset = true;
 }
 
 void Model::calculateTextureInfo() {

From 515ee40824ae83fc8078cfa4ee9682e1fd0ad071 Mon Sep 17 00:00:00 2001
From: HifiExperiments <thingsandstuffblog@gmail.com>
Date: Fri, 12 Feb 2021 10:38:40 -0800
Subject: [PATCH 08/10] third times the charm

---
 .../system/create/entityProperties/html/js/entityProperties.js   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/system/create/entityProperties/html/js/entityProperties.js b/scripts/system/create/entityProperties/html/js/entityProperties.js
index ba78c5d950..a7800b3e73 100644
--- a/scripts/system/create/entityProperties/html/js/entityProperties.js
+++ b/scripts/system/create/entityProperties/html/js/entityProperties.js
@@ -248,6 +248,7 @@ const GROUPS = [
                     right: "Right"
                 },
                 propertyID: "textAlignment",
+                propertyName: "alignment", // actual entity property name
             },
             {
                 label: "Top Margin",

From b2b38ad23be55bf2dc1f47087a7914d63433b3dd Mon Sep 17 00:00:00 2001
From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Date: Tue, 16 Feb 2021 21:49:26 -0500
Subject: [PATCH 09/10] Minor adjustments

Minor adjustments
---
 scripts/system/create/entityList/html/js/entityList.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/system/create/entityList/html/js/entityList.js b/scripts/system/create/entityList/html/js/entityList.js
index cd33bdd29c..d21e65d47d 100644
--- a/scripts/system/create/entityList/html/js/entityList.js
+++ b/scripts/system/create/entityList/html/js/entityList.js
@@ -933,7 +933,7 @@ function loaded() {
                 entityIds: selection,
             }));
         }
-        
+
         function updateEntityData(entityData) {
             entities = [];
             entitiesByID = {};
@@ -943,7 +943,7 @@ function loaded() {
                 entityData.forEach(function(entity) {
                     let type = entity.type;
                     let filename = getFilename(entity.url);
-                    
+
                     let entityData = {
                         id: entity.id,
                         name: entity.name,
@@ -991,7 +991,7 @@ function loaded() {
                                                                  e.type.toLowerCase().indexOf(searchTerm) > -1 ||
                                                                  e.fullUrl.toLowerCase().indexOf(searchTerm) > -1 ||
                                                                  (e.urlWithPath.toLowerCase().indexOf(searchTerm) > -1 && 
-                                                                 columnsByID["urlWithPath"].elTh.style.visibility === "visible")||
+                                                                 columnsByID["urlWithPath"].elTh.style.visibility === "visible") ||
                                                                  e.id.toLowerCase().indexOf(searchTerm) > -1);
                         return typeFilter && searchFilter;
                     });

From 852edec9e76d6dfe04965f9c3a5e9c1cc59a10c4 Mon Sep 17 00:00:00 2001
From: HifiExperiments <thingsandstuffblog@gmail.com>
Date: Thu, 18 Feb 2021 22:15:12 -0800
Subject: [PATCH 10/10] entities with billboardMode != none use local rotation
 so parent rotation doesn't affect them

---
 .../src/RenderableEntityItem.cpp                | 17 +++++++++++------
 .../src/RenderableEntityItem.h                  | 11 ++++++-----
 .../src/RenderableModelEntityItem.cpp           |  5 +++--
 .../src/RenderablePolyLineEntityItem.cpp        |  6 +++---
 .../src/RenderablePolyLineEntityItem.h          |  2 +-
 .../src/RenderablePolyVoxEntityItem.cpp         |  5 +++--
 .../src/RenderableShapeEntityItem.cpp           |  7 ++-----
 .../src/RenderableShapeEntityItem.h             |  4 ----
 .../src/RenderableTextEntityItem.cpp            | 12 ++++++------
 libraries/entities/src/EntityItem.cpp           | 13 +++++++++++++
 libraries/entities/src/EntityItem.h             |  1 +
 libraries/entities/src/EntityTreeElement.cpp    | 10 ++++++----
 libraries/entities/src/GizmoEntityItem.cpp      | 10 ++++++----
 libraries/entities/src/ModelEntityItem.cpp      | 13 +++++++++++++
 libraries/entities/src/ModelEntityItem.h        |  1 +
 libraries/entities/src/PolyVoxEntityItem.cpp    |  7 ++++---
 libraries/entities/src/ShapeEntityItem.cpp      | 10 ++++++----
 libraries/render-utils/src/Model.cpp            |  3 ++-
 libraries/shared/src/SpatiallyNestable.cpp      | 11 +++++++++++
 libraries/shared/src/SpatiallyNestable.h        |  1 +
 20 files changed, 99 insertions(+), 50 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableEntityItem.cpp b/libraries/entities-renderer/src/RenderableEntityItem.cpp
index b2670e3bce..3e13b301df 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableEntityItem.cpp
@@ -368,6 +368,11 @@ bool EntityRenderer::needsRenderUpdate() const {
     return needsRenderUpdateFromEntity(_entity);
 }
 
+Transform EntityRenderer::getTransformToCenterWithMaybeOnlyLocalRotation(const EntityItemPointer& entity, bool& success) const {
+    return entity->getBillboardMode() == BillboardMode::NONE ? entity->getTransformToCenter(success) :
+        entity->getTransformToCenterWithOnlyLocalRotation(success);
+}
+
 // Returns true if the item in question needs to have updateInScene called because of changes in the entity
 bool EntityRenderer::needsRenderUpdateFromEntity(const EntityItemPointer& entity) const {
     if (entity->needsRenderUpdate()) {
@@ -379,12 +384,12 @@ bool EntityRenderer::needsRenderUpdateFromEntity(const EntityItemPointer& entity
     }
 
     bool success = false;
-    auto bound = _entity->getAABox(success);
+    auto bound = entity->getAABox(success);
     if (success && _bound != bound) {
         return true;
     }
 
-    auto newModelTransform = _entity->getTransformToCenter(success);
+    auto newModelTransform = getTransformToCenterWithMaybeOnlyLocalRotation(entity, success);
     // FIXME can we use a stale model transform here?
     if (success && newModelTransform != _modelTransform) {
         return true;
@@ -401,15 +406,15 @@ bool EntityRenderer::needsRenderUpdateFromEntity(const EntityItemPointer& entity
     return false;
 }
 
-void EntityRenderer::updateModelTransformAndBound() {
+void EntityRenderer::updateModelTransformAndBound(const EntityItemPointer& entity) {
     bool success = false;
-    auto newModelTransform = _entity->getTransformToCenter(success);
+    auto newModelTransform = getTransformToCenterWithMaybeOnlyLocalRotation(entity, success);
     if (success) {
         _modelTransform = newModelTransform;
     }
 
     success = false;
-    auto bound = _entity->getAABox(success);
+    auto bound = entity->getAABox(success);
     if (success) {
         _bound = bound;
     }
@@ -429,7 +434,7 @@ void EntityRenderer::doRenderUpdateSynchronous(const ScenePointer& scene, Transa
 
         _prevIsTransparent = transparent;
 
-        updateModelTransformAndBound();
+        updateModelTransformAndBound(entity);
 
         _moving = entity->isMovingRelativeToParent();
         _visible = entity->getVisible();
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.h b/libraries/entities-renderer/src/RenderableEntityItem.h
index 7f0e1e16ee..9392d61e75 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableEntityItem.h
@@ -101,7 +101,7 @@ protected:
     virtual void doRender(RenderArgs* args) = 0;
 
     virtual bool isFading() const { return _isFading; }
-    virtual void updateModelTransformAndBound();
+    virtual void updateModelTransformAndBound(const EntityItemPointer& entity);
     virtual bool isTransparent() const { return _isFading ? Interpolate::calculateFadeRatio(_fadeStartTime) < 1.0f : false; }
     inline bool isValidRenderItem() const { return _renderItemID != Item::INVALID_ITEM_ID; }
 
@@ -109,16 +109,14 @@ protected:
     virtual void setRenderLayer(RenderLayer value) { _renderLayer = value; }
     virtual void setCullWithParent(bool value) { _cullWithParent = value; }
 
-signals:
-    void requestRenderUpdate();
-
-protected:
     template<typename T>
     std::shared_ptr<T> asTypedEntity() { return std::static_pointer_cast<T>(_entity); }
 
     static void makeStatusGetters(const EntityItemPointer& entity, Item::Status::Getters& statusGetters);
     const Transform& getModelTransform() const;
 
+    Transform getTransformToCenterWithMaybeOnlyLocalRotation(const EntityItemPointer& entity, bool& success) const;
+
     Item::Bound _bound;
     SharedSoundPointer _collisionSound;
     QUuid _changeHandlerId;
@@ -154,6 +152,9 @@ protected:
     const EntityItemPointer _entity;
 
     QUuid _entityID;
+
+signals:
+    void requestRenderUpdate();
 };
 
 template <typename T>
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 4d3a79c9af..3c245e5d4f 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -115,11 +115,12 @@ bool RenderableModelEntityItem::needsUpdateModelBounds() const {
     }
 
     bool success;
-    auto transform = getTransform(success);
+    auto transform = getBillboardMode() == BillboardMode::NONE ? getTransform(success) : getTransformWithOnlyLocalRotation(success);
     if (success) {
         if (model->getTranslation() != transform.getTranslation()) {
             return true;
         }
+
         if (model->getRotation() != transform.getRotation()) {
             return true;
         }
@@ -171,7 +172,7 @@ void RenderableModelEntityItem::updateModelBounds() {
     }
 
     bool success;
-    auto transform = getTransform(success);
+    auto transform = getBillboardMode() == BillboardMode::NONE ? getTransform(success) : getTransformWithOnlyLocalRotation(success);
     if (success && (model->getTranslation() != transform.getTranslation() ||
             model->getRotation() != transform.getRotation())) {
         model->setTransformNoUpdateRenderItems(transform);
diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
index 65e9f57b02..e4bb6952a7 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
@@ -41,13 +41,13 @@ PolyLineEntityRenderer::PolyLineEntityRenderer(const EntityItemPointer& entity)
     }
 }
 
-void PolyLineEntityRenderer::updateModelTransformAndBound() {
+void PolyLineEntityRenderer::updateModelTransformAndBound(const EntityItemPointer& entity) {
     bool success = false;
-    auto newModelTransform = _entity->getTransformToCenter(success);
+    auto newModelTransform = getTransformToCenterWithMaybeOnlyLocalRotation(entity, success);
     if (success) {
         _modelTransform = newModelTransform;
 
-        auto lineEntity = std::static_pointer_cast<PolyLineEntityItem>(_entity);
+        auto lineEntity = std::static_pointer_cast<PolyLineEntityItem>(entity);
         AABox bound;
         lineEntity->computeTightLocalBoundingBox(bound);
         bound.transform(newModelTransform);
diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
index c4fbb9a776..6e5068c24f 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
@@ -25,7 +25,7 @@ class PolyLineEntityRenderer : public TypedEntityRenderer<PolyLineEntityItem> {
 public:
     PolyLineEntityRenderer(const EntityItemPointer& entity);
 
-    void updateModelTransformAndBound() override;
+    void updateModelTransformAndBound(const EntityItemPointer& entity) override;
 
     virtual bool isTransparent() const override;
 
diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
index 859accf01a..5c8374b937 100644
--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
@@ -1785,8 +1785,9 @@ void PolyVoxEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& s
 
 void PolyVoxEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) {
     _lastVoxelToLocalMatrix = entity->voxelToLocalMatrix();
-    _position = entity->getWorldPosition();
-    _orientation = entity->getWorldOrientation();
+    bool success;
+    _position = entity->getCenterPosition(success);
+    _orientation = entity->getBillboardMode() == BillboardMode::NONE ? entity->getWorldOrientation() : entity->getLocalOrientation();
     _lastVoxelVolumeSize = entity->getVoxelVolumeSize();
     _params->setSubData(0, vec4(_lastVoxelVolumeSize, 0.0));
     graphics::MeshPointer newMesh;
diff --git a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
index 674d7c297d..35739c2430 100644
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
@@ -56,15 +56,12 @@ void ShapeEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
     AbstractViewStateInterface::instance()->pushPostUpdateLambda(key, [this, entity] {
         withWriteLock([&] {
             _shape = entity->getShape();
-            _position = entity->getWorldPosition();
-            _dimensions = entity->getUnscaledDimensions(); // get unscaled to avoid scaling twice
-            _orientation = entity->getWorldOrientation();
             _renderTransform = getModelTransform(); // contains parent scale, if this entity scales with its parent
             if (_shape == entity::Sphere) {
                 _renderTransform.postScale(SPHERE_ENTITY_SCALE);
             }
 
-            _renderTransform.postScale(_dimensions);
+            _renderTransform.postScale(entity->getUnscaledDimensions());
         });
     });
 }
@@ -248,7 +245,7 @@ void ShapeEntityRenderer::doRender(RenderArgs* args) {
         outColor = procedural->getColor(outColor);
         outColor.a *= procedural->isFading() ? Interpolate::calculateFadeRatio(procedural->getFadeStartTime()) : 1.0f;
         withReadLock([&] {
-            procedural->prepare(batch, _position, _dimensions, _orientation, _created, ProceduralProgramKey(outColor.a < 1.0f));
+            procedural->prepare(batch, transform.getTranslation(), transform.getScale(), transform.getRotation(), _created, ProceduralProgramKey(outColor.a < 1.0f));
         });
 
         if (render::ShapeKey(args->_globalShapeKey).isWireframe() || _primitiveMode == PrimitiveMode::LINES) {
diff --git a/libraries/entities-renderer/src/RenderableShapeEntityItem.h b/libraries/entities-renderer/src/RenderableShapeEntityItem.h
index fe62ad48b9..403d389378 100644
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.h
@@ -45,10 +45,6 @@ private:
     std::shared_ptr<graphics::ProceduralMaterial> _material { std::make_shared<graphics::ProceduralMaterial>() };
     glm::vec3 _color { NAN };
     float _alpha { NAN };
-
-    glm::vec3 _position;
-    glm::vec3 _dimensions;
-    glm::quat _orientation;
 };
 
 } } 
diff --git a/libraries/entities-renderer/src/RenderableTextEntityItem.cpp b/libraries/entities-renderer/src/RenderableTextEntityItem.cpp
index 16d9afb913..3d658d8511 100644
--- a/libraries/entities-renderer/src/RenderableTextEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableTextEntityItem.cpp
@@ -292,12 +292,12 @@ void entities::TextPayload::render(RenderArgs* args) {
     }
     auto textRenderable = std::static_pointer_cast<TextEntityRenderer>(renderable);
 
-    Transform modelTransform;
+    Transform transform;
     glm::vec3 dimensions;
 
     glm::vec4 textColor;
     textRenderable->withReadLock([&] {
-        modelTransform = textRenderable->_renderTransform;
+        transform = textRenderable->_renderTransform;
         dimensions = textRenderable->_dimensions;
 
         float fadeRatio = textRenderable->_isFading ? Interpolate::calculateFadeRatio(textRenderable->_fadeStartTime) : 1.0f;
@@ -313,13 +313,13 @@ void entities::TextPayload::render(RenderArgs* args) {
         return;
     }
 
-    modelTransform.setRotation(BillboardModeHelpers::getBillboardRotation(modelTransform.getTranslation(), modelTransform.getRotation(), textRenderable->_billboardMode,
+    transform.setRotation(BillboardModeHelpers::getBillboardRotation(transform.getTranslation(), transform.getRotation(), textRenderable->_billboardMode,
         args->_renderMode == RenderArgs::RenderMode::SHADOW_RENDER_MODE ? BillboardModeHelpers::getPrimaryViewFrustumPosition() : args->getViewFrustum().getPosition()));
 
     float scale = textRenderable->_lineHeight / textRenderer->getFontSize();
-    modelTransform.postTranslate(glm::vec3(-0.5, 0.5, 1.0f + EPSILON / dimensions.z));
-    modelTransform.setScale(scale);
-    batch.setModelTransform(modelTransform);
+    transform.postTranslate(glm::vec3(-0.5, 0.5, 1.0f + EPSILON / dimensions.z));
+    transform.setScale(scale);
+    batch.setModelTransform(transform);
 
     glm::vec2 bounds = glm::vec2(dimensions.x - (textRenderable->_leftMargin + textRenderable->_rightMargin), dimensions.y - (textRenderable->_topMargin + textRenderable->_bottomMargin));
     textRenderer->draw(batch, textRenderable->_leftMargin / scale, -textRenderable->_topMargin / scale, bounds / scale, scale,
diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 9d3947ab56..6e761698c9 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -1620,6 +1620,19 @@ const Transform EntityItem::getTransformToCenter(bool& success) const {
     return result;
 }
 
+const Transform EntityItem::getTransformToCenterWithOnlyLocalRotation(bool& success) const {
+    Transform result = getTransformWithOnlyLocalRotation(success);
+    glm::vec3 pivot = getPivot();
+    if (pivot != ENTITY_ITEM_ZERO_VEC3) {
+        result.postTranslate(pivot);
+    }
+    glm::vec3 registrationPoint = getRegistrationPoint();
+    if (registrationPoint != ENTITY_ITEM_HALF_VEC3) { // If it is not already centered, translate to center
+        result.postTranslate((ENTITY_ITEM_HALF_VEC3 - registrationPoint) * getScaledDimensions()); // Position to center
+    }
+    return result;
+}
+
 /// The maximum bounding cube for the entity, independent of it's rotation.
 /// This accounts for the registration point (upon which rotation occurs around).
 ///
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index 152e003913..b08817044a 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -190,6 +190,7 @@ public:
     void setCenterPosition(const glm::vec3& position);
 
     const Transform getTransformToCenter(bool& success) const;
+    const Transform getTransformToCenterWithOnlyLocalRotation(bool& success) const;
 
     void requiresRecalcBoxes();
 
diff --git a/libraries/entities/src/EntityTreeElement.cpp b/libraries/entities/src/EntityTreeElement.cpp
index 90c185be8b..f330058a78 100644
--- a/libraries/entities/src/EntityTreeElement.cpp
+++ b/libraries/entities/src/EntityTreeElement.cpp
@@ -218,8 +218,9 @@ EntityItemID EntityTreeElement::evalDetailedRayIntersection(const glm::vec3& ori
         // extents is the entity relative, scaled, centered extents of the entity
         glm::vec3 position = entity->getWorldPosition();
         glm::mat4 translation = glm::translate(position);
-        glm::quat orientation = entity->getWorldOrientation();
-        glm::mat4 rotation = glm::mat4_cast(BillboardModeHelpers::getBillboardRotation(position, orientation, entity->getBillboardMode(),
+        BillboardMode billboardMode = entity->getBillboardMode();
+        glm::quat orientation = billboardMode == BillboardMode::NONE ? entity->getWorldOrientation() : entity->getLocalOrientation();
+        glm::mat4 rotation = glm::mat4_cast(BillboardModeHelpers::getBillboardRotation(position, orientation, billboardMode,
             viewFrustumPos, entity->getRotateForPicking()));
         glm::mat4 entityToWorldMatrix = translation * rotation;
         glm::mat4 worldToEntityMatrix = glm::inverse(entityToWorldMatrix);
@@ -368,8 +369,9 @@ EntityItemID EntityTreeElement::evalDetailedParabolaIntersection(const glm::vec3
         // extents is the entity relative, scaled, centered extents of the entity
         glm::vec3 position = entity->getWorldPosition();
         glm::mat4 translation = glm::translate(position);
-        glm::quat orientation = entity->getWorldOrientation();
-        glm::mat4 rotation = glm::mat4_cast(BillboardModeHelpers::getBillboardRotation(position, orientation, entity->getBillboardMode(),
+        BillboardMode billboardMode = entity->getBillboardMode();
+        glm::quat orientation = billboardMode == BillboardMode::NONE ? entity->getWorldOrientation() : entity->getLocalOrientation();
+        glm::mat4 rotation = glm::mat4_cast(BillboardModeHelpers::getBillboardRotation(position, orientation, billboardMode,
             viewFrustumPos, entity->getRotateForPicking()));
         glm::mat4 entityToWorldMatrix = translation * rotation;
         glm::mat4 worldToEntityMatrix = glm::inverse(entityToWorldMatrix);
diff --git a/libraries/entities/src/GizmoEntityItem.cpp b/libraries/entities/src/GizmoEntityItem.cpp
index 694371d739..b6c5713c1a 100644
--- a/libraries/entities/src/GizmoEntityItem.cpp
+++ b/libraries/entities/src/GizmoEntityItem.cpp
@@ -108,10 +108,11 @@ bool GizmoEntityItem::findDetailedRayIntersection(const glm::vec3& origin, const
                                                   QVariantMap& extraInfo, bool precisionPicking) const {
     glm::vec3 dimensions = getScaledDimensions();
     glm::vec2 xyDimensions(dimensions.x, dimensions.z);
-    glm::quat rotation = getWorldOrientation();
+    BillboardMode billboardMode = getBillboardMode();
+    glm::quat rotation = billboardMode == BillboardMode::NONE ? getWorldOrientation() : getLocalOrientation();
     rotation *= glm::angleAxis(-(float)M_PI_2, Vectors::RIGHT);
     glm::vec3 position = getWorldPosition() + rotation * (dimensions * (ENTITY_ITEM_DEFAULT_REGISTRATION_POINT - getRegistrationPoint()));
-    rotation = BillboardModeHelpers::getBillboardRotation(position, rotation, getBillboardMode(), viewFrustumPos);
+    rotation = BillboardModeHelpers::getBillboardRotation(position, rotation, billboardMode, viewFrustumPos);
 
     if (findRayRectangleIntersection(origin, direction, rotation, position, xyDimensions, distance)) {
         glm::vec3 hitPosition = origin + (distance * direction);
@@ -143,10 +144,11 @@ bool GizmoEntityItem::findDetailedParabolaIntersection(const glm::vec3& origin,
     //// Scale the dimensions by the diameter
     glm::vec3 dimensions = getScaledDimensions();
     glm::vec2 xyDimensions(dimensions.x, dimensions.z);
-    glm::quat rotation = getWorldOrientation();
+    BillboardMode billboardMode = getBillboardMode();
+    glm::quat rotation = billboardMode == BillboardMode::NONE ? getWorldOrientation() : getLocalOrientation();
     rotation *= glm::angleAxis(-(float)M_PI_2, Vectors::RIGHT);
     glm::vec3 position = getWorldPosition();
-    rotation = BillboardModeHelpers::getBillboardRotation(position, rotation, getBillboardMode(), viewFrustumPos);
+    rotation = BillboardModeHelpers::getBillboardRotation(position, rotation, billboardMode, viewFrustumPos);
 
     glm::quat inverseRot = glm::inverse(rotation);
     glm::vec3 localOrigin = inverseRot * (origin - position);
diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp
index 61362896ee..321e92b9f0 100644
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@@ -330,6 +330,19 @@ const Transform ModelEntityItem::getTransform(bool& success, int depth) const {
 
     return worldTransform;
 }
+
+const Transform ModelEntityItem::getTransformWithOnlyLocalRotation(bool& success, int depth) const {
+    const Transform parentTransform = getParentTransform(success, depth);
+    Transform localTransform = getLocalTransform();
+    localTransform.postScale(getModelScale());
+
+    Transform worldTransform;
+    Transform::mult(worldTransform, parentTransform, localTransform);
+    worldTransform.setRotation(localTransform.getRotation());
+
+    return worldTransform;
+}
+
 void ModelEntityItem::setCompoundShapeURL(const QString& url) {
     withWriteLock([&] {
         if (_compoundShapeURL.get() != url) {
diff --git a/libraries/entities/src/ModelEntityItem.h b/libraries/entities/src/ModelEntityItem.h
index 6e92b225a1..a00327251c 100644
--- a/libraries/entities/src/ModelEntityItem.h
+++ b/libraries/entities/src/ModelEntityItem.h
@@ -71,6 +71,7 @@ public:
     virtual void setScaledDimensions(const glm::vec3& value) override;
 
     virtual const Transform getTransform(bool& success, int depth = 0) const override;
+    virtual const Transform getTransformWithOnlyLocalRotation(bool& success, int depth = 0) const override;
     virtual const Transform getTransform() const override;
 
     static const QString DEFAULT_COMPOUND_SHAPE_URL;
diff --git a/libraries/entities/src/PolyVoxEntityItem.cpp b/libraries/entities/src/PolyVoxEntityItem.cpp
index 5ed9f69b5a..49dc0d7c90 100644
--- a/libraries/entities/src/PolyVoxEntityItem.cpp
+++ b/libraries/entities/src/PolyVoxEntityItem.cpp
@@ -378,14 +378,15 @@ glm::mat4 PolyVoxEntityItem::localToVoxelMatrix() const {
 }
 
 glm::mat4 PolyVoxEntityItem::voxelToWorldMatrix(bool includeBillboard) const {
-    glm::quat orientation = getWorldOrientation();
     glm::vec3 position = getWorldPosition();
     glm::mat4 translation = glm::translate(position);
     glm::mat4 rotation;
     if (includeBillboard) {
-        rotation = glm::mat4_cast(BillboardModeHelpers::getBillboardRotation(position, orientation, getBillboardMode(), BillboardModeHelpers::getPrimaryViewFrustumPosition()));
+        BillboardMode billboardMode = getBillboardMode();
+        glm::quat orientation = billboardMode == BillboardMode::NONE ? getWorldOrientation() : getLocalOrientation();
+        rotation = glm::mat4_cast(BillboardModeHelpers::getBillboardRotation(position, orientation, billboardMode, BillboardModeHelpers::getPrimaryViewFrustumPosition()));
     } else {
-        rotation = glm::mat4_cast(orientation);
+        rotation = glm::mat4_cast(getWorldOrientation());
     }
     return translation * rotation * voxelToLocalMatrix();
 }
diff --git a/libraries/entities/src/ShapeEntityItem.cpp b/libraries/entities/src/ShapeEntityItem.cpp
index 7858e62f7d..4349eefd2d 100644
--- a/libraries/entities/src/ShapeEntityItem.cpp
+++ b/libraries/entities/src/ShapeEntityItem.cpp
@@ -277,9 +277,10 @@ bool ShapeEntityItem::findDetailedRayIntersection(const glm::vec3& origin, const
                                                   float& distance, BoxFace& face, glm::vec3& surfaceNormal,
                                                   QVariantMap& extraInfo, bool precisionPicking) const {
     glm::vec3 dimensions = getScaledDimensions();
-    glm::quat rotation = getWorldOrientation();
+    BillboardMode billboardMode = getBillboardMode();
+    glm::quat rotation = billboardMode == BillboardMode::NONE ? getWorldOrientation() : getLocalOrientation();
     glm::vec3 position = getWorldPosition() + rotation * (dimensions * (ENTITY_ITEM_DEFAULT_REGISTRATION_POINT - getRegistrationPoint()));
-    rotation = BillboardModeHelpers::getBillboardRotation(position, rotation, getBillboardMode(), viewFrustumPos);
+    rotation = BillboardModeHelpers::getBillboardRotation(position, rotation, billboardMode, viewFrustumPos);
 
     // determine the ray in the frame of the entity transformed from a unit sphere
     glm::mat4 entityToWorldMatrix = glm::translate(position) * glm::mat4_cast(rotation) * glm::scale(dimensions);
@@ -309,9 +310,10 @@ bool ShapeEntityItem::findDetailedParabolaIntersection(const glm::vec3& origin,
                                                        BoxFace& face, glm::vec3& surfaceNormal,
                                                        QVariantMap& extraInfo, bool precisionPicking) const {
     glm::vec3 dimensions = getScaledDimensions();
-    glm::quat rotation = getWorldOrientation();
+    BillboardMode billboardMode = getBillboardMode();
+    glm::quat rotation = billboardMode == BillboardMode::NONE ? getWorldOrientation() : getLocalOrientation();
     glm::vec3 position = getWorldPosition() + rotation * (dimensions * (ENTITY_ITEM_DEFAULT_REGISTRATION_POINT - getRegistrationPoint()));
-    rotation = BillboardModeHelpers::getBillboardRotation(position, rotation, getBillboardMode(), viewFrustumPos);
+    rotation = BillboardModeHelpers::getBillboardRotation(position, rotation, billboardMode, viewFrustumPos);
 
     // determine the parabola in the frame of the entity transformed from a unit sphere
     glm::mat4 entityToWorldMatrix = glm::translate(position) * glm::mat4_cast(rotation) * glm::scale(dimensions);
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 1c9fdc50d6..5d0273c7bf 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -114,7 +114,8 @@ Transform Model::getTransform() const {
         return transform;
     } else if (_spatiallyNestableOverride) {
         bool success;
-        Transform transform = _spatiallyNestableOverride->getTransform(success);
+        Transform transform = _billboardMode == BillboardMode::NONE ? _spatiallyNestableOverride->getTransform(success) :
+            _spatiallyNestableOverride->getTransformWithOnlyLocalRotation(success);
         if (success) {
             transform.setScale(getScale());
             return transform;
diff --git a/libraries/shared/src/SpatiallyNestable.cpp b/libraries/shared/src/SpatiallyNestable.cpp
index c1c1fd38d9..670b03611b 100644
--- a/libraries/shared/src/SpatiallyNestable.cpp
+++ b/libraries/shared/src/SpatiallyNestable.cpp
@@ -754,6 +754,17 @@ const Transform SpatiallyNestable::getTransform(bool& success, int depth) const
     return result;
 }
 
+const Transform SpatiallyNestable::getTransformWithOnlyLocalRotation(bool& success, int depth) const {
+    Transform result;
+    // return a world-space transform for this object's location
+    Transform parentTransform = getParentTransform(success, depth);
+    _transformLock.withReadLock([&] {
+        Transform::mult(result, parentTransform, _transform);
+        result.setRotation(_transform.getRotation());
+    });
+    return result;
+}
+
 const Transform SpatiallyNestable::getTransform() const {
     bool success;
     Transform result = getTransform(success);
diff --git a/libraries/shared/src/SpatiallyNestable.h b/libraries/shared/src/SpatiallyNestable.h
index 01e3b045ad..29f23afdfb 100644
--- a/libraries/shared/src/SpatiallyNestable.h
+++ b/libraries/shared/src/SpatiallyNestable.h
@@ -82,6 +82,7 @@ public:
 
     // world frame
     virtual const Transform getTransform(bool& success, int depth = 0) const;
+    virtual const Transform getTransformWithOnlyLocalRotation(bool& success, int depth = 0) const;
     virtual const Transform getTransform() const;
     virtual void setTransform(const Transform& transform, bool& success);
     virtual bool setTransform(const Transform& transform);
