Merge branch 'master' of hg::https://www.mitsuba-renderer.org/repos/mitsuba
commit
11c5ef7458
|
@ -221,8 +221,8 @@ class MTS_EXPORT_CORE half
|
|||
|
||||
unsigned short _h;
|
||||
|
||||
static MTS_EXPORT_CORE uif _toFloat[1 << 16];
|
||||
static MTS_EXPORT_CORE unsigned short _eLut[1 << 9];
|
||||
static uif _toFloat[1 << 16];
|
||||
static unsigned short _eLut[1 << 9];
|
||||
};
|
||||
|
||||
//-----------
|
||||
|
|
|
@ -179,9 +179,9 @@ template <typename Scalar> struct Resampler {
|
|||
m_weights = new Scalar[m_taps];
|
||||
Float sum = 0;
|
||||
for (int i=0; i<m_taps; i++) {
|
||||
Float weight = (Scalar) rfilter->eval((Float) (i-m_halfTaps));
|
||||
Scalar weight = (Scalar) rfilter->eval((Float) (i-m_halfTaps));
|
||||
m_weights[i] = weight;
|
||||
sum += weight;
|
||||
sum += (Float) weight;
|
||||
}
|
||||
Float normalization = 1.0f / sum;
|
||||
for (int i=0; i<m_taps; i++) {
|
||||
|
|
|
@ -1884,7 +1884,7 @@ std::map<std::string, Bitmap *> Bitmap::split() const {
|
|||
|
||||
ChannelMap channels;
|
||||
for (size_t i=0; i<m_channelNames.size(); ++i)
|
||||
channels[boost::to_lower_copy(m_channelNames[i])] = i;
|
||||
channels[boost::to_lower_copy(m_channelNames[i])] = (int) i;
|
||||
|
||||
for (size_t i=0; i<m_channelNames.size(); ++i) {
|
||||
std::string name = boost::to_lower_copy(m_channelNames[i]);
|
||||
|
@ -1951,7 +1951,7 @@ std::map<std::string, Bitmap *> Bitmap::split() const {
|
|||
channels.erase(prefix + "y");
|
||||
} else {
|
||||
extractFormat = ELuminance;
|
||||
extractChannels.push_back(i);
|
||||
extractChannels.push_back((int) i);
|
||||
channels.erase(name);
|
||||
}
|
||||
|
||||
|
@ -1989,7 +1989,7 @@ ref<Bitmap> Bitmap::extractChannels(EPixelFormat fmt, const std::vector<int> &ch
|
|||
Log(EError, "Bitmap::extractChannel(%i): channel index "
|
||||
"must be between 0 and %i", channels[i], channelCount-1);
|
||||
|
||||
ref<Bitmap> result = new Bitmap(fmt, m_componentFormat, m_size, channels.size());
|
||||
ref<Bitmap> result = new Bitmap(fmt, m_componentFormat, m_size, (int) channels.size());
|
||||
result->setMetadata(m_metadata);
|
||||
result->setGamma(m_gamma);
|
||||
|
||||
|
@ -2851,7 +2851,7 @@ void Bitmap::readOpenEXR(Stream *stream, const std::string &_prefix) {
|
|||
if (multichannel) {
|
||||
for (Imf::ChannelList::ConstIterator it = channels.begin(); it != channels.end(); ++it)
|
||||
sourceChannels.push_back(it.name());
|
||||
m_channelCount = sourceChannels.size();
|
||||
m_channelCount = (int) sourceChannels.size();
|
||||
m_pixelFormat = EMultiChannel;
|
||||
formatString = "Multichannel";
|
||||
} else if (spectral) {
|
||||
|
|
|
@ -53,6 +53,10 @@ static AABB shapekdtree_getAABB(const ShapeKDTree *kdtree) {
|
|||
return kdtree->getAABB();
|
||||
}
|
||||
|
||||
static bool shapekdtree_isBuilt(const ShapeKDTree *kdtree) {
|
||||
return kdtree->isBuilt();
|
||||
}
|
||||
|
||||
static bp::object shapekdtree_rayIntersect(const ShapeKDTree *kdtree, const Ray &ray) {
|
||||
Intersection its;
|
||||
|
||||
|
@ -330,7 +334,7 @@ void export_render() {
|
|||
.def("getPrimitiveCount", &ShapeKDTree::getPrimitiveCount)
|
||||
.def("addShape", &ShapeKDTree::addShape)
|
||||
.def("build", &ShapeKDTree::build)
|
||||
.def("isBuilt", &ShapeKDTree::isBuilt)
|
||||
.def("isBuilt", &shapekdtree_isBuilt)
|
||||
.def("getAABB", &shapekdtree_getAABB, BP_RETURN_VALUE)
|
||||
.def("getShapes", &shapekdtree_getShapes)
|
||||
.def("rayIntersect", &shapekdtree_rayIntersect);
|
||||
|
|
Loading…
Reference in New Issue