refactor: Move sketch mode camera animations to Camera class
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
This commit is contained in:
@@ -22,8 +22,6 @@
|
||||
#include <QSvgRenderer>
|
||||
#include <QWheelEvent>
|
||||
#include <QApplication>
|
||||
#include <QPropertyAnimation>
|
||||
#include <QParallelAnimationGroup>
|
||||
#include <cmath>
|
||||
#include <QtMath>
|
||||
#include <QOpenGLShaderProgram>
|
||||
@@ -46,6 +44,7 @@ ViewportWidget::ViewportWidget(QWidget *parent)
|
||||
{
|
||||
m_camera = new Camera(this);
|
||||
connect(m_camera, &Camera::cameraChanged, this, QOverload<>::of(&QWidget::update));
|
||||
connect(m_camera, &Camera::restoreStateAnimationFinished, this, &ViewportWidget::onRestoreStateAnimationFinished);
|
||||
m_viewCube = new ViewCube();
|
||||
m_sketchGrid = new SketchGrid();
|
||||
m_featureBrowser = new FeatureBrowser();
|
||||
@@ -318,64 +317,7 @@ void ViewportWidget::onSketchModeStarted(SketchPlane plane)
|
||||
m_currentPlane = plane;
|
||||
|
||||
m_camera->saveState();
|
||||
|
||||
float targetXRot = m_camera->xRotation();
|
||||
float targetYRot = m_camera->yRotation();
|
||||
switch (plane) {
|
||||
case SketchPlane::XY: // Top view
|
||||
targetXRot = 90 * 16;
|
||||
targetYRot = 0;
|
||||
break;
|
||||
case SketchPlane::XZ: // Front view
|
||||
targetXRot = 0;
|
||||
targetYRot = 0;
|
||||
break;
|
||||
case SketchPlane::YZ: // Right view
|
||||
targetXRot = 0;
|
||||
targetYRot = -90 * 16;
|
||||
break;
|
||||
case SketchPlane::NONE:
|
||||
break;
|
||||
}
|
||||
|
||||
auto* animGroup = new QParallelAnimationGroup(this);
|
||||
|
||||
auto* xRotAnim = new QPropertyAnimation(m_camera, "xRotation");
|
||||
xRotAnim->setDuration(300);
|
||||
xRotAnim->setStartValue(m_camera->xRotation());
|
||||
xRotAnim->setEndValue(targetXRot);
|
||||
xRotAnim->setEasingCurve(QEasingCurve::InOutQuad);
|
||||
animGroup->addAnimation(xRotAnim);
|
||||
|
||||
auto* yRotAnim = new QPropertyAnimation(m_camera, "yRotation");
|
||||
yRotAnim->setDuration(300);
|
||||
yRotAnim->setStartValue(m_camera->yRotation());
|
||||
yRotAnim->setEndValue(targetYRot);
|
||||
yRotAnim->setEasingCurve(QEasingCurve::InOutQuad);
|
||||
animGroup->addAnimation(yRotAnim);
|
||||
|
||||
auto* panXAnim = new QPropertyAnimation(m_camera, "panX");
|
||||
panXAnim->setDuration(300);
|
||||
panXAnim->setStartValue(m_camera->panX());
|
||||
panXAnim->setEndValue(0.0f);
|
||||
panXAnim->setEasingCurve(QEasingCurve::InOutQuad);
|
||||
animGroup->addAnimation(panXAnim);
|
||||
|
||||
auto* panYAnim = new QPropertyAnimation(m_camera, "panY");
|
||||
panYAnim->setDuration(300);
|
||||
panYAnim->setStartValue(m_camera->panY());
|
||||
panYAnim->setEndValue(0.0f);
|
||||
panYAnim->setEasingCurve(QEasingCurve::InOutQuad);
|
||||
animGroup->addAnimation(panYAnim);
|
||||
|
||||
auto* zoomAnim = new QPropertyAnimation(m_camera, "zoom");
|
||||
zoomAnim->setDuration(300);
|
||||
zoomAnim->setStartValue(m_camera->zoom());
|
||||
zoomAnim->setEndValue(-20.0f);
|
||||
zoomAnim->setEasingCurve(QEasingCurve::InOutQuad);
|
||||
animGroup->addAnimation(zoomAnim);
|
||||
|
||||
animGroup->start(QAbstractAnimation::DeleteWhenStopped);
|
||||
m_camera->animateToPlaneView(static_cast<int>(plane));
|
||||
}
|
||||
|
||||
void ViewportWidget::onPlaneSelectionModeStarted()
|
||||
|
||||
Reference in New Issue
Block a user