OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-21 22:13:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

#827 Fixed issue causing some categories to use uninitialized region of texture

Browse Source
This commit is contained in:
Magne Sjaastad 2016-09-14 08:23:50 +02:00
parent 91476b43c8
commit 8e79a781c9
2 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Fwk/AppFwk/cafVizExtensions/cafCategoryMapper.cpp
View File

@ -57,6 +57,8 @@ void CategoryMapper::setCycleColors(const Color3ubArray& colorArray)
size_t colIdx = i % colorArray.size();
m_colors[i] = colorArray[colIdx];
}
recomputeMaxTexCoord();
}
//--------------------------------------------------------------------------------------------------
@ -69,6 +71,8 @@ void CategoryMapper::setInterpolateColors(const cvf::Color3ubArray& colorArray)
if (m_categoryValues.size() > 1 && colorArray.size() > 1)
{
m_colors = *interpolateColorArray(colorArray, static_cast<cvf::uint>(m_categoryValues.size()));
recomputeMaxTexCoord();
return;
}
@ -80,6 +84,8 @@ void CategoryMapper::setInterpolateColors(const cvf::Color3ubArray& colorArray)
{
m_colors.add(colorArray[0]);
}
recomputeMaxTexCoord();
}
//--------------------------------------------------------------------------------------------------
@ -114,7 +120,17 @@ Vec2f CategoryMapper::mapToTextureCoord(double categoryValue) const
{
double normVal = normalizedValue(categoryValue);
return Vec2f(static_cast<float>(normVal), 0.5f);
double s = normVal*m_maxTexCoord;
// Clamp to the currently legal texture coord range
// Might need to add code to correct for float precision, but that is probably not the main enemy.
// Our real problem is the fact that in most cases the texture coords get treated with even less precision
// on the graphics hardware. What we would really like is to guess at the HW precision and then correct for that.
// Currently the workaround is done in updateTexture() which pads the upper end of the texture when we're not filling
// all the texture pixels.
s = Math::clamp(s, 0.0, m_maxTexCoord);
return Vec2f(static_cast<float>(s), 0.5f);
}
//--------------------------------------------------------------------------------------------------
@ -206,6 +222,31 @@ int CategoryMapper::categoryIndexForCategory(double domainValue) const
return catIndex;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void CategoryMapper::recomputeMaxTexCoord()
{
const uint numColors = static_cast<uint>(m_colors.size());
if (numColors == 0)
{
m_maxTexCoord = 1.0;
return;
}
const uint numPixelsPerColor = m_textureSize / numColors;
if (numPixelsPerColor == 0)
{
m_maxTexCoord = 1.0;
return;
}
uint texturePixelsInUse = numColors*numPixelsPerColor;
CVF_ASSERT(texturePixelsInUse <= m_textureSize);
m_maxTexCoord = static_cast<double>(texturePixelsInUse) / static_cast<double>(m_textureSize);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

6
Fwk/AppFwk/cafVizExtensions/cafCategoryMapper.h
View File

@ -45,10 +45,12 @@ private:
const cvf::String textForCategoryIndex(size_t index) const;
int categoryIndexForCategory(double domainValue) const;
void recomputeMaxTexCoord();
private:
cvf::Color3ubArray m_colors;
cvf::uint m_textureSize; // The size of texture that updateTexture() is will produce.
cvf::Color3ubArray m_colors;
cvf::uint m_textureSize; // The size of texture that updateTexture() is will produce.
double m_maxTexCoord; // The largest allowable s texture coordinate, scalar values >= m_rangeMax will get mapped to this coordinate
std::vector<int> m_categoryValues;
std::vector<cvf::String> m_categoryNames;