Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 07:19:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix compile errors, maybe

Browse source
This commit is contained in:
SamGondelman 2018-08-24 15:41:25 -07:00
parent 70f4d0c634
commit ff6020e0ef
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/render-utils/src/Model.cpp
View file

@ -319,7 +319,7 @@ bool Model::updateGeometry() {
// Interleave normals and tangents // Interleave normals and tangents
// Parallel version for performance // Parallel version for performance
tbb::parallel_for(tbb::blocked_range<size_t>(0, mesh.normals.size()), [&](const tbb::blocked_range<size_t>& range) { tbb::parallel_for(tbb::blocked_range<int>(0, mesh.normals.size()), [&](const tbb::blocked_range<int>& range) {
auto normalsRange = std::make_pair(mesh.normals.begin() + range.begin(), mesh.normals.begin() + range.end()); auto normalsRange = std::make_pair(mesh.normals.begin() + range.begin(), mesh.normals.begin() + range.end());
auto tangentsRange = std::make_pair(mesh.tangents.begin() + range.begin(), mesh.tangents.begin() + range.end()); auto tangentsRange = std::make_pair(mesh.tangents.begin() + range.begin(), mesh.tangents.begin() + range.end());
auto normalsAndTangentsIt = normalsAndTangents.begin() + 2 * range.begin(); auto normalsAndTangentsIt = normalsAndTangents.begin() + 2 * range.begin();
@ -1281,7 +1281,7 @@ void Blender::run() {
} }
float normalCoefficient = vertexCoefficient * NORMAL_COEFFICIENT_SCALE; float normalCoefficient = vertexCoefficient * NORMAL_COEFFICIENT_SCALE;
const FBXBlendshape& blendshape = mesh.blendshapes.at(i); const FBXBlendshape& blendshape = mesh.blendshapes.at(i);
tbb::parallel_for(tbb::blocked_range<size_t>(0, blendshape.indices.size()), [&](const tbb::blocked_range<size_t>& range) { tbb::parallel_for(tbb::blocked_range<int>(0, blendshape.indices.size()), [&](const tbb::blocked_range<int>& range) {
for (auto j = range.begin(); j < range.end(); j++) { for (auto j = range.begin(); j < range.end(); j++) {
int index = blendshape.indices.at(j); int index = blendshape.indices.at(j);
meshVertices[index] += blendshape.vertices.at(j) * vertexCoefficient; meshVertices[index] += blendshape.vertices.at(j) * vertexCoefficient;