OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-03 20:57:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2544 Well CF Visualization: Add support for no lighting

Browse Source
This commit is contained in:
Magne Sjaastad 2018-03-15 19:20:40 +01:00
parent f55d029256
commit eb6b7450eb
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ModelVisualization/RivVirtualConnFactorPartMgr.cpp
View File

@ -144,7 +144,9 @@ void RivVirtualConnFactorPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBa
auto scalarMapper = m_virtualPerforationResult->legendConfig()->scalarMapper();
cvf::ref<cvf::Part> part = RivVirtualConnFactorPartMgr::createPart(centerColorPairs, radius, scalarMapper);
bool disableLighting = eclView->isLightingDisabled();
cvf::ref<cvf::Part> part =
RivVirtualConnFactorPartMgr::createPart(centerColorPairs, radius, scalarMapper, disableLighting);
model->addPart(part.p());
}
@ -155,7 +157,8 @@ void RivVirtualConnFactorPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBa
//--------------------------------------------------------------------------------------------------
cvf::ref<cvf::Part> RivVirtualConnFactorPartMgr::createPart(std::vector<CompletionVizData>& vizDataItems,
double radius,
cvf::ScalarMapper* scalarMapper)
cvf::ScalarMapper* scalarMapper,
bool disableLighting)
{
std::vector<cvf::Vec3f> verticesForOneObject;
std::vector<cvf::uint> indicesForOneObject;
@ -215,7 +218,6 @@ cvf::ref<cvf::Part> RivVirtualConnFactorPartMgr::createPart(std::vector<Completi
caf::ScalarMapperEffectGenerator effGen(scalarMapper, caf::PO_1);
bool disableLighting = true;
effGen.disableLighting(disableLighting);
cvf::ref<cvf::Effect> eff = effGen.generateCachedEffect();
@ -340,9 +342,9 @@ cvf::Mat4f RivVirtualConnFactorPartMgr::rotationMatrixBetweenVectors(const cvf::
rotAxis.normalize();
// Guard acos against out-of-domain input
const double dotProduct = Math::clamp(v1*v2, -1.0, 1.0);
const double angle = Math::acos(dotProduct);
Mat4d rotMat = Mat4d::fromRotation(rotAxis, angle);
const double dotProduct = Math::clamp(v1 * v2, -1.0, 1.0);
const double angle = Math::acos(dotProduct);
Mat4d rotMat = Mat4d::fromRotation(rotAxis, angle);
Mat4f myMat(rotMat);

3
ApplicationCode/ModelVisualization/RivVirtualConnFactorPartMgr.h
View File

@ -73,7 +73,8 @@ public:
private:
static cvf::ref<cvf::Part> createPart(std::vector<CompletionVizData>& centerColorPairs,
double radius,
cvf::ScalarMapper* scalarMapper);
cvf::ScalarMapper* scalarMapper,
bool disableLighting);
static void createStarGeometry(std::vector<cvf::Vec3f>* vertices, std::vector<cvf::uint>* indices, double radius, double thickness);