OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

(#266) Added edge visibility calculation for when to show legend

Browse Source
This commit is contained in:
Magne Sjaastad
2015-11-16 13:37:13 +01:00
parent 2c1b960251
commit a7656e2367
2 changed files with 98 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
ApplicationCode/ModelVisualization/GridBox/RivGridBoxGenerator.cpp
View File

@@ -107,6 +107,7 @@ void RivGridBoxGenerator::updateFromCamera(const cvf::Camera* camera)
if (m_gridBoxSideParts.size() == 0) return;
std::vector<bool> sideVisibility(6, false);
for (size_t i = POS_X; i <= NEG_Z; i++)
{
cvf::Vec3f sideNorm = sideNormalOutwards((FaceType)i);
@@ -117,12 +118,87 @@ void RivGridBoxGenerator::updateFromCamera(const cvf::Camera* camera)
if (sideNorm.dot(cvf::Vec3f(camToSide)) < 0.0)
{
m_gridBoxModel->addPart(m_gridBoxSideParts[i].p());
sideVisibility[i] = true;
}
}
for (size_t i = 0; i < m_gridBoxLegendParts.size(); i++)
std::vector<bool> edgeVisibility(12, false);
computeEdgeVisibility(sideVisibility, edgeVisibility);
// We have two parts for each edge - line and text
CVF_ASSERT(m_gridBoxLegendParts.size() == (NEG_X_NEG_Y + 1)*2);
for (size_t i = POS_Z_POS_X; i <= NEG_X_NEG_Y; i++)
{
m_gridBoxModel->addPart(m_gridBoxLegendParts[i].p());
if (edgeVisibility[i])
{
m_gridBoxModel->addPart(m_gridBoxLegendParts[2 * i].p());
m_gridBoxModel->addPart(m_gridBoxLegendParts[2 * i + 1].p());
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivGridBoxGenerator::computeEdgeVisibility(const std::vector<bool>& faceVisibility, std::vector<bool>& edgeVisibility)
{
CVF_ASSERT(faceVisibility.size() == NEG_Z);
CVF_ASSERT(edgeVisibility.size() == NEG_X_NEG_Y);
// POS Z
if (faceVisibility[POS_Z] ^ faceVisibility[POS_X])
{
edgeVisibility[POS_Z_POS_X] = true;
}
if (faceVisibility[POS_Z] ^ faceVisibility[NEG_X])
{
edgeVisibility[POS_Z_NEG_X] = true;
}
if (faceVisibility[POS_Z] ^ faceVisibility[POS_Y])
{
edgeVisibility[POS_Z_POS_Y] = true;
}
if (faceVisibility[POS_Z] ^ faceVisibility[NEG_Y])
{
edgeVisibility[POS_Z_NEG_Y] = true;
}
// NEG Z
if (faceVisibility[NEG_Z] ^ faceVisibility[POS_X])
{
edgeVisibility[NEG_Z_POS_X] = true;
}
if (faceVisibility[NEG_Z] ^ faceVisibility[NEG_X])
{
edgeVisibility[NEG_Z_NEG_X] = true;
}
if (faceVisibility[NEG_Z] ^ faceVisibility[POS_Y])
{
edgeVisibility[NEG_Z_POS_Y] = true;
}
if (faceVisibility[NEG_Z] ^ faceVisibility[NEG_Y])
{
edgeVisibility[NEG_Z_NEG_Y] = true;
}
// POS X
if (faceVisibility[POS_X] ^ faceVisibility[POS_Y])
{
edgeVisibility[POS_X_POS_Y] = true;
}
if (faceVisibility[POS_X] ^ faceVisibility[NEG_Y])
{
edgeVisibility[POS_X_NEG_Y] = true;
}
// NEG X
if (faceVisibility[NEG_X] ^ faceVisibility[POS_Y])
{
edgeVisibility[NEG_X_POS_Y] = true;
}
if (faceVisibility[NEG_X] ^ faceVisibility[NEG_Y])
{
edgeVisibility[NEG_X_NEG_Y] = true;
}
}

41
ApplicationCode/ModelVisualization/GridBox/RivGridBoxGenerator.h
View File

@@ -89,27 +89,21 @@ private:
NEG_X_NEG_Y
};
private:
void createGridBoxSideParts();
void createGridBoxLegendParts();
void createLegend(EdgeType edge, cvf::Collection<cvf::Part>* parts);
void computeEdgeVisibility(const std::vector<bool>& faceVisibility, std::vector<bool>& edgeVisibility);
void computeDisplayCoords();
cvf::Vec3d displayModelCoordFromDomainCoord(const cvf::Vec3d& domainCoord) const;
cvf::Vec3f sideNormalOutwards(FaceType face);
cvf::Vec3d pointOnSide(FaceType face);
cvf::Vec3f cornerDirection(FaceType face1, FaceType face2);
private:
void createGridBoxSideParts();
void createGridBoxLegendParts();
cvf::Vec3d displayModelCoordFromDomainCoord(const cvf::Vec3d& domainCoord) const;
void createLegend(EdgeType edge, cvf::Collection<cvf::Part>* parts);
cvf::Vec3f sideNormalOutwards(FaceType face);
cvf::Vec3d pointOnSide(FaceType face);
cvf::Vec3f cornerDirection(FaceType face1, FaceType face2);
void computeDisplayCoords();
private:
cvf::Collection<cvf::Part> m_gridBoxSideParts;
cvf::Collection<cvf::Part> m_gridBoxLegendParts;
cvf::ref<cvf::ModelBasicList> m_gridBoxModel;
cvf::BoundingBox m_domainCoordsBoundingBox;
std::vector<double> m_domainCoordsXValues;
std::vector<double> m_domainCoordsYValues;
@@ -120,7 +114,12 @@ private:
std::vector<double> m_displayCoordsYValues;
std::vector<double> m_displayCoordsZValues;
double m_scaleZ;
cvf::Vec3d m_displayModelOffset;
double m_scaleZ;
cvf::Vec3d m_displayModelOffset;
cvf::Collection<cvf::Part> m_gridBoxSideParts;
cvf::Collection<cvf::Part> m_gridBoxLegendParts;
cvf::ref<cvf::ModelBasicList> m_gridBoxModel;
};