From 1655afcb49816eb92d71b8e8f2f2efa352ba6f75 Mon Sep 17 00:00:00 2001 From: dnk-88 Date: Sun, 20 Feb 2011 14:50:33 +0200 Subject: [PATCH] Changed: #1193 Polished layout dialogs and code. --- .../object_viewer_qt/src/animation_dialog.cpp | 38 +- .../object_viewer_qt/src/animation_dialog.h | 2 + .../3d/object_viewer_qt/src/animation_form.ui | 919 +++++----- .../src/animation_set_dialog.cpp | 28 +- .../src/animation_set_dialog.h | 1 - .../src/animation_set_form.ui | 973 +++++----- .../3d/object_viewer_qt/src/emitter_form.ui | 598 +++---- .../src/located_bindable_form.ui | 1588 +++++++++-------- .../src/located_bindable_page.cpp | 16 +- .../3d/object_viewer_qt/src/main_window.cpp | 2 +- .../src/particle_force_form.ui | 294 ++- .../src/particle_light_form.ui | 50 +- .../src/particle_texture_anim_form.ui | 61 +- .../src/particle_texture_form.ui | 162 +- .../src/particle_texture_widget.cpp | 10 +- .../src/particle_zone_form.ui | 21 +- 16 files changed, 2461 insertions(+), 2302 deletions(-) diff --git a/code/nel/tools/3d/object_viewer_qt/src/animation_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/animation_dialog.cpp index c2c69ac15..0ff05e5dd 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/animation_dialog.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/animation_dialog.cpp @@ -46,6 +46,8 @@ CAnimationDialog::CAnimationDialog(QWidget *parent) connect(_ui.horizontalSlider, SIGNAL(sliderMoved(int)), this, SLOT(changeFrame(int))); connect(_ui.startSpinBox, SIGNAL(valueChanged(int)), this, SLOT(changeStartAnim(int))); connect(_ui.endSpinBox, SIGNAL(valueChanged(int)), this, SLOT(changeEndAnim(int))); + connect(_ui.playlistToolButton, SIGNAL(toggled(bool)), this, SLOT(setModePlayList())); + connect(_ui.mixerToolButton, SIGNAL(toggled(bool)), this, SLOT(setModeMixer())); // init QTimeLine _timeLine = new QTimeLine(_ui.endSpinBox->value() * _frameRate, this); @@ -92,6 +94,11 @@ void CAnimationDialog::setCurrentShape(const QString &name) _ui.inPlaceCheckBox->setChecked(entity.getInPlace()); _ui.incPosCheckBox->setChecked(entity.getIncPos()); + + if (_ui.playlistToolButton->isChecked()) + entity.setMode(CEntity::Mode::PlayList); + else + entity.setMode(CEntity::Mode::Mixer); } void CAnimationDialog::start() @@ -112,7 +119,8 @@ void CAnimationDialog::play() if (_timeLine->state() == QTimeLine::Running) _timeLine->setPaused(true); - else if (_timeLine->currentFrame() == _timeLine->endFrame()) _timeLine->start(); + else if (_timeLine->currentFrame() == _timeLine->endFrame()) + _timeLine->start(); else _timeLine->resume(); } @@ -184,8 +192,30 @@ void CAnimationDialog::setIncPos(bool state) void CAnimationDialog::finish() { - if (_ui.loopCheckBox->checkState() == Qt::Checked) play(); - else _ui.playPushButton->setChecked(false); + if (_ui.loopCheckBox->isChecked()) + play(); + else + _ui.playPushButton->setChecked(false); } -} /* namespace NLQT */ \ No newline at end of file +void CAnimationDialog::setModePlayList() +{ + std::string curObj = Modules::objView().getCurrentObject(); + if (curObj.empty()) + return; + CEntity &entity = Modules::objView().getEntity(curObj); + + entity.setMode(CEntity::Mode::PlayList); +} + +void CAnimationDialog::setModeMixer() +{ + std::string curObj = Modules::objView().getCurrentObject(); + if (curObj.empty()) + return; + CEntity &entity = Modules::objView().getEntity(curObj); + + entity.setMode(CEntity::Mode::Mixer); +} + +} /* namespace NLQT */ diff --git a/code/nel/tools/3d/object_viewer_qt/src/animation_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/animation_dialog.h index 6c1e3d588..81a7527de 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/animation_dialog.h +++ b/code/nel/tools/3d/object_viewer_qt/src/animation_dialog.h @@ -77,6 +77,8 @@ private Q_SLOTS: void setInPlace(bool state); void setIncPos(bool state); void finish(); + void setModePlayList(); + void setModeMixer(); private: diff --git a/code/nel/tools/3d/object_viewer_qt/src/animation_form.ui b/code/nel/tools/3d/object_viewer_qt/src/animation_form.ui index 10485858e..42a7bfbd8 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/animation_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/animation_form.ui @@ -1,398 +1,521 @@ - - - CAnimationDialog - - - - 0 - 0 - 489 - 92 - - - - - 0 - 0 - - - - - 489 - 92 - - - - - 524287 - 524287 - - - - false - - - QDockWidget::AllDockWidgetFeatures - - - Qt::AllDockWidgetAreas - - - Animation - - - - - 9 - - - 1 - - - - - - - 99 - - - 10 - - - Qt::Horizontal - - - false - - - false - - - QSlider::TicksBelow - - - 10 - - - - - - - true - - - QAbstractSpinBox::NoButtons - - - 999999 - - - - - - - - - 0 - - - QLayout::SetMaximumSize - - - 0 - - - - - QAbstractSpinBox::UpDownArrows - - - false - - - 999999 - - - - - - - Loop - - - - - - - true - - - In place - - - - - - - true - - - Increment pos - - - - - - - false - - - 999999 - - - 100 - - - - - - - - - - 25 - 25 - - - - - 25 - 25 - - - - - - - - :/images/skip-backward.png:/images/skip-backward.png - - - - 28 - 28 - - - - true - - - - - - - - 25 - 25 - - - - - 25 - 25 - - - - - - - - :/images/seek-backward.png:/images/seek-backward.png - - - - 28 - 28 - - - - true - - - - - - - - 25 - 25 - - - - - 25 - 25 - - - - - - - - :/images/play.png - :/images/pause.png:/images/play.png - - - - 28 - 28 - - - - true - - - true - - - - - - - - 25 - 25 - - - - - 25 - 25 - - - - - - - - :/images/stop.png:/images/stop.png - - - - 28 - 28 - - - - false - - - true - - - - - - - - 25 - 25 - - - - - 25 - 25 - - - - - - - - :/images/seek-forward.png:/images/seek-forward.png - - - - 28 - 28 - - - - true - - - - - - - - 25 - 25 - - - - - 25 - 25 - - - - - - - - :/images/skip-forward.png:/images/skip-forward.png - - - - 28 - 28 - - - - true - - - - - - - - - - - - currentSpinBox - valueChanged(int) - horizontalSlider - setValue(int) - - - 151 - 55 - - - 163 - 77 - - - - - horizontalSlider - valueChanged(int) - currentSpinBox - setValue(int) - - - 224 - 85 - - - 141 - 55 - - - - - + + + CAnimationDialog + + + + 0 + 0 + 609 + 102 + + + + + 0 + 0 + + + + + 609 + 102 + + + + + 524287 + 524287 + + + + false + + + QDockWidget::AllDockWidgetFeatures + + + Qt::AllDockWidgetAreas + + + Animation control + + + + + 3 + + + 1 + + + + + 1 + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + 99 + + + 10 + + + Qt::Horizontal + + + false + + + false + + + QSlider::TicksBelow + + + 10 + + + + + + + true + + + QAbstractSpinBox::NoButtons + + + 999999 + + + + + + + + + 0 + + + QLayout::SetMaximumSize + + + 0 + + + + + QAbstractSpinBox::UpDownArrows + + + false + + + 999999 + + + + + + + Loop + + + + + + + true + + + In place + + + + + + + true + + + Increment pos + + + + + + + false + + + 999999 + + + 100 + + + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Use the PlayList + + + + + + + :/images/animset.png:/images/animset.png + + + + 25 + 25 + + + + true + + + true + + + true + + + true + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Use the Mixer + + + + + + + :/images/mixer.png:/images/mixer.png + + + + 25 + 25 + + + + true + + + true + + + true + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + + + + + :/images/skip-backward.png:/images/skip-backward.png + + + + 25 + 25 + + + + true + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + + + + + :/images/seek-backward.png:/images/seek-backward.png + + + + 25 + 25 + + + + + + + true + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Play/Pause + + + + + + + :/images/play.png + :/images/pause.png:/images/play.png + + + + 25 + 25 + + + + true + + + true + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + Stop + + + + + + + :/images/stop.png:/images/stop.png + + + + 25 + 25 + + + + false + + + true + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + + + + + :/images/seek-forward.png:/images/seek-forward.png + + + + 25 + 25 + + + + true + + + + + + + + 28 + 28 + + + + + 28 + 28 + + + + + + + + :/images/skip-forward.png:/images/skip-forward.png + + + + 25 + 25 + + + + true + + + + + + + Qt::Vertical + + + + + + + Qt::Vertical + + + + + + + + + + + + currentSpinBox + valueChanged(int) + horizontalSlider + setValue(int) + + + 151 + 55 + + + 163 + 77 + + + + + horizontalSlider + valueChanged(int) + currentSpinBox + setValue(int) + + + 224 + 85 + + + 141 + 55 + + + + + diff --git a/code/nel/tools/3d/object_viewer_qt/src/animation_set_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/animation_set_dialog.cpp index 93436f4d3..f49b03e0c 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/animation_set_dialog.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/animation_set_dialog.cpp @@ -43,10 +43,7 @@ CAnimationSetDialog::CAnimationSetDialog(QWidget *parent) connect(ui.downToolButton, SIGNAL(clicked()), this, SLOT(downAnim())); connect(ui.addAnimPushButton, SIGNAL(clicked()), this, SLOT(loadAnim())); connect(ui.addSwtPushButton, SIGNAL(clicked()), this, SLOT(loadSwt())); - connect(ui.resetPushButton, SIGNAL(clicked()), this, SLOT(resetAnim())); - - connect(ui.listRadioButton, SIGNAL(clicked(bool)), this, SLOT(setModeAnim())); - connect(ui.mixerRadioButton, SIGNAL(clicked(bool)), this, SLOT(setModeAnim())); + connect(ui.resetToolButton, SIGNAL(clicked()), this, SLOT(resetAnim())); connect(ui.objectsComboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(setCurrentShape(QString))); } @@ -68,19 +65,6 @@ void CAnimationSetDialog::setCurrentShape(const QString &name) } -void CAnimationSetDialog::setModeAnim() -{ - std::string curObj = Modules::objView().getCurrentObject(); - if (curObj.empty()) - return; - CEntity &entity = Modules::objView().getEntity(curObj); - - if (ui.mixerRadioButton->isChecked()) - entity.setMode(CEntity::Mode::Mixer); - else - entity.setMode(CEntity::Mode::PlayList); -} - void CAnimationSetDialog::updateListObject() { ui.objectsComboBox->clear(); @@ -95,15 +79,15 @@ void CAnimationSetDialog::updateListObject() { ui.addAnimPushButton->setEnabled(false); ui.addSwtPushButton->setEnabled(false); - ui.resetPushButton->setEnabled(false); - ui.setLengthPushButton->setEnabled(false); + ui.resetToolButton->setEnabled(false); + ui.setLengthToolButton->setEnabled(false); } else { ui.addAnimPushButton->setEnabled(true); ui.addSwtPushButton->setEnabled(true); - ui.resetPushButton->setEnabled(true); - ui.setLengthPushButton->setEnabled(true); + ui.resetToolButton->setEnabled(true); + ui.setLengthToolButton->setEnabled(true); } } @@ -291,4 +275,4 @@ void CAnimationSetDialog::downAnim() entity.swapAnimToPlayList(i, i + 1); } -} /* namespace NLQT */ \ No newline at end of file +} /* namespace NLQT */ diff --git a/code/nel/tools/3d/object_viewer_qt/src/animation_set_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/animation_set_dialog.h index 9a3235dfc..0f3f48c5e 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/animation_set_dialog.h +++ b/code/nel/tools/3d/object_viewer_qt/src/animation_set_dialog.h @@ -66,7 +66,6 @@ public Q_SLOTS: void setCurrentShape(const QString &name); private Q_SLOTS: - void setModeAnim(); void loadAnim(); void loadSwt(); void resetAnim(); diff --git a/code/nel/tools/3d/object_viewer_qt/src/animation_set_form.ui b/code/nel/tools/3d/object_viewer_qt/src/animation_set_form.ui index f472fa3ce..9b9d78c40 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/animation_set_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/animation_set_form.ui @@ -1,477 +1,496 @@ - - - CAnimationSetDialog - - - - 0 - 0 - 300 - 576 - - - - - 0 - 0 - - - - - 300 - 390 - - - - - :/images/animset.png:/images/animset.png - - - Animation set manager - - - - - 0 - 0 - - - - - 100 - 0 - - - - - 5 - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 40 - 20 - - - - - - - - Edited object: - - - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - - - - - 0 - 0 - - - - Qt::Horizontal - - - - Qt::Vertical - - - - - - - Animations: - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - false - - - QAbstractItemView::NoDragDrop - - - QAbstractItemView::ExtendedSelection - - - 1 - - - false - - - - 1 - - - - - - - - - - - - Skeleton weight template: - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - 16777215 - 5646546 - - - - false - - - - 1 - - - - - - - - - - - - - Animations playlist: - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - false - - - QAbstractItemView::NoDragDrop - - - Qt::IgnoreAction - - - QAbstractItemView::ContiguousSelection - - - - - - - false - - - ... - - - - :/images/list-add.png:/images/list-add.png - - - - 20 - 20 - - - - - - - - false - - - ... - - - - :/images/list-remove.png:/images/list-remove.png - - - - 20 - 20 - - - - - - - - false - - - ... - - - - :/images/go-up.png:/images/go-up.png - - - - 20 - 20 - - - - - - - - false - - - ... - - - - :/images/go-down.png:/images/go-down.png - - - - 20 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - false - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Add anim - - - - - - - false - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Add swt - - - - - - - false - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Reset - - - - - - - false - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Set anim length - - - - - - - - - - - Use the list - - - true - - - - - - - true - - - Use the mixer - - - - - - - - - - - - - + + + CAnimationSetDialog + + + + 0 + 0 + 330 + 618 + + + + + 0 + 0 + + + + + 300 + 390 + + + + + :/images/animset.png:/images/animset.png + + + Animation set manager + + + + + 0 + 0 + + + + + 100 + 0 + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + Edited object: + + + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + + + + Qt::Vertical + + + + + + + Animations: + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + false + + + QAbstractItemView::NoDragDrop + + + QAbstractItemView::ExtendedSelection + + + 1 + + + false + + + + 1 + + + + + + + + false + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Add anim + + + + + + + + + + + Skeleton weight template: + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + false + + + + 1 + + + + + + + + false + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Add swt + + + + + + + + + + + + + Animations playlist: + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + false + + + QAbstractItemView::NoDragDrop + + + Qt::IgnoreAction + + + QAbstractItemView::ContiguousSelection + + + + + + + + + + + false + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Unload all anim and swt files + + + + + + + :/images/clear.png:/images/clear.png + + + + 24 + 24 + + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Vertical + + + + + + + false + + + Add anim in PlayList + + + + + + + :/images/list-add.png:/images/list-add.png + + + + 24 + 24 + + + + true + + + + + + + false + + + Delete anim from PlayList + + + + + + + :/images/list-remove.png:/images/list-remove.png + + + + 24 + 24 + + + + true + + + + + + + false + + + + + + + :/images/go-up.png:/images/go-up.png + + + + 24 + 24 + + + + true + + + + + + + false + + + + + + + :/images/go-down.png:/images/go-down.png + + + + 24 + 24 + + + + true + + + + + + + false + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Set duration of time in Animation control + + + + + + + :/images/time.png:/images/time.png + + + + 24 + 24 + + + + true + + + + + + + + + + + + + diff --git a/code/nel/tools/3d/object_viewer_qt/src/emitter_form.ui b/code/nel/tools/3d/object_viewer_qt/src/emitter_form.ui index 765b829a4..79f9dcce1 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/emitter_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/emitter_form.ui @@ -1,299 +1,299 @@ - - - CEmitterPage - - - - 0 - 0 - 349 - 393 - - - - Form - - - - 6 - - - - - true - - - QTabWidget::East - - - 0 - - - true - - - - General - - - - 5 - - - - - - - Emitted type: - - - - - - - - - - Type of emission: - - - - - - - - Regular - - - - - On death - - - - - Once - - - - - On bounce - - - - - External only - - - - - - - - - - Direction: - - - - - - - - Default - - - - - Direction is aligned on the emitter direction - - - - - Direction is in world - - - - - Direction is local to the system - - - - - User - - - - - - - - Force consistent emission - - - - - - - Bypass Auto-LOD - - - - - - - Speed inheritance factor: - - - - - - - - - - Delayed emission: - - - - - - - - - - Max Emission Count: - - - - - - - - - - - - - Radius: - - - - - - - - - - Qt::Vertical - - - - 17 - 143 - - - - - - - - - Emission period - - - - - - Qt::Vertical - - - - 20 - 291 - - - - - - - - Emmision period - - - - - - - - Emmision quantity/Speed - - - - - - Emmision quantity - - - - - - - Strenght modulation - - - - - - - Qt::Vertical - - - - 20 - 275 - - - - - - - - - - - - - NLQT::CEditRangeUIntWidget - QWidget -
edit_range_widget.h
- 1 - - - NLQT::CEditRangeFloatWidget - QWidget -
edit_range_widget.h
- 1 - - - NLQT::CDirectionWidget - QWidget -
direction_widget.h
- 1 - - - NLQT::CAttribFloatWidget - QGroupBox -
attrib_widget.h
- 1 - - - NLQT::CAttribUIntWidget - QGroupBox -
attrib_widget.h
- 1 - - - - - + + + CEmitterPage + + + + 0 + 0 + 352 + 393 + + + + Form + + + + 6 + + + + + true + + + QTabWidget::East + + + 1 + + + true + + + + General + + + + 5 + + + + + + + Emitted type: + + + + + + + + + + Type of emission: + + + + + + + + Regular + + + + + On death + + + + + Once + + + + + On bounce + + + + + External only + + + + + + + + + + Direction: + + + + + + + + Default + + + + + Direction is aligned on the emitter direction + + + + + Direction is in world + + + + + Direction is local to the system + + + + + User + + + + + + + + Force consistent emission + + + + + + + Bypass Auto-LOD + + + + + + + Speed inheritance factor: + + + + + + + + + + Delayed emission: + + + + + + + + + + Max Emission Count: + + + + + + + + + + + + + Radius: + + + + + + + + + + Qt::Vertical + + + + 17 + 143 + + + + + + + + + Emission period + + + + + + Qt::Vertical + + + + 20 + 291 + + + + + + + + Emission period + + + + + + + + Emission quantity/Speed + + + + + + Emission quantity + + + + + + + Strenght modulation + + + + + + + Qt::Vertical + + + + 20 + 275 + + + + + + + + + + + + + NLQT::CEditRangeUIntWidget + QWidget +
edit_range_widget.h
+ 1 + + + NLQT::CEditRangeFloatWidget + QWidget +
edit_range_widget.h
+ 1 + + + NLQT::CAttribFloatWidget + QGroupBox +
attrib_widget.h
+ 1 + + + NLQT::CDirectionWidget + QWidget +
direction_widget.h
+ 1 + + + NLQT::CAttribUIntWidget + QGroupBox +
attrib_widget.h
+ 1 + + + + + diff --git a/code/nel/tools/3d/object_viewer_qt/src/located_bindable_form.ui b/code/nel/tools/3d/object_viewer_qt/src/located_bindable_form.ui index 9df75e452..6b6ffec9b 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/located_bindable_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/located_bindable_form.ui @@ -1,791 +1,797 @@ - - - CLocatedBindablePage - - - - 0 - 0 - 262 - 473 - - - - - 0 - 0 - - - - Form - - - - 5 - - - 6 - - - - - - 0 - 0 - - - - QTabWidget::East - - - 0 - - - Qt::ElideNone - - - false - - - true - - - - - 0 - 0 - - - - - - - - - - - - Blending mode: - - - - - - - - Add - - - - - Modulate - - - - - Alpha blend - - - - - Alpha test - - - - - - - - - - - - No AutoLOD - - - - - - - Global color lighting - - - - - - - - - Z-Test - - - - - - - - - ZBias: - - - - - - - -9999.000000000000000 - - - 9999.000000000000000 - - - - - - - - - Color - - - - - - - Qt::Vertical - - - - 20 - 21 - - - - - - - - - - 0 - 0 - - - - - - - - - - Independant size - - - - - - - false - - - - - - - 9 - - - 6 - - - - - Height - - - - - - - Width - - - true - - - - - - - - - - Size - - - - - - - Angle 2D - - - - - - - Qt::Vertical - - - - 31 - 354 - - - - - - - - - - 0 - 0 - - - - - - - - - - Rotation - - - - - - - hint / precomputed rotations - - - - - - - false - - - - - - - 6 - - - 5 - - - - - Rot speed min: - - - - - - - - - - Rot speed max: - - - - - - - - - - Nb models: - - - - - - - 1 - - - 32 - - - - - - - - - - Qt::Vertical - - - - 17 - 184 - - - - - - - - - - 0 - 0 - - - - - - - - - - Align on motion - - - - - - - Z-Align - - - - - - - Fake motion blur coeff.: - - - - - - - - - - Fake motion blur treshold: - - - - - - - - - - Qt::Vertical - - - - 20 - 203 - - - - - - - - - - 0 - 0 - - - - - - - - - - Radius cut: - - - - - - - - - - Number of segs: - - - - - - - - - - Texture U factor: - - - - - - - - - - Qt::Vertical - - - - 20 - 251 - - - - - - - - - - 0 - 0 - - - - - - - - - - Number fan light: - - - - - - - - - - Phase smoothnes: - - - - - - - - - - Fan light speed: - - - - - - - - - - Fan light intensity: - - - - - - - - - - Qt::Vertical - - - - 20 - 229 - - - - - - - - - - 0 - 0 - - - - - - - - - - Nb segs: - - - - - - - - - - Seg duration: - - - - - - - - - - Texture U factor: - - - - - - - - - - Texture V factor: - - - - - - - - - - - - - - - - Non parametric anim only - - - Force constant length(m): - - - - - - - false - - - - - - - LOD degradation: - - - - - - - - - - Trail coord. system: - - - - - - - - Local - - - - - World - - - - - User - - - - - Father coord. system - - - - - - - - Use hermitte interpolation - - - - - - - - - - - - - Qt::Vertical - - - - 20 - 100 - - - - - - - - - - - - - - - - - - - - - Qt::Vertical - - - - 20 - 407 - - - - - - - - - - - - - - - - - - - - - Qt::Vertical - - - QSizePolicy::Preferred - - - - 20 - 463 - - - - - - - - - - - - - NLQT::CParticleTextureWidget - QWidget -
particle_texture_widget.h
- 1 - - - NLQT::CEditRangeUIntWidget - QWidget -
edit_range_widget.h
- 1 - - - NLQT::CEditRangeFloatWidget - QWidget -
edit_range_widget.h
- 1 - - - NLQT::CAttribFloatWidget - QGroupBox -
attrib_widget.h
- 1 - - - NLQT::CMeshWidget - QWidget -
mesh_widget.h
- 1 - - - NLQT::CConstraintMeshWidget - QWidget -
constraint_mesh_widget.h
- 1 - - - NLQT::CTailParticleWidget - QWidget -
tail_particle_widget.h
- 1 - - - NLQT::CParticleTextureAnimWidget - QWidget -
particle_texture_anim_widget.h
- 1 - - - NLQT::CAttribRGBAWidget - QGroupBox -
attrib_widget.h
- 1 - - - NLQT::CAttribPlaneBasisWidget - QGroupBox -
attrib_widget.h
- 1 - - - - - + + + CLocatedBindablePage + + + + 0 + 0 + 262 + 473 + + + + + 0 + 0 + + + + Form + + + + 5 + + + 6 + + + + + + 0 + 0 + + + + QTabWidget::East + + + 0 + + + Qt::ElideNone + + + false + + + true + + + + + 0 + 0 + + + + + + + + + + + + Blending mode: + + + + + + + + Add + + + + + Modulate + + + + + Alpha blend + + + + + Alpha test + + + + + + + + + + + + No AutoLOD + + + + + + + Global color lighting + + + + + + + + + Z-Test + + + + + + + + + ZBias: + + + + + + + -9999.000000000000000 + + + 9999.000000000000000 + + + + + + + + + Color + + + + + + + Qt::Vertical + + + + 20 + 21 + + + + + + + + + + 0 + 0 + + + + + + + + + + Independent size + + + + + + + false + + + + + + + 9 + + + 6 + + + + + Height + + + + + + + Width + + + true + + + + + + + + + + Size + + + + + + + Angle 2D + + + + + + + Qt::Vertical + + + + 31 + 354 + + + + + + + + + + 0 + 0 + + + + + + + + + + Rotation + + + + + + + hint / precomputed rotations + + + + + + + false + + + + + + + 6 + + + 5 + + + + + Rot speed min: + + + + + + + + + + Rot speed max: + + + + + + + + + + Nb models: + + + + + + + 1 + + + 32 + + + + + + + + + + Qt::Vertical + + + + 17 + 184 + + + + + + + + + + 0 + 0 + + + + + + + + + + Align on motion + + + + + + + Z-Align + + + + + + + Fake motion blur coeff.: + + + + + + + + + + Fake motion blur treshold: + + + + + + + + + + Qt::Vertical + + + + 20 + 203 + + + + + + + + + + 0 + 0 + + + + + + + + + + Radius cut: + + + + + + + + + + Number of segments: + + + + + + + + + + Texture U factor: + + + + + + + + + + Qt::Vertical + + + + 20 + 251 + + + + + + + + + + 0 + 0 + + + + + + + + + + Number fan light: + + + + + + + + + + Phase smoothnes: + + + + + + + + + + Fan light speed: + + + + + + + + + + Fan light intensity: + + + + + + + + + + Qt::Vertical + + + + 20 + 229 + + + + + + + + + + 0 + 0 + + + + + + + + + + Number of segments: + + + + + + + + + + Duration segment: + + + + + + + + + + Texture U factor: + + + + + + + + + + Texture V factor: + + + + + + + + + + + + + + + + Non parametric anim only + + + Force constant length(m): + + + + + + + false + + + + + + + LOD degradation: + + + + + + + + + + Trail coord. system: + + + + + + + + Local + + + + + World + + + + + User + + + + + Father coord. system + + + + + + + + Use hermitte interpolation + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 100 + + + + + + + + + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 407 + + + + + + + + + + + + + 6 + + + 3 + + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 20 + 463 + + + + + + + + + + + + + NLQT::CParticleTextureWidget + QWidget +
particle_texture_widget.h
+ 1 + + + NLQT::CEditRangeUIntWidget + QWidget +
edit_range_widget.h
+ 1 + + + NLQT::CEditRangeFloatWidget + QWidget +
edit_range_widget.h
+ 1 + + + NLQT::CAttribFloatWidget + QGroupBox +
attrib_widget.h
+ 1 + + + NLQT::CMeshWidget + QWidget +
mesh_widget.h
+ 1 + + + NLQT::CConstraintMeshWidget + QWidget +
constraint_mesh_widget.h
+ 1 + + + NLQT::CTailParticleWidget + QWidget +
tail_particle_widget.h
+ 1 + + + NLQT::CParticleTextureAnimWidget + QWidget +
particle_texture_anim_widget.h
+ 1 + + + NLQT::CAttribRGBAWidget + QGroupBox +
attrib_widget.h
+ 1 + + + NLQT::CAttribPlaneBasisWidget + QGroupBox +
attrib_widget.h
+ 1 + + + + + diff --git a/code/nel/tools/3d/object_viewer_qt/src/located_bindable_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/located_bindable_page.cpp index 81f23092b..084c44f50 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/located_bindable_page.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/located_bindable_page.cpp @@ -135,7 +135,7 @@ CLocatedBindablePage::CLocatedBindablePage(QWidget *parent) connect(_ui.autoLodCheckBox, SIGNAL(toggled(bool)), this, SLOT(setAutoLOD(bool))); connect(_ui.globalColorLightingCheckBox, SIGNAL(toggled(bool)), this, SLOT(setGlobalColorLight(bool))); - connect(_ui.independantSizeCheckBox, SIGNAL(toggled(bool)), this, SLOT(setIndependantSize(bool))); + connect(_ui.independentSizeCheckBox, SIGNAL(toggled(bool)), this, SLOT(setIndependantSize(bool))); connect(_ui.alignCheckBox, SIGNAL(toggled(bool)), this, SLOT(setAlignOnMotion(bool))); connect(_ui.ztestCheckBox, SIGNAL(toggled(bool)), this, SLOT(setZTest(bool))); connect(_ui.zalignCheckBox, SIGNAL(toggled(bool)), this, SLOT(setZAlign(bool))); @@ -283,18 +283,18 @@ void CLocatedBindablePage::setEditedItem(CWorkspaceNode *ownerNode, NL3D::CPSLoc _ui.zalignCheckBox->setChecked(fla->getAlignOnZAxis()); // 'look at' independant sizes - _ui.independantSizeCheckBox->setChecked(fla->hasIndependantSizes()); + _ui.independentSizeCheckBox->setChecked(fla->hasIndependantSizes()); - _ui.independantSizeCheckBox->show(); - _ui.independantGroupBox->show(); + _ui.independentSizeCheckBox->show(); + _ui.independentGroupBox->show(); // Add Look at page in tabWidget _ui.tabWidget->addTab(_ui.lookAtPage, tr("Look At param")); } else { - _ui.independantSizeCheckBox->hide(); - _ui.independantGroupBox->hide(); + _ui.independentSizeCheckBox->hide(); + _ui.independentGroupBox->hide(); } // Shock wave page setup @@ -495,7 +495,7 @@ void CLocatedBindablePage::setIndependantSize(bool state) la->setIndependantSizes(state); updateModifiedFlag(); } - _ui.independantGroupBox->setEnabled(state); + _ui.independentGroupBox->setEnabled(state); updateSizeControl(); } @@ -683,4 +683,4 @@ void CLocatedBindablePage::touchPSState() } } -} /* namespace NLQT */ \ No newline at end of file +} /* namespace NLQT */ diff --git a/code/nel/tools/3d/object_viewer_qt/src/main_window.cpp b/code/nel/tools/3d/object_viewer_qt/src/main_window.cpp index 2176a6f93..a157c7e78 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/main_window.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/main_window.cpp @@ -504,7 +504,7 @@ void CMainWindow::createDialogs() connect(_ParticleControlDialog, SIGNAL(changeState()), _ParticleWorkspaceDialog, SLOT(setNewState())); connect(_ParticleWorkspaceDialog, SIGNAL(changeActiveNode()), _ParticleControlDialog, SLOT(updateActiveNode())); - connect(_AnimationSetDialog->ui.setLengthPushButton, SIGNAL(clicked()), _AnimationDialog, SLOT(changeAnimLength())); + connect(_AnimationSetDialog->ui.setLengthToolButton, SIGNAL(clicked()), _AnimationDialog, SLOT(changeAnimLength())); connect(_AnimationSetDialog, SIGNAL(changeCurrentShape(QString)), _SkeletonTreeModel, SLOT(rebuildModel())); connect(_AnimationSetDialog, SIGNAL(changeCurrentShape(QString)), _SkeletonScaleDialog, SLOT(setCurrentShape(QString))); connect(_AnimationSetDialog, SIGNAL(changeCurrentShape(QString)), _AnimationDialog, SLOT(setCurrentShape(QString))); diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_force_form.ui b/code/nel/tools/3d/object_viewer_qt/src/particle_force_form.ui index c5c697954..2e99b6b87 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_force_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/particle_force_form.ui @@ -6,178 +6,152 @@ 0 0 - 243 - 451 + 212 + 335 Form - + 6 + + 6 + + + 6 + + + 3 + - - - QTabWidget::East + + + Targets: - - 0 - - - - Target - - - - 3 - - - - - Targets: - - - - - - - Avaible targets: - - - - - - - - - - Qt::Vertical - - - - 20 - 57 - - - - - - - - - - - - 30 - 16777215 - - - - < - - - - - - - - 30 - 16777215 - - - - > - - - - - - - Qt::Vertical - - - - 20 - 56 - - - - - - - - - - - Parametric factor: - - - - - - - - - - Radial viscosity: - - - - - - - - - - Tangential viscosity: - - - - - - - - - - Qt::Vertical - - - - 20 - 36 - - - - - - - - - Force intensity - - - - - - - - - Qt::Vertical - - - - 20 - 349 - - - - - - + + + + Avaible targets: + + + + + + + + 0 + 0 + + + + + + + + Qt::Vertical + + + + 20 + 57 + + + + + + + + + 0 + 0 + + + + + + + + + 30 + 16777215 + + + + < + + + + + + + + 30 + 16777215 + + + + > + + + + + + + Qt::Vertical + + + + 20 + 56 + + + + + + + + Force intensity + + + + + + + Parametric factor: + + + + + + + + + + Radial viscosity: + + + + + + + + + + Tangential viscosity: + + + + + + + + + diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_light_form.ui b/code/nel/tools/3d/object_viewer_qt/src/particle_light_form.ui index 3b7df9357..effb86b5f 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_light_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/particle_light_form.ui @@ -30,6 +30,12 @@ Light color + + 6 + + + 3 + @@ -50,13 +56,30 @@ - Attenuation start + Attenuation start/end + + 6 + + + 3 + - + + + Attenuation start + + + + + Attenuation end + + + + Qt::Vertical @@ -71,29 +94,6 @@ - - - Attenuation end - - - - - - - - - Qt::Vertical - - - - 20 - 228 - - - - - - diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_texture_anim_form.ui b/code/nel/tools/3d/object_viewer_qt/src/particle_texture_anim_form.ui index 26ecadcaf..2dfb93977 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_texture_anim_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/particle_texture_anim_form.ui @@ -6,28 +6,53 @@ 0 0 - 212 - 101 + 252 + 103 Form - + 0 - 5 + 3 - - - Enable texture anim + + + + + + 6 + + + + + Enable texture anim + + + + + + + false + + + Texture grouped + + + true + + + + - + @@ -39,6 +64,9 @@ + + 6 + 5 @@ -62,25 +90,12 @@ - + - + - - - - false - - - Texture grouped - - - true - - - diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_texture_form.ui b/code/nel/tools/3d/object_viewer_qt/src/particle_texture_form.ui index a1a6a5c32..4e5139533 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_texture_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/particle_texture_form.ui @@ -6,65 +6,91 @@ 0 0 - 172 - 161 + 178 + 154 Form - + 0 - 5 + 3 - - - - 105 - 105 - + + + 3 - - - 100 - 100 - - - - true - - - - - 0 - 0 - 103 - 103 - - - - - - - - 85 - 85 - - - - - - - - - - + + + + + 100 + 100 + + + + + 100 + 100 + + + + + + + + 3 + + + + + + 16777215 + 16777215 + + + + + + + + + + + + + + + 0 + 0 + + + + Choose texture + + + + + + + + 0 + 0 + + + + Remove + + + + - + @@ -81,6 +107,9 @@ Name: + + true + @@ -88,12 +117,18 @@ Size: + + true + - + - Memory: + Depth: + + + true @@ -102,10 +137,13 @@ Qt::Vertical + + QSizePolicy::Preferred + 20 - 81 + 50 @@ -113,32 +151,6 @@ - - - - - 0 - 0 - - - - Choose texture - - - - - - - - 0 - 0 - - - - Remove - - - diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_texture_widget.cpp b/code/nel/tools/3d/object_viewer_qt/src/particle_texture_widget.cpp index 42f172866..9d5615275 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_texture_widget.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/particle_texture_widget.cpp @@ -109,6 +109,9 @@ void CParticleTextureWidget::removeTexture() void CParticleTextureWidget::updateTexture() { + _ui.nameLabel->setText(tr("Name:")); + _ui.sizeLabel->setText(tr("Size:")); + _ui.depthLabel->setText(tr("Depth:")); if (!_Texture) { _ui.imageLabel->setPixmap(QPixmap()); @@ -119,7 +122,12 @@ void CParticleTextureWidget::updateTexture() std::string texName = (static_cast(_Wrapper->get()))->getFileName().c_str(); _ui.nameLabel->setText(tr("Name: %1").arg(texName.c_str())); if (!NLMISC::CFile::getFilename(texName).empty()) - _ui.imageLabel->setPixmap(QPixmap(NLMISC::CPath::lookup(texName).c_str())); + { + QPixmap pixmap(NLMISC::CPath::lookup(texName).c_str()); + _ui.sizeLabel->setText(tr("Size: %1x%2").arg(pixmap.width()).arg(pixmap.height())); + _ui.depthLabel->setText(tr("Depth: %1").arg(pixmap.depth())); + _ui.imageLabel->setPixmap(pixmap); + } else _ui.imageLabel->setPixmap(QPixmap()); } diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_zone_form.ui b/code/nel/tools/3d/object_viewer_qt/src/particle_zone_form.ui index 786511d78..9e0dcfa70 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_zone_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/particle_zone_form.ui @@ -6,8 +6,8 @@ 0 0 - 210 - 302 + 198 + 310 @@ -15,10 +15,10 @@ - 9 + 6 - 6 + 3 @@ -129,19 +129,6 @@ - - - - Qt::Vertical - - - - 20 - 1 - - - -