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

Merge 10.0.0.234:src/hifi-master into set-model-entity-joints

Browse source
This commit is contained in:
Seth Alves 2016-01-04 14:43:23 -08:00
commit bb7a1515c6
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -713,8 +713,8 @@ bool RenderableModelEntityItem::setAbsoluteJointRotationInObjectFrame(int index,
bool result = false; bool result = false;
_jointDataLock.withWriteLock([&] { _jointDataLock.withWriteLock([&] {
resizeJointArrays(); resizeJointArrays();
if (index >= 0 && index < _absoluteJointRotationsInObjectFrame.size() && if (index >= 0 && index < _absoluteJointRotationsInObjectFrame.size() /* &&
_absoluteJointRotationsInObjectFrame[index] != rotation) { _absoluteJointRotationsInObjectFrame[index] != rotation*/) {
_absoluteJointRotationsInObjectFrame[index] = rotation; _absoluteJointRotationsInObjectFrame[index] = rotation;
_absoluteJointRotationsInObjectFrameSet[index] = true; _absoluteJointRotationsInObjectFrameSet[index] = true;
_absoluteJointRotationsInObjectFrameDirty[index] = true; _absoluteJointRotationsInObjectFrameDirty[index] = true;
@ -728,8 +728,8 @@ bool RenderableModelEntityItem::setAbsoluteJointTranslationInObjectFrame(int ind
bool result = false; bool result = false;
_jointDataLock.withWriteLock([&] { _jointDataLock.withWriteLock([&] {
resizeJointArrays(); resizeJointArrays();
if (index >= 0 && index < _absoluteJointTranslationsInObjectFrame.size() && if (index >= 0 && index < _absoluteJointTranslationsInObjectFrame.size() /* &&
_absoluteJointTranslationsInObjectFrame[index] != translation) { _absoluteJointTranslationsInObjectFrame[index] != translation*/) {
_absoluteJointTranslationsInObjectFrame[index] = translation; _absoluteJointTranslationsInObjectFrame[index] = translation;
_absoluteJointTranslationsInObjectFrameSet[index] = true; _absoluteJointTranslationsInObjectFrameSet[index] = true;
_absoluteJointTranslationsInObjectFrameDirty[index] = true; _absoluteJointTranslationsInObjectFrameDirty[index] = true;

1
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -891,6 +891,7 @@ bool EntityScriptingInterface::setAbsoluteJointsDataInObjectFrame(const QUuid& e
EntityItemProperties properties; EntityItemProperties properties;
_entityTree->withWriteLock([&] { _entityTree->withWriteLock([&] {
properties = entity->getProperties(); properties = entity->getProperties();
entity->setLastEdited(now);
entity->setLastBroadcast(now); entity->setLastBroadcast(now);
}); });