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

tweak

Browse source
This commit is contained in:
Seth Alves 2015-10-13 14:13:53 -07:00
parent 8b72f6e7c6
commit fcbb107bc0
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/avatar/AvatarActionHold.cpp
View file

@ -63,11 +63,8 @@ void AvatarActionHold::updateActionWorker(float deltaTimeStep) {
if (gotLock) { if (gotLock) {
gotLock = withTryWriteLock([&]{ gotLock = withTryWriteLock([&]{
if (_positionalTarget != position || _rotationalTarget != rotation) { _positionalTarget = position;
auto ownerEntity = _ownerEntity.lock(); _rotationalTarget = rotation;
_positionalTarget = position;
_rotationalTarget = rotation;
}
}); });
} }

7
libraries/entities/src/EntityItemProperties.h
View file

@ -370,7 +370,12 @@ inline QDebug operator<<(QDebug debug, const EntityItemProperties& properties) {
DEBUG_PROPERTY_IF_CHANGED(debug, properties, VoxelSurfaceStyle, voxelSurfaceStyle, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, VoxelSurfaceStyle, voxelSurfaceStyle, "");
DEBUG_PROPERTY_IF_CHANGED(debug, properties, Href, href, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, Href, href, "");
DEBUG_PROPERTY_IF_CHANGED(debug, properties, Description, description, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, Description, description, "");
DEBUG_PROPERTY_IF_CHANGED(debug, properties, ActionData, actionData, "");
// DEBUG_PROPERTY_IF_CHANGED(debug, properties, ActionData, actionData, "");
if (properties.actionDataChanged()) {
debug << " " << "actionData" << ":" << properties.getActionData().toHex() << "" << "\n";
}
DEBUG_PROPERTY_IF_CHANGED(debug, properties, XTextureURL, xTextureURL, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, XTextureURL, xTextureURL, "");
DEBUG_PROPERTY_IF_CHANGED(debug, properties, YTextureURL, yTextureURL, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, YTextureURL, yTextureURL, "");
DEBUG_PROPERTY_IF_CHANGED(debug, properties, ZTextureURL, zTextureURL, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, ZTextureURL, zTextureURL, "");

3
libraries/physics/src/ObjectActionSpring.cpp
View file

@ -38,6 +38,7 @@ ObjectActionSpring::~ObjectActionSpring() {
} }
void ObjectActionSpring::updateActionWorker(btScalar deltaTimeStep) { void ObjectActionSpring::updateActionWorker(btScalar deltaTimeStep) {
// don't risk hanging the thread running the physics simulation
auto lockResult = withTryReadLock([&]{ auto lockResult = withTryReadLock([&]{
auto ownerEntity = _ownerEntity.lock(); auto ownerEntity = _ownerEntity.lock();
if (!ownerEntity) { if (!ownerEntity) {
@ -100,9 +101,7 @@ void ObjectActionSpring::updateActionWorker(btScalar deltaTimeStep) {
} }
}); });
if (!lockResult) { if (!lockResult) {
// don't risk hanging the thread running the physics simulation
qDebug() << "ObjectActionSpring::updateActionWorker lock failed"; qDebug() << "ObjectActionSpring::updateActionWorker lock failed";
return;
} }
} }