#4683 clang-format on all files in ApplicationCode

This commit is contained in:
Magne Sjaastad
2019-09-06 10:40:57 +02:00
parent 3a317504bb
commit fe9e567825
2092 changed files with 117952 additions and 111846 deletions

View File

@@ -2,17 +2,17 @@
//
// Copyright (C) Statoil ASA
// Copyright (C) Ceetron Solutions AS
//
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
@@ -35,101 +35,134 @@
#include "cvfDrawableGeo.h"
#include "cvfPart.h"
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
void RivScalarMapperUtils::applyTextureResultsToPart(cvf::Part* part, cvf::Vec2fArray* textureCoords, const cvf::ScalarMapper* mapper, float opacityLevel, caf::FaceCulling faceCulling, bool disableLighting, const cvf::Color3f& undefColor)
void RivScalarMapperUtils::applyTextureResultsToPart( cvf::Part* part,
cvf::Vec2fArray* textureCoords,
const cvf::ScalarMapper* mapper,
float opacityLevel,
caf::FaceCulling faceCulling,
bool disableLighting,
const cvf::Color3f& undefColor )
{
CVF_ASSERT(part && textureCoords && mapper);
CVF_ASSERT( part && textureCoords && mapper );
cvf::DrawableGeo* dg = dynamic_cast<cvf::DrawableGeo*>(part->drawable());
if (dg) dg->setTextureCoordArray(textureCoords);
cvf::DrawableGeo* dg = dynamic_cast<cvf::DrawableGeo*>( part->drawable() );
if ( dg ) dg->setTextureCoordArray( textureCoords );
cvf::ref<cvf::Effect> scalarEffect = RivScalarMapperUtils::createScalarMapperEffect(mapper, opacityLevel, faceCulling, disableLighting, undefColor);
part->setEffect(scalarEffect.p());
cvf::ref<cvf::Effect> scalarEffect = RivScalarMapperUtils::createScalarMapperEffect( mapper,
opacityLevel,
faceCulling,
disableLighting,
undefColor );
part->setEffect( scalarEffect.p() );
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
void RivScalarMapperUtils::applyTernaryTextureResultsToPart(cvf::Part* part, cvf::Vec2fArray* textureCoords, const RivTernaryScalarMapper* mapper, float opacityLevel, caf::FaceCulling faceCulling, bool disableLighting)
void RivScalarMapperUtils::applyTernaryTextureResultsToPart( cvf::Part* part,
cvf::Vec2fArray* textureCoords,
const RivTernaryScalarMapper* mapper,
float opacityLevel,
caf::FaceCulling faceCulling,
bool disableLighting )
{
CVF_ASSERT(part && textureCoords && mapper);
CVF_ASSERT( part && textureCoords && mapper );
cvf::DrawableGeo* dg = dynamic_cast<cvf::DrawableGeo*>(part->drawable());
if (dg) dg->setTextureCoordArray(textureCoords);
cvf::DrawableGeo* dg = dynamic_cast<cvf::DrawableGeo*>( part->drawable() );
if ( dg ) dg->setTextureCoordArray( textureCoords );
cvf::ref<cvf::Effect> scalarEffect = RivScalarMapperUtils::createTernaryScalarMapperEffect(mapper, opacityLevel, faceCulling, disableLighting);
part->setEffect(scalarEffect.p());
cvf::ref<cvf::Effect> scalarEffect = RivScalarMapperUtils::createTernaryScalarMapperEffect( mapper,
opacityLevel,
faceCulling,
disableLighting );
part->setEffect( scalarEffect.p() );
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
cvf::ref<cvf::Effect> RivScalarMapperUtils::createCellEdgeEffect(cvf::DrawableGeo* dg,
const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper,
size_t gridIndex,
size_t timeStepIndex,
RimEclipseCellColors* cellResultColors,
RimCellEdgeColors* cellEdgeResultColors,
float opacityLevel,
cvf::Color3f defaultColor,
caf::FaceCulling faceCulling,
bool disableLighting)
cvf::ref<cvf::Effect>
RivScalarMapperUtils::createCellEdgeEffect( cvf::DrawableGeo* dg,
const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper,
size_t gridIndex,
size_t timeStepIndex,
RimEclipseCellColors* cellResultColors,
RimCellEdgeColors* cellEdgeResultColors,
float opacityLevel,
cvf::Color3f defaultColor,
caf::FaceCulling faceCulling,
bool disableLighting )
{
CellEdgeEffectGenerator cellFaceEffectGen(cellEdgeResultColors->legendConfig()->scalarMapper());
CellEdgeEffectGenerator cellFaceEffectGen( cellEdgeResultColors->legendConfig()->scalarMapper() );
if (cellResultColors->isTernarySaturationSelected())
if ( cellResultColors->isTernarySaturationSelected() )
{
RivCellEdgeGeometryUtils::addTernaryCellEdgeResultsToDrawableGeo(timeStepIndex, cellResultColors, cellEdgeResultColors,
quadToCellFaceMapper, dg, gridIndex, opacityLevel);
RivCellEdgeGeometryUtils::addTernaryCellEdgeResultsToDrawableGeo( timeStepIndex,
cellResultColors,
cellEdgeResultColors,
quadToCellFaceMapper,
dg,
gridIndex,
opacityLevel );
const RivTernaryScalarMapper* ternaryCellScalarMapper = cellResultColors->ternaryLegendConfig()->scalarMapper();
cellFaceEffectGen.setTernaryScalarMapper(ternaryCellScalarMapper);
cellFaceEffectGen.setTernaryScalarMapper( ternaryCellScalarMapper );
}
else
{
bool useDefaultValueForHugeVals = false;
if (!cellResultColors->hasResult())
if ( !cellResultColors->hasResult() )
{
useDefaultValueForHugeVals = true;
}
RivCellEdgeGeometryUtils::addCellEdgeResultsToDrawableGeo(timeStepIndex, cellResultColors, cellEdgeResultColors,
quadToCellFaceMapper, dg, gridIndex, useDefaultValueForHugeVals, opacityLevel);
RivCellEdgeGeometryUtils::addCellEdgeResultsToDrawableGeo( timeStepIndex,
cellResultColors,
cellEdgeResultColors,
quadToCellFaceMapper,
dg,
gridIndex,
useDefaultValueForHugeVals,
opacityLevel );
if (cellResultColors->hasResult())
if ( cellResultColors->hasResult() )
{
// If no scalar mapper is set for the effect, a default color is used to fill the texture
// This is what we want when the fault colors should be visible in combination with cell edge
cvf::ScalarMapper* cellScalarMapper = cellResultColors->legendConfig()->scalarMapper();
cellFaceEffectGen.setScalarMapper(cellScalarMapper);
cellFaceEffectGen.setScalarMapper( cellScalarMapper );
}
}
cellFaceEffectGen.setOpacityLevel(opacityLevel);
cellFaceEffectGen.setDefaultCellColor(defaultColor);
cellFaceEffectGen.setFaceCulling(faceCulling);
cellFaceEffectGen.disableLighting(disableLighting);
cellFaceEffectGen.setOpacityLevel( opacityLevel );
cellFaceEffectGen.setDefaultCellColor( defaultColor );
cellFaceEffectGen.setFaceCulling( faceCulling );
cellFaceEffectGen.disableLighting( disableLighting );
cvf::ref<cvf::Effect> eff = cellFaceEffectGen.generateCachedEffect();
return eff;
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
cvf::ref<cvf::Effect> RivScalarMapperUtils::createScalarMapperEffect(const cvf::ScalarMapper* mapper, float opacityLevel, caf::FaceCulling faceCulling, bool disableLighting, const cvf::Color3f& undefColor)
cvf::ref<cvf::Effect> RivScalarMapperUtils::createScalarMapperEffect( const cvf::ScalarMapper* mapper,
float opacityLevel,
caf::FaceCulling faceCulling,
bool disableLighting,
const cvf::Color3f& undefColor )
{
CVF_ASSERT(mapper);
CVF_ASSERT( mapper );
caf::PolygonOffset polygonOffset = caf::PO_1;
caf::ScalarMapperEffectGenerator scalarEffgen(mapper, polygonOffset);
scalarEffgen.setOpacityLevel(opacityLevel);
scalarEffgen.setFaceCulling(faceCulling);
scalarEffgen.setUndefinedColor(undefColor);
scalarEffgen.disableLighting(disableLighting);
caf::PolygonOffset polygonOffset = caf::PO_1;
caf::ScalarMapperEffectGenerator scalarEffgen( mapper, polygonOffset );
scalarEffgen.setOpacityLevel( opacityLevel );
scalarEffgen.setFaceCulling( faceCulling );
scalarEffgen.setUndefinedColor( undefColor );
scalarEffgen.disableLighting( disableLighting );
cvf::ref<cvf::Effect> scalarEffect = scalarEffgen.generateCachedEffect();
@@ -137,21 +170,23 @@ cvf::ref<cvf::Effect> RivScalarMapperUtils::createScalarMapperEffect(const cvf::
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
cvf::ref<cvf::Effect> RivScalarMapperUtils::createTernaryScalarMapperEffect(const RivTernaryScalarMapper* mapper, float opacityLevel, caf::FaceCulling faceCulling, bool disableLighting)
cvf::ref<cvf::Effect> RivScalarMapperUtils::createTernaryScalarMapperEffect( const RivTernaryScalarMapper* mapper,
float opacityLevel,
caf::FaceCulling faceCulling,
bool disableLighting )
{
CVF_ASSERT(mapper);
CVF_ASSERT( mapper );
caf::PolygonOffset polygonOffset = caf::PO_1;
RivTernaryScalarMapperEffectGenerator scalarEffgen(mapper, polygonOffset);
scalarEffgen.setOpacityLevel(opacityLevel);
scalarEffgen.setFaceCulling(faceCulling);
scalarEffgen.setUndefinedColor(RiaColorTables::undefinedCellColor());
scalarEffgen.disableLighting(disableLighting);
caf::PolygonOffset polygonOffset = caf::PO_1;
RivTernaryScalarMapperEffectGenerator scalarEffgen( mapper, polygonOffset );
scalarEffgen.setOpacityLevel( opacityLevel );
scalarEffgen.setFaceCulling( faceCulling );
scalarEffgen.setUndefinedColor( RiaColorTables::undefinedCellColor() );
scalarEffgen.disableLighting( disableLighting );
cvf::ref<cvf::Effect> scalarEffect = scalarEffgen.generateCachedEffect();
return scalarEffect;
}