Partial implementation of rotated labels (bounding cuboid limits still calculated incorrectly).

Author: trisyoungs

src/classes/cuboid.cpp

@@ -1,4 +1,5 @@
 #include "classes/cuboid.h"
+#include <QMatrix4x4>
 
 using namespace Mildred;
 
@@ -195,3 +196,32 @@ float Cuboid::zExtent() const
 
 //! Return vector of extents
 QVector3D Cuboid::extents() const { return {xExtent(), yExtent(), zExtent()}; }
+
+//! Return bounding box cuboid required for rotated original cuboid (in degrees, around z-axis)
+/*!
+ * Returns the bounding cuboid required to contain the original cuboid rotated @param rotation
+ * @return
+ */
+Cuboid Cuboid::zRotatedBoundingCuboid(QVector3D rotationOrigin, double thetaZ) const
+{
+    QMatrix4x4 m;
+    m.rotate(thetaZ, QVector3D{0.0, 0.0, 1.0});
+    std::array<QPointF, 4> corners;
+    corners[0] = QPointF(v1x_.value_or(0.0) - rotationOrigin.x(), v1y_.value_or(0.0) - rotationOrigin.y());
+    corners[1] = QPointF(v2x_.value_or(0.0) - rotationOrigin.x(), v1y_.value_or(0.0) - rotationOrigin.y());
+    corners[2] = QPointF(v1x_.value_or(0.0) - rotationOrigin.x(), v2y_.value_or(0.0) - rotationOrigin.y());
+    corners[3] = QPointF(v2x_.value_or(0.0) - rotationOrigin.x(), v2y_.value_or(0.0) - rotationOrigin.y());
+
+    Cuboid rotated;
+    for (const auto &p : corners)
+    {
+        auto newP = m.map(p);
+        rotated.expand(newP.x() + rotationOrigin.x(), newP.y() + rotationOrigin.y(), {});
+    }
+
+    // Set Z extents
+    rotated.v1z_ = v1z_;
+    rotated.v2z_ = v2z_;
+
+    return rotated;
+}

src/classes/cuboid.h

@@ -60,5 +60,7 @@ class Cuboid
     float zExtent() const;
     // Return vector of extents
     QVector3D extents() const;
+    // Return bounding box cuboid required for rotated original cuboid (in degrees, around z-axis)
+    Cuboid zRotatedBoundingCuboid(QVector3D rotationOrigin, double thetaZ) const;
 };
 } // namespace Mildred

src/entities/axis.cpp

@@ -594,11 +594,7 @@ Cuboid AxisEntity::createTickAndLabelEntities(const std::vector<std::pair<double
             (*tickLabelEntity)->setText(QString::number(v));
             (*tickLabelEntity)
                 ->setAnchorPosition(axisPos + tickDirection_ * (metrics_.tickPixelSize() + metrics_.tickLabelPixelGap()));
-            boundingCuboid.expand(TextEntity::boundingCuboid(
-                                      metrics_.axisTickLabelFont(), QString::number(v),
-                                      {axisPos + tickDirection_ * (metrics_.tickPixelSize() + metrics_.tickLabelPixelGap())},
-                                      labelAnchorPoint_)
-                                      .first);
+            boundingCuboid.expand((*tickLabelEntity)->boundingCuboid(metrics_.axisTickLabelFont()).first);
             ++tickLabelEntity;
         }
         else
@@ -713,20 +709,20 @@ Cuboid AxisEntity::boundingCuboid(const MildredMetrics &metrics) const
             cuboid.expand(
                 TextEntity::boundingCuboid(metrics.axisTickLabelFont(), QString::number(v),
                                            axisPos + tickDirection_ * (metrics_.tickPixelSize() + metrics.tickLabelPixelGap()),
-                                           labelAnchorPoint_)
+                                           labelAnchorPoint_, 0.0)
                     .first);
         }
         else
             cuboid.expand({axisPos, axisPos + tickDirection_ * metrics_.tickPixelSize() * 0.5});
     }
     // -- Title
     if (!axisTitleEntity_->text().isEmpty())
-        cuboid.expand(TextEntity::boundingCuboid(metrics.axisTitleFont(), axisTitleEntity_->text(),
-                                                 direction_ * metrics.displayVolumeExtent()[axisDirectionIndex_] * 0.5 +
-                                                     tickDirection_ *
-                                                         (cuboid.extents()[tickDirectionIndex_] + metrics.tickLabelPixelGap()),
-                                                 labelAnchorPoint_)
-                          .first);
+        cuboid.expand(
+            axisTitleEntity_
+                ->boundingCuboid(metrics.axisTitleFont(),
+                                 direction_ * metrics.displayVolumeExtent()[axisDirectionIndex_] * 0.5 +
+                                     tickDirection_ * (cuboid.extents()[tickDirectionIndex_] + metrics.tickLabelPixelGap()))
+                .first);
 
     return cuboid;
 }

src/entities/line.cpp

@@ -67,10 +67,13 @@ void LineEntity::addVertex(QVector3D v) { cachedVertices_.emplace_back(v); }
 
 //! Append vertex to cached data
 /*!
- * Append the vertex defined by the coordinates @param x, @param y, and @param z to the cached vertices. The buffer objects (and hence the display primitive) are not regenerated
- * until a call to the finalise() method is made.
+ * Append the vertex defined by the coordinates @param x, @param y, and @param z to the cached vertices. The buffer objects (and
+ * hence the display primitive) are not regenerated until a call to the finalise() method is made.
  */
-void LineEntity::addVertex(double x, double y, double z) { cachedVertices_.emplace_back(QVector3D{float(x), float(y), float(z)});}
+void LineEntity::addVertex(double x, double y, double z)
+{
+    cachedVertices_.emplace_back(QVector3D{float(x), float(y), float(z)});
+}
 
 //! Append vertex and colour to cached data
 /*!

src/entities/text.cpp

@@ -4,7 +4,7 @@
 using namespace Mildred;
 
 // Enables showing of bounding boxes around Text Entities.
-constexpr auto showBoundingBoxes = false;
+constexpr auto showBoundingBoxes = true;
 
 //! Construct a new text entity
 /*!
@@ -90,7 +90,7 @@ void TextEntity::updateTranslation()
     positionalTransform_->setRotationZ(rotation_);
 
     // Set the text translation vector so that the defined anchor point is located at {0,0,0}
-    auto [textCuboid, translation] = boundingCuboid(textMesh_->font(), textMesh_->text(), {}, anchorPoint_, textMesh_->depth(), rotation_);
+    auto [textCuboid, translation] = boundingCuboid(textMesh_->font(), textMesh_->text(), {}, anchorPoint_, textMesh_->depth());
     auto v = QVector3D(textCuboid.lowerLeftBack().x(), textCuboid.lowerLeftBack().y(), 0.0);
     textTransform_->setTranslation(v + translation);
 
@@ -154,6 +154,12 @@ void TextEntity::setRotation(double rotation)
     updateTranslation();
 }
 
+// Return bounding cuboid and anchor translation vector for current text and positioning
+std::pair<Cuboid, QVector3D> TextEntity::boundingCuboid(const QFont &font, std::optional<QVector3D> newAnchorPosition) const
+{
+    return boundingCuboid(font, text(), newAnchorPosition.value_or(anchorPosition_), anchorPoint_, rotation_, 0.01);
+}
+
 //! Return simple bounding cuboid for text, along with baseline descent from font metrics
 /*!
  * Calculates a bounding cuboid in the XY plane for the specified @param font and @param text. The @param depth is applied in
@@ -182,7 +188,7 @@ std::pair<Cuboid, int> TextEntity::boundingCuboid(const QFont &font, const QStri
  * should be applied to the mesh to be rendered in order to get the correct positioning.
  */
 std::pair<Cuboid, QVector3D> TextEntity::boundingCuboid(const QFont &font, const QString &text, QVector3D anchorPosition,
-                                                        MildredMetrics::AnchorPoint anchorPoint, float depth)
+                                                        MildredMetrics::AnchorPoint anchorPoint, double rotation, float depth)
 {
     // Get basic bounding cuboid for the text
     auto [cuboid, descent] = boundingCuboid(font, text, depth);
@@ -209,5 +215,6 @@ std::pair<Cuboid, QVector3D> TextEntity::boundingCuboid(const QFont &font, const
     auto anchorFrac = MildredMetrics::anchorLocation(anchorPoint);
     cuboid.translate(-QVector3D(cuboid.xExtent() * anchorFrac.x(), cuboid.yExtent() * anchorFrac.y(), 0.0));
 
-    return {cuboid, meshTranslation};
+    // Return the bounding cuboid (accounting for rotation)
+    return {cuboid.zRotatedBoundingCuboid(anchorPosition, rotation), meshTranslation};
 }

src/entities/text.h

@@ -69,10 +69,14 @@ class TextEntity : public Qt3DCore::QEntity
     void setAnchorPosition(QVector3D p);
     // Set rotation
     void setRotation(double rotation);
+    // Return bounding cuboid and anchor translation vector for current text and positioning
+    std::pair<Cuboid, QVector3D> boundingCuboid(const QFont &font,
+                                                std::optional<QVector3D> newAnchorPosition = std::nullopt) const;
     // Return simple bounding cuboid for text, along with baseline descent from font metrics
     static std::pair<Cuboid, int> boundingCuboid(const QFont &font, const QString &text, float depth = 0.1f);
     // Return bounding cuboid with translation and anchor point applied, and required translation vector for text mesh
     static std::pair<Cuboid, QVector3D> boundingCuboid(const QFont &font, const QString &text, QVector3D anchorPosition,
-                                                       MildredMetrics::AnchorPoint anchorPoint, float depth = 0.1f);
+                                                       MildredMetrics::AnchorPoint anchorPoint, double rotation,
+                                                       float depth = 0.1f);
 };
 } // namespace Mildred