Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 15:29:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #4608 from ctrlaltdavid/fix-animation-not-starting

Browse source 
CR for Animation fixes
This commit is contained in:
Clément Brisset 2015-04-09 11:39:13 +02:00
commit 36631dd3a3
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/MyAvatar.cpp
View file

@ -640,6 +640,7 @@ void MyAvatar::saveData() {
settings.setValue("firstFrame", pointer->getFirstFrame()); settings.setValue("firstFrame", pointer->getFirstFrame());
settings.setValue("lastFrame", pointer->getLastFrame()); settings.setValue("lastFrame", pointer->getLastFrame());
settings.setValue("maskedJoints", pointer->getMaskedJoints()); settings.setValue("maskedJoints", pointer->getMaskedJoints());
settings.setValue("running", pointer->getLoop() && pointer->isRunning());
} }
settings.endArray(); settings.endArray();
@ -713,6 +714,9 @@ void MyAvatar::loadData() {
handle->setFirstFrame(settings.value("firstFrame", 0.0f).toFloat()); handle->setFirstFrame(settings.value("firstFrame", 0.0f).toFloat());
handle->setLastFrame(settings.value("lastFrame", INT_MAX).toFloat()); handle->setLastFrame(settings.value("lastFrame", INT_MAX).toFloat());
handle->setMaskedJoints(settings.value("maskedJoints").toStringList()); handle->setMaskedJoints(settings.value("maskedJoints").toStringList());
if (settings.value("loop", true).toBool() && settings.value("running", false).toBool()) {
handle->setRunning(true);
}
} }
settings.endArray(); settings.endArray();

6
interface/src/ui/AnimationsDialog.cpp
View file

@ -96,7 +96,7 @@ AnimationPanel::AnimationPanel(AnimationsDialog* dialog, const AnimationHandlePo
QHBoxLayout* urlBox = new QHBoxLayout(); QHBoxLayout* urlBox = new QHBoxLayout();
layout->addRow("URL:", urlBox); layout->addRow("URL:", urlBox);
urlBox->addWidget(_url = new QLineEdit(handle->getURL().toString()), 1); 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"); QPushButton* chooseURL = new QPushButton("Choose");
urlBox->addWidget(chooseURL); urlBox->addWidget(chooseURL);
connect(chooseURL, SIGNAL(clicked(bool)), SLOT(chooseURL())); connect(chooseURL, SIGNAL(clicked(bool)), SLOT(chooseURL()));
@ -118,7 +118,7 @@ AnimationPanel::AnimationPanel(AnimationsDialog* dialog, const AnimationHandlePo
QHBoxLayout* maskedJointBox = new QHBoxLayout(); QHBoxLayout* maskedJointBox = new QHBoxLayout();
layout->addRow("Masked Joints:", maskedJointBox); layout->addRow("Masked Joints:", maskedJointBox);
maskedJointBox->addWidget(_maskedJoints = new QLineEdit(handle->getMaskedJoints().join(", ")), 1); 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")); maskedJointBox->addWidget(_chooseMaskedJoints = new QPushButton("Choose"));
connect(_chooseMaskedJoints, SIGNAL(clicked(bool)), SLOT(chooseMaskedJoints())); connect(_chooseMaskedJoints, SIGNAL(clicked(bool)), SLOT(chooseMaskedJoints()));
@ -168,7 +168,7 @@ void AnimationPanel::chooseURL() {
} }
_animationDirectory.set(QFileInfo(filename).path()); _animationDirectory.set(QFileInfo(filename).path());
_url->setText(QUrl::fromLocalFile(filename).toString()); _url->setText(QUrl::fromLocalFile(filename).toString());
emit _url->returnPressed(); emit _url->editingFinished();
} }
void AnimationPanel::chooseMaskedJoints() { void AnimationPanel::chooseMaskedJoints() {

2
interface/src/ui/AttachmentsDialog.cpp
View file

@ -113,7 +113,7 @@ AttachmentPanel::AttachmentPanel(AttachmentsDialog* dialog, const AttachmentData
layout->addRow("Model URL:", urlBox); layout->addRow("Model URL:", urlBox);
urlBox->addWidget(_modelURL = new QLineEdit(data.modelURL.toString()), 1); urlBox->addWidget(_modelURL = new QLineEdit(data.modelURL.toString()), 1);
_modelURL->setText(data.modelURL.toString()); _modelURL->setText(data.modelURL.toString());
connect(_modelURL, SIGNAL(returnPressed()), SLOT(modelURLChanged())); connect(_modelURL, SIGNAL(editingFinished()), SLOT(modelURLChanged()));
QPushButton* chooseURL = new QPushButton("Choose"); QPushButton* chooseURL = new QPushButton("Choose");
urlBox->addWidget(chooseURL); urlBox->addWidget(chooseURL);
connect(chooseURL, SIGNAL(clicked(bool)), SLOT(chooseModelURL())); connect(chooseURL, SIGNAL(clicked(bool)), SLOT(chooseModelURL()));

2
libraries/render-utils/src/AnimationHandle.cpp
View file

@ -64,8 +64,8 @@ void AnimationHandle::setRunning(bool running) {
if (running) { if (running) {
// move back to the beginning // move back to the beginning
setFrameIndex(getFirstFrame()); setFrameIndex(getFirstFrame());
return;
} }
return;
} }
_animationLoop.setRunning(running); _animationLoop.setRunning(running);
if (isRunning()) { if (isRunning()) {