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

Warning fixes

Browse source
This commit is contained in:
Anthony J. Thibault 2015-11-20 14:50:42 -08:00
parent 30087ef0bd
commit 2f37335d77
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -87,9 +87,6 @@ void Rig::overrideAnimation(const QString& url, float fps, bool loop, float firs
_animVars.set("userAnimB", _userAnimState == UserAnimState::B); _animVars.set("userAnimB", _userAnimState == UserAnimState::B);
} }
const float FRAMES_PER_SECOND = 30.0f;
const float FADE_FRAMES = 30.0f;
void Rig::restoreAnimation() { void Rig::restoreAnimation() {
if (_currentUserAnimURL != "") { if (_currentUserAnimURL != "") {
_currentUserAnimURL = ""; _currentUserAnimURL = "";
@ -691,7 +688,7 @@ void Rig::updateAnimations(float deltaTime, glm::mat4 rootTransform) {
// evaluate the animation // evaluate the animation
AnimNode::Triggers triggersOut; AnimNode::Triggers triggersOut;
_relativePoses = _animNode->evaluate(_animVars, deltaTime, triggersOut); _relativePoses = _animNode->evaluate(_animVars, deltaTime, triggersOut);
if (_relativePoses.size() != _animSkeleton->getNumJoints()) { if ((int)_relativePoses.size() != _animSkeleton->getNumJoints()) {
// animations haven't fully loaded yet. // animations haven't fully loaded yet.
_relativePoses = _animSkeleton->getRelativeBindPoses(); _relativePoses = _animSkeleton->getRelativeBindPoses();
} }
@ -913,8 +910,6 @@ glm::quat Rig::avatarToGeometryZForward(const glm::quat& quat) const {
void Rig::updateFromHandParameters(const HandParameters& params, float dt) { void Rig::updateFromHandParameters(const HandParameters& params, float dt) {
if (_animSkeleton && _animNode) { if (_animSkeleton && _animNode) {
AnimPose rootBindPose = _animSkeleton->getRootAbsoluteBindPoseByChildName("LeftHand");
if (params.isLeftEnabled) { if (params.isLeftEnabled) {
_animVars.set("leftHandPosition", avatarToGeometry(params.leftPosition)); _animVars.set("leftHandPosition", avatarToGeometry(params.leftPosition));
_animVars.set("leftHandRotation", avatarToGeometryZForward(params.leftOrientation)); _animVars.set("leftHandRotation", avatarToGeometryZForward(params.leftOrientation));
@ -1005,9 +1000,9 @@ void Rig::applyOverridePoses() {
return; return;
} }
ASSERT(_animSkeleton->getNumJoints() == _relativePoses.size()); ASSERT(_animSkeleton->getNumJoints() == (int)_relativePoses.size());
ASSERT(_animSkeleton->getNumJoints() == _overrideFlags.size()); ASSERT(_animSkeleton->getNumJoints() == (int)_overrideFlags.size());
ASSERT(_animSkeleton->getNumJoints() == _overridePoses.size()); ASSERT(_animSkeleton->getNumJoints() == (int)_overridePoses.size());
for (size_t i = 0; i < _overrideFlags.size(); i++) { for (size_t i = 0; i < _overrideFlags.size(); i++) {
if (_overrideFlags[i]) { if (_overrideFlags[i]) {
@ -1021,7 +1016,7 @@ void Rig::buildAbsolutePoses() {
return; return;
} }
ASSERT(_animSkeleton->getNumJoints() == _relativePoses.size()); ASSERT(_animSkeleton->getNumJoints() == (int)_relativePoses.size());
_absolutePoses.resize(_relativePoses.size()); _absolutePoses.resize(_relativePoses.size());
for (int i = 0; i < (int)_relativePoses.size(); i++) { for (int i = 0; i < (int)_relativePoses.size(); i++) {

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

@ -108,7 +108,6 @@ void Model::initJointTransforms() {
if (!_geometry || !_geometry->isLoaded()) { if (!_geometry || !_geometry->isLoaded()) {
return; return;
} }
const FBXGeometry& geometry = _geometry->getFBXGeometry();
glm::mat4 modelOffset = glm::scale(_scale) * glm::translate(_offset); glm::mat4 modelOffset = glm::scale(_scale) * glm::translate(_offset);
_rig->setModelOffset(modelOffset); _rig->setModelOffset(modelOffset);
} }
@ -933,8 +932,6 @@ void Model::updateRig(float deltaTime, glm::mat4 parentTransform) {
} }
void Model::simulateInternal(float deltaTime) { void Model::simulateInternal(float deltaTime) {
// update the world space transforms for all joints // update the world space transforms for all joints
const FBXGeometry& geometry = _geometry->getFBXGeometry();
glm::mat4 parentTransform = glm::scale(_scale) * glm::translate(_offset); glm::mat4 parentTransform = glm::scale(_scale) * glm::translate(_offset);
updateRig(deltaTime, parentTransform); updateRig(deltaTime, parentTransform);
} }