Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set(CMAKE_C_STANDARD 99)
set(CMAKE_C_STANDARD_REQUIRED ON)
set(CMAKE_C_EXTENSIONS OFF)

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

Expand Down
12 changes: 6 additions & 6 deletions openpgl/data/PathSegmentDataStorage.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ struct PathSegmentDataStorage
void reserve(const size_t &size)
{
#if defined(OPENPGL_PATHSEGMENT_STORAGE_USE_ARRAY)
if (m_max_sample_size == size)
if ((uint32_t)m_max_sample_size == size)
return;
if (m_segmentStorage)
delete[] m_segmentStorage;
Expand Down Expand Up @@ -248,8 +248,8 @@ struct PathSegmentDataStorage
openpgl::Vector3(currentPathSegment.scatteringWeight.x, currentPathSegment.scatteringWeight.y, currentPathSegment.scatteringWeight.z);
openpgl::Vector3 scatteredContribution =
openpgl::Vector3(currentPathSegment.scatteredContribution.x, currentPathSegment.scatteredContribution.y, currentPathSegment.scatteredContribution.z);
openpgl::Vector3 directContribution =
openpgl::Vector3(currentPathSegment.directContribution.x, currentPathSegment.directContribution.y, currentPathSegment.directContribution.z);
//openpgl::Vector3 directContribution =
// openpgl::Vector3(currentPathSegment.directContribution.x, currentPathSegment.directContribution.y, currentPathSegment.directContribution.z);
#endif
float pdf = std::max(minPDF, currentPathSegment.pdfDirectionIn);
uint32_t flags{0};
Expand Down Expand Up @@ -296,7 +296,7 @@ struct PathSegmentDataStorage
}
if (directContribution[0] > 0.f || directContribution[1] > 0.f || directContribution[2] > 0.f)
{
if (j == i + 1)
if ((int)j == i + 1)
{
if (contribution[0] > 0.f || contribution[1] > 0.f || contribution[2] > 0.f)
{
Expand Down Expand Up @@ -579,7 +579,7 @@ struct PathSegmentDataStorage
#endif

bool valid = true;
for (int s = 0; s < numSegments; s++)
for (uint32_t s = 0; s < numSegments; s++)
{
PathSegmentData psd = m_segmentStorage[s];
valid = valid && isValid(psd);
Expand All @@ -605,7 +605,7 @@ struct PathSegmentDataStorage
std::stringstream ss;
ss << "PathSegmentDataStorage:" << std::endl;
ss << "segment storage: size = " << numSegments << std::endl;
for (int s = 0; s < numSegments; s++)
for (uint32_t s = 0; s < numSegments; s++)
{
PathSegmentData psd = m_segmentStorage[s];
ss << "seg[" << s << "]: " << openpgl::toString(psd);
Expand Down
50 changes: 25 additions & 25 deletions openpgl/data/SampleDataStorage.h
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ struct SampleDataStorage
return m_surfaceContainer.samples.size();
}

inline SampleData getSampleSurface(const int idx) const
inline SampleData getSampleSurface(const uint32_t idx) const
{
OPENPGL_ASSERT(idx >= 0);
OPENPGL_ASSERT(idx < m_surfaceContainer.samples.size());
Expand Down Expand Up @@ -165,7 +165,7 @@ struct SampleDataStorage
return m_volumeContainer.samples.size();
}

inline SampleData getSampleVolume(const int idx) const
inline SampleData getSampleVolume(const uint32_t idx) const
{
OPENPGL_ASSERT(idx >= 0);
OPENPGL_ASSERT(idx < m_volumeContainer.samples.size());
Expand Down Expand Up @@ -198,7 +198,7 @@ struct SampleDataStorage
return m_surfaceContainer.zeroValueSamples.size();
}

inline ZeroValueSampleData getZeroValueSampleSurface(const int idx) const
inline ZeroValueSampleData getZeroValueSampleSurface(const uint32_t idx) const
{
OPENPGL_ASSERT(idx >= 0);
OPENPGL_ASSERT(idx < m_surfaceContainer.zeroValueSamples.size());
Expand Down Expand Up @@ -231,7 +231,7 @@ struct SampleDataStorage
return m_volumeContainer.zeroValueSamples.size();
}

inline ZeroValueSampleData getZeroValueSampleVolume(const int idx) const
inline ZeroValueSampleData getZeroValueSampleVolume(const uint32_t idx) const
{
OPENPGL_ASSERT(idx >= 0);
OPENPGL_ASSERT(idx < m_volumeContainer.zeroValueSamples.size());
Expand Down Expand Up @@ -351,12 +351,12 @@ struct SampleDataStorage
bool validate() const
{
bool valid = true;
for (int i = 0; i < m_surfaceContainer.samples.size(); i++)
for (uint32_t i = 0; i < m_surfaceContainer.samples.size(); i++)
{
valid = valid && isValid(m_surfaceContainer.samples[i]);
}

for (int i = 0; i < m_volumeContainer.samples.size(); i++)
for (uint32_t i = 0; i < m_volumeContainer.samples.size(); i++)
{
valid = valid && isValid(m_volumeContainer.samples[i]);
}
Expand All @@ -365,22 +365,22 @@ struct SampleDataStorage

void merge(const SampleDataStorage &b)
{
for (int i = 0; i < b.m_surfaceContainer.samples.size(); i++)
for (uint32_t i = 0; i < b.m_surfaceContainer.samples.size(); i++)
{
m_surfaceContainer.samples.push_back(b.m_surfaceContainer.samples[i]);
}

for (int i = 0; i < b.m_volumeContainer.samples.size(); i++)
for (uint32_t i = 0; i < b.m_volumeContainer.samples.size(); i++)
{
m_volumeContainer.samples.push_back(b.m_volumeContainer.samples[i]);
}

for (int i = 0; i < b.m_surfaceContainer.zeroValueSamples.size(); i++)
for (uint32_t i = 0; i < b.m_surfaceContainer.zeroValueSamples.size(); i++)
{
m_surfaceContainer.zeroValueSamples.push_back(b.m_surfaceContainer.zeroValueSamples[i]);
}

for (int i = 0; i < b.m_volumeContainer.zeroValueSamples.size(); i++)
for (uint32_t i = 0; i < b.m_volumeContainer.zeroValueSamples.size(); i++)
{
m_volumeContainer.zeroValueSamples.push_back(b.m_volumeContainer.zeroValueSamples[i]);
}
Expand All @@ -403,13 +403,13 @@ struct SampleDataStorage
surfaceSampleDataA.resize(m_surfaceContainer.samples.size());
volumeSampleDataA.resize(m_volumeContainer.samples.size());

for (int i = 0; i < m_surfaceContainer.samples.size(); i++)
for (uint32_t i = 0; i < m_surfaceContainer.samples.size(); i++)
{
surfaceSampleDataA[i] = m_surfaceContainer.samples[i];
}
tbb::parallel_sort(surfaceSampleDataA.begin(), surfaceSampleDataA.end(), SampleDataLess);

for (int i = 0; i < m_volumeContainer.samples.size(); i++)
for (uint32_t i = 0; i < m_volumeContainer.samples.size(); i++)
{
volumeSampleDataA[i] = m_volumeContainer.samples[i];
}
Expand All @@ -418,13 +418,13 @@ struct SampleDataStorage
surfaceZeroValueSampleDataA.resize(m_surfaceContainer.zeroValueSamples.size());
volumeZeroValueSampleDataA.resize(m_volumeContainer.zeroValueSamples.size());

for (int i = 0; i < m_surfaceContainer.zeroValueSamples.size(); i++)
for (uint32_t i = 0; i < m_surfaceContainer.zeroValueSamples.size(); i++)
{
surfaceZeroValueSampleDataA[i] = m_surfaceContainer.zeroValueSamples[i];
}
tbb::parallel_sort(surfaceZeroValueSampleDataA.begin(), surfaceZeroValueSampleDataA.end(), ZeroValueSampleDataLess);

for (int i = 0; i < m_volumeContainer.zeroValueSamples.size(); i++)
for (uint32_t i = 0; i < m_volumeContainer.zeroValueSamples.size(); i++)
{
volumeZeroValueSampleDataA[i] = m_volumeContainer.zeroValueSamples[i];
}
Expand All @@ -433,13 +433,13 @@ struct SampleDataStorage
surfaceSampleDataB.resize(b.m_surfaceContainer.samples.size());
volumeSampleDataB.resize(b.m_volumeContainer.samples.size());

for (int i = 0; i < b.m_surfaceContainer.samples.size(); i++)
for (uint32_t i = 0; i < b.m_surfaceContainer.samples.size(); i++)
{
surfaceSampleDataB[i] = b.m_surfaceContainer.samples[i];
}
tbb::parallel_sort(surfaceSampleDataB.begin(), surfaceSampleDataB.end(), SampleDataLess);

for (int i = 0; i < b.m_volumeContainer.samples.size(); i++)
for (uint32_t i = 0; i < b.m_volumeContainer.samples.size(); i++)
{
volumeSampleDataB[i] = b.m_volumeContainer.samples[i];
}
Expand All @@ -448,21 +448,21 @@ struct SampleDataStorage
surfaceZeroValueSampleDataB.resize(b.m_surfaceContainer.zeroValueSamples.size());
volumeZeroValueSampleDataB.resize(b.m_volumeContainer.zeroValueSamples.size());

for (int i = 0; i < b.m_surfaceContainer.zeroValueSamples.size(); i++)
for (uint32_t i = 0; i < b.m_surfaceContainer.zeroValueSamples.size(); i++)
{
surfaceZeroValueSampleDataB[i] = b.m_surfaceContainer.zeroValueSamples[i];
}
tbb::parallel_sort(surfaceZeroValueSampleDataB.begin(), surfaceZeroValueSampleDataB.end(), ZeroValueSampleDataLess);

for (int i = 0; i < b.m_volumeContainer.zeroValueSamples.size(); i++)
for (uint32_t i = 0; i < b.m_volumeContainer.zeroValueSamples.size(); i++)
{
volumeZeroValueSampleDataB[i] = b.m_volumeContainer.zeroValueSamples[i];
}
tbb::parallel_sort(volumeZeroValueSampleDataB.begin(), volumeZeroValueSampleDataB.end(), ZeroValueSampleDataLess);

bool equal = true;
int sizeB = surfaceSampleDataB.size();
for (int i = 0; i < surfaceSampleDataA.size(); i++)
uint32_t sizeB = surfaceSampleDataB.size();
for (uint32_t i = 0; i < surfaceSampleDataA.size(); i++)
{
if (i < sizeB && !SampleDataEqual(surfaceSampleDataA[i], surfaceSampleDataB[i]))
{
Expand All @@ -471,7 +471,7 @@ struct SampleDataStorage
}

sizeB = surfaceZeroValueSampleDataB.size();
for (int i = 0; i < surfaceZeroValueSampleDataA.size(); i++)
for (uint32_t i = 0; i < surfaceZeroValueSampleDataA.size(); i++)
{
if (i < sizeB && !ZeroValueSampleDataEqual(surfaceZeroValueSampleDataA[i], surfaceZeroValueSampleDataB[i]))
{
Expand All @@ -480,7 +480,7 @@ struct SampleDataStorage
}

sizeB = volumeSampleDataB.size();
for (int i = 0; i < volumeSampleDataA.size(); i++)
for (uint32_t i = 0; i < volumeSampleDataA.size(); i++)
{
if (i < sizeB && !SampleDataEqual(volumeSampleDataA[i], volumeSampleDataB[i]))
{
Expand All @@ -489,7 +489,7 @@ struct SampleDataStorage
}

sizeB = volumeZeroValueSampleDataB.size();
for (int i = 0; i < volumeZeroValueSampleDataA.size(); i++)
for (uint32_t i = 0; i < volumeZeroValueSampleDataA.size(); i++)
{
if (i < sizeB && !ZeroValueSampleDataEqual(volumeZeroValueSampleDataA[i], volumeZeroValueSampleDataB[i]))
{
Expand All @@ -505,7 +505,7 @@ struct SampleDataStorage
{
std::vector<SampleData> subSampledData;
subSampledData.reserve(sampleContainer.size());
for (size_t i = 0; i < sampleContainer.size(); i++)
for (uint32_t i = 0; i < sampleContainer.size(); i++)
{
subSampledData.push_back(sampleContainer[i]);
}
Expand Down Expand Up @@ -538,7 +538,7 @@ struct SampleDataStorage

if (!pointsOnly)
{
for (int i = 0; i < subSampledData.size(); i++)
for (uint32_t i = 0; i < subSampledData.size(); i++)
{
objFile << "f " << i * 3 + 1 << "\t" << i * 3 + 2 << "\t" << i * 3 + 3 << std::endl;
}
Expand Down
4 changes: 2 additions & 2 deletions openpgl/directional/OutgoingRadianceHistogram.h
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,15 @@ OPENPGL_INLINE_INTER void OutgoingRadianceHistogram::update(const SampleData *sa
const size_t numZeroValueSamples)
{
// std::cout << "OutgoingRadianceHistogram::update: numSamples = " << numSamples << "\t numZeroValueSamples = " << numZeroValueSamples << std::endl;
for (int n = 0; n < numSamples; n++)
for (uint32_t n = 0; n < numSamples; n++)
{
pgl_vec3f directionOut = samples[n].directionOut;
Vector3 dir = Vector3(directionOut.x, directionOut.y, directionOut.z);
pgl_vec3f color = samples[n].radianceOut;
Vector3 col = Vector3(color.x, color.y, color.z);
addSample(dir, col);
}
for (int n = 0; n < numZeroValueSamples; n++)
for (uint32_t n = 0; n < numZeroValueSamples; n++)
{
pgl_vec3f directionOut = zeroValueSamples[n].directionOut;
Vector3 dir = Vector3(directionOut.x, directionOut.y, directionOut.z);
Expand Down
16 changes: 8 additions & 8 deletions openpgl/directional/vmm/AdaptiveSplitandMergeFactory.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ struct AdaptiveSplitAndMergeFactory
bool useSplitAndMerge{true};

bool partialReFit{false};
int maxSplitItr{1};
uint32_t maxSplitItr{1};

int minSamplesForSplitting{0};
int minSamplesForPartialRefitting{0};
int minSamplesForMerging{0};
uint32_t minSamplesForSplitting{0};
uint32_t minSamplesForPartialRefitting{0};
uint32_t minSamplesForMerging{0};

void serialize(std::ostream &stream) const;

Expand Down Expand Up @@ -254,11 +254,11 @@ void AdaptiveSplitAndMergeFactory<TVMMDistribution>::Configuration::serialize(st
stream.write(reinterpret_cast<const char *>(&mergingThreshold), sizeof(float));

stream.write(reinterpret_cast<const char *>(&partialReFit), sizeof(bool));
stream.write(reinterpret_cast<const char *>(&maxSplitItr), sizeof(int));
stream.write(reinterpret_cast<const char *>(&maxSplitItr), sizeof(uint32_t));

stream.write(reinterpret_cast<const char *>(&minSamplesForSplitting), sizeof(int));
stream.write(reinterpret_cast<const char *>(&minSamplesForMerging), sizeof(int));
stream.write(reinterpret_cast<const char *>(&minSamplesForPartialRefitting), sizeof(int));
stream.write(reinterpret_cast<const char *>(&minSamplesForSplitting), sizeof(uint32_t));
stream.write(reinterpret_cast<const char *>(&minSamplesForMerging), sizeof(uint32_t));
stream.write(reinterpret_cast<const char *>(&minSamplesForPartialRefitting), sizeof(uint32_t));
}

template <class TVMMDistribution>
Expand Down
21 changes: 11 additions & 10 deletions openpgl/directional/vmm/ParallaxAwareVonMisesFisherMixture.h
Original file line number Diff line number Diff line change
Expand Up @@ -782,8 +782,8 @@ float ParallaxAwareVonMisesFisherMixture<VecSize, maxComponents, UseParallaxComp
const embree::vfloat<VecSize> zeros(0.0f);
const embree::vfloat<VecSize> zeroKappaNorm(ONE_OVER_FOUR_PI);

const int cnt = (_numComponents + VecSize - 1) / VecSize;
const int rem = _numComponents % VecSize;
const uint32_t cnt = (_numComponents + VecSize - 1) / VecSize;
const uint32_t rem = _numComponents % VecSize;

const embree::vfloat<VecSize> weight = _weight;
const embree::vfloat<VecSize> kappa = _kappa;
Expand All @@ -793,7 +793,7 @@ float ParallaxAwareVonMisesFisherMixture<VecSize, maxComponents, UseParallaxComp

embree::vfloat<VecSize> productIntegralVec(0.f);

for (int k = 0; k < cnt; k++)
for (uint32_t k = 0; k < cnt; k++)
{
embree::Vec3<embree::vfloat<VecSize>> newMeanDirection = _kappas[k] * _meanDirections[k] + kappa * meanDirection;
embree::vfloat<VecSize> newKappa = embree::sqrt(embree::dot(newMeanDirection, newMeanDirection));
Expand Down Expand Up @@ -832,14 +832,14 @@ float ParallaxAwareVonMisesFisherMixture<VecSize, maxComponents, UseParallaxComp
}

float productIntegral = embree::reduce_add(productIntegralVec);
for (int k = 0; k < cnt; k++)
for (uint32_t k = 0; k < cnt; k++)
{
_weights[k] /= productIntegral;
}

if (rem > 0)
{
for (size_t i = rem; i < VecSize; i++)
for (uint32_t i = rem; i < VecSize; i++)
{
_meanDirections[cnt - 1].x[i] = 0.0f;
_meanDirections[cnt - 1].y[i] = 0.0f;
Expand Down Expand Up @@ -979,7 +979,8 @@ inline void ParallaxAwareVonMisesFisherMixture<VecSize, maxComponents, UseParall
float sumWeights = 0.0f;
float cdf = 0.0f;

const div_t tmp = div(_numComponents - 1, VectorSize);
const uint32_t quot = (_numComponents - 1) / VecSize;
const uint32_t rem = (_numComponents - 1) % VecSize;;

selectedVector = 0;
selectedComponent = 0;
Expand All @@ -988,7 +989,7 @@ inline void ParallaxAwareVonMisesFisherMixture<VecSize, maxComponents, UseParall
{
cdfs[selectedVector] = vinclusive_prefix_sum(_weights[selectedVector]);
cdf = cdfs[selectedVector][VectorSize - 1];
if (sumWeights + cdf >= searched || selectedVector >= tmp.quot)
if (sumWeights + cdf >= searched || selectedVector >= quot)
{
break;
}
Expand All @@ -1002,7 +1003,7 @@ inline void ParallaxAwareVonMisesFisherMixture<VecSize, maxComponents, UseParall
{
cdfs[selectedVector] = vinclusive_prefix_sum(_weights[selectedVector]);
cdf = cdfs[selectedVector][VectorSize - 1];
if (sumWeights + cdf >= searched || selectedVector + 1 >= (tmp.quot + 1))
if (sumWeights + cdf >= searched || selectedVector + 1 >= (quot + 1))
{
break;
}
Expand All @@ -1017,7 +1018,7 @@ inline void ParallaxAwareVonMisesFisherMixture<VecSize, maxComponents, UseParall
float sumWeightsCheckPoint = sumWeights;
#endif

const uint32_t maxSelectedComponent = selectedVector == tmp.quot ? tmp.rem + 1 : VectorSize;
const uint32_t maxSelectedComponent = selectedVector == quot ? rem + 1 : VectorSize;

cdfs[selectedVector] += sumWeights;
selectedComponent = embree::select_min(cdfs[selectedVector] >= searched, cdfs[selectedVector]);
Expand Down Expand Up @@ -1139,7 +1140,7 @@ void ParallaxAwareVonMisesFisherMixture<VecSize, maxComponents, UseParallaxCompe
return;
}

const int cnt = (this->_numComponents + VectorSize - 1) / VectorSize;
const uint32_t cnt = (this->_numComponents + VectorSize - 1) / VectorSize;
// const int rem = this->_numComponents % VectorSize;

const embree::Vec3<embree::vfloat<VecSize>> shiftDirectionVec(shiftDirection);
Expand Down
Loading
Loading