add animationSettings property to model entities

examples/libraries/entityPropertyDialogBox.js

@@ -52,6 +52,8 @@ EntityPropertyDialogBox = (function () {
             index++;
             array.push({ label: "Animation Frame:", value: properties.animationFrameIndex });
             index++;
+            array.push({ label: "Animation Settings:", value: properties.animationSettings });
+            index++;
             array.push({ label: "Textures:", value: properties.textures });
             index++;
             array.push({ label: "Original Textures:\n" + properties.originalTextures, type: "header" });
@@ -240,6 +242,7 @@ EntityPropertyDialogBox = (function () {
                 properties.animationIsPlaying = array[index++].value;
                 properties.animationFPS = array[index++].value;
                 properties.animationFrameIndex = array[index++].value;
+                properties.animationSettings = array[index++].value;
                 properties.textures = array[index++].value;
                 index++; // skip textureNames label
             }

libraries/entities/src/EntityItemProperties.cpp

@@ -66,6 +66,7 @@ EntityItemProperties::EntityItemProperties() :
     _animationIsPlaying(ModelEntityItem::DEFAULT_ANIMATION_IS_PLAYING),
     _animationFrameIndex(ModelEntityItem::DEFAULT_ANIMATION_FRAME_INDEX),
     _animationFPS(ModelEntityItem::DEFAULT_ANIMATION_FPS),
+    _animationSettings(""),
     _glowLevel(0.0f),
     _localRenderAlpha(1.0f),
     _isSpotlight(false),
@@ -76,6 +77,8 @@ EntityItemProperties::EntityItemProperties() :
     _animationIsPlayingChanged(false),
     _animationFrameIndexChanged(false),
     _animationFPSChanged(false),
+    _animationSettingsChanged(false),
+
     _glowLevelChanged(false),
     _localRenderAlphaChanged(false),
     _isSpotlightChanged(false),
@@ -149,6 +152,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_ANIMATION_PLAYING, animationIsPlaying);
     CHECK_PROPERTY_CHANGE(PROP_ANIMATION_FRAME_INDEX, animationFrameIndex);
     CHECK_PROPERTY_CHANGE(PROP_ANIMATION_FPS, animationFPS);
+    CHECK_PROPERTY_CHANGE(PROP_ANIMATION_SETTINGS, animationSettings);
     CHECK_PROPERTY_CHANGE(PROP_VISIBLE, visible);
     CHECK_PROPERTY_CHANGE(PROP_REGISTRATION_POINT, registrationPoint);
     CHECK_PROPERTY_CHANGE(PROP_ANGULAR_VELOCITY, angularVelocity);
@@ -201,8 +205,9 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine) cons
     COPY_PROPERTY_TO_QSCRIPTVALUE(modelURL);
     COPY_PROPERTY_TO_QSCRIPTVALUE(animationURL);
     COPY_PROPERTY_TO_QSCRIPTVALUE(animationIsPlaying);
-    COPY_PROPERTY_TO_QSCRIPTVALUE(animationFrameIndex);
     COPY_PROPERTY_TO_QSCRIPTVALUE(animationFPS);
+    COPY_PROPERTY_TO_QSCRIPTVALUE(animationFrameIndex);
+    COPY_PROPERTY_TO_QSCRIPTVALUE(animationSettings);
     COPY_PROPERTY_TO_QSCRIPTVALUE(glowLevel);
     COPY_PROPERTY_TO_QSCRIPTVALUE(localRenderAlpha);
     COPY_PROPERTY_TO_QSCRIPTVALUE(ignoreForCollisions);
@@ -276,6 +281,7 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object) {
     COPY_PROPERTY_FROM_QSCRIPTVALUE_BOOL(animationIsPlaying, setAnimationIsPlaying);
     COPY_PROPERTY_FROM_QSCRIPTVALUE_FLOAT(animationFPS, setAnimationFPS);
     COPY_PROPERTY_FROM_QSCRIPTVALUE_FLOAT(animationFrameIndex, setAnimationFrameIndex);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE_STRING(animationSettings, setAnimationSettings);
     COPY_PROPERTY_FROM_QSCRIPTVALUE_FLOAT(glowLevel, setGlowLevel);
     COPY_PROPERTY_FROM_QSCRIPTVALUE_FLOAT(localRenderAlpha, setLocalRenderAlpha);
     COPY_PROPERTY_FROM_QSCRIPTVALUE_BOOL(ignoreForCollisions, setIgnoreForCollisions);
@@ -452,6 +458,7 @@ bool EntityItemProperties::encodeEntityEditPacket(PacketType command, EntityItem
             APPEND_ENTITY_PROPERTY(PROP_CUTOFF, appendValue, properties.getCutoff());
             APPEND_ENTITY_PROPERTY(PROP_LOCKED, appendValue, properties.getLocked());
             APPEND_ENTITY_PROPERTY(PROP_TEXTURES, appendValue, properties.getTextures());
+            APPEND_ENTITY_PROPERTY(PROP_ANIMATION_SETTINGS, appendValue, properties.getAnimationSettings());
         }
         if (propertyCount > 0) {
             int endOfEntityItemData = packetData->getUncompressedByteOffset();
@@ -661,7 +668,8 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_CUTOFF, float, setCutoff);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_LOCKED, bool, setLocked);
     READ_ENTITY_PROPERTY_STRING_TO_PROPERTIES(PROP_TEXTURES, setTextures);
-
+    READ_ENTITY_PROPERTY_STRING_TO_PROPERTIES(PROP_ANIMATION_SETTINGS, setAnimationSettings);
+    
     return valid;
 }
 
@@ -714,6 +722,7 @@ void EntityItemProperties::markAllChanged() {
     _animationIsPlayingChanged = true;
     _animationFrameIndexChanged = true;
     _animationFPSChanged = true;
+    _animationSettingsChanged = true;
     _glowLevelChanged = true;
     _localRenderAlphaChanged = true;
     _isSpotlightChanged = true;

libraries/entities/src/EntityItemProperties.h

@@ -80,8 +80,9 @@ enum EntityPropertyList {
     
     // used by Model entities
     PROP_TEXTURES,
+    PROP_ANIMATION_SETTINGS,
 
-    PROP_LAST_ITEM = PROP_CUTOFF
+    PROP_LAST_ITEM = PROP_ANIMATION_SETTINGS
 };
 
 typedef PropertyFlags<EntityPropertyList> EntityPropertyFlags;
@@ -178,6 +179,8 @@ public:
     float getAnimationFrameIndex() const { return _animationFrameIndex; }
     bool getAnimationIsPlaying() const { return _animationIsPlaying;  }
     float getAnimationFPS() const { return _animationFPS; }
+    const QString& getAnimationSettings() const { return _animationSettings; }
+
     float getGlowLevel() const { return _glowLevel; }
     float getLocalRenderAlpha() const { return _localRenderAlpha; }
     const QString& getScript() const { return _script; }
@@ -189,6 +192,10 @@ public:
     void setAnimationFrameIndex(float value) { _animationFrameIndex = value; _animationFrameIndexChanged = true; }
     void setAnimationIsPlaying(bool value) { _animationIsPlaying = value; _animationIsPlayingChanged = true;  }
     void setAnimationFPS(float value) { _animationFPS = value; _animationFPSChanged = true; }
+    void setAnimationSettings(const QString& value) 
+            { _animationSettings = value; _animationSettingsChanged = true; }
+
+
     void setGlowLevel(float value) { _glowLevel = value; _glowLevelChanged = true; }
     void setLocalRenderAlpha(float value) { _localRenderAlpha = value; _localRenderAlphaChanged = true; }
     void setScript(const QString& value) { _script = value; _scriptChanged = true; }
@@ -342,6 +349,7 @@ private:
     bool _animationIsPlaying;
     float _animationFrameIndex;
     float _animationFPS;
+    QString _animationSettings;
     float _glowLevel;
     float _localRenderAlpha;
     bool _isSpotlight;
@@ -352,6 +360,7 @@ private:
     bool _animationIsPlayingChanged;
     bool _animationFrameIndexChanged;
     bool _animationFPSChanged;
+    bool _animationSettingsChanged;
     bool _glowLevelChanged;
     bool _localRenderAlphaChanged;
     bool _isSpotlightChanged;

libraries/entities/src/ModelEntityItem.cpp

@@ -49,6 +49,7 @@ EntityItemProperties ModelEntityItem::getProperties() const {
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(animationFPS, getAnimationFPS);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(glowLevel, getGlowLevel);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(textures, getTextures);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(animationSettings, getAnimationSettings);
     return properties;
 }
 
@@ -63,6 +64,7 @@ bool ModelEntityItem::setProperties(const EntityItemProperties& properties, bool
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(animationFrameIndex, setAnimationFrameIndex);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(animationFPS, setAnimationFPS);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(textures, setTextures);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(animationSettings, setAnimationSettings);
 
     if (somethingChanged) {
         bool wantDebug = false;
@@ -115,6 +117,7 @@ int ModelEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
     setAnimationFrameIndex(animationFrameIndex);
 
     READ_ENTITY_PROPERTY_STRING(PROP_TEXTURES, setTextures);
+    READ_ENTITY_PROPERTY_STRING(PROP_ANIMATION_SETTINGS, setAnimationSettings);
 
     return bytesRead;
 }
@@ -244,6 +247,7 @@ EntityPropertyFlags ModelEntityItem::getEntityProperties(EncodeBitstreamParams&
     requestedProperties += PROP_ANIMATION_FPS;
     requestedProperties += PROP_ANIMATION_FRAME_INDEX;
     requestedProperties += PROP_ANIMATION_PLAYING;
+    requestedProperties += PROP_ANIMATION_SETTINGS;
     requestedProperties += PROP_TEXTURES;
     
     return requestedProperties;
@@ -266,6 +270,7 @@ void ModelEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBit
     APPEND_ENTITY_PROPERTY(PROP_ANIMATION_FRAME_INDEX, appendValue, getAnimationFrameIndex());
     APPEND_ENTITY_PROPERTY(PROP_ANIMATION_PLAYING, appendValue, getAnimationIsPlaying());
     APPEND_ENTITY_PROPERTY(PROP_TEXTURES, appendValue, getTextures());
+    APPEND_ENTITY_PROPERTY(PROP_ANIMATION_SETTINGS, appendValue, getAnimationSettings());
 }
 
 

libraries/entities/src/ModelEntityItem.h

@@ -76,6 +76,7 @@ public:
     void setAnimationURL(const QString& url) { _animationURL = url; }
     static const float DEFAULT_ANIMATION_FRAME_INDEX;
     void setAnimationFrameIndex(float value) { _animationLoop.setFrameIndex(value); }
+    void setAnimationSettings(const QString& value) { _animationSettings = value; }
 
     static const bool DEFAULT_ANIMATION_IS_PLAYING;
     void setAnimationIsPlaying(bool value) { _animationLoop.setRunning(value); }
@@ -90,6 +91,7 @@ public:
     bool getAnimationIsPlaying() const { return _animationLoop.isRunning(); }
     float getAnimationFrameIndex() const { return _animationLoop.getFrameIndex(); }
     float getAnimationFPS() const { return _animationLoop.getFPS(); }
+    const QString& getAnimationSettings() const { return _animationSettings; }
 
     static const QString DEFAULT_TEXTURES;
     const QString& getTextures() const { return _textures; }
@@ -109,6 +111,7 @@ protected:
     quint64 _lastAnimated;
     QString _animationURL;
     AnimationLoop _animationLoop;
+    QString _animationSettings;
     QString _textures;
 
     // used on client side