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

don't use string comparison when polling for changed animation URL

Browse source
This commit is contained in:
Andrew Meadows 2018-09-17 15:29:18 -07:00
parent 0c61779331
commit da0d70af3f
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -976,7 +976,20 @@ QStringList RenderableModelEntityItem::getJointNames() const {
} }
void RenderableModelEntityItem::setAnimationURL(const QString& url) { void RenderableModelEntityItem::setAnimationURL(const QString& url) {
QString oldURL = getAnimationURL();
ModelEntityItem::setAnimationURL(url); ModelEntityItem::setAnimationURL(url);
if (oldURL != getAnimationURL()) {
_needsAnimationReset = true;
}
}
bool RenderableModelEntityItem::needsAnimationReset() const {
return _needsAnimationReset;
}
QString RenderableModelEntityItem::getAnimationURLAndReset() {
_needsAnimationReset = false;
return getAnimationURL();
} }
scriptable::ScriptableModelBase render::entities::ModelEntityRenderer::getScriptableModel() { scriptable::ScriptableModelBase render::entities::ModelEntityRenderer::getScriptableModel() {
@ -1477,7 +1490,8 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
if (_animating) { if (_animating) {
DETAILED_PROFILE_RANGE(simulation_physics, "Animate"); DETAILED_PROFILE_RANGE(simulation_physics, "Animate");
if (_animation && (_animation->getURL().toString() != entity->getAnimationURL())) { // bad check if (_animation && entity->needsAnimationReset()) {
//(_animation->getURL().toString() != entity->getAnimationURL())) { // bad check
// the joints have been mapped before but we have a new animation to load // the joints have been mapped before but we have a new animation to load
_animation.reset(); _animation.reset();
_jointMappingCompleted = false; _jointMappingCompleted = false;
@ -1527,7 +1541,7 @@ void ModelEntityRenderer::mapJoints(const TypedEntityPointer& entity, const Mode
} }
if (!_animation) { if (!_animation) {
_animation = DependencyManager::get<AnimationCache>()->getAnimation(entity->getAnimationURL()); _animation = DependencyManager::get<AnimationCache>()->getAnimation(entity->getAnimationURLAndReset());
} }
if (_animation && _animation->isLoaded()) { if (_animation && _animation->isLoaded()) {

3
libraries/entities-renderer/src/RenderableModelEntityItem.h
View file

@ -115,6 +115,8 @@ public:
virtual QStringList getJointNames() const override; virtual QStringList getJointNames() const override;
void setAnimationURL(const QString& url) override; void setAnimationURL(const QString& url) override;
bool needsAnimationReset() const;
QString getAnimationURLAndReset();
private: private:
bool needsUpdateModelBounds() const; bool needsUpdateModelBounds() const;
@ -130,6 +132,7 @@ private:
bool _originalTexturesRead { false }; bool _originalTexturesRead { false };
bool _dimensionsInitialized { true }; bool _dimensionsInitialized { true };
bool _needsJointSimulation { false }; bool _needsJointSimulation { false };
bool _needsAnimationReset { false };
}; };
namespace render { namespace entities { namespace render { namespace entities {