Janitor : Add missing includes (GNU 8.3.0)

This commit is contained in:
Magne Sjaastad 2021-02-22 17:12:50 +01:00
parent c542b457a6
commit 7d5268987c
9 changed files with 107 additions and 11 deletions

View File

@ -33,6 +33,8 @@
#include "cvfBoundingBox.h"
#include "cvfMath.h"
#include <algorithm>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@ -30,12 +30,14 @@
#include "cvfShaderProgramGenerator.h"
#include "cvfShaderSourceProvider.h"
#include "cvfTexture.h"
#include "cvfUniform.h"
#include "cvfqtUtils.h"
#include "cvfUniform.h"
#include <QFile>
#include <QTextStream>
#include <algorithm>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -67,6 +69,46 @@ void CellEdgeEffectGenerator::setTernaryScalarMapper( const RivTernaryScalarMapp
m_ternaryCellScalarMapper = ternaryScalarMapper;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void CellEdgeEffectGenerator::setOpacityLevel( float opacity )
{
m_opacityLevel = std::clamp( opacity, 0.0f, 1.0f );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void CellEdgeEffectGenerator::setUndefinedColor( cvf::Color3f color )
{
m_undefinedColor = color;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void CellEdgeEffectGenerator::setFaceCulling( caf::FaceCulling faceCulling )
{
m_cullBackfaces = faceCulling;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void CellEdgeEffectGenerator::setDefaultCellColor( cvf::Color3f color )
{
m_defaultCellColor = color;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void CellEdgeEffectGenerator::disableLighting( bool disable )
{
m_disableLighting = disable;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@ -106,11 +106,11 @@ public:
void setScalarMapper( const cvf::ScalarMapper* cellScalarMapper );
void setTernaryScalarMapper( const RivTernaryScalarMapper* ternaryScalarMapper );
void setOpacityLevel( float opacity ) { m_opacityLevel = std::clamp( opacity, 0.0f, 1.0f ); }
void setUndefinedColor( cvf::Color3f color ) { m_undefinedColor = color; }
void setFaceCulling( caf::FaceCulling faceCulling ) { m_cullBackfaces = faceCulling; }
void setDefaultCellColor( cvf::Color3f color ) { m_defaultCellColor = color; }
void disableLighting( bool disable ) { m_disableLighting = disable; }
void setOpacityLevel( float opacity );
void setUndefinedColor( cvf::Color3f color );
void setFaceCulling( caf::FaceCulling faceCulling );
void setDefaultCellColor( cvf::Color3f color );
void disableLighting( bool disable );
protected:
bool isEqual( const EffectGenerator* other ) const override;

View File

@ -18,8 +18,11 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RivTernaryScalarMapper.h"
#include "cvfTextureImage.h"
#include <algorithm>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@ -36,6 +36,8 @@
#include "cvfTexture2D_FF.h"
#include "cvfUniform.h"
#include <algorithm>
//==================================================================================================
//
// RivTernaryScalarMapperEffectGenerator
@ -57,6 +59,46 @@ RivTernaryScalarMapperEffectGenerator::RivTernaryScalarMapperEffectGenerator( co
m_disableLighting = false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivTernaryScalarMapperEffectGenerator::setOpacityLevel( float opacity )
{
m_opacityLevel = std::clamp( opacity, 0.0f, 1.0f );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivTernaryScalarMapperEffectGenerator::setUndefinedColor( cvf::Color3f color )
{
m_undefinedColor = color;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivTernaryScalarMapperEffectGenerator::setFaceCulling( caf::FaceCulling faceCulling )
{
m_faceCulling = faceCulling;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivTernaryScalarMapperEffectGenerator::enableDepthWrite( bool enableWrite )
{
m_enableDepthWrite = enableWrite;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivTernaryScalarMapperEffectGenerator::disableLighting( bool disable )
{
m_disableLighting = disable;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@ -38,11 +38,11 @@ class RivTernaryScalarMapperEffectGenerator : public caf::EffectGenerator
public:
RivTernaryScalarMapperEffectGenerator( const RivTernaryScalarMapper* scalarMapper, caf::PolygonOffset polygonOffset );
void setOpacityLevel( float opacity ) { m_opacityLevel = std::clamp( opacity, 0.0f, 1.0f ); }
void setUndefinedColor( cvf::Color3f color ) { m_undefinedColor = color; }
void setFaceCulling( caf::FaceCulling faceCulling ) { m_faceCulling = faceCulling; }
void enableDepthWrite( bool enableWrite ) { m_enableDepthWrite = enableWrite; }
void disableLighting( bool disable ) { m_disableLighting = disable; }
void setOpacityLevel( float opacity );
void setUndefinedColor( cvf::Color3f color );
void setFaceCulling( caf::FaceCulling faceCulling );
void enableDepthWrite( bool enableWrite );
void disableLighting( bool disable );
public:
static bool isImagesEqual( const cvf::TextureImage* texImg1, const cvf::TextureImage* texImg2 );

View File

@ -32,6 +32,8 @@
#include "cvfGeometryTools.h"
#include <algorithm>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@ -20,9 +20,12 @@
#include "qwt_plot.h"
#include "qwt_scale_div.h"
#include <QEvent>
#include <QWheelEvent>
#include <algorithm>
#define RIU_LOGARITHMIC_MINIMUM 1.0e-15
#define RIU_SCROLLWHEEL_ZOOMFACTOR 1.1
#define RIU_SCROLLWHEEL_PANFACTOR 0.1

View File

@ -26,6 +26,8 @@
#include <QPaintEvent>
#include <QPainter>
#include <algorithm>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------