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

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

Browse Source
This commit is contained in:
Пелипенко Иван
2019-11-26 21:22:48 +00:00
parent 5eaf516eae
commit 7a935aea58
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qglengine/renderer_service.cpp
View File

@@ -64,7 +64,7 @@ RendererService::RendererService(Renderer * r_): r(r_) {
omni_mesh ->scalePoints(1.3); omni_mesh ->scalePoints(1.3);
handle_move_mesh = Primitive::arrow(12, 0.06); handle_move_mesh = Primitive::arrow(12, 0.06);
handle_ms_2_mesh = Primitive::torus(8, 12, 0.5, 0.025, 90); handle_ms_2_mesh = Primitive::torus(8, 12, 0.5, 0.02, 90);
Mesh * m = Primitive::disc(8, 1., 1., true, 90); Mesh * m = Primitive::disc(8, 1., 1., true, 90);
handle_ms_2_mesh->append(m); handle_ms_2_mesh->append(m);
delete m; delete m;
@@ -235,7 +235,7 @@ void RendererService::drawCurrentHandleObjects() {
if (current_action == haScale) { if (current_action == haScale) {
hm = handle_scale_3_mesh; hm = handle_scale_3_mesh;
QVector<QMatrix4x4> mv; mv.resize(1); QVector<QMatrix4x4> mv; mv.resize(1);
QVector<QVector4D> cv; cv.fill(QVector4D(0.9, 0.9, 0.7, 1), 1); QVector<QVector4D> cv; cv.fill(QVector4D(1, 1, 0.5, 1), 1);
ids[0] = hmMaxScale; ids[0] = hmMaxScale;
fillHandleObjects(selection_center, ids, mv, cv, axis_mat, 1); fillHandleObjects(selection_center, ids, mv, cv, axis_mat, 1);
hm->loadObjects(r->view, cur_objects); hm->loadObjects(r->view, cur_objects);