aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Fadel <samuelfadel@gmail.com>2016-01-12 11:12:55 +0100
committerSamuel Fadel <samuelfadel@gmail.com>2016-01-12 11:13:02 +0100
commitdf657b8e4ba24c561b96e8ce48811a408474960c (patch)
tree34ec0d20307f5d3db317c9154c61b668d1f6f300
parent3e71b2587352a00e7bc8ba414da4691a612cf591 (diff)
VoronoiSplat: renamed internal variables for clarity.
-rw-r--r--voronoisplat.cpp20
-rw-r--r--voronoisplat.h2
2 files changed, 11 insertions, 11 deletions
diff --git a/voronoisplat.cpp b/voronoisplat.cpp
index d064def..adf144f 100644
--- a/voronoisplat.cpp
+++ b/voronoisplat.cpp
@@ -216,19 +216,19 @@ void VoronoiSplatTexture::bind()
bool VoronoiSplatTexture::updateTexture()
{
- if (!m_sitesUpdated && !m_valuesUpdated && !m_colormapUpdated) {
+ if (!m_sitesChanged && !m_valuesChanged && !m_colormapChanged) {
// Texture is already updated
return false;
}
// Update OpenGL buffers and textures as needed
- if (m_sitesUpdated) {
+ if (m_sitesChanged) {
updateSites();
}
- if (m_valuesUpdated) {
+ if (m_valuesChanged) {
updateValues();
}
- if (m_colormapUpdated) {
+ if (m_colormapChanged) {
updateColormap();
}
@@ -305,7 +305,7 @@ void VoronoiSplatTexture::updateSites()
// Compute DT values for the new positions
computeDT();
- m_sitesUpdated = false;
+ m_sitesChanged = false;
}
void VoronoiSplatTexture::updateValues()
@@ -315,7 +315,7 @@ void VoronoiSplatTexture::updateValues()
gl.glBufferData(GL_ARRAY_BUFFER, m_values.size() * sizeof(float),
m_values.data(), GL_DYNAMIC_DRAW);
- m_valuesUpdated = false;
+ m_valuesChanged = false;
}
void VoronoiSplatTexture::updateColormap()
@@ -324,7 +324,7 @@ void VoronoiSplatTexture::updateColormap()
gl.glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, COLORMAP_SAMPLES, 1, GL_RGB,
GL_FLOAT, m_cmap.data());
- m_colormapUpdated = false;
+ m_colormapChanged = false;
}
void VoronoiSplatTexture::computeDT()
@@ -379,7 +379,7 @@ void VoronoiSplatTexture::setSites(const arma::mat &points)
m_sites[2*i + 1] = sy(col[i]);
}
- m_sitesUpdated = true;
+ m_sitesChanged = true;
}
void VoronoiSplatTexture::setValues(const arma::vec &values)
@@ -393,7 +393,7 @@ void VoronoiSplatTexture::setValues(const arma::vec &values)
LinearScale<float> scale(values.min(), values.max(), 0, 1.0f);
std::transform(values.begin(), values.end(), m_values.begin(), scale);
- m_valuesUpdated = true;
+ m_valuesChanged = true;
}
void VoronoiSplatTexture::setColormap(const ColorScale *scale)
@@ -414,5 +414,5 @@ void VoronoiSplatTexture::setColormap(const ColorScale *scale)
t += step;
}
- m_colormapUpdated = true;
+ m_colormapChanged = true;
}
diff --git a/voronoisplat.h b/voronoisplat.h
index 5663f8b..9859e8d 100644
--- a/voronoisplat.h
+++ b/voronoisplat.h
@@ -58,7 +58,7 @@ private:
std::vector<float> m_sites, m_values, m_cmap;
QSize m_size;
- bool m_sitesUpdated, m_valuesUpdated, m_colormapUpdated;
+ bool m_sitesChanged, m_valuesChanged, m_colormapChanged;
};
#endif // VORONOISPLAT_H