From 5300963183126ad491b7b1ab559f89f91c117bc2 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 11 Dec 2015 15:25:36 -0800 Subject: [PATCH] More warning fixes --- libraries/animation/src/AnimSkeleton.cpp | 4 ++-- libraries/animation/src/AnimSkeleton.h | 2 +- libraries/animation/src/Rig.cpp | 4 ++-- libraries/animation/src/Rig.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/animation/src/AnimSkeleton.cpp b/libraries/animation/src/AnimSkeleton.cpp index 8dcb2157c5..72fd806a1d 100644 --- a/libraries/animation/src/AnimSkeleton.cpp +++ b/libraries/animation/src/AnimSkeleton.cpp @@ -39,8 +39,8 @@ int AnimSkeleton::nameToJointIndex(const QString& jointName) const { return -1; } -size_t AnimSkeleton::getNumJoints() const { - return _joints.size(); +int AnimSkeleton::getNumJoints() const { + return (int)_joints.size(); } const AnimPose& AnimSkeleton::getAbsoluteBindPose(int jointIndex) const { diff --git a/libraries/animation/src/AnimSkeleton.h b/libraries/animation/src/AnimSkeleton.h index 73e31d090a..7312fea6b1 100644 --- a/libraries/animation/src/AnimSkeleton.h +++ b/libraries/animation/src/AnimSkeleton.h @@ -27,7 +27,7 @@ public: AnimSkeleton(const std::vector& joints); int nameToJointIndex(const QString& jointName) const; const QString& getJointName(int jointIndex) const; - size_t getNumJoints() const; + int getNumJoints() const; // absolute pose, not relative to parent const AnimPose& getAbsoluteBindPose(int jointIndex) const; diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp index 950ac58ae2..56135ce821 100644 --- a/libraries/animation/src/Rig.cpp +++ b/libraries/animation/src/Rig.cpp @@ -233,8 +233,8 @@ bool Rig::jointStatesEmpty() { return _internalPoseSet._relativePoses.empty(); } -size_t Rig::getJointStateCount() const { - return _internalPoseSet._relativePoses.size(); +int Rig::getJointStateCount() const { + return (int)_internalPoseSet._relativePoses.size(); } int Rig::indexOfJoint(const QString& jointName) const { diff --git a/libraries/animation/src/Rig.h b/libraries/animation/src/Rig.h index 8d8d425112..e3ec5d18cf 100644 --- a/libraries/animation/src/Rig.h +++ b/libraries/animation/src/Rig.h @@ -89,7 +89,7 @@ public: void initJointStates(const FBXGeometry& geometry, const glm::mat4& modelOffset); void reset(const FBXGeometry& geometry); bool jointStatesEmpty(); - size_t getJointStateCount() const; + int getJointStateCount() const; int indexOfJoint(const QString& jointName) const; void setModelOffset(const glm::mat4& modelOffsetMat);