SHS/qglengine
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

small refactoring

Browse Source
This commit is contained in:
Бычков Андрей
2021-05-31 12:47:46 +03:00
parent 5eaa20202b
commit a9f7408e71
44 changed files with 86 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mouse_controller.cpp
View File

@@ -57,7 +57,7 @@ void MouseController::mouseReleaseEvent(QMouseEvent * e) {
selecting_ = false;
canSelect_ = true;
view->renderer_.mouse_rect = QRect();
view->scene_->selectObjects(hov_objects.toList(), add_ts);
view->scene()->selectObjects(hov_objects.toList(), add_ts);
return;
}
if (canSelect_ && mouseSelect_) {
@@ -68,16 +68,16 @@ void MouseController::mouseReleaseEvent(QMouseEvent * e) {
view->scene()->clearSelection();
} else {
if (!hov_objects.isEmpty())
view->scene_->selectObject(hov_objects[0], add_ts);
view->scene()->selectObject(hov_objects[0], add_ts);
if (!hov_aims.isEmpty()) {
view->scene_->selectObject(hov_aims[0], add_ts);
hov_aims[0]->selected_aim = true;
view->scene()->selectObject(hov_aims[0], add_ts);
hov_aims[0]->setAimSelected(true);
}
}
}
if (e->button() == Qt::RightButton) {
if (view->renderer_.edit_mode && !view->scene()->selectedObjects().isEmpty())
view->context_menu.popup(e->globalPos());
view->popupMenu(e->globalPos());
}
}
}
@@ -107,7 +107,7 @@ void MouseController::mouseMoveEvent(QMouseEvent * e) {
QPoint cpos = e->pos();
if (cur_action != RendererService::haNoAction && (e->buttons() == Qt::LeftButton)) {
RendererService & rs(view->renderer_.rend_service);
ObjectBaseList objects = view->scene_->selectedObjects(true);
ObjectBaseList objects = view->scene()->selectedObjects(true);
QVector<int> axis;
switch (cur_action) {
case RendererService::haMove:
@@ -146,7 +146,7 @@ void MouseController::mouseMoveEvent(QMouseEvent * e) {
if (o->parent())
pmat = o->parent()->worldTransform().inverted();
QVector3D dv = pmat.mapVector(axe_vector);
if (o->selected_aim) {
if (o->isAimSelected()) {
AimedObject * ao = (AimedObject*)o;
ao->setAim(ao->aim() + dv);
} else
@@ -168,7 +168,6 @@ void MouseController::mouseMoveEvent(QMouseEvent * e) {
scales << axe_vector;
}
}
//if (cur_handle >= RendererService::htScaleX && cur_handle <= RendererService::htScaleZ ) cs = Qt::SplitHCursor;
if (cur_action == RendererService::haScale) {
double sc = 0., max = 0.;
foreach (const QVector3D & s, scales) {
@@ -222,7 +221,7 @@ void MouseController::mouseMoveEvent(QMouseEvent * e) {
if (customMouseMove_) emit view->customMouseMoveEvent(e->pos(), lastPos, e->buttons());
lastPos = e->pos();
if (e->buttons() == 0) {
cur_handle = 0;
cur_handle = QFlags<RendererService::HandleMesh>();
cur_action = RendererService::haNoAction;
Qt::CursorShape cs = Qt::CrossCursor;
if (view->renderer_.edit_mode) {
@@ -242,7 +241,7 @@ void MouseController::mouseMoveEvent(QMouseEvent * e) {
}
}
if (cur_action == RendererService::haNoAction)
cur_handle = 0;
cur_handle = QFlags<RendererService::HandleMesh>();
view->setCursor(cs);
view->renderer_.rend_service.current_handle = cur_handle;
}