Skip to content
2 changes: 1 addition & 1 deletion openpgl/device/Device.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ static tbb::task_scheduler_init g_opgl_tbb_threads(tbb::task_scheduler_init::def

struct IDevice
{
virtual ~IDevice(){};
virtual ~IDevice() {};
virtual ISurfaceVolumeField *newField(PGLFieldArguments args) const = 0;
virtual ISurfaceVolumeField *newFieldFromFile(const std::string fieldFileName) const = 0;
};
Expand Down
4 changes: 2 additions & 2 deletions openpgl/directional/ISurfaceSamplingDistribution.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ struct ISurfaceSamplingDistribution
{
// ISurfaceSamplingDistribution() = delete;

ISurfaceSamplingDistribution(){};
ISurfaceSamplingDistribution() {};

virtual ~ISurfaceSamplingDistribution(){};
virtual ~ISurfaceSamplingDistribution() {};

virtual void init(const void *distribution, Point3 samplePosition) = 0;

Expand Down
4 changes: 2 additions & 2 deletions openpgl/directional/IVolumeSamplingDistribution.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ struct IVolumeSamplingDistribution
{
// IVolumeSamplingDistribution() = delete;

IVolumeSamplingDistribution(){};
IVolumeSamplingDistribution() {};

virtual ~IVolumeSamplingDistribution(){};
virtual ~IVolumeSamplingDistribution() {};

virtual void init(const void *distribution, Point3 samplePosition) = 0;

Expand Down
28 changes: 18 additions & 10 deletions openpgl/directional/dqt/DQTFactory.h
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,11 @@ class DirectionalQuadtreeFactory
{
return true;
}

std::string toString() const
{
return "";
}
};

struct FittingStatistics
Expand All @@ -174,17 +179,20 @@ class DirectionalQuadtreeFactory
uint32_t numMerges = 0;
};

void prepareSamples([[maybe_unused]] SampleData *samples, [[maybe_unused]] const size_t numSamples, [[maybe_unused]] const SampleStatistics &sampleStatistics, [[maybe_unused]] const Configuration &cfg) const {}
void prepareSamples([[maybe_unused]] SampleData *samples, [[maybe_unused]] const size_t numSamples, [[maybe_unused]] const SampleStatistics &sampleStatistics,
[[maybe_unused]] const Configuration &cfg) const
{}

void updateFluenceEstimate(Distribution &dist, const SampleData *samples, const size_t numSamples, const size_t numZeroValueSamples,
const SampleStatistics &sampleStatistics) const
void updateFluenceEstimate([[maybe_unused]] Distribution &dist, [[maybe_unused]] const SampleData *samples, [[maybe_unused]] const size_t numSamples,
[[maybe_unused]] const size_t numZeroValueSamples, [[maybe_unused]] const SampleStatistics &sampleStatistics) const
{}

void updateVolumeScatterProbability(Distribution &dist, Statistics &stats, const SampleData *samples, const size_t numSamples, const ZeroValueSampleData *zeroValueSamples,
const size_t numZeroValueSamples, const bool varianceBased) const
void updateVolumeScatterProbability([[maybe_unused]] Distribution &dist, [[maybe_unused]] Statistics &stats, [[maybe_unused]] const SampleData *samples,
[[maybe_unused]] const size_t numSamples, [[maybe_unused]] const ZeroValueSampleData *zeroValueSamples,
[[maybe_unused]] const size_t numZeroValueSamples, [[maybe_unused]] const bool varianceBased) const
{}

void fit(Distribution &dist, Statistics &stats, const SampleData *samples, const size_t numSamples, const Configuration &cfg, FittingStatistics &fitStats)
void fit(Distribution &dist, Statistics &stats, const SampleData *samples, const size_t numSamples, const Configuration &cfg, FittingStatistics &fitStats) const
{
for (uint32_t i = 0; i < 5; i++)
{
Expand All @@ -194,7 +202,7 @@ class DirectionalQuadtreeFactory
}
}

void update(Distribution &dist, Statistics &stats, const SampleData *samples, const size_t numSamples, const Configuration &cfg, FittingStatistics &fitStats)
void update(Distribution &dist, Statistics &stats, const SampleData *samples, const size_t numSamples, const Configuration &cfg, FittingStatistics &fitStats) const
{
Context ctx = {&dist, &stats, &fitStats, samples, numSamples, &cfg};

Expand Down Expand Up @@ -237,7 +245,7 @@ class DirectionalQuadtreeFactory

// Internal Update Routines
template <LeafEstimator TLeafEstimator, SplitMetric TSplitMetric, bool TIsFootprintFactorNonZero>
void updateInternal(Context &ctx)
void updateInternal(Context &ctx) const
{
ctx.fitStats->numSamples = ctx.stats->numSamples += ctx.numSamples;

Expand Down Expand Up @@ -327,7 +335,7 @@ class DirectionalQuadtreeFactory
}
}

void buildRecursive(Context &ctx, std::vector<StatsNode> &old_nodes, Rect<float> rect, uint32_t i, uint32_t j, uint32_t level = 0)
void buildRecursive(Context &ctx, std::vector<StatsNode> &old_nodes, Rect<float> rect, uint32_t i, uint32_t j, uint32_t level = 0) const
{
StatsNode &old_node = old_nodes[i];
ctx.stats->nodes[j] = old_node;
Expand Down Expand Up @@ -368,7 +376,7 @@ class DirectionalQuadtreeFactory
}
}

void buildSplit(Context &ctx, Rect<float> rect, uint32_t p, uint32_t i, uint32_t level)
void buildSplit(Context &ctx, Rect<float> rect, uint32_t p, uint32_t i, uint32_t level) const
{
const auto &parent = ctx.stats->nodes[p];
auto &node = ctx.stats->nodes[i];
Expand Down
10 changes: 5 additions & 5 deletions openpgl/directional/dqt/DQTSurfaceSamplingDistribution.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ namespace openpgl
template <class TDirectionalQuadtree>
struct DQTSurfaceSamplingDistribution : public ISurfaceSamplingDistribution
{
DQTSurfaceSamplingDistribution(){};
DQTSurfaceSamplingDistribution() {};

virtual ~DQTSurfaceSamplingDistribution() override{};
virtual ~DQTSurfaceSamplingDistribution() override {};

virtual void init(const void *distribution, [[maybe_unused]] Point3 samplePosition) override
{
Expand Down Expand Up @@ -49,12 +49,12 @@ struct DQTSurfaceSamplingDistribution : public ISurfaceSamplingDistribution
return distribution.pdf(dir);
};
#ifdef OPENPGL_RADIANCE_CACHES
inline Vector3 incomingRadiance(const Vector3 dir, const bool directLightMIS) const override
inline Vector3 incomingRadiance([[maybe_unused]] const Vector3 dir, [[maybe_unused]] const bool directLightMIS) const override
{
return Vector3(0.f, 0.f, 0.f);
}

inline Vector3 irradiance(const Vector3 normal, const bool directLightMIS) const override
inline Vector3 irradiance([[maybe_unused]] const Vector3 normal, [[maybe_unused]] const bool directLightMIS) const override
{
return Vector3(0.f, 0.f, 0.f);
}
Expand Down Expand Up @@ -88,7 +88,7 @@ struct DQTSurfaceSamplingDistribution : public ISurfaceSamplingDistribution
}

#ifdef OPENPGL_VSP_GUIDING
float volumeScatterProbability(Vector3 dir) const override
float volumeScatterProbability([[maybe_unused]] Vector3 dir) const override
{
return 0.f;
}
Expand Down
12 changes: 6 additions & 6 deletions openpgl/directional/dqt/DQTVolumeSamplingDistribution.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ namespace openpgl
template <class TDirectionalQuadtree>
struct DQTVolumeSamplingDistribution : public IVolumeSamplingDistribution
{
DQTVolumeSamplingDistribution(){};
DQTVolumeSamplingDistribution() {};

virtual ~DQTVolumeSamplingDistribution() override{};
virtual ~DQTVolumeSamplingDistribution() override {};

virtual void init(const void *distribution, [[maybe_unused]] Point3 samplePosition) override
{
Expand Down Expand Up @@ -39,7 +39,7 @@ struct DQTVolumeSamplingDistribution : public IVolumeSamplingDistribution
};

#ifdef OPENPGL_RADIANCE_CACHES
inline Vector3 incomingRadiance(const Vector3 dir, const bool directLightMIS) const override
inline Vector3 incomingRadiance([[maybe_unused]] const Vector3 dir, [[maybe_unused]] const bool directLightMIS) const override
{
return Vector3(0.f, 0.f, 0.f);
}
Expand All @@ -49,12 +49,12 @@ struct DQTVolumeSamplingDistribution : public IVolumeSamplingDistribution
return m_region->getOutgoingRadiance(dir);
}

inline Vector3 inScatteredRadiance(const Vector3 dir, const float g, const bool directLightMIS) const override
inline Vector3 inScatteredRadiance([[maybe_unused]] const Vector3 dir, [[maybe_unused]] const float g, [[maybe_unused]] const bool directLightMIS) const override
{
return Vector3(0.f, 0.f, 0.f);
}

inline Vector3 fluence(const bool directLightMIS) const override
inline Vector3 fluence([[maybe_unused]] const bool directLightMIS) const override
{
return Vector3(0.f, 0.f, 0.f);
}
Expand Down Expand Up @@ -94,7 +94,7 @@ struct DQTVolumeSamplingDistribution : public IVolumeSamplingDistribution
}

#ifdef OPENPGL_VSP_GUIDING
float volumeScatterProbability(Vector3 dir) const override
float volumeScatterProbability([[maybe_unused]] Vector3 dir) const override
{
return 0.f;
}
Expand Down
2 changes: 1 addition & 1 deletion openpgl/directional/vmm/VMMSurfaceSamplingDistribution.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ struct __aligned(TVMMDistribution::VectorSize * 4) VMMSurfaceSamplingDistributio
{
OPENPGL_ALIGNED_STRUCT_(TVMMDistribution::VectorSize * 4)

VMMSurfaceSamplingDistribution(){};
VMMSurfaceSamplingDistribution() {};
~VMMSurfaceSamplingDistribution() override = default;

typedef std::integral_constant<size_t, 2> MaxNumProductDistributions;
Expand Down
2 changes: 1 addition & 1 deletion openpgl/directional/vmm/VMMVolumeSamplingDistribution.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ template <class TVMMDistribution, bool UseParallaxCompensation>
struct __aligned(TVMMDistribution::VectorSize * 4) VMMVolumeSamplingDistribution : public IVolumeSamplingDistribution
{
OPENPGL_ALIGNED_STRUCT_(TVMMDistribution::VectorSize * 4)
VMMVolumeSamplingDistribution() : IVolumeSamplingDistribution(){};
VMMVolumeSamplingDistribution() : IVolumeSamplingDistribution() {};
~VMMVolumeSamplingDistribution() override = default;

typedef std::integral_constant<size_t, OPENPGL_VMM_NUM_PHASE_COMP> MaxNumProductDistributions;
Expand Down
4 changes: 2 additions & 2 deletions openpgl/field/Field.h
Original file line number Diff line number Diff line change
Expand Up @@ -488,9 +488,9 @@ struct Field
std::cout << "!!!! " << (m_isSurface ? "Surface" : "Volume") << " regionStorage.first.valid !!! " << regionStorage.first.distribution.toString()
<< std::endl;
#endif
regionStorage.first.numSplits = 0;
regionStorage.first.initialized = true;
}
regionStorage.first.numSplits = 0;
regionStorage.first.initialized = true;
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion openpgl/field/ISurfaceVolumeField.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ struct ISurfaceVolumeField
{
using SampleContainer = SampleDataStorage::SampleContainer;

virtual ~ISurfaceVolumeField(){};
virtual ~ISurfaceVolumeField() {};

virtual ISurfaceSamplingDistribution *newSurfaceSamplingDistribution() const = 0;

Expand Down
Loading
Loading