summaryrefslogtreecommitdiffstats
path: root/tests/manual
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@qt.io>2018-12-05 11:05:06 +0100
committerLaszlo Agocs <laszlo.agocs@qt.io>2018-12-10 12:06:58 +0000
commitefd642d9221bcd1ddb80a58e12868f3c40648cc9 (patch)
tree10078ada99d877429192d00009e6acbb60a7a1d2 /tests/manual
parentbfc9ea8f4e33702ed6af46b74621c75258b66ce8 (diff)
DragonsWings
This adds the basis for the dragon wings animation system, which is a light weight animator that works directly with the qt3ds' graph objects. To enable it pass --dragon-wings to the viewer or set the env variable DRAGONWINGS. Change-Id: I4403b1ac5f8c96a62993fa2043af9c611be64abb Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'tests/manual')
-rw-r--r--tests/manual/qt3dsexplorer/slideexplorerwidget.cpp4
-rw-r--r--tests/manual/qt3dsexplorer/slideexplorerwidget.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/manual/qt3dsexplorer/slideexplorerwidget.cpp b/tests/manual/qt3dsexplorer/slideexplorerwidget.cpp
index 816c53b..cde3694 100644
--- a/tests/manual/qt3dsexplorer/slideexplorerwidget.cpp
+++ b/tests/manual/qt3dsexplorer/slideexplorerwidget.cpp
@@ -202,7 +202,7 @@ void SlideExplorerWidget::handleSelectionChanged(const QModelIndex &index)
// Get the master slide, it has the slide player for this slide
Q3DSSlide *masterSlide = static_cast<Q3DSSlide *>(slide->parent());
qDebug("Getting player from master slide %s", qPrintable(masterSlide->name()));
- Q3DSSlidePlayer *player = masterSlide->attached<Q3DSSlideAttached>()->slidePlayer;
+ Q3DSAbstractSlidePlayer *player = masterSlide->attached<Q3DSSlideAttached>()->slidePlayer;
Q_ASSERT(player);
player->slideDeck()->setCurrentSlide(index.row());
}
@@ -344,7 +344,7 @@ void SlideExplorerWidget::updateModel()
if (!data)
return;
- Q3DSSlidePlayer *player = data->slidePlayer;
+ Q3DSAbstractSlidePlayer *player = data->slidePlayer;
if (m_slidePlayer && m_slidePlayer != player)
disconnect(m_slidePlayer);
diff --git a/tests/manual/qt3dsexplorer/slideexplorerwidget.h b/tests/manual/qt3dsexplorer/slideexplorerwidget.h
index 2985e09..1a6bbad 100644
--- a/tests/manual/qt3dsexplorer/slideexplorerwidget.h
+++ b/tests/manual/qt3dsexplorer/slideexplorerwidget.h
@@ -44,7 +44,7 @@ class QSpinBox;
class SlideListModel;
class QPushButton;
class QCheckBox;
-class Q3DSSlidePlayer;
+class Q3DSAbstractSlidePlayer;
class SlideExplorerWidget : public QWidget
{
@@ -74,7 +74,7 @@ private:
Q3DSComponentNode *m_component = nullptr;
Q3DSUipPresentation *m_presentation = nullptr;
Q3DSSceneManager *m_sceneManager = nullptr;
- Q3DSSlidePlayer *m_slidePlayer = nullptr;
+ Q3DSAbstractSlidePlayer *m_slidePlayer = nullptr;
QListView *m_slideListView;
QPushButton *m_nextSlideButton;