Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 14:59:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix more integer conversion warnings

Browse source
This commit is contained in:
sabrina-shanman 2019-09-16 09:55:25 -07:00
parent 5837053f50
commit 46616b4efd
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/ModelPropertiesDialog.cpp
View file

@ -80,7 +80,7 @@ QVariantHash ModelPropertiesDialog::getMapping() const {
// update the joint indices // update the joint indices
QVariantHash jointIndices; QVariantHash jointIndices;
for (int i = 0; i < _hfmModel.joints.size(); i++) { for (size_t i = 0; i < _hfmModel.joints.size(); i++) {
jointIndices.insert(_hfmModel.joints.at(i).name, QString::number(i)); jointIndices.insert(_hfmModel.joints.at(i).name, QString::number(i));
} }
mapping.insert(JOINT_INDEX_FIELD, jointIndices); mapping.insert(JOINT_INDEX_FIELD, jointIndices);

2
libraries/fbx/src/FST.cpp
View file

@ -77,7 +77,7 @@ FST* FST::createFSTFromModel(const QString& fstPath, const QString& modelFilePat
mapping.insert(JOINT_FIELD, joints); mapping.insert(JOINT_FIELD, joints);
QVariantHash jointIndices; QVariantHash jointIndices;
for (int i = 0; i < hfmModel.joints.size(); i++) { for (size_t i = 0; i < (size_t)hfmModel.joints.size(); i++) {
jointIndices.insert(hfmModel.joints.at(i).name, QString::number(i)); jointIndices.insert(hfmModel.joints.at(i).name, QString::number(i));
} }
mapping.insert(JOINT_INDEX_FIELD, jointIndices); mapping.insert(JOINT_INDEX_FIELD, jointIndices);

4
libraries/hfm/src/hfm/HFM.cpp
View file

@ -166,11 +166,11 @@ void HFMModel::computeKdops() {
glm::vec3(INV_SQRT_3, INV_SQRT_3, -INV_SQRT_3), glm::vec3(INV_SQRT_3, INV_SQRT_3, -INV_SQRT_3),
glm::vec3(INV_SQRT_3, -INV_SQRT_3, -INV_SQRT_3) glm::vec3(INV_SQRT_3, -INV_SQRT_3, -INV_SQRT_3)
}; };
if (joints.size() != (int)shapeVertices.size()) { if (joints.size() != shapeVertices.size()) {
return; return;
} }
// now that all joints have been scanned compute a k-Dop bounding volume of mesh // now that all joints have been scanned compute a k-Dop bounding volume of mesh
for (int i = 0; i < joints.size(); ++i) { for (size_t i = 0; i < joints.size(); ++i) {
HFMJoint& joint = joints[i]; HFMJoint& joint = joints[i];
// NOTE: points are in joint-frame // NOTE: points are in joint-frame

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

@ -37,7 +37,7 @@ namespace baker {
output.edit2() = hfmModelIn->meshIndicesToModelNames; output.edit2() = hfmModelIn->meshIndicesToModelNames;
auto& blendshapesPerMesh = output.edit3(); auto& blendshapesPerMesh = output.edit3();
blendshapesPerMesh.reserve(hfmModelIn->meshes.size()); blendshapesPerMesh.reserve(hfmModelIn->meshes.size());
for (int i = 0; i < hfmModelIn->meshes.size(); i++) { for (size_t i = 0; i < hfmModelIn->meshes.size(); i++) {
blendshapesPerMesh.push_back(hfmModelIn->meshes[i].blendshapes.toStdVector()); blendshapesPerMesh.push_back(hfmModelIn->meshes[i].blendshapes.toStdVector());
} }
output.edit4() = hfmModelIn->joints; output.edit4() = hfmModelIn->joints;