From 082a9196ffa4e307e36dd0c260bbe22c1e207d57 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 7 Apr 2015 13:43:04 -0700 Subject: [PATCH 1/5] Fix manually entered animation URL not being able to be started --- interface/src/ui/AnimationsDialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/ui/AnimationsDialog.cpp b/interface/src/ui/AnimationsDialog.cpp index 1586d9ebad..9230d70f55 100644 --- a/interface/src/ui/AnimationsDialog.cpp +++ b/interface/src/ui/AnimationsDialog.cpp @@ -96,7 +96,7 @@ AnimationPanel::AnimationPanel(AnimationsDialog* dialog, const AnimationHandlePo QHBoxLayout* urlBox = new QHBoxLayout(); layout->addRow("URL:", urlBox); urlBox->addWidget(_url = new QLineEdit(handle->getURL().toString()), 1); - connect(_url, SIGNAL(returnPressed()), SLOT(updateHandle())); + connect(_url, SIGNAL(editingFinished()), SLOT(updateHandle())); QPushButton* chooseURL = new QPushButton("Choose"); urlBox->addWidget(chooseURL); connect(chooseURL, SIGNAL(clicked(bool)), SLOT(chooseURL())); @@ -168,7 +168,7 @@ void AnimationPanel::chooseURL() { } _animationDirectory.set(QFileInfo(filename).path()); _url->setText(QUrl::fromLocalFile(filename).toString()); - emit _url->returnPressed(); + emit _url->editingFinished(); } void AnimationPanel::chooseMaskedJoints() { From ccf3afadfba2e02d6f0046c8f262efa6d2e7b4f0 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 7 Apr 2015 13:43:58 -0700 Subject: [PATCH 2/5] Fix manually entered joint mask value not being applied --- interface/src/ui/AnimationsDialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/ui/AnimationsDialog.cpp b/interface/src/ui/AnimationsDialog.cpp index 9230d70f55..0428e79e6f 100644 --- a/interface/src/ui/AnimationsDialog.cpp +++ b/interface/src/ui/AnimationsDialog.cpp @@ -118,7 +118,7 @@ AnimationPanel::AnimationPanel(AnimationsDialog* dialog, const AnimationHandlePo QHBoxLayout* maskedJointBox = new QHBoxLayout(); layout->addRow("Masked Joints:", maskedJointBox); maskedJointBox->addWidget(_maskedJoints = new QLineEdit(handle->getMaskedJoints().join(", ")), 1); - connect(_maskedJoints, SIGNAL(returnPressed()), SLOT(updateHandle())); + connect(_maskedJoints, SIGNAL(editingFinished()), SLOT(updateHandle())); maskedJointBox->addWidget(_chooseMaskedJoints = new QPushButton("Choose")); connect(_chooseMaskedJoints, SIGNAL(clicked(bool)), SLOT(chooseMaskedJoints())); From 670d455b90809524e7c898d63d0969bb252950e8 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 7 Apr 2015 13:47:37 -0700 Subject: [PATCH 3/5] Fix manually entered attachment model URL not being used --- interface/src/ui/AttachmentsDialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/ui/AttachmentsDialog.cpp b/interface/src/ui/AttachmentsDialog.cpp index 2a6ff2b2b1..1d53eb3871 100644 --- a/interface/src/ui/AttachmentsDialog.cpp +++ b/interface/src/ui/AttachmentsDialog.cpp @@ -113,7 +113,7 @@ AttachmentPanel::AttachmentPanel(AttachmentsDialog* dialog, const AttachmentData layout->addRow("Model URL:", urlBox); urlBox->addWidget(_modelURL = new QLineEdit(data.modelURL.toString()), 1); _modelURL->setText(data.modelURL.toString()); - connect(_modelURL, SIGNAL(returnPressed()), SLOT(modelURLChanged())); + connect(_modelURL, SIGNAL(editingFinished()), SLOT(modelURLChanged())); QPushButton* chooseURL = new QPushButton("Choose"); urlBox->addWidget(chooseURL); connect(chooseURL, SIGNAL(clicked(bool)), SLOT(chooseModelURL())); From 09b929b729e7529f938b2689d933e26cf6140b05 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 7 Apr 2015 14:02:24 -0700 Subject: [PATCH 4/5] Restart looped animation running at shutdown when Interface starts --- interface/src/avatar/MyAvatar.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 25803e5c36..0c456da824 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -640,6 +640,7 @@ void MyAvatar::saveData() { settings.setValue("firstFrame", pointer->getFirstFrame()); settings.setValue("lastFrame", pointer->getLastFrame()); settings.setValue("maskedJoints", pointer->getMaskedJoints()); + settings.setValue("running", pointer->getLoop() && pointer->isRunning()); } settings.endArray(); @@ -713,6 +714,9 @@ void MyAvatar::loadData() { handle->setFirstFrame(settings.value("firstFrame", 0.0f).toFloat()); handle->setLastFrame(settings.value("lastFrame", INT_MAX).toFloat()); handle->setMaskedJoints(settings.value("maskedJoints").toStringList()); + if (settings.value("loop", true).toBool() && settings.value("running", false).toBool()) { + handle->setRunning(true); + } } settings.endArray(); From 43a130dabe2224f961ee129177b5883c4433cf4f Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 7 Apr 2015 14:02:42 -0700 Subject: [PATCH 5/5] Fix Stop button not working at the end of a non-looped animation --- libraries/render-utils/src/AnimationHandle.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/render-utils/src/AnimationHandle.cpp b/libraries/render-utils/src/AnimationHandle.cpp index 64e2bf28b9..1cb3d4654f 100644 --- a/libraries/render-utils/src/AnimationHandle.cpp +++ b/libraries/render-utils/src/AnimationHandle.cpp @@ -64,8 +64,8 @@ void AnimationHandle::setRunning(bool running) { if (running) { // move back to the beginning setFrameIndex(getFirstFrame()); + return; } - return; } _animationLoop.setRunning(running); if (isRunning()) {