SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@630 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2019-11-24 20:39:02 +00:00
parent 6c8da692e2
commit 9059a17cd0
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
qglengine/qglview.cpp
View File

@@ -280,8 +280,9 @@ void QGLView::mouseMoveEvent(QMouseEvent * e) {
if (cur_handle >= RendererService::htRotateX && cur_handle <= RendererService::htRotateZ) axis -= RendererService::htRotateX;
if (cur_handle >= RendererService::htScaleX && cur_handle <= RendererService::htScaleZ ) axis -= RendererService::htScaleX;
QVector3D axe_vector; axe_vector[axis] = 1.;
QVector3D center_screen = camera()->fullViewMatrix() * rs.selection_center;
QVector3D axe_screen = ((camera()->fullViewMatrix() * (rs.selection_center + axe_vector)) - center_screen).normalized();
QMatrix4x4 axis_mat = camera()->fullViewMatrix() * rs.axis_mat;
QVector3D center_screen = axis_mat * rs.selection_center;
QVector3D axe_screen = ((axis_mat * (rs.selection_center + axe_vector)) - center_screen).normalized();
QVector3D mouse_vector(cpos - lastPos);
mouse_vector[1] *= -1.;
if (cur_handle >= RendererService::htMoveX && cur_handle <= RendererService::htMoveZ) {

15
qglengine/renderer_service.cpp
View File

@@ -37,7 +37,7 @@ RendererService::RendererService(Renderer * r_): r(r_) {
QMatrix4x4 m;
m.rotate(90., _rot[i]);
mat_xyz[i] = m;
color_xyz[i] = QVector4D(0,0,0,1);
color_xyz[i] = QVector4D(0,0,0,0.667);
color_xyz[i][i] = 1.;
}
axis_camera = new Camera();
@@ -155,13 +155,13 @@ bool RendererService::fillCurrentHandleObjects() {
selection_center = sol[0]->worldPos();
else
selection_center = bb.center();
QMatrix4x4 rm;
axis_mat = QMatrix4x4();
if ((sol.size() == 1) && (current_handle >= htRotateX)) {
rm.rotate(sol[0]->angles_.z(), 0., 0., 1.);
rm.rotate(sol[0]->angles_.y(), 0., 1., 0.);
rm.rotate(sol[0]->angles_.x(), 1., 0., 0.);
axis_mat.rotate(sol[0]->angles_.z(), 0., 0., 1.);
axis_mat.rotate(sol[0]->angles_.y(), 0., 1., 0.);
axis_mat.rotate(sol[0]->angles_.x(), 1., 0., 0.);
}
fillHandleObjects(selection_center, current_handle, rm);
fillHandleObjects(selection_center, current_handle, axis_mat);
return true;
}
@@ -211,11 +211,14 @@ void RendererService::renderService() {
/// handles
if (fillCurrentHandleObjects()) {
f->glEnable(GL_BLEND);
f->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
Mesh * hm = currentHandleMesh();
if (hm) {
hm->loadObjects(r->view, cur_objects);
hm->draw(f, 3);
}
f->glDisable(GL_BLEND);
}
/// axis

2
qglengine/renderer_service.h
View File

@@ -64,7 +64,7 @@ private:
Mesh * axis_mesh, * handle_move_mesh, * handle_rotate_mesh, * handle_scale_mesh;
Mesh * box_mesh_f, * omni_mesh_f, * box_mesh, * omni_mesh;
QMatrix4x4 v_mat;
QMatrix4x4 v_mat, axis_mat;
QVector3D selection_center;
QVector<QMatrix4x4> mat_xyz;
QVector<QVector4D> color_xyz;