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

add some missing property handling boilerplate

Browse source
This commit is contained in:
Seth Alves 2016-01-04 16:17:00 -08:00
parent 202a6ae294
commit 3026415f03
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libraries/entities/src/EntityItemProperties.cpp
View file

@ -485,6 +485,11 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_LOCAL_POSITION, localPosition);
COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_LOCAL_ROTATION, localRotation);
COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_JOINT_ROTATIONS_SET, jointRotationsSet);
COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_JOINT_ROTATIONS, jointRotations);
COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_JOINT_TRANSLATIONS_SET, jointTranslationsSet);
COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_JOINT_TRANSLATIONS, jointTranslations);
// FIXME - I don't think these properties are supported any more
//COPY_PROPERTY_TO_QSCRIPTVALUE(glowLevel);
//COPY_PROPERTY_TO_QSCRIPTVALUE(localRenderAlpha);
@ -613,6 +618,11 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
COPY_PROPERTY_FROM_QSCRIPTVALUE(localPosition, glmVec3, setLocalPosition);
COPY_PROPERTY_FROM_QSCRIPTVALUE(localRotation, glmQuat, setLocalRotation);
COPY_PROPERTY_FROM_QSCRIPTVALUE(jointRotationsSet, qVectorBool, setJointRotationsSet);
COPY_PROPERTY_FROM_QSCRIPTVALUE(jointRotations, qVectorQuat, setJointRotations);
COPY_PROPERTY_FROM_QSCRIPTVALUE(jointTranslationsSet, qVectorBool, setJointTranslationsSet);
COPY_PROPERTY_FROM_QSCRIPTVALUE(jointTranslations, qVectorVec3, setJointTranslations);
_lastEdited = usecTimestampNow();
}
@ -1486,6 +1496,11 @@ void EntityItemProperties::markAllChanged() {
_parentIDChanged = true;
_parentJointIndexChanged = true;
_jointRotationsSetChanged = true;
_jointRotationsChanged = true;
_jointTranslationsSetChanged = true;
_jointTranslationsChanged = true;
}
/// The maximum bounding cube for the entity, independent of it's rotation.

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

@ -888,7 +888,7 @@ bool EntityScriptingInterface::setAbsoluteJointRotationsInObjectFrame(const QUui
if (result) {
EntityItemProperties properties;
_entityTree->withWriteLock([&] {
// entity->setLastEdited(now);
entity->setLastEdited(now);
entity->setLastBroadcast(now);
properties = entity->getProperties();
});
@ -916,7 +916,7 @@ bool EntityScriptingInterface::setAbsoluteJointTranslationsInObjectFrame(const Q
if (result) {
EntityItemProperties properties;
_entityTree->withWriteLock([&] {
// entity->setLastEdited(now);
entity->setLastEdited(now);
entity->setLastBroadcast(now);
properties = entity->getProperties();
});