Merge branch 'ire_lines' of https://github.com/ThomasWilshaw/olive into ThomasWilshaw-ire_lines

This commit is contained in:
itsmattkc
2020-05-06 00:12:37 +10:00
2 changed files with 3 additions and 2 deletions
+1 -1
View File
@@ -52,7 +52,7 @@ void main(void) {
float waveform_x = (ove_texcoord.x - waveform_uv.x) / waveform_scale;
float waveform_y = (ove_texcoord.y - waveform_uv.y) / waveform_scale;
for (int i = 0; i < waveform_dims.y; i++) {
ratio = float(i) / float(waveform_dims.y);
ratio = float(i) / float(waveform_dims.y - 1);
cur_col = texture(
ove_maintex,
vec2(waveform_x, ratio)
+2 -1
View File
@@ -98,7 +98,8 @@ void WaveformScope::DrawScope()
QFontMetrics font_metrics = QFontMetrics(QFont());
QString label;
float ire_increment = 0.1f;
float ire_steps = int(1.0 / ire_increment);
// Cast required to avoid floating point errors
int ire_steps = static_cast<int>(std::round(1.0 / ire_increment));
QVector<QLine> ire_lines(ire_steps + 1);
int font_x_offset = 0;
int font_y_offset = font_metrics.capHeight() / 2.0f;