diff --git a/spine-cpp/spine-cpp/include/spine/Event.h b/spine-cpp/spine-cpp/include/spine/Event.h index cf89eb46f..3e749b91d 100644 --- a/spine-cpp/spine-cpp/include/spine/Event.h +++ b/spine-cpp/spine-cpp/include/spine/Event.h @@ -56,17 +56,17 @@ namespace spine { /// The animation time this event was keyed. float getTime(); - int getIntValue(); + int getInt(); - void setIntValue(int inValue); + void setInt(int inValue); - float getFloatValue(); + float getFloat(); - void setFloatValue(float inValue); + void setFloat(float inValue); - const String &getStringValue(); + const String &getString(); - void setStringValue(const String &inValue); + void setString(const String &inValue); float getVolume(); diff --git a/spine-cpp/spine-cpp/src/spine/Event.cpp b/spine-cpp/spine-cpp/src/spine/Event.cpp index 3086184d5..e3011a496 100644 --- a/spine-cpp/spine-cpp/src/spine/Event.cpp +++ b/spine-cpp/spine-cpp/src/spine/Event.cpp @@ -33,11 +33,11 @@ spine::Event::Event(float time, const spine::EventData &data) : _data(data), _time(time), - _intValue(0), - _floatValue(0), - _stringValue(), - _volume(1), - _balance(0) { + _intValue(data.getIntValue()), + _floatValue(data.getFloatValue()), + _stringValue(data.getStringValue()), + _volume(data.getVolume()), + _balance(data.getBalance()) { } const spine::EventData &spine::Event::getData() { @@ -48,27 +48,27 @@ float spine::Event::getTime() { return _time; } -int spine::Event::getIntValue() { +int spine::Event::getInt() { return _intValue; } -void spine::Event::setIntValue(int inValue) { +void spine::Event::setInt(int inValue) { _intValue = inValue; } -float spine::Event::getFloatValue() { +float spine::Event::getFloat() { return _floatValue; } -void spine::Event::setFloatValue(float inValue) { +void spine::Event::setFloat(float inValue) { _floatValue = inValue; } -const spine::String &spine::Event::getStringValue() { +const spine::String &spine::Event::getString() { return _stringValue; } -void spine::Event::setStringValue(const spine::String &inValue) { +void spine::Event::setString(const spine::String &inValue) { _stringValue = inValue; }