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

minor rename and formatting

Browse source
This commit is contained in:
Andrew Meadows 2014-05-30 08:28:15 -07:00
parent e21dbd8726
commit 557d7d428b
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
interface/src/renderer/Model.cpp
View file

@ -42,7 +42,7 @@ Model::Model(QObject* parent) :
_rootIndex(-1), _rootIndex(-1),
_shapesAreDirty(true), _shapesAreDirty(true),
_boundingRadius(0.0f), _boundingRadius(0.0f),
_boundingShape(), _boundingShape(),
_boundingShapeLocalOffset(0.0f), _boundingShapeLocalOffset(0.0f),
_lodDistance(0.0f), _lodDistance(0.0f),
_pupilDilation(0.0f), _pupilDilation(0.0f),
@ -104,7 +104,7 @@ void Model::setScale(const glm::vec3& scale) {
void Model::setScaleInternal(const glm::vec3& scale) { void Model::setScaleInternal(const glm::vec3& scale) {
float scaleLength = glm::length(_scale); float scaleLength = glm::length(_scale);
float relativeDeltaScale = glm::length(_scale - scale) / scaleLength; float relativeDeltaScale = glm::length(_scale - scale) / scaleLength;
const float ONE_PERCENT = 0.01f; const float ONE_PERCENT = 0.01f;
if (relativeDeltaScale > ONE_PERCENT || scaleLength < EPSILON) { if (relativeDeltaScale > ONE_PERCENT || scaleLength < EPSILON) {
_scale = scale; _scale = scale;
@ -1068,13 +1068,14 @@ void Model::simulate(float deltaTime, bool fullUpdate) {
} }
void Model::simulateInternal(float deltaTime) { void Model::simulateInternal(float deltaTime) {
// NOTE: this is a recursive call that walks all attachments, and their attachments
// update the world space transforms for all joints
// update animations // update animations
foreach (const AnimationHandlePointer& handle, _runningAnimations) { foreach (const AnimationHandlePointer& handle, _runningAnimations) {
handle->simulate(deltaTime); handle->simulate(deltaTime);
} }
// NOTE: this is a recursive call that walks all attachments, and their attachments
// update the world space transforms for all joints
for (int i = 0; i < _jointStates.size(); i++) { for (int i = 0; i < _jointStates.size(); i++) {
updateJointState(i); updateJointState(i);
} }
@ -1847,7 +1848,7 @@ JointState::JointState() :
_fbxJoint(NULL) { _fbxJoint(NULL) {
} }
void JointState::setFBXJoint(const FBXJoint* joint) { void JointState::setFBXJoint(const FBXJoint* joint) {
assert(joint != NULL); assert(joint != NULL);
_rotation = joint->rotation; _rotation = joint->rotation;
// NOTE: JointState does not own the FBXJoint to which it points. // NOTE: JointState does not own the FBXJoint to which it points.
@ -1862,18 +1863,21 @@ void JointState::copyState(const JointState& state) {
// DO NOT copy _fbxJoint // DO NOT copy _fbxJoint
} }
void JointState::computeTransforms(const glm::mat4& baseTransform, const glm::quat& parentRotation) { void JointState::computeTransforms(const glm::mat4& baseTransform, const glm::quat& baseRotation) {
assert(_fbxJoint != NULL); assert(_fbxJoint != NULL);
glm::quat combinedRotation = _fbxJoint->preRotation * _rotation * _fbxJoint->postRotation; glm::quat combinedRotation = _fbxJoint->preRotation * _rotation * _fbxJoint->postRotation;
_transform = baseTransform * glm::translate(_fbxJoint->translation) * _fbxJoint->preTransform * glm::mat4_cast(combinedRotation) * _fbxJoint->postTransform; _transform = baseTransform * glm::translate(_fbxJoint->translation) * _fbxJoint->preTransform
_combinedRotation = parentRotation * combinedRotation; * glm::mat4_cast(combinedRotation) * _fbxJoint->postTransform;
_combinedRotation = baseRotation * combinedRotation;
} }
glm::quat JointState::getJointRotation(bool fromBind) const { glm::quat JointState::getJointRotation(bool fromBind) const {
assert(_fbxJoint != NULL);
return _combinedRotation * (fromBind ? _fbxJoint->inverseBindRotation : _fbxJoint->inverseDefaultRotation); return _combinedRotation * (fromBind ? _fbxJoint->inverseBindRotation : _fbxJoint->inverseDefaultRotation);
} }
void JointState::restoreRotation(float fraction, float priority) { void JointState::restoreRotation(float fraction, float priority) {
assert(_fbxJoint != NULL);
if (priority == _animationPriority) { if (priority == _animationPriority) {
_rotation = safeMix(_rotation, _fbxJoint->rotation, fraction); _rotation = safeMix(_rotation, _fbxJoint->rotation, fraction);
_animationPriority = 0.0f; _animationPriority = 0.0f;
@ -1881,6 +1885,7 @@ void JointState::restoreRotation(float fraction, float priority) {
} }
void JointState::applyRotationDelta(const glm::quat& delta, bool constrain, float priority) { void JointState::applyRotationDelta(const glm::quat& delta, bool constrain, float priority) {
assert(_fbxJoint != NULL);
if (priority < _animationPriority) { if (priority < _animationPriority) {
return; return;
} }
@ -1900,5 +1905,6 @@ void JointState::applyRotationDelta(const glm::quat& delta, bool constrain, floa
} }
const glm::vec3& JointState::getDefaultTranslationInParentFrame() const { const glm::vec3& JointState::getDefaultTranslationInParentFrame() const {
assert(_fbxJoint != NULL);
return _fbxJoint->translation; return _fbxJoint->translation;
} }

3
interface/src/renderer/Model.h
View file

@ -40,7 +40,8 @@ public:
void copyState(const JointState& state); void copyState(const JointState& state);
void computeTransforms(const glm::mat4& baseTransform, const glm::quat& parentRotation); /// computes new _transform and _combinedRotation
void computeTransforms(const glm::mat4& baseTransform, const glm::quat& baseRotation);
/// \return rotation from the joint's default (or bind) frame to world frame /// \return rotation from the joint's default (or bind) frame to world frame
glm::quat getJointRotation(bool fromBind = false) const; glm::quat getJointRotation(bool fromBind = false) const;