Skip to content

Add Viewpoint shortcuts and isometric view #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptsouchlos merged 3 commits into from
May 17, 2024
Merged

Add Viewpoint shortcuts and isometric view #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ba9c8a
Do not reset rotation on 'Center the model'
Apr 25, 2024
b22bbcd
Add shortcuts to Viewpoint submenu, reorder
Apr 25, 2024
a1462ab
Add isometric view
Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions src/canvas.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,19 +88,26 @@ void Canvas::view_anim(float v)

void Canvas::common_view_change(enum ViewPoint c)
{
if (c == centerview) {
scale = default_scale;
center = default_center;
zoom = 1;
update();
return;
}

currentTransform.setToIdentity();
currentTransform.rotate(180.0, QVector3D(0, 0, 1));

switch (c)
{
case centerview:
case isoview:
{
scale = default_scale;
center = default_center;
zoom = 1;
currentTransform.rotate(90, QVector3D(1, 0, 0));
currentTransform.rotate(-45, QVector3D(0, 0, 1));
currentTransform.rotate(35.264, QVector3D(1, 1, 0));
}
break;

case topview:
{
currentTransform.rotate(180, QVector3D(1, 0, 0));
Expand Down
2 changes: 1 addition & 1 deletion src/canvas.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class Mesh;
class Backdrop;
class Axis;

enum ViewPoint {centerview, topview, bottomview, leftview, rightview, frontview, backview};
enum ViewPoint {centerview, isoview, topview, bottomview, leftview, rightview, frontview, backview};
enum DrawMode {shaded, wireframe, surfaceangle, meshlight, DRAWMODECOUNT};

class Canvas : public QOpenGLWidget, protected QOpenGLFunctions
Expand Down
24 changes: 18 additions & 6 deletions src/window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Window::Window(QWidget *parent) :
quit_action(new QAction("Quit", this)),
perspective_action(new QAction("Perspective", this)),
common_view_center_action(new QAction("Center the model", this)),
common_view_iso_action(new QAction("Isometric", this)),
common_view_top_action(new QAction("Top", this)),
common_view_bottom_action(new QAction("Bottom", this)),
common_view_left_action(new QAction("Left", this)),
Expand Down Expand Up @@ -144,21 +145,31 @@ Window::Window(QWidget *parent) :
drawModePrefs_action->setDisabled(true);

const auto common_menu = view_menu->addMenu("Viewpoint");
common_menu->addAction(common_view_center_action);
common_menu->addAction(common_view_iso_action);
common_menu->addAction(common_view_top_action);
common_menu->addAction(common_view_bottom_action);
common_menu->addAction(common_view_left_action);
common_menu->addAction(common_view_right_action);
common_menu->addAction(common_view_front_action);
common_menu->addAction(common_view_back_action);
common_menu->addAction(common_view_left_action);
common_menu->addAction(common_view_right_action);
common_menu->addAction(common_view_center_action);
const auto common_views = new QActionGroup(common_menu);
common_views->addAction(common_view_center_action);
common_views->addAction(common_view_iso_action);
common_views->addAction(common_view_top_action);
common_views->addAction(common_view_bottom_action);
common_views->addAction(common_view_left_action);
common_views->addAction(common_view_right_action);
common_views->addAction(common_view_front_action);
common_views->addAction(common_view_back_action);
common_views->addAction(common_view_left_action);
common_views->addAction(common_view_right_action);
common_views->addAction(common_view_center_action);
common_view_iso_action->setShortcut(Qt::Key_0);
common_view_top_action->setShortcut(Qt::Key_1);
common_view_bottom_action->setShortcut(Qt::Key_2);
common_view_front_action->setShortcut(Qt::Key_3);
common_view_back_action->setShortcut(Qt::Key_4);
common_view_left_action->setShortcut(Qt::Key_5);
common_view_right_action->setShortcut(Qt::Key_6);
common_view_center_action->setShortcut(Qt::Key_9);
QObject::connect(common_views, &QActionGroup::triggered,
this, &Window::on_common_view_change);

Expand Down Expand Up @@ -499,6 +510,7 @@ void Window::on_reload()
void Window::on_common_view_change(QAction* common)
{
if (common == common_view_center_action) canvas->common_view_change(centerview);
if (common == common_view_iso_action) canvas->common_view_change(isoview);
if (common == common_view_top_action) canvas->common_view_change(topview);
if (common == common_view_bottom_action) canvas->common_view_change(bottomview);
if (common == common_view_left_action) canvas->common_view_change(leftview);
Expand Down
1 change: 1 addition & 0 deletions src/window.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ private slots:
QAction* const quit_action;
QAction* const perspective_action;
QAction* const common_view_center_action;
QAction* const common_view_iso_action;
QAction* const common_view_top_action;
QAction* const common_view_bottom_action;
QAction* const common_view_left_action;
Expand Down