Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-08 04:42:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix linker error and build warnings

Browse source
This commit is contained in:
sabrina-shanman 2019-01-24 14:43:43 -08:00
parent 64ef8b6919
commit 5993aab174
4 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/model-baker/CMakeLists.txt
View file

@ -1,6 +1,4 @@
set(TARGET_NAME model-baker)
setup_hifi_library()
link_hifi_libraries(shared task gpu graphics)
include_hifi_library_headers(hfm)
link_hifi_libraries(shared task gpu graphics hfm)

4
libraries/model-baker/src/model-baker/Baker.cpp
View file

@ -56,11 +56,11 @@ namespace baker {
blendshapesPerMeshOut = blendshapesPerMeshIn;
for (int i = 0; i < blendshapesPerMeshOut.size(); i++) {
for (int i = 0; i < (int)blendshapesPerMeshOut.size(); i++) {
const auto& normalsPerBlendshape = normalsPerBlendshapePerMesh[i];
const auto& tangentsPerBlendshape = tangentsPerBlendshapePerMesh[i];
auto& blendshapesOut = blendshapesPerMeshOut[i];
for (int j = 0; j < blendshapesOut.size(); j++) {
for (int j = 0; j < (int)blendshapesOut.size(); j++) {
const auto& normals = normalsPerBlendshape[j];
const auto& tangents = tangentsPerBlendshape[j];
auto& blendshape = blendshapesOut[j];

2
libraries/model-baker/src/model-baker/CalculateMeshNormalsTask.cpp
View file

@ -18,7 +18,7 @@ void CalculateMeshNormalsTask::run(const baker::BakeContextPointer& context, con
auto& normalsPerMeshOut = output;
normalsPerMeshOut.reserve(meshes.size());
for (int i = 0; i < meshes.size(); i++) {
for (int i = 0; i < (int)meshes.size(); i++) {
const auto& mesh = meshes[i];
normalsPerMeshOut.emplace_back();
auto& normalsOut = normalsPerMeshOut[normalsPerMeshOut.size()-1];

3
libraries/model-baker/src/model-baker/CalculateMeshTangentsTask.cpp
View file

@ -20,11 +20,10 @@ void CalculateMeshTangentsTask::run(const baker::BakeContextPointer& context, co
auto& tangentsPerMeshOut = output;
tangentsPerMeshOut.reserve(meshes.size());
for (int i = 0; i < meshes.size(); i++) {
for (int i = 0; i < (int)meshes.size(); i++) {
const auto& mesh = meshes[i];
const auto& tangentsIn = mesh.tangents;
const auto& normals = normalsPerMesh[i];
const auto& vertices = mesh.vertices;
tangentsPerMeshOut.emplace_back();
auto& tangentsOut = tangentsPerMeshOut[tangentsPerMeshOut.size()-1];