Skip to content
Snippets Groups Projects
Commit d4146a31 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

rm remnants of use_cache

parent 52a03966
No related branches found
No related tags found
1 merge request!195trivial cleanup
Pipeline #41281 canceled
......@@ -13,14 +13,11 @@
// ************************************************************************************************
#include "Resample/Fresnel/IFresnelMap.h"
#include "Base/Pixel/DiffuseElement.h"
#include "Resample/Flux/IFlux.h"
#include "Resample/Slice/Slice.h"
#include "Resample/Slice/SliceStack.h"
#include "Resample/Specular/ISpecularStrategy.h"
IFresnelMap::IFresnelMap(const SliceStack& stack, std::unique_ptr<ISpecularStrategy>&& strategy,
bool /*useCache*/)
IFresnelMap::IFresnelMap(const SliceStack& stack, std::unique_ptr<ISpecularStrategy>&& strategy)
: m_slices(stack), m_strategy(std::move(strategy))
{
}
......
......@@ -33,8 +33,7 @@ class DiffuseElement;
class IFresnelMap {
public:
IFresnelMap(const SliceStack& stack, std::unique_ptr<ISpecularStrategy>&& strategy,
bool useCache);
IFresnelMap(const SliceStack& stack, std::unique_ptr<ISpecularStrategy>&& strategy);
virtual ~IFresnelMap();
//! Retrieves the amplitude coefficients for given wavevector and layer.
......
......@@ -19,8 +19,8 @@
#include "Resample/Slice/SliceStack.h"
MatrixFresnelMap::MatrixFresnelMap(const SliceStack& stack,
std::unique_ptr<ISpecularStrategy>&& strategy, bool useCache)
: IFresnelMap(stack, std::move(strategy), useCache)
std::unique_ptr<ISpecularStrategy>&& strategy)
: IFresnelMap(stack, std::move(strategy))
{
m_inverted_slices.clear();
for (Slice slice : m_slices) {
......
......@@ -33,8 +33,7 @@ class DiffuseElement;
class MatrixFresnelMap : public IFresnelMap {
public:
MatrixFresnelMap(const SliceStack& stack, std::unique_ptr<ISpecularStrategy>&& strategy,
bool useCache);
MatrixFresnelMap(const SliceStack& stack, std::unique_ptr<ISpecularStrategy>&& strategy);
~MatrixFresnelMap() override;
MatrixFresnelMap(const MatrixFresnelMap& other) = delete;
......
......@@ -17,8 +17,8 @@
#include "Resample/Flux/IFlux.h"
ScalarFresnelMap::ScalarFresnelMap(const SliceStack& stack,
std::unique_ptr<ISpecularStrategy>&& strategy, bool useCache)
: IFresnelMap(stack, std::move(strategy), useCache)
std::unique_ptr<ISpecularStrategy>&& strategy)
: IFresnelMap(stack, std::move(strategy))
{
}
......
......@@ -33,8 +33,7 @@ class DiffuseElement;
class ScalarFresnelMap : public IFresnelMap {
public:
ScalarFresnelMap(const SliceStack& stack, std::unique_ptr<ISpecularStrategy>&& strategy,
bool useCache);
ScalarFresnelMap(const SliceStack& stack, std::unique_ptr<ISpecularStrategy>&& strategy);
~ScalarFresnelMap() override;
ScalarFresnelMap(const ScalarFresnelMap& other) = delete;
......
......@@ -204,17 +204,16 @@ std::unique_ptr<IFresnelMap> fresnelify(const MultiLayer& sample, const SliceSta
const SimulationOptions& options)
{
SliceStack fresnelStack = slices;
bool useCache = !options.isIntegrate();
if (options.useAvgMaterials()) // modify fresnelStack
setAvgMatsInStack(fresnelStack, layouts);
if (slices.containsMagneticMaterial())
return std::make_unique<MatrixFresnelMap>(
fresnelStack,
SampleUtils::SpecularStrategyBuilder::buildMagnetic(sample.roughnessModel()), useCache);
SampleUtils::SpecularStrategyBuilder::buildMagnetic(sample.roughnessModel()));
return std::make_unique<ScalarFresnelMap>(
fresnelStack, SampleUtils::SpecularStrategyBuilder::buildScalar(sample.roughnessModel()),
useCache);
fresnelStack, SampleUtils::SpecularStrategyBuilder::buildScalar(sample.roughnessModel()));
}
} // namespace
......
......@@ -256,7 +256,7 @@ Holds all information that is needed to compute the IFlux that characterize an
C++ includes: IFresnelMap.h
";
%feature("docstring") IFresnelMap::IFresnelMap "IFresnelMap::IFresnelMap(const SliceStack &stack, std::unique_ptr< ISpecularStrategy > &&strategy, bool useCache)
%feature("docstring") IFresnelMap::IFresnelMap "IFresnelMap::IFresnelMap(const SliceStack &stack, std::unique_ptr< ISpecularStrategy > &&strategy)
";
%feature("docstring") IFresnelMap::~IFresnelMap "IFresnelMap::~IFresnelMap()
......@@ -422,7 +422,7 @@ Implementation of IFresnelMap for matrix valued reflection/transmission coeffic
C++ includes: MatrixFresnelMap.h
";
%feature("docstring") MatrixFresnelMap::MatrixFresnelMap "MatrixFresnelMap::MatrixFresnelMap(const SliceStack &stack, std::unique_ptr< ISpecularStrategy > &&strategy, bool useCache)
%feature("docstring") MatrixFresnelMap::MatrixFresnelMap "MatrixFresnelMap::MatrixFresnelMap(const SliceStack &stack, std::unique_ptr< ISpecularStrategy > &&strategy)
";
%feature("docstring") MatrixFresnelMap::~MatrixFresnelMap "MatrixFresnelMap::~MatrixFresnelMap() override
......@@ -613,7 +613,7 @@ Implementation of IFresnelMap for scalar valued reflection/transmission coeffic
C++ includes: ScalarFresnelMap.h
";
%feature("docstring") ScalarFresnelMap::ScalarFresnelMap "ScalarFresnelMap::ScalarFresnelMap(const SliceStack &stack, std::unique_ptr< ISpecularStrategy > &&strategy, bool useCache)
%feature("docstring") ScalarFresnelMap::ScalarFresnelMap "ScalarFresnelMap::ScalarFresnelMap(const SliceStack &stack, std::unique_ptr< ISpecularStrategy > &&strategy)
";
%feature("docstring") ScalarFresnelMap::~ScalarFresnelMap "ScalarFresnelMap::~ScalarFresnelMap() override
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment