History

Updated Protocol to add allowTranslation

There still is a bug for the value no actually updating

Menithal committed 9 years ago

Commit 982d4a41 parent 59151da14 files · +68 −14Browse files

Showing the changes to libraries/shared/src/RegisteredMetaTypes.cpp (1 of 14 files). Show all

Unified · Split

libraries/shared/src/RegisteredMetaTypes.cpp+3−2
@@ -808,10 +808,10 @@ AnimationDetails::AnimationDetails() : · 807 unmodified lines
808}808}
809 809
810AnimationDetails::AnimationDetails(QString role, QUrl url, float fps, float priority, bool loop,810AnimationDetails::AnimationDetails(QString role, QUrl url, float fps, float priority, bool loop,
811 bool hold, bool startAutomatically, float firstFrame, float lastFrame, bool running, float currentFrame) :811 bool hold, bool startAutomatically, float firstFrame, float lastFrame, bool running, float currentFrame, bool allowTranslation) :
812 role(role), url(url), fps(fps), priority(priority), loop(loop), hold(hold),812 role(role), url(url), fps(fps), priority(priority), loop(loop), hold(hold),
813 startAutomatically(startAutomatically), firstFrame(firstFrame), lastFrame(lastFrame),813 startAutomatically(startAutomatically), firstFrame(firstFrame), lastFrame(lastFrame),
814 running(running), currentFrame(currentFrame) {814 running(running), currentFrame(currentFrame), allowTranslation(allowTranslation) {
815}815}
816 816
817 817
@@ -828,6 +828,7 @@ QScriptValue animationDetailsToScriptValue(QScriptEngine* engine, const Animatio · 10 unmodified lines
828 obj.setProperty("lastFrame", details.lastFrame);828 obj.setProperty("lastFrame", details.lastFrame);
829 obj.setProperty("running", details.running);829 obj.setProperty("running", details.running);
830 obj.setProperty("currentFrame", details.currentFrame);830 obj.setProperty("currentFrame", details.currentFrame);
831 obj.setProperty("allowTranslation", details.allowTranslation);
831 return obj;832 return obj;
832}833}
833 834

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t