#5988: The RenderableBox renderable should take the local bounds orig…

…in into account, it's not always located at 0,0,0. (This is related to a change in #5968.) The visible Entity Boxes are not necessarily centered at the value of their origin key, they are offset using editor_mins and editor_maxs vectors that are not necessarily symmetric.
codereader · Aug 15, 2022 · 7ee4cbe · 7ee4cbe
1 parent 8799d29
commit 7ee4cbe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/libs/render/RenderableBox.h b/libs/render/RenderableBox.h
@@ -168,11 +168,9 @@ class RenderableBox :
 
         _needsUpdate = false;
 
-        static Vector3 Origin(0, 0, 0);
-
         // Calculate the corner vertices of this bounding box
-        Vector3 max(Origin + _bounds.extents);
-        Vector3 min(Origin - _bounds.extents);
+        Vector3 max(_bounds.origin + _bounds.extents);
+        Vector3 min(_bounds.origin - _bounds.extents);
 
         auto colour = getVertexColour();
 

diff --git a/radiantcore/entity/generic/GenericEntityNode.cpp b/radiantcore/entity/generic/GenericEntityNode.cpp
@@ -14,7 +14,7 @@ GenericEntityNode::GenericEntityNode(const IEntityClassPtr& eclass) :
 	m_angle(AngleKey::IDENTITY),
 	m_rotationKey(std::bind(&GenericEntityNode::rotationChanged, this)),
     _renderableArrow(*this),
-    _renderableBox(*this, localAABB(), worldAABB().getOrigin()),
+    _renderableBox(*this, localAABB(), m_origin),
 	_allow3Drotations(_spawnArgs.getKeyValue("editor_rotatable") == "1")
 {}
 
@@ -27,7 +27,7 @@ GenericEntityNode::GenericEntityNode(const GenericEntityNode& other) :
 	m_angle(AngleKey::IDENTITY),
 	m_rotationKey(std::bind(&GenericEntityNode::rotationChanged, this)),
     _renderableArrow(*this),
-    _renderableBox(*this, localAABB(), worldAABB().getOrigin()),
+    _renderableBox(*this, localAABB(), m_origin),
 	_allow3Drotations(_spawnArgs.getKeyValue("editor_rotatable") == "1")
 {}