Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 03:44:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2

Merge pull request from ZappoMan/RenderableModelEntityItemOptimization

Browse source 
Renderable model entity item optimizations
This commit is contained in:
Seth Alves 2015-08-10 15:10:12 -07:00
commit b26d6d2b9c
4 changed files with 17 additions and 10 deletions
libraries
animation/src
JointState.cpp
entities-renderer/src
RenderableModelEntityItem.cpp
entities/src
ModelEntityItem.cppModelEntityItem.h

12
libraries/animation/src/JointState.cpp
View file

@ -230,11 +230,13 @@ void JointState::setRotationInConstrainedFrame(glm::quat targetRotation, float p
}
void JointState::setRotationInConstrainedFrameInternal(const glm::quat& targetRotation) {
glm::quat parentRotation = computeParentRotation();
_rotationInConstrainedFrame = targetRotation;
_transformChanged = true;
// R' = Rp * Rpre * r' * Rpost
_rotation = parentRotation * _preRotation * _rotationInConstrainedFrame * _postRotation;
if (_rotationInConstrainedFrame != targetRotation) {
glm::quat parentRotation = computeParentRotation();
_rotationInConstrainedFrame = targetRotation;
_transformChanged = true;
// R' = Rp * Rpre * r' * Rpost
_rotation = parentRotation * _preRotation * _rotationInConstrainedFrame * _postRotation;
}
}
void JointState::setVisibleRotationInConstrainedFrame(const glm::quat& targetRotation) {

9
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -275,9 +275,12 @@ void RenderableModelEntityItem::render(RenderArgs* args) {
}
if (jointsMapped()) {
auto frameData = getAnimationFrame();
for (int i = 0; i < frameData.size(); i++) {
_model->setJointState(i, true, frameData[i]);
bool newFrame;
auto frameData = getAnimationFrame(newFrame);
if (newFrame) {
for (int i = 0; i < frameData.size(); i++) {
_model->setJointState(i, true, frameData[i]);
}
}
}
}

4
libraries/entities/src/ModelEntityItem.cpp
View file

@ -218,7 +218,8 @@ void ModelEntityItem::mapJoints(const QStringList& modelJointNames) {
}
}
const QVector<glm::quat>& ModelEntityItem::getAnimationFrame() {
const QVector<glm::quat>& ModelEntityItem::getAnimationFrame(bool& newFrame) {
newFrame = false;
if (!hasAnimation() || !_jointMappingCompleted) {
return _lastKnownFrameData;
@ -238,6 +239,7 @@ const QVector<glm::quat>& ModelEntityItem::getAnimationFrame() {
if (animationFrameIndex != _lastKnownFrameIndex) {
_lastKnownFrameIndex = animationFrameIndex;
newFrame = true;
const QVector<glm::quat>& rotations = frames[animationFrameIndex].rotations;

2
libraries/entities/src/ModelEntityItem.h
View file

@ -106,7 +106,7 @@ public:
float getAnimationLastFrame() const { return _animationLoop.getLastFrame(); }
void mapJoints(const QStringList& modelJointNames);
const QVector<glm::quat>& getAnimationFrame();
const QVector<glm::quat>& getAnimationFrame(bool& newFrame);
bool jointsMapped() const { return _jointMappingCompleted; }
bool getAnimationIsPlaying() const { return _animationLoop.isRunning(); }