diff --git a/libraries/entities/src/AnimationPropertyGroup.cpp b/libraries/entities/src/AnimationPropertyGroup.cpp index 7108f3a4cd..29b134235a 100644 --- a/libraries/entities/src/AnimationPropertyGroup.cpp +++ b/libraries/entities/src/AnimationPropertyGroup.cpp @@ -92,6 +92,13 @@ void AnimationPropertyGroup::copyFromScriptValue(const QScriptValue& object, boo COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(animationIsPlaying, bool, setRunning, getRunning); COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(animationFrameIndex, float, setFrameIndex, getFrameIndex); } + + if (_animationLoop) { + qDebug() << "copyFromScriptValue() running:" << _animationLoop->getRunning(); + } else { + qDebug() << "copyFromScriptValue() running:" << getRunning(); + } + } void AnimationPropertyGroup::setFromOldAnimationSettings(const QString& value) { @@ -203,6 +210,13 @@ bool AnimationPropertyGroup::appendToEditPacket(OctreePacketData* packetData, APPEND_ENTITY_PROPERTY(PROP_ANIMATION_START_AUTOMATICALLY, getStartAutomatically()); } + if (_animationLoop) { + qDebug() << "appendToEditPacket() running:" << _animationLoop->getRunning(); + } else { + qDebug() << "appendToEditPacket() running:" << getRunning(); + } + + return true; } @@ -246,6 +260,12 @@ bool AnimationPropertyGroup::decodeFromEditPacket(EntityPropertyFlags& propertyF processedBytes += bytesRead; + if (_animationLoop) { + qDebug() << "decodeFromEditPacket() running:" << _animationLoop->getRunning(); + } else { + qDebug() << "decodeFromEditPacket() running:" << getRunning(); + } + return true; } @@ -319,6 +339,12 @@ bool AnimationPropertyGroup::setProperties(const EntityItemProperties& propertie SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, StartAutomatically, startAutomatically, setStartAutomatically); } + if (_animationLoop) { + qDebug() << "setProperties() running:" << _animationLoop->getRunning(); + } else { + qDebug() << "setProperties() running:" << getRunning(); + } + return somethingChanged; } @@ -368,6 +394,13 @@ void AnimationPropertyGroup::appendSubclassData(OctreePacketData* packetData, En APPEND_ENTITY_PROPERTY(PROP_ANIMATION_HOLD, getHold()); APPEND_ENTITY_PROPERTY(PROP_ANIMATION_START_AUTOMATICALLY, getStartAutomatically()); } + + if (_animationLoop) { + qDebug() << "appendSubclassData() running:" << _animationLoop->getRunning(); + } else { + qDebug() << "appendSubclassData() running:" << getRunning(); + } + } int AnimationPropertyGroup::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead, @@ -400,5 +433,11 @@ int AnimationPropertyGroup::readEntitySubclassDataFromBuffer(const unsigned char READ_ENTITY_PROPERTY(PROP_ANIMATION_START_AUTOMATICALLY, bool, setStartAutomatically); } + if (_animationLoop) { + qDebug() << "readEntitySubclassDataFromBuffer() running:" << _animationLoop->getRunning(); + } else { + qDebug() << "readEntitySubclassDataFromBuffer() running:" << getRunning(); + } + return bytesRead; } diff --git a/libraries/entities/src/AnimationPropertyGroup.h b/libraries/entities/src/AnimationPropertyGroup.h index 5541e49840..5612c1a99e 100644 --- a/libraries/entities/src/AnimationPropertyGroup.h +++ b/libraries/entities/src/AnimationPropertyGroup.h @@ -16,14 +16,16 @@ // DONE - 3) make sure that setting properties and reading from stream actually set the animationLoop object properly // 4) test it! // DONE - a) toybox/windmill -// b) toybox "put me down" doll +// DONE - b) toybox "put me down" doll // c) asana bugs about animations +// d) spray paint can (particles) +// e) grenade // // DONE - 5) update all scripts // DONE - 6) remove all remnants of old member variables // DONE - 7) research and remove animation settings from Particle Effect // DONE - 8) make sure animations start properly when entering a domain... with previously running animations -// 9) test particles!!! +// 9) debug running property // #ifndef hifi_AnimationPropertyGroup_h