3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Measuring - Gizmo measure - Render dimensioning auxiliary lines in light gray color

Browse Source
This commit is contained in:
enricoturri1966 2022-10-25 09:25:05 +02:00
parent 59f1c349fc
commit 5561e22ba7
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
View File

@ -933,7 +933,8 @@ void GLGizmoMeasure::render_dimensioning()
shader->set_uniform("view_model_matrix", overlap ?
ss_to_ndc_matrix * Geometry::translation_transform(v1ss_3) * q12ss * Geometry::translation_transform(-2.0 * TRIANGLE_HEIGHT * Vec3d::UnitX()) * Geometry::scale_transform({ v12ss_len + 4.0 * TRIANGLE_HEIGHT, 1.0f, 1.0f }) :
ss_to_ndc_matrix * Geometry::translation_transform(v1ss_3) * q12ss * Geometry::scale_transform({ v12ss_len, 1.0f, 1.0f }));
m_dimensioning.line.render();
m_dimensioning.line.set_color(ColorRGBA::WHITE());
m_dimensioning.line.render();
// arrow 1
shader->set_uniform("view_model_matrix", overlap ?
@ -1072,6 +1073,7 @@ void GLGizmoMeasure::render_dimensioning()
shader->set_uniform("projection_matrix", Transform3d::Identity());
shader->set_uniform("view_model_matrix", ss_to_ndc_matrix * Geometry::translation_transform({ pss.x(), pss.y(), 0.0 }) * q *
Geometry::scale_transform({ pv_projss_len, 1.0f, 1.0f }));
m_dimensioning.line.set_color(ColorRGBA::LIGHT_GRAY());
m_dimensioning.line.render();
}
};
@ -1154,6 +1156,7 @@ void GLGizmoMeasure::render_dimensioning()
shader->set_uniform("view_model_matrix", camera.get_view_matrix() * Geometry::translation_transform(center)*
Eigen::Quaternion<double>::FromTwoVectors(Vec3d::UnitX(), Measure::edge_direction(e1.first, e1.second))*
Geometry::scale_transform({ e11center_len, 1.0f, 1.0f }));
m_dimensioning.line.set_color(ColorRGBA::LIGHT_GRAY());
m_dimensioning.line.render();
}
@ -1164,6 +1167,7 @@ void GLGizmoMeasure::render_dimensioning()
shader->set_uniform("view_model_matrix", camera.get_view_matrix() * Geometry::translation_transform(center)*
Eigen::Quaternion<double>::FromTwoVectors(Vec3d::UnitX(), Measure::edge_direction(e2.first, e2.second))*
Geometry::scale_transform({ (coplanar && radius > 0.0) ? e21center_len : draw_radius, 1.0f, 1.0f }));
m_dimensioning.line.set_color(ColorRGBA::LIGHT_GRAY());
m_dimensioning.line.render();
}