tanner/unnamed-cad-software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Animate camera transitions for sketch mode

Browse Source 
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
This commit is contained in:
Tanner Collin
2026-02-09 18:11:36 -07:00
parent eea8099bd2
commit 7955af77be
2 changed files with 170 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
src/ViewportWidget.cpp
View File

@@ -9,6 +9,8 @@
#include <QPainter>
#include <QWheelEvent>
#include <QApplication>
#include <QPropertyAnimation>
#include <QParallelAnimationGroup>
ViewportWidget::ViewportWidget(QWidget *parent)
: QOpenGLWidget(parent)
@@ -30,6 +32,51 @@ void ViewportWidget::setDocument(Document* document)
m_featureBrowser->setDocument(document);
}
float ViewportWidget::xRotation() const { return xRot; }
void ViewportWidget::setXRotation(float angle)
{
if (angle != xRot) {
xRot = angle;
update();
}
}
float ViewportWidget::yRotation() const { return yRot; }
void ViewportWidget::setYRotation(float angle)
{
if (angle != yRot) {
yRot = angle;
update();
}
}
float ViewportWidget::zoom() const { return zoom; }
void ViewportWidget::setZoom(float value)
{
if (value != zoom) {
zoom = value;
update();
}
}
float ViewportWidget::panX() const { return panX; }
void ViewportWidget::setPanX(float value)
{
if (value != panX) {
panX = value;
update();
}
}
float ViewportWidget::panY() const { return panY; }
void ViewportWidget::setPanY(float value)
{
if (value != panY) {
panY = value;
update();
}
}
void ViewportWidget::initializeGL()
{
initializeOpenGLFunctions();
@@ -124,33 +171,117 @@ void ViewportWidget::wheelEvent(QWheelEvent *event)
void ViewportWidget::startSketch(SketchPlane plane)
{
m_currentPlane = plane;
panX = 0;
panY = 0;
zoom = -20.0f; // Zoom out to see the grid
m_savedXRot = xRot;
m_savedYRot = yRot;
m_savedPanX = panX;
m_savedPanY = panY;
m_savedZoom = zoom;
float targetXRot = xRot;
float targetYRot = yRot;
switch (plane) {
case SketchPlane::XY: // Front view
xRot = 0;
yRot = 0;
targetXRot = 0;
targetYRot = 0;
break;
case SketchPlane::XZ: // Top view
xRot = -90 * 16;
yRot = 0;
targetXRot = -90 * 16;
targetYRot = 0;
break;
case SketchPlane::YZ: // Right view
xRot = 0;
yRot = 90 * 16;
targetXRot = 0;
targetYRot = 90 * 16;
break;
case SketchPlane::NONE:
break;
}
update();
auto* animGroup = new QParallelAnimationGroup(this);
auto* xRotAnim = new QPropertyAnimation(this, "xRotation");
xRotAnim->setDuration(300);
xRotAnim->setStartValue(xRot);
xRotAnim->setEndValue(targetXRot);
xRotAnim->setEasingCurve(QEasingCurve::InOutQuad);
animGroup->addAnimation(xRotAnim);
auto* yRotAnim = new QPropertyAnimation(this, "yRotation");
yRotAnim->setDuration(300);
yRotAnim->setStartValue(yRot);
yRotAnim->setEndValue(targetYRot);
yRotAnim->setEasingCurve(QEasingCurve::InOutQuad);
animGroup->addAnimation(yRotAnim);
auto* panXAnim = new QPropertyAnimation(this, "panX");
panXAnim->setDuration(300);
panXAnim->setStartValue(panX);
panXAnim->setEndValue(0.0f);
panXAnim->setEasingCurve(QEasingCurve::InOutQuad);
animGroup->addAnimation(panXAnim);
auto* panYAnim = new QPropertyAnimation(this, "panY");
panYAnim->setDuration(300);
panYAnim->setStartValue(panY);
panYAnim->setEndValue(0.0f);
panYAnim->setEasingCurve(QEasingCurve::InOutQuad);
animGroup->addAnimation(panYAnim);
auto* zoomAnim = new QPropertyAnimation(this, "zoom");
zoomAnim->setDuration(300);
zoomAnim->setStartValue(zoom);
zoomAnim->setEndValue(-20.0f);
zoomAnim->setEasingCurve(QEasingCurve::InOutQuad);
animGroup->addAnimation(zoomAnim);
animGroup->start(QAbstractAnimation::DeleteWhenStopped);
}
void ViewportWidget::saveSketch()
{
m_currentPlane = SketchPlane::NONE;
update();
auto* animGroup = new QParallelAnimationGroup(this);
auto* xRotAnim = new QPropertyAnimation(this, "xRotation");
xRotAnim->setDuration(300);
xRotAnim->setStartValue(xRot);
xRotAnim->setEndValue(m_savedXRot);
xRotAnim->setEasingCurve(QEasingCurve::InOutQuad);
animGroup->addAnimation(xRotAnim);
auto* yRotAnim = new QPropertyAnimation(this, "yRotation");
yRotAnim->setDuration(300);
yRotAnim->setStartValue(yRot);
yRotAnim->setEndValue(m_savedYRot);
yRotAnim->setEasingCurve(QEasingCurve::InOutQuad);
animGroup->addAnimation(yRotAnim);
auto* panXAnim = new QPropertyAnimation(this, "panX");
panXAnim->setDuration(300);
panXAnim->setStartValue(panX);
panXAnim->setEndValue(m_savedPanX);
panXAnim->setEasingCurve(QEasingCurve::InOutQuad);
animGroup->addAnimation(panXAnim);
auto* panYAnim = new QPropertyAnimation(this, "panY");
panYAnim->setDuration(300);
panYAnim->setStartValue(panY);
panYAnim->setEndValue(m_savedPanY);
panYAnim->setEasingCurve(QEasingCurve::InOutQuad);
animGroup->addAnimation(panYAnim);
auto* zoomAnim = new QPropertyAnimation(this, "zoom");
zoomAnim->setDuration(300);
zoomAnim->setStartValue(zoom);
zoomAnim->setEndValue(m_savedZoom);
zoomAnim->setEasingCurve(QEasingCurve::InOutQuad);
animGroup->addAnimation(zoomAnim);
connect(animGroup, &QParallelAnimationGroup::finished, this, [this]() {
m_currentPlane = SketchPlane::NONE;
update();
});
animGroup->start(QAbstractAnimation::DeleteWhenStopped);
}
QVector3D ViewportWidget::project(const QVector3D& worldCoord, const QMatrix4x4& modelView, const QMatrix4x4& projection, const QRect& viewport)