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

More warning fixes

Browse source
This commit is contained in:
Atlante45 2015-12-11 15:25:36 -08:00
parent 79fdb2e882
commit 5300963183
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/animation/src/AnimSkeleton.cpp
View file

@ -39,8 +39,8 @@ int AnimSkeleton::nameToJointIndex(const QString& jointName) const {
return -1; return -1;
} }
size_t AnimSkeleton::getNumJoints() const { int AnimSkeleton::getNumJoints() const {
return _joints.size(); return (int)_joints.size();
} }
const AnimPose& AnimSkeleton::getAbsoluteBindPose(int jointIndex) const { const AnimPose& AnimSkeleton::getAbsoluteBindPose(int jointIndex) const {

2
libraries/animation/src/AnimSkeleton.h
View file

@ -27,7 +27,7 @@ public:
AnimSkeleton(const std::vector<FBXJoint>& joints); AnimSkeleton(const std::vector<FBXJoint>& joints);
int nameToJointIndex(const QString& jointName) const; int nameToJointIndex(const QString& jointName) const;
const QString& getJointName(int jointIndex) const; const QString& getJointName(int jointIndex) const;
size_t getNumJoints() const; int getNumJoints() const;
// absolute pose, not relative to parent // absolute pose, not relative to parent
const AnimPose& getAbsoluteBindPose(int jointIndex) const; const AnimPose& getAbsoluteBindPose(int jointIndex) const;

4
libraries/animation/src/Rig.cpp
View file

@ -233,8 +233,8 @@ bool Rig::jointStatesEmpty() {
return _internalPoseSet._relativePoses.empty(); return _internalPoseSet._relativePoses.empty();
} }
size_t Rig::getJointStateCount() const { int Rig::getJointStateCount() const {
return _internalPoseSet._relativePoses.size(); return (int)_internalPoseSet._relativePoses.size();
} }
int Rig::indexOfJoint(const QString& jointName) const { int Rig::indexOfJoint(const QString& jointName) const {

2
libraries/animation/src/Rig.h
View file

@ -89,7 +89,7 @@ public:
void initJointStates(const FBXGeometry& geometry, const glm::mat4& modelOffset); void initJointStates(const FBXGeometry& geometry, const glm::mat4& modelOffset);
void reset(const FBXGeometry& geometry); void reset(const FBXGeometry& geometry);
bool jointStatesEmpty(); bool jointStatesEmpty();
size_t getJointStateCount() const; int getJointStateCount() const;
int indexOfJoint(const QString& jointName) const; int indexOfJoint(const QString& jointName) const;
void setModelOffset(const glm::mat4& modelOffsetMat); void setModelOffset(const glm::mat4& modelOffsetMat);