Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #1193 Polished layout dialogs and code.

Browse source
This commit is contained in:
dnk-88 2011-02-20 14:50:33 +02:00
parent cfd9b1d916
commit 1655afcb49
16 changed files with 2461 additions and 2302 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
code/nel/tools/3d/object_viewer_qt/src/animation_dialog.cpp
View file

@ -46,6 +46,8 @@ CAnimationDialog::CAnimationDialog(QWidget *parent)
connect(_ui.horizontalSlider, SIGNAL(sliderMoved(int)), this, SLOT(changeFrame(int))); connect(_ui.horizontalSlider, SIGNAL(sliderMoved(int)), this, SLOT(changeFrame(int)));
connect(_ui.startSpinBox, SIGNAL(valueChanged(int)), this, SLOT(changeStartAnim(int))); connect(_ui.startSpinBox, SIGNAL(valueChanged(int)), this, SLOT(changeStartAnim(int)));
connect(_ui.endSpinBox, SIGNAL(valueChanged(int)), this, SLOT(changeEndAnim(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 // init QTimeLine
_timeLine = new QTimeLine(_ui.endSpinBox->value() * _frameRate, this); _timeLine = new QTimeLine(_ui.endSpinBox->value() * _frameRate, this);
@ -92,6 +94,11 @@ void CAnimationDialog::setCurrentShape(const QString &name)
_ui.inPlaceCheckBox->setChecked(entity.getInPlace()); _ui.inPlaceCheckBox->setChecked(entity.getInPlace());
_ui.incPosCheckBox->setChecked(entity.getIncPos()); _ui.incPosCheckBox->setChecked(entity.getIncPos());
if (_ui.playlistToolButton->isChecked())
entity.setMode(CEntity::Mode::PlayList);
else
entity.setMode(CEntity::Mode::Mixer);
} }
void CAnimationDialog::start() void CAnimationDialog::start()
@ -112,7 +119,8 @@ void CAnimationDialog::play()
if (_timeLine->state() == QTimeLine::Running) if (_timeLine->state() == QTimeLine::Running)
_timeLine->setPaused(true); _timeLine->setPaused(true);
else if (_timeLine->currentFrame() == _timeLine->endFrame()) _timeLine->start(); else if (_timeLine->currentFrame() == _timeLine->endFrame())
_timeLine->start();
else else
_timeLine->resume(); _timeLine->resume();
} }
@ -184,8 +192,30 @@ void CAnimationDialog::setIncPos(bool state)
void CAnimationDialog::finish() void CAnimationDialog::finish()
{ {
if (_ui.loopCheckBox->checkState() == Qt::Checked) play(); if (_ui.loopCheckBox->isChecked())
else _ui.playPushButton->setChecked(false); play();
else
_ui.playPushButton->setChecked(false);
} }
} /* namespace NLQT */ 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 */

2
code/nel/tools/3d/object_viewer_qt/src/animation_dialog.h
View file

@ -77,6 +77,8 @@ private Q_SLOTS:
void setInPlace(bool state); void setInPlace(bool state);
void setIncPos(bool state); void setIncPos(bool state);
void finish(); void finish();
void setModePlayList();
void setModeMixer();
private: private:

919
code/nel/tools/3d/object_viewer_qt/src/animation_form.ui
View file

@ -1,398 +1,521 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>CAnimationDialog</class> <class>CAnimationDialog</class>
<widget class="QDockWidget" name="CAnimationDialog"> <widget class="QDockWidget" name="CAnimationDialog">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>489</width> <width>609</width>
<height>92</height> <height>102</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred"> <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>489</width> <width>609</width>
<height>92</height> <height>102</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>524287</width> <width>524287</width>
<height>524287</height> <height>524287</height>
</size> </size>
</property> </property>
<property name="floating"> <property name="floating">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="features"> <property name="features">
<set>QDockWidget::AllDockWidgetFeatures</set> <set>QDockWidget::AllDockWidgetFeatures</set>
</property> </property>
<property name="allowedAreas"> <property name="allowedAreas">
<set>Qt::AllDockWidgetAreas</set> <set>Qt::AllDockWidgetAreas</set>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Animation </string> <string>Animation control</string>
</property> </property>
<widget class="QWidget" name="dockWidgetContents"> <widget class="QWidget" name="dockWidgetContents">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin"> <property name="margin">
<number>9</number> <number>3</number>
</property> </property>
<property name="spacing"> <property name="spacing">
<number>1</number> <number>1</number>
</property> </property>
<item row="0" column="0" colspan="7"> <item row="0" column="0" colspan="11">
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<item> <property name="spacing">
<widget class="QSlider" name="horizontalSlider"> <number>1</number>
<property name="maximum"> </property>
<number>99</number> <item>
</property> <widget class="QSlider" name="horizontalSlider">
<property name="pageStep"> <property name="minimumSize">
<number>10</number> <size>
</property> <width>0</width>
<property name="orientation"> <height>0</height>
<enum>Qt::Horizontal</enum> </size>
</property> </property>
<property name="invertedAppearance"> <property name="maximumSize">
<bool>false</bool> <size>
</property> <width>16777215</width>
<property name="invertedControls"> <height>16777215</height>
<bool>false</bool> </size>
</property> </property>
<property name="tickPosition"> <property name="maximum">
<enum>QSlider::TicksBelow</enum> <number>99</number>
</property> </property>
<property name="tickInterval"> <property name="pageStep">
<number>10</number> <number>10</number>
</property> </property>
</widget> <property name="orientation">
</item> <enum>Qt::Horizontal</enum>
<item> </property>
<widget class="QSpinBox" name="currentSpinBox"> <property name="invertedAppearance">
<property name="readOnly"> <bool>false</bool>
<bool>true</bool> </property>
</property> <property name="invertedControls">
<property name="buttonSymbols"> <bool>false</bool>
<enum>QAbstractSpinBox::NoButtons</enum> </property>
</property> <property name="tickPosition">
<property name="maximum"> <enum>QSlider::TicksBelow</enum>
<number>999999</number> </property>
</property> <property name="tickInterval">
</widget> <number>10</number>
</item> </property>
</layout> </widget>
</item> </item>
<item row="1" column="0"> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <widget class="QSpinBox" name="currentSpinBox">
<property name="spacing"> <property name="readOnly">
<number>0</number> <bool>true</bool>
</property> </property>
<property name="sizeConstraint"> <property name="buttonSymbols">
<enum>QLayout::SetMaximumSize</enum> <enum>QAbstractSpinBox::NoButtons</enum>
</property> </property>
<property name="leftMargin"> <property name="maximum">
<number>0</number> <number>999999</number>
</property> </property>
<item> </widget>
<widget class="QSpinBox" name="startSpinBox"> </item>
<property name="buttonSymbols"> </layout>
<enum>QAbstractSpinBox::UpDownArrows</enum> </item>
</property> <item row="1" column="0">
<property name="keyboardTracking"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<bool>false</bool> <property name="spacing">
</property> <number>0</number>
<property name="maximum"> </property>
<number>999999</number> <property name="sizeConstraint">
</property> <enum>QLayout::SetMaximumSize</enum>
</widget> </property>
</item> <property name="leftMargin">
<item> <number>0</number>
<widget class="QCheckBox" name="loopCheckBox"> </property>
<property name="text"> <item>
<string>Loop</string> <widget class="QSpinBox" name="startSpinBox">
</property> <property name="buttonSymbols">
</widget> <enum>QAbstractSpinBox::UpDownArrows</enum>
</item> </property>
<item> <property name="keyboardTracking">
<widget class="QCheckBox" name="inPlaceCheckBox"> <bool>false</bool>
<property name="enabled"> </property>
<bool>true</bool> <property name="maximum">
</property> <number>999999</number>
<property name="text"> </property>
<string>In place</string> </widget>
</property> </item>
</widget> <item>
</item> <widget class="QCheckBox" name="loopCheckBox">
<item> <property name="text">
<widget class="QCheckBox" name="incPosCheckBox"> <string>Loop</string>
<property name="enabled"> </property>
<bool>true</bool> </widget>
</property> </item>
<property name="text"> <item>
<string>Increment pos</string> <widget class="QCheckBox" name="inPlaceCheckBox">
</property> <property name="enabled">
</widget> <bool>true</bool>
</item> </property>
<item> <property name="text">
<widget class="QSpinBox" name="endSpinBox"> <string>In place</string>
<property name="keyboardTracking"> </property>
<bool>false</bool> </widget>
</property> </item>
<property name="maximum"> <item>
<number>999999</number> <widget class="QCheckBox" name="incPosCheckBox">
</property> <property name="enabled">
<property name="value"> <bool>true</bool>
<number>100</number> </property>
</property> <property name="text">
</widget> <string>Increment pos</string>
</item> </property>
</layout> </widget>
</item> </item>
<item row="1" column="1"> <item>
<widget class="QToolButton" name="startPushButton"> <widget class="QSpinBox" name="endSpinBox">
<property name="minimumSize"> <property name="keyboardTracking">
<size> <bool>false</bool>
<width>25</width> </property>
<height>25</height> <property name="maximum">
</size> <number>999999</number>
</property> </property>
<property name="maximumSize"> <property name="value">
<size> <number>100</number>
<width>25</width> </property>
<height>25</height> </widget>
</size> </item>
</property> </layout>
<property name="text"> </item>
<string/> <item row="1" column="2">
</property> <widget class="QToolButton" name="playlistToolButton">
<property name="icon"> <property name="minimumSize">
<iconset resource="object_viewer_qt.qrc"> <size>
<normaloff>:/images/skip-backward.png</normaloff>:/images/skip-backward.png</iconset> <width>28</width>
</property> <height>28</height>
<property name="iconSize"> </size>
<size> </property>
<width>28</width> <property name="maximumSize">
<height>28</height> <size>
</size> <width>28</width>
</property> <height>28</height>
<property name="autoRaise"> </size>
<bool>true</bool> </property>
</property> <property name="toolTip">
</widget> <string>Use the PlayList</string>
</item> </property>
<item row="1" column="2"> <property name="text">
<widget class="QToolButton" name="backwardPushButton"> <string/>
<property name="minimumSize"> </property>
<size> <property name="icon">
<width>25</width> <iconset resource="object_viewer_qt.qrc">
<height>25</height> <normaloff>:/images/animset.png</normaloff>:/images/animset.png</iconset>
</size> </property>
</property> <property name="iconSize">
<property name="maximumSize"> <size>
<size> <width>25</width>
<width>25</width> <height>25</height>
<height>25</height> </size>
</size> </property>
</property> <property name="checkable">
<property name="text"> <bool>true</bool>
<string/> </property>
</property> <property name="checked">
<property name="icon"> <bool>true</bool>
<iconset resource="object_viewer_qt.qrc"> </property>
<normaloff>:/images/seek-backward.png</normaloff>:/images/seek-backward.png</iconset> <property name="autoExclusive">
</property> <bool>true</bool>
<property name="iconSize"> </property>
<size> <property name="autoRaise">
<width>28</width> <bool>true</bool>
<height>28</height> </property>
</size> </widget>
</property> </item>
<property name="autoRaise"> <item row="1" column="3">
<bool>true</bool> <widget class="QToolButton" name="mixerToolButton">
</property> <property name="minimumSize">
</widget> <size>
</item> <width>28</width>
<item row="1" column="3"> <height>28</height>
<widget class="QToolButton" name="playPushButton"> </size>
<property name="minimumSize"> </property>
<size> <property name="maximumSize">
<width>25</width> <size>
<height>25</height> <width>28</width>
</size> <height>28</height>
</property> </size>
<property name="maximumSize"> </property>
<size> <property name="toolTip">
<width>25</width> <string>Use the Mixer</string>
<height>25</height> </property>
</size> <property name="text">
</property> <string/>
<property name="text"> </property>
<string/> <property name="icon">
</property> <iconset resource="object_viewer_qt.qrc">
<property name="icon"> <normaloff>:/images/mixer.png</normaloff>:/images/mixer.png</iconset>
<iconset resource="object_viewer_qt.qrc"> </property>
<normaloff>:/images/play.png</normaloff> <property name="iconSize">
<normalon>:/images/pause.png</normalon>:/images/play.png</iconset> <size>
</property> <width>25</width>
<property name="iconSize"> <height>25</height>
<size> </size>
<width>28</width> </property>
<height>28</height> <property name="checkable">
</size> <bool>true</bool>
</property> </property>
<property name="checkable"> <property name="autoExclusive">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="autoRaise"> <property name="autoRaise">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="4"> <item row="1" column="5">
<widget class="QToolButton" name="stopPushButton"> <widget class="QToolButton" name="startPushButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>25</width> <width>28</width>
<height>25</height> <height>28</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>25</width> <width>28</width>
<height>25</height> <height>28</height>
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="object_viewer_qt.qrc"> <iconset resource="object_viewer_qt.qrc">
<normaloff>:/images/stop.png</normaloff>:/images/stop.png</iconset> <normaloff>:/images/skip-backward.png</normaloff>:/images/skip-backward.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
<size> <size>
<width>28</width> <width>25</width>
<height>28</height> <height>25</height>
</size> </size>
</property> </property>
<property name="checkable"> <property name="autoRaise">
<bool>false</bool> <bool>true</bool>
</property> </property>
<property name="autoRaise"> </widget>
<bool>true</bool> </item>
</property> <item row="1" column="6">
</widget> <widget class="QToolButton" name="backwardPushButton">
</item> <property name="minimumSize">
<item row="1" column="5"> <size>
<widget class="QToolButton" name="forwardPushButton"> <width>28</width>
<property name="minimumSize"> <height>28</height>
<size> </size>
<width>25</width> </property>
<height>25</height> <property name="maximumSize">
</size> <size>
</property> <width>28</width>
<property name="maximumSize"> <height>28</height>
<size> </size>
<width>25</width> </property>
<height>25</height> <property name="text">
</size> <string/>
</property> </property>
<property name="text"> <property name="icon">
<string/> <iconset resource="object_viewer_qt.qrc">
</property> <normaloff>:/images/seek-backward.png</normaloff>:/images/seek-backward.png</iconset>
<property name="icon"> </property>
<iconset resource="object_viewer_qt.qrc"> <property name="iconSize">
<normaloff>:/images/seek-forward.png</normaloff>:/images/seek-forward.png</iconset> <size>
</property> <width>25</width>
<property name="iconSize"> <height>25</height>
<size> </size>
<width>28</width> </property>
<height>28</height> <property name="shortcut">
</size> <string/>
</property> </property>
<property name="autoRaise"> <property name="autoRaise">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="6"> <item row="1" column="7">
<widget class="QToolButton" name="endPushButton"> <widget class="QToolButton" name="playPushButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>25</width> <width>28</width>
<height>25</height> <height>28</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>25</width> <width>28</width>
<height>25</height> <height>28</height>
</size> </size>
</property> </property>
<property name="text"> <property name="toolTip">
<string/> <string>Play/Pause</string>
</property> </property>
<property name="icon"> <property name="text">
<iconset resource="object_viewer_qt.qrc"> <string/>
<normaloff>:/images/skip-forward.png</normaloff>:/images/skip-forward.png</iconset> </property>
</property> <property name="icon">
<property name="iconSize"> <iconset resource="object_viewer_qt.qrc">
<size> <normaloff>:/images/play.png</normaloff>
<width>28</width> <normalon>:/images/pause.png</normalon>:/images/play.png</iconset>
<height>28</height> </property>
</size> <property name="iconSize">
</property> <size>
<property name="autoRaise"> <width>25</width>
<bool>true</bool> <height>25</height>
</property> </size>
</widget> </property>
</item> <property name="checkable">
</layout> <bool>true</bool>
</widget> </property>
</widget> <property name="autoRaise">
<resources> <bool>true</bool>
<include location="object_viewer_qt.qrc"/> </property>
</resources> </widget>
<connections> </item>
<connection> <item row="1" column="8">
<sender>currentSpinBox</sender> <widget class="QToolButton" name="stopPushButton">
<signal>valueChanged(int)</signal> <property name="minimumSize">
<receiver>horizontalSlider</receiver> <size>
<slot>setValue(int)</slot> <width>28</width>
<hints> <height>28</height>
<hint type="sourcelabel"> </size>
<x>151</x> </property>
<y>55</y> <property name="maximumSize">
</hint> <size>
<hint type="destinationlabel"> <width>28</width>
<x>163</x> <height>28</height>
<y>77</y> </size>
</hint> </property>
</hints> <property name="toolTip">
</connection> <string>Stop</string>
<connection> </property>
<sender>horizontalSlider</sender> <property name="text">
<signal>valueChanged(int)</signal> <string/>
<receiver>currentSpinBox</receiver> </property>
<slot>setValue(int)</slot> <property name="icon">
<hints> <iconset resource="object_viewer_qt.qrc">
<hint type="sourcelabel"> <normaloff>:/images/stop.png</normaloff>:/images/stop.png</iconset>
<x>224</x> </property>
<y>85</y> <property name="iconSize">
</hint> <size>
<hint type="destinationlabel"> <width>25</width>
<x>141</x> <height>25</height>
<y>55</y> </size>
</hint> </property>
</hints> <property name="checkable">
</connection> <bool>false</bool>
</connections> </property>
</ui> <property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="9">
<widget class="QToolButton" name="forwardPushButton">
<property name="minimumSize">
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="object_viewer_qt.qrc">
<normaloff>:/images/seek-forward.png</normaloff>:/images/seek-forward.png</iconset>
</property>
<property name="iconSize">
<size>
<width>25</width>
<height>25</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="10">
<widget class="QToolButton" name="endPushButton">
<property name="minimumSize">
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="object_viewer_qt.qrc">
<normaloff>:/images/skip-forward.png</normaloff>:/images/skip-forward.png</iconset>
</property>
<property name="iconSize">
<size>
<width>25</width>
<height>25</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
<resources>
<include location="object_viewer_qt.qrc"/>
</resources>
<connections>
<connection>
<sender>currentSpinBox</sender>
<signal>valueChanged(int)</signal>
<receiver>horizontalSlider</receiver>
<slot>setValue(int)</slot>
<hints>
<hint type="sourcelabel">
<x>151</x>
<y>55</y>
</hint>
<hint type="destinationlabel">
<x>163</x>
<y>77</y>
</hint>
</hints>
</connection>
<connection>
<sender>horizontalSlider</sender>
<signal>valueChanged(int)</signal>
<receiver>currentSpinBox</receiver>
<slot>setValue(int)</slot>
<hints>
<hint type="sourcelabel">
<x>224</x>
<y>85</y>
</hint>
<hint type="destinationlabel">
<x>141</x>
<y>55</y>
</hint>
</hints>
</connection>
</connections>
</ui>

28
code/nel/tools/3d/object_viewer_qt/src/animation_set_dialog.cpp
View file

@ -43,10 +43,7 @@ CAnimationSetDialog::CAnimationSetDialog(QWidget *parent)
connect(ui.downToolButton, SIGNAL(clicked()), this, SLOT(downAnim())); connect(ui.downToolButton, SIGNAL(clicked()), this, SLOT(downAnim()));
connect(ui.addAnimPushButton, SIGNAL(clicked()), this, SLOT(loadAnim())); connect(ui.addAnimPushButton, SIGNAL(clicked()), this, SLOT(loadAnim()));
connect(ui.addSwtPushButton, SIGNAL(clicked()), this, SLOT(loadSwt())); connect(ui.addSwtPushButton, SIGNAL(clicked()), this, SLOT(loadSwt()));
connect(ui.resetPushButton, SIGNAL(clicked()), this, SLOT(resetAnim())); connect(ui.resetToolButton, 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.objectsComboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(setCurrentShape(QString))); 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() void CAnimationSetDialog::updateListObject()
{ {
ui.objectsComboBox->clear(); ui.objectsComboBox->clear();
@ -95,15 +79,15 @@ void CAnimationSetDialog::updateListObject()
{ {
ui.addAnimPushButton->setEnabled(false); ui.addAnimPushButton->setEnabled(false);
ui.addSwtPushButton->setEnabled(false); ui.addSwtPushButton->setEnabled(false);
ui.resetPushButton->setEnabled(false); ui.resetToolButton->setEnabled(false);
ui.setLengthPushButton->setEnabled(false); ui.setLengthToolButton->setEnabled(false);
} }
else else
{ {
ui.addAnimPushButton->setEnabled(true); ui.addAnimPushButton->setEnabled(true);
ui.addSwtPushButton->setEnabled(true); ui.addSwtPushButton->setEnabled(true);
ui.resetPushButton->setEnabled(true); ui.resetToolButton->setEnabled(true);
ui.setLengthPushButton->setEnabled(true); ui.setLengthToolButton->setEnabled(true);
} }
} }
@ -291,4 +275,4 @@ void CAnimationSetDialog::downAnim()
entity.swapAnimToPlayList(i, i + 1); entity.swapAnimToPlayList(i, i + 1);
} }
} /* namespace NLQT */ } /* namespace NLQT */

1
code/nel/tools/3d/object_viewer_qt/src/animation_set_dialog.h
View file

@ -66,7 +66,6 @@ public Q_SLOTS:
void setCurrentShape(const QString &name); void setCurrentShape(const QString &name);
private Q_SLOTS: private Q_SLOTS:
void setModeAnim();
void loadAnim(); void loadAnim();
void loadSwt(); void loadSwt();
void resetAnim(); void resetAnim();

973
code/nel/tools/3d/object_viewer_qt/src/animation_set_form.ui
View file

@ -1,477 +1,496 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>CAnimationSetDialog</class> <class>CAnimationSetDialog</class>
<widget class="QDockWidget" name="CAnimationSetDialog"> <widget class="QDockWidget" name="CAnimationSetDialog">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>300</width> <width>330</width>
<height>576</height> <height>618</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>300</width> <width>300</width>
<height>390</height> <height>390</height>
</size> </size>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="object_viewer_qt.qrc"> <iconset resource="object_viewer_qt.qrc">
<normaloff>:/images/animset.png</normaloff>:/images/animset.png</iconset> <normaloff>:/images/animset.png</normaloff>:/images/animset.png</iconset>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Animation set manager</string> <string>Animation set manager</string>
</property> </property>
<widget class="QWidget" name="dockWidgetContents"> <widget class="QWidget" name="dockWidgetContents">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="spacing"> <item row="0" column="0">
<number>5</number> <layout class="QHBoxLayout" name="horizontalLayout_2">
</property> <item>
<item row="0" column="0"> <spacer name="horizontalSpacer">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <property name="orientation">
<item> <enum>Qt::Horizontal</enum>
<spacer name="horizontalSpacer"> </property>
<property name="orientation"> <property name="sizeType">
<enum>Qt::Horizontal</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeType"> <property name="sizeHint" stdset="0">
<enum>QSizePolicy::Expanding</enum> <size>
</property> <width>40</width>
<property name="sizeHint" stdset="0"> <height>20</height>
<size> </size>
<width>40</width> </property>
<height>20</height> </spacer>
</size> </item>
</property> <item>
</spacer> <widget class="QLabel" name="label">
</item> <property name="text">
<item> <string>Edited object:</string>
<widget class="QLabel" name="label"> </property>
<property name="text"> </widget>
<string>Edited object:</string> </item>
</property> </layout>
</widget> </item>
</item> <item row="0" column="1">
</layout> <widget class="QComboBox" name="objectsComboBox">
</item> <property name="sizePolicy">
<item row="0" column="1"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<widget class="QComboBox" name="objectsComboBox"> <horstretch>0</horstretch>
<property name="sizePolicy"> <verstretch>0</verstretch>
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> </sizepolicy>
<horstretch>0</horstretch> </property>
<verstretch>0</verstretch> <property name="minimumSize">
</sizepolicy> <size>
</property> <width>50</width>
<property name="minimumSize"> <height>0</height>
<size> </size>
<width>50</width> </property>
<height>0</height> </widget>
</size> </item>
</property> <item row="1" column="0">
</widget> <widget class="QSplitter" name="splitter">
</item> <property name="orientation">
<item row="1" column="0" colspan="2"> <enum>Qt::Vertical</enum>
<widget class="QSplitter" name="splitter_2"> </property>
<property name="sizePolicy"> <widget class="QWidget" name="layoutWidget">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <layout class="QVBoxLayout" name="verticalLayout_3">
<horstretch>0</horstretch> <item>
<verstretch>0</verstretch> <widget class="QLabel" name="label_3">
</sizepolicy> <property name="text">
</property> <string>Animations:</string>
<property name="orientation"> </property>
<enum>Qt::Horizontal</enum> </widget>
</property> </item>
<widget class="QSplitter" name="splitter"> <item>
<property name="orientation"> <widget class="QTreeWidget" name="animTreeWidget">
<enum>Qt::Vertical</enum> <property name="sizePolicy">
</property> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<widget class="QWidget" name="layoutWidget"> <horstretch>0</horstretch>
<layout class="QVBoxLayout" name="verticalLayout_3"> <verstretch>0</verstretch>
<item> </sizepolicy>
<widget class="QLabel" name="label_3"> </property>
<property name="text"> <property name="minimumSize">
<string>Animations:</string> <size>
</property> <width>0</width>
</widget> <height>0</height>
</item> </size>
<item> </property>
<widget class="QTreeWidget" name="animTreeWidget"> <property name="dragEnabled">
<property name="sizePolicy"> <bool>false</bool>
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> </property>
<horstretch>0</horstretch> <property name="dragDropMode">
<verstretch>0</verstretch> <enum>QAbstractItemView::NoDragDrop</enum>
</sizepolicy> </property>
</property> <property name="selectionMode">
<property name="minimumSize"> <enum>QAbstractItemView::ExtendedSelection</enum>
<size> </property>
<width>50</width> <property name="columnCount">
<height>0</height> <number>1</number>
</size> </property>
</property> <attribute name="headerVisible">
<property name="dragEnabled"> <bool>false</bool>
<bool>false</bool> </attribute>
</property> <column>
<property name="dragDropMode"> <property name="text">
<enum>QAbstractItemView::NoDragDrop</enum> <string notr="true">1</string>
</property> </property>
<property name="selectionMode"> </column>
<enum>QAbstractItemView::ExtendedSelection</enum> </widget>
</property> </item>
<property name="columnCount"> <item>
<number>1</number> <widget class="QPushButton" name="addAnimPushButton">
</property> <property name="enabled">
<attribute name="headerVisible"> <bool>false</bool>
<bool>false</bool> </property>
</attribute> <property name="sizePolicy">
<column> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<property name="text"> <horstretch>0</horstretch>
<string notr="true">1</string> <verstretch>0</verstretch>
</property> </sizepolicy>
</column> </property>
</widget> <property name="minimumSize">
</item> <size>
</layout> <width>0</width>
</widget> <height>0</height>
<widget class="QWidget" name="layoutWidget"> </size>
<layout class="QVBoxLayout" name="verticalLayout_2"> </property>
<item> <property name="maximumSize">
<widget class="QLabel" name="label_4"> <size>
<property name="text"> <width>16777215</width>
<string>Skeleton weight template:</string> <height>16777215</height>
</property> </size>
</widget> </property>
</item> <property name="text">
<item> <string>Add anim</string>
<widget class="QTreeWidget" name="skeletonTreeWidget"> </property>
<property name="sizePolicy"> </widget>
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> </item>
<horstretch>0</horstretch> </layout>
<verstretch>0</verstretch> </widget>
</sizepolicy> <widget class="QWidget" name="layoutWidget">
</property> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="minimumSize"> <item>
<size> <widget class="QLabel" name="label_4">
<width>50</width> <property name="text">
<height>0</height> <string>Skeleton weight template:</string>
</size> </property>
</property> </widget>
<property name="maximumSize"> </item>
<size> <item>
<width>16777215</width> <widget class="QTreeWidget" name="skeletonTreeWidget">
<height>5646546</height> <property name="sizePolicy">
</size> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
</property> <horstretch>0</horstretch>
<attribute name="headerVisible"> <verstretch>0</verstretch>
<bool>false</bool> </sizepolicy>
</attribute> </property>
<column> <property name="minimumSize">
<property name="text"> <size>
<string notr="true">1</string> <width>0</width>
</property> <height>0</height>
</column> </size>
</widget> </property>
</item> <property name="maximumSize">
</layout> <size>
</widget> <width>16777215</width>
</widget> <height>16777215</height>
<widget class="QWidget" name="layoutWidget"> </size>
<layout class="QGridLayout" name="gridLayout_3"> </property>
<item row="0" column="0" colspan="4"> <attribute name="headerVisible">
<widget class="QLabel" name="label_2"> <bool>false</bool>
<property name="text"> </attribute>
<string>Animations playlist:</string> <column>
</property> <property name="text">
</widget> <string notr="true">1</string>
</item> </property>
<item row="1" column="0" colspan="5"> </column>
<widget class="QListWidget" name="animPlaylistWidget"> </widget>
<property name="sizePolicy"> </item>
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <item>
<horstretch>0</horstretch> <widget class="QPushButton" name="addSwtPushButton">
<verstretch>0</verstretch> <property name="enabled">
</sizepolicy> <bool>false</bool>
</property> </property>
<property name="minimumSize"> <property name="sizePolicy">
<size> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<width>50</width> <horstretch>0</horstretch>
<height>0</height> <verstretch>0</verstretch>
</size> </sizepolicy>
</property> </property>
<property name="dragEnabled"> <property name="minimumSize">
<bool>false</bool> <size>
</property> <width>0</width>
<property name="dragDropMode"> <height>0</height>
<enum>QAbstractItemView::NoDragDrop</enum> </size>
</property> </property>
<property name="defaultDropAction"> <property name="maximumSize">
<enum>Qt::IgnoreAction</enum> <size>
</property> <width>16777215</width>
<property name="selectionMode"> <height>16777215</height>
<enum>QAbstractItemView::ContiguousSelection</enum> </size>
</property> </property>
</widget> <property name="text">
</item> <string>Add swt</string>
<item row="2" column="0"> </property>
<widget class="QToolButton" name="addToolButton"> </widget>
<property name="enabled"> </item>
<bool>false</bool> </layout>
</property> </widget>
<property name="text"> </widget>
<string>...</string> </item>
</property> <item row="1" column="1">
<property name="icon"> <layout class="QVBoxLayout" name="verticalLayout">
<iconset resource="object_viewer_qt.qrc"> <item>
<normaloff>:/images/list-add.png</normaloff>:/images/list-add.png</iconset> <widget class="QLabel" name="label_2">
</property> <property name="text">
<property name="iconSize"> <string>Animations playlist:</string>
<size> </property>
<width>20</width> </widget>
<height>20</height> </item>
</size> <item>
</property> <widget class="QListWidget" name="animPlaylistWidget">
</widget> <property name="sizePolicy">
</item> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<item row="2" column="1"> <horstretch>0</horstretch>
<widget class="QToolButton" name="removeToolButton"> <verstretch>0</verstretch>
<property name="enabled"> </sizepolicy>
<bool>false</bool> </property>
</property> <property name="minimumSize">
<property name="text"> <size>
<string>...</string> <width>0</width>
</property> <height>0</height>
<property name="icon"> </size>
<iconset resource="object_viewer_qt.qrc"> </property>
<normaloff>:/images/list-remove.png</normaloff>:/images/list-remove.png</iconset> <property name="dragEnabled">
</property> <bool>false</bool>
<property name="iconSize"> </property>
<size> <property name="dragDropMode">
<width>20</width> <enum>QAbstractItemView::NoDragDrop</enum>
<height>20</height> </property>
</size> <property name="defaultDropAction">
</property> <enum>Qt::IgnoreAction</enum>
</widget> </property>
</item> <property name="selectionMode">
<item row="2" column="2"> <enum>QAbstractItemView::ContiguousSelection</enum>
<widget class="QToolButton" name="upToolButton"> </property>
<property name="enabled"> </widget>
<bool>false</bool> </item>
</property> </layout>
<property name="text"> </item>
<string>...</string> <item row="2" column="0" colspan="2">
</property> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="icon"> <item>
<iconset resource="object_viewer_qt.qrc"> <widget class="QToolButton" name="resetToolButton">
<normaloff>:/images/go-up.png</normaloff>:/images/go-up.png</iconset> <property name="enabled">
</property> <bool>false</bool>
<property name="iconSize"> </property>
<size> <property name="sizePolicy">
<width>20</width> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<height>20</height> <horstretch>0</horstretch>
</size> <verstretch>0</verstretch>
</property> </sizepolicy>
</widget> </property>
</item> <property name="minimumSize">
<item row="2" column="3"> <size>
<widget class="QToolButton" name="downToolButton"> <width>0</width>
<property name="enabled"> <height>0</height>
<bool>false</bool> </size>
</property> </property>
<property name="text"> <property name="maximumSize">
<string>...</string> <size>
</property> <width>16777215</width>
<property name="icon"> <height>16777215</height>
<iconset resource="object_viewer_qt.qrc"> </size>
<normaloff>:/images/go-down.png</normaloff>:/images/go-down.png</iconset> </property>
</property> <property name="toolTip">
<property name="iconSize"> <string>Unload all anim and swt files</string>
<size> </property>
<width>20</width> <property name="text">
<height>20</height> <string/>
</size> </property>
</property> <property name="icon">
</widget> <iconset resource="object_viewer_qt.qrc">
</item> <normaloff>:/images/clear.png</normaloff>:/images/clear.png</iconset>
<item row="2" column="4"> </property>
<spacer name="horizontalSpacer_2"> <property name="iconSize">
<property name="orientation"> <size>
<enum>Qt::Horizontal</enum> <width>24</width>
</property> <height>24</height>
<property name="sizeHint" stdset="0"> </size>
<size> </property>
<width>40</width> <property name="autoRaise">
<height>20</height> <bool>true</bool>
</size> </property>
</property> </widget>
</spacer> </item>
</item> <item>
</layout> <spacer name="horizontalSpacer_2">
</widget> <property name="orientation">
</widget> <enum>Qt::Horizontal</enum>
</item> </property>
<item row="2" column="0"> <property name="sizeHint" stdset="0">
<layout class="QGridLayout" name="gridLayout_2"> <size>
<item row="0" column="0"> <width>40</width>
<widget class="QPushButton" name="addAnimPushButton"> <height>20</height>
<property name="enabled"> </size>
<bool>false</bool> </property>
</property> </spacer>
<property name="sizePolicy"> </item>
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <item>
<horstretch>0</horstretch> <widget class="Line" name="line">
<verstretch>0</verstretch> <property name="orientation">
</sizepolicy> <enum>Qt::Vertical</enum>
</property> </property>
<property name="minimumSize"> </widget>
<size> </item>
<width>0</width> <item>
<height>0</height> <widget class="QToolButton" name="addToolButton">
</size> <property name="enabled">
</property> <bool>false</bool>
<property name="maximumSize"> </property>
<size> <property name="toolTip">
<width>16777215</width> <string>Add anim in PlayList</string>
<height>16777215</height> </property>
</size> <property name="text">
</property> <string/>
<property name="text"> </property>
<string>Add anim</string> <property name="icon">
</property> <iconset resource="object_viewer_qt.qrc">
</widget> <normaloff>:/images/list-add.png</normaloff>:/images/list-add.png</iconset>
</item> </property>
<item row="0" column="1"> <property name="iconSize">
<widget class="QPushButton" name="addSwtPushButton"> <size>
<property name="enabled"> <width>24</width>
<bool>false</bool> <height>24</height>
</property> </size>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <property name="autoRaise">
<horstretch>0</horstretch> <bool>true</bool>
<verstretch>0</verstretch> </property>
</sizepolicy> </widget>
</property> </item>
<property name="minimumSize"> <item>
<size> <widget class="QToolButton" name="removeToolButton">
<width>0</width> <property name="enabled">
<height>0</height> <bool>false</bool>
</size> </property>
</property> <property name="toolTip">
<property name="maximumSize"> <string>Delete anim from PlayList</string>
<size> </property>
<width>16777215</width> <property name="text">
<height>16777215</height> <string/>
</size> </property>
</property> <property name="icon">
<property name="text"> <iconset resource="object_viewer_qt.qrc">
<string>Add swt</string> <normaloff>:/images/list-remove.png</normaloff>:/images/list-remove.png</iconset>
</property> </property>
</widget> <property name="iconSize">
</item> <size>
<item row="1" column="0"> <width>24</width>
<widget class="QPushButton" name="resetPushButton"> <height>24</height>
<property name="enabled"> </size>
<bool>false</bool> </property>
</property> <property name="autoRaise">
<property name="sizePolicy"> <bool>true</bool>
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> </property>
<horstretch>0</horstretch> </widget>
<verstretch>0</verstretch> </item>
</sizepolicy> <item>
</property> <widget class="QToolButton" name="upToolButton">
<property name="minimumSize"> <property name="enabled">
<size> <bool>false</bool>
<width>0</width> </property>
<height>0</height> <property name="text">
</size> <string/>
</property> </property>
<property name="maximumSize"> <property name="icon">
<size> <iconset resource="object_viewer_qt.qrc">
<width>16777215</width> <normaloff>:/images/go-up.png</normaloff>:/images/go-up.png</iconset>
<height>16777215</height> </property>
</size> <property name="iconSize">
</property> <size>
<property name="text"> <width>24</width>
<string>Reset</string> <height>24</height>
</property> </size>
</widget> </property>
</item> <property name="autoRaise">
<item row="1" column="1"> <bool>true</bool>
<widget class="QPushButton" name="setLengthPushButton"> </property>
<property name="enabled"> </widget>
<bool>false</bool> </item>
</property> <item>
<property name="sizePolicy"> <widget class="QToolButton" name="downToolButton">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <property name="enabled">
<horstretch>0</horstretch> <bool>false</bool>
<verstretch>0</verstretch> </property>
</sizepolicy> <property name="text">
</property> <string/>
<property name="minimumSize"> </property>
<size> <property name="icon">
<width>0</width> <iconset resource="object_viewer_qt.qrc">
<height>0</height> <normaloff>:/images/go-down.png</normaloff>:/images/go-down.png</iconset>
</size> </property>
</property> <property name="iconSize">
<property name="maximumSize"> <size>
<size> <width>24</width>
<width>16777215</width> <height>24</height>
<height>16777215</height> </size>
</size> </property>
</property> <property name="autoRaise">
<property name="text"> <bool>true</bool>
<string>Set anim length</string> </property>
</property> </widget>
</widget> </item>
</item> <item>
</layout> <widget class="QToolButton" name="setLengthToolButton">
</item> <property name="enabled">
<item row="2" column="1"> <bool>false</bool>
<layout class="QVBoxLayout" name="verticalLayout"> </property>
<item> <property name="sizePolicy">
<widget class="QRadioButton" name="listRadioButton"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<property name="text"> <horstretch>0</horstretch>
<string>Use the list</string> <verstretch>0</verstretch>
</property> </sizepolicy>
<property name="checked"> </property>
<bool>true</bool> <property name="minimumSize">
</property> <size>
</widget> <width>0</width>
</item> <height>0</height>
<item> </size>
<widget class="QRadioButton" name="mixerRadioButton"> </property>
<property name="enabled"> <property name="maximumSize">
<bool>true</bool> <size>
</property> <width>16777215</width>
<property name="text"> <height>16777215</height>
<string>Use the mixer</string> </size>
</property> </property>
</widget> <property name="toolTip">
</item> <string>Set duration of time in Animation control</string>
</layout> </property>
</item> <property name="text">
</layout> <string/>
</widget> </property>
</widget> <property name="icon">
<resources> <iconset resource="object_viewer_qt.qrc">
<include location="object_viewer_qt.qrc"/> <normaloff>:/images/time.png</normaloff>:/images/time.png</iconset>
</resources> </property>
<connections/> <property name="iconSize">
</ui> <size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
<resources>
<include location="object_viewer_qt.qrc"/>
</resources>
<connections/>
</ui>

598
code/nel/tools/3d/object_viewer_qt/src/emitter_form.ui
View file

@ -1,299 +1,299 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>CEmitterPage</class> <class>CEmitterPage</class>
<widget class="QWidget" name="CEmitterPage"> <widget class="QWidget" name="CEmitterPage">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>349</width> <width>352</width>
<height>393</height> <height>393</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<property name="margin"> <property name="margin">
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="tabPosition"> <property name="tabPosition">
<enum>QTabWidget::East</enum> <enum>QTabWidget::East</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<property name="movable"> <property name="movable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<widget class="QWidget" name="tabWidgetPage1"> <widget class="QWidget" name="tabWidgetPage1">
<attribute name="title"> <attribute name="title">
<string>General</string> <string>General</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<property name="spacing"> <property name="spacing">
<number>5</number> <number>5</number>
</property> </property>
<item row="0" column="0" colspan="3"> <item row="0" column="0" colspan="3">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>Emitted type:</string> <string>Emitted type:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QComboBox" name="emittedTypeComboBox"/> <widget class="QComboBox" name="emittedTypeComboBox"/>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>Type of emission:</string> <string>Type of emission:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QComboBox" name="typeEmissionComboBox"> <widget class="QComboBox" name="typeEmissionComboBox">
<item> <item>
<property name="text"> <property name="text">
<string>Regular</string> <string>Regular</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>On death</string> <string>On death</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>Once</string> <string>Once</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>On bounce</string> <string>On bounce</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>External only</string> <string>External only</string>
</property> </property>
</item> </item>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
<string>Direction:</string> <string>Direction:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" colspan="2"> <item row="1" column="1" colspan="2">
<widget class="QComboBox" name="directionComboBox"> <widget class="QComboBox" name="directionComboBox">
<item> <item>
<property name="text"> <property name="text">
<string>Default</string> <string>Default</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>Direction is aligned on the emitter direction</string> <string>Direction is aligned on the emitter direction</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>Direction is in world</string> <string>Direction is in world</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>Direction is local to the system</string> <string>Direction is local to the system</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>User</string> <string>User</string>
</property> </property>
</item> </item>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2"> <item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="forceConsistentCheckBox"> <widget class="QCheckBox" name="forceConsistentCheckBox">
<property name="text"> <property name="text">
<string>Force consistent emission</string> <string>Force consistent emission</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="2"> <item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="bypassAutoLODCheckBox"> <widget class="QCheckBox" name="bypassAutoLODCheckBox">
<property name="text"> <property name="text">
<string>Bypass Auto-LOD</string> <string>Bypass Auto-LOD</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="2"> <item row="4" column="0" colspan="2">
<widget class="QLabel" name="label_7"> <widget class="QLabel" name="label_7">
<property name="text"> <property name="text">
<string>Speed inheritance factor:</string> <string>Speed inheritance factor:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0" colspan="3"> <item row="5" column="0" colspan="3">
<widget class="NLQT::CEditRangeFloatWidget" name="speedInherFactorWidget" native="true"/> <widget class="NLQT::CEditRangeFloatWidget" name="speedInherFactorWidget" native="true"/>
</item> </item>
<item row="6" column="0" colspan="2"> <item row="6" column="0" colspan="2">
<widget class="QLabel" name="delayedEmissionLabel"> <widget class="QLabel" name="delayedEmissionLabel">
<property name="text"> <property name="text">
<string>Delayed emission:</string> <string>Delayed emission:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0" colspan="3"> <item row="7" column="0" colspan="3">
<widget class="NLQT::CEditRangeFloatWidget" name="delayedEmissionWidget" native="true"/> <widget class="NLQT::CEditRangeFloatWidget" name="delayedEmissionWidget" native="true"/>
</item> </item>
<item row="8" column="0" colspan="2"> <item row="8" column="0" colspan="2">
<widget class="QLabel" name="maxEmissinCountLabel"> <widget class="QLabel" name="maxEmissinCountLabel">
<property name="text"> <property name="text">
<string>Max Emission Count:</string> <string>Max Emission Count:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="0" colspan="3"> <item row="9" column="0" colspan="3">
<widget class="NLQT::CEditRangeUIntWidget" name="maxEmissionCountWidget" native="true"/> <widget class="NLQT::CEditRangeUIntWidget" name="maxEmissionCountWidget" native="true"/>
</item> </item>
<item row="10" column="0" colspan="3"> <item row="10" column="0" colspan="3">
<widget class="NLQT::CDirectionWidget" name="directionWidget" native="true"/> <widget class="NLQT::CDirectionWidget" name="directionWidget" native="true"/>
</item> </item>
<item row="11" column="0"> <item row="11" column="0">
<widget class="QLabel" name="radiusLabel"> <widget class="QLabel" name="radiusLabel">
<property name="text"> <property name="text">
<string>Radius:</string> <string>Radius:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="0" rowspan="2" colspan="3"> <item row="12" column="0" rowspan="2" colspan="3">
<widget class="NLQT::CEditRangeFloatWidget" name="radiusWidget" native="true"/> <widget class="NLQT::CEditRangeFloatWidget" name="radiusWidget" native="true"/>
</item> </item>
<item row="14" column="0"> <item row="14" column="0">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>17</width> <width>17</width>
<height>143</height> <height>143</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tabWidgetPage2"> <widget class="QWidget" name="tabWidgetPage2">
<attribute name="title"> <attribute name="title">
<string>Emission period</string> <string>Emission period</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="1" column="0"> <item row="1" column="0">
<spacer name="verticalSpacer_2"> <spacer name="verticalSpacer_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>291</height> <height>291</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="NLQT::CAttribFloatWidget" name="periodWidget"> <widget class="NLQT::CAttribFloatWidget" name="periodWidget">
<property name="title"> <property name="title">
<string>Emmision period</string> <string>Emission period</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tabWidgetPage3"> <widget class="QWidget" name="tabWidgetPage3">
<attribute name="title"> <attribute name="title">
<string>Emmision quantity/Speed</string> <string>Emission quantity/Speed</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0"> <item row="0" column="0">
<widget class="NLQT::CAttribUIntWidget" name="genNbWidget"> <widget class="NLQT::CAttribUIntWidget" name="genNbWidget">
<property name="title"> <property name="title">
<string>Emmision quantity</string> <string>Emission quantity</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="NLQT::CAttribFloatWidget" name="strenghtModulateWidget"> <widget class="NLQT::CAttribFloatWidget" name="strenghtModulateWidget">
<property name="title"> <property name="title">
<string>Strenght modulation</string> <string>Strenght modulation</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<spacer name="verticalSpacer_3"> <spacer name="verticalSpacer_3">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>275</height> <height>275</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
</layout> </layout>
</widget> </widget>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>NLQT::CEditRangeUIntWidget</class> <class>NLQT::CEditRangeUIntWidget</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>edit_range_widget.h</header> <header>edit_range_widget.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>NLQT::CEditRangeFloatWidget</class> <class>NLQT::CEditRangeFloatWidget</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>edit_range_widget.h</header> <header>edit_range_widget.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>NLQT::CDirectionWidget</class> <class>NLQT::CAttribFloatWidget</class>
<extends>QWidget</extends> <extends>QGroupBox</extends>
<header>direction_widget.h</header> <header>attrib_widget.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>NLQT::CAttribFloatWidget</class> <class>NLQT::CDirectionWidget</class>
<extends>QGroupBox</extends> <extends>QWidget</extends>
<header>attrib_widget.h</header> <header>direction_widget.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>NLQT::CAttribUIntWidget</class> <class>NLQT::CAttribUIntWidget</class>
<extends>QGroupBox</extends> <extends>QGroupBox</extends>
<header>attrib_widget.h</header> <header>attrib_widget.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

1588
code/nel/tools/3d/object_viewer_qt/src/located_bindable_form.ui
View file

File diff suppressed because it is too large Load diff

16
code/nel/tools/3d/object_viewer_qt/src/located_bindable_page.cpp
View file

@ -135,7 +135,7 @@ CLocatedBindablePage::CLocatedBindablePage(QWidget *parent)
connect(_ui.autoLodCheckBox, SIGNAL(toggled(bool)), this, SLOT(setAutoLOD(bool))); connect(_ui.autoLodCheckBox, SIGNAL(toggled(bool)), this, SLOT(setAutoLOD(bool)));
connect(_ui.globalColorLightingCheckBox, SIGNAL(toggled(bool)), this, SLOT(setGlobalColorLight(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.alignCheckBox, SIGNAL(toggled(bool)), this, SLOT(setAlignOnMotion(bool)));
connect(_ui.ztestCheckBox, SIGNAL(toggled(bool)), this, SLOT(setZTest(bool))); connect(_ui.ztestCheckBox, SIGNAL(toggled(bool)), this, SLOT(setZTest(bool)));
connect(_ui.zalignCheckBox, SIGNAL(toggled(bool)), this, SLOT(setZAlign(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()); _ui.zalignCheckBox->setChecked(fla->getAlignOnZAxis());
// 'look at' independant sizes // 'look at' independant sizes
_ui.independantSizeCheckBox->setChecked(fla->hasIndependantSizes()); _ui.independentSizeCheckBox->setChecked(fla->hasIndependantSizes());
_ui.independantSizeCheckBox->show(); _ui.independentSizeCheckBox->show();
_ui.independantGroupBox->show(); _ui.independentGroupBox->show();
// Add Look at page in tabWidget // Add Look at page in tabWidget
_ui.tabWidget->addTab(_ui.lookAtPage, tr("Look At param")); _ui.tabWidget->addTab(_ui.lookAtPage, tr("Look At param"));
} }
else else
{ {
_ui.independantSizeCheckBox->hide(); _ui.independentSizeCheckBox->hide();
_ui.independantGroupBox->hide(); _ui.independentGroupBox->hide();
} }
// Shock wave page setup // Shock wave page setup
@ -495,7 +495,7 @@ void CLocatedBindablePage::setIndependantSize(bool state)
la->setIndependantSizes(state); la->setIndependantSizes(state);
updateModifiedFlag(); updateModifiedFlag();
} }
_ui.independantGroupBox->setEnabled(state); _ui.independentGroupBox->setEnabled(state);
updateSizeControl(); updateSizeControl();
} }
@ -683,4 +683,4 @@ void CLocatedBindablePage::touchPSState()
} }
} }
} /* namespace NLQT */ } /* namespace NLQT */

2
code/nel/tools/3d/object_viewer_qt/src/main_window.cpp
View file

@ -504,7 +504,7 @@ void CMainWindow::createDialogs()
connect(_ParticleControlDialog, SIGNAL(changeState()), _ParticleWorkspaceDialog, SLOT(setNewState())); connect(_ParticleControlDialog, SIGNAL(changeState()), _ParticleWorkspaceDialog, SLOT(setNewState()));
connect(_ParticleWorkspaceDialog, SIGNAL(changeActiveNode()), _ParticleControlDialog, SLOT(updateActiveNode())); 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)), _SkeletonTreeModel, SLOT(rebuildModel()));
connect(_AnimationSetDialog, SIGNAL(changeCurrentShape(QString)), _SkeletonScaleDialog, SLOT(setCurrentShape(QString))); connect(_AnimationSetDialog, SIGNAL(changeCurrentShape(QString)), _SkeletonScaleDialog, SLOT(setCurrentShape(QString)));
connect(_AnimationSetDialog, SIGNAL(changeCurrentShape(QString)), _AnimationDialog, SLOT(setCurrentShape(QString))); connect(_AnimationSetDialog, SIGNAL(changeCurrentShape(QString)), _AnimationDialog, SLOT(setCurrentShape(QString)));

294
code/nel/tools/3d/object_viewer_qt/src/particle_force_form.ui
View file

@ -6,178 +6,152 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>243</width> <width>212</width>
<height>451</height> <height>335</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin"> <property name="leftMargin">
<number>6</number> <number>6</number>
</property> </property>
<property name="topMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<property name="spacing">
<number>3</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QLabel" name="label_2">
<property name="tabPosition"> <property name="text">
<enum>QTabWidget::East</enum> <string>Targets:</string>
</property> </property>
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="tabWidgetPage1">
<attribute name="title">
<string>Target</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_2">
<property name="spacing">
<number>3</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Targets:</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Avaible targets:</string>
</property>
</widget>
</item>
<item row="1" column="0" rowspan="4">
<widget class="QListWidget" name="targetsListWidget"/>
</item>
<item row="1" column="1">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>57</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="2" rowspan="4">
<widget class="QListWidget" name="avaibleTargetsListWidget"/>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="toTargetsPushButton">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>&lt;</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QPushButton" name="toAvaibleTargetsPushButton">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>&gt;</string>
</property>
</widget>
</item>
<item row="4" column="1">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>56</height>
</size>
</property>
</spacer>
</item>
<item row="5" column="0" colspan="3">
<widget class="NLQT::CDirectionWidget" name="directionWidget" native="true"/>
</item>
<item row="6" column="0" colspan="3">
<widget class="QLabel" name="parametricFactorLabel">
<property name="text">
<string>Parametric factor:</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="3">
<widget class="NLQT::CEditRangeFloatWidget" name="parametricFactorWidget" native="true"/>
</item>
<item row="8" column="0" colspan="2">
<widget class="QLabel" name="radialViscosityLabel">
<property name="text">
<string>Radial viscosity:</string>
</property>
</widget>
</item>
<item row="9" column="0" colspan="3">
<widget class="NLQT::CEditRangeFloatWidget" name="radialViscosityWidget" native="true"/>
</item>
<item row="10" column="0" colspan="2">
<widget class="QLabel" name="tangentialViscosityLabel">
<property name="text">
<string>Tangential viscosity:</string>
</property>
</widget>
</item>
<item row="11" column="0" colspan="3">
<widget class="NLQT::CEditRangeFloatWidget" name="tangentialViscosityWidget" native="true"/>
</item>
<item row="12" column="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>36</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="tabWidgetPage2">
<attribute name="title">
<string>Force intensity</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="NLQT::CAttribFloatWidget" name="forceIntensityWidget"/>
</item>
<item row="1" column="0">
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>349</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
<item row="0" column="2">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Avaible targets:</string>
</property>
</widget>
</item>
<item row="1" column="0" rowspan="4">
<widget class="QListWidget" name="targetsListWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="1">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>57</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="2" rowspan="4">
<widget class="QListWidget" name="avaibleTargetsListWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="toTargetsPushButton">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>&lt;</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QPushButton" name="toAvaibleTargetsPushButton">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>&gt;</string>
</property>
</widget>
</item>
<item row="4" column="1">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>56</height>
</size>
</property>
</spacer>
</item>
<item row="5" column="0" colspan="3">
<widget class="NLQT::CAttribFloatWidget" name="forceIntensityWidget">
<property name="title">
<string>Force intensity</string>
</property>
</widget>
</item>
<item row="6" column="0" colspan="3">
<widget class="QLabel" name="parametricFactorLabel">
<property name="text">
<string>Parametric factor:</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="3">
<widget class="NLQT::CEditRangeFloatWidget" name="parametricFactorWidget" native="true"/>
</item>
<item row="8" column="0">
<widget class="QLabel" name="radialViscosityLabel">
<property name="text">
<string>Radial viscosity:</string>
</property>
</widget>
</item>
<item row="9" column="0" colspan="3">
<widget class="NLQT::CEditRangeFloatWidget" name="radialViscosityWidget" native="true"/>
</item>
<item row="10" column="0" colspan="2">
<widget class="QLabel" name="tangentialViscosityLabel">
<property name="text">
<string>Tangential viscosity:</string>
</property>
</widget>
</item>
<item row="11" column="0" colspan="3">
<widget class="NLQT::CEditRangeFloatWidget" name="tangentialViscosityWidget" native="true"/>
</item>
<item row="12" column="0" colspan="3">
<widget class="NLQT::CDirectionWidget" name="directionWidget" native="true"/>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>

50
code/nel/tools/3d/object_viewer_qt/src/particle_light_form.ui
View file

@ -30,6 +30,12 @@
<string>Light color</string> <string>Light color</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>6</number>
</property>
<property name="spacing">
<number>3</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="NLQT::CAttribRGBAWidget" name="lightColorWidget"/> <widget class="NLQT::CAttribRGBAWidget" name="lightColorWidget"/>
</item> </item>
@ -50,13 +56,30 @@
</widget> </widget>
<widget class="QWidget" name="tabWidgetPage2"> <widget class="QWidget" name="tabWidgetPage2">
<attribute name="title"> <attribute name="title">
<string>Attenuation start</string> <string>Attenuation start/end</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<property name="margin">
<number>6</number>
</property>
<property name="spacing">
<number>3</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="NLQT::CAttribFloatWidget" name="attenStartWidget"/> <widget class="NLQT::CAttribFloatWidget" name="attenStartWidget">
<property name="title">
<string>Attenuation start</string>
</property>
</widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="NLQT::CAttribFloatWidget" name="attenEndWidget">
<property name="title">
<string>Attenuation end</string>
</property>
</widget>
</item>
<item row="2" column="0">
<spacer name="verticalSpacer_2"> <spacer name="verticalSpacer_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -71,29 +94,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tabWidgetPage3">
<attribute name="title">
<string>Attenuation end</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="NLQT::CAttribFloatWidget" name="attenEndWidget"/>
</item>
<item row="1" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>228</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
</layout> </layout>

61
code/nel/tools/3d/object_viewer_qt/src/particle_texture_anim_form.ui
View file

@ -6,28 +6,53 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>212</width> <width>252</width>
<height>101</height> <height>103</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_3">
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing"> <property name="spacing">
<number>5</number> <number>3</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QCheckBox" name="texAnimCheckBox"> <widget class="QGroupBox" name="texAnimGroupBox">
<property name="text"> <property name="title">
<string>Enable texture anim</string> <string/>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="QCheckBox" name="texAnimCheckBox">
<property name="text">
<string>Enable texture anim</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="textureGroupedPushButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Texture grouped</string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="1" column="0">
<widget class="QGroupBox" name="multitexturingGroupBox"> <widget class="QGroupBox" name="multitexturingGroupBox">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@ -39,6 +64,9 @@
<string/> <string/>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>6</number>
</property>
<property name="spacing"> <property name="spacing">
<number>5</number> <number>5</number>
</property> </property>
@ -62,25 +90,12 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2"> <item row="2" column="0">
<widget class="NLQT::CAttribIntWidget" name="texIndexWidget" native="true"/> <widget class="NLQT::CAttribIntWidget" name="texIndexWidget" native="true"/>
</item> </item>
<item row="3" column="0" colspan="2"> <item row="3" column="0">
<widget class="NLQT::CParticleTextureWidget" name="texWidget" native="true"/> <widget class="NLQT::CParticleTextureWidget" name="texWidget" native="true"/>
</item> </item>
<item row="0" column="1">
<widget class="QPushButton" name="textureGroupedPushButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Texture grouped</string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>

162
code/nel/tools/3d/object_viewer_qt/src/particle_texture_form.ui
View file

@ -6,65 +6,91 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>172</width> <width>178</width>
<height>161</height> <height>154</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout_2">
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing"> <property name="spacing">
<number>5</number> <number>3</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QScrollArea" name="scrollArea"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="minimumSize"> <property name="spacing">
<size> <number>3</number>
<width>105</width>
<height>105</height>
</size>
</property> </property>
<property name="maximumSize"> <item>
<size> <widget class="QGroupBox" name="groupBox_2">
<width>100</width> <property name="minimumSize">
<height>100</height> <size>
</size> <width>100</width>
</property> <height>100</height>
<property name="widgetResizable"> </size>
<bool>true</bool> </property>
</property> <property name="maximumSize">
<widget class="QWidget" name="scrollAreaWidgetContents"> <size>
<property name="geometry"> <width>100</width>
<rect> <height>100</height>
<x>0</x> </size>
<y>0</y> </property>
<width>103</width> <property name="title">
<height>103</height> <string/>
</rect> </property>
</property> <layout class="QGridLayout" name="gridLayout">
<layout class="QGridLayout" name="gridLayout_2"> <property name="margin">
<item row="0" column="0"> <number>3</number>
<widget class="QLabel" name="imageLabel"> </property>
<property name="maximumSize"> <item row="0" column="0">
<size> <widget class="QLabel" name="imageLabel">
<width>85</width> <property name="maximumSize">
<height>85</height> <size>
</size> <width>16777215</width>
</property> <height>16777215</height>
<property name="text"> </size>
<string/> </property>
</property> <property name="text">
</widget> <string/>
</item> </property>
</layout> </widget>
</widget> </item>
</widget> </layout>
</widget>
</item>
<item>
<widget class="QPushButton" name="chooseTexPushButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Choose texture</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="removePushButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item row="0" column="1" rowspan="3"> <item row="0" column="1">
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@ -81,6 +107,9 @@
<property name="text"> <property name="text">
<string>Name:</string> <string>Name:</string>
</property> </property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
@ -88,12 +117,18 @@
<property name="text"> <property name="text">
<string>Size:</string> <string>Size:</string>
</property> </property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="memoryLabel"> <widget class="QLabel" name="depthLabel">
<property name="text"> <property name="text">
<string>Memory:</string> <string>Depth:</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
@ -102,10 +137,13 @@
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>81</height> <height>50</height>
</size> </size>
</property> </property>
</spacer> </spacer>
@ -113,32 +151,6 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QPushButton" name="chooseTexPushButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Choose texture</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QPushButton" name="removePushButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>

10
code/nel/tools/3d/object_viewer_qt/src/particle_texture_widget.cpp
View file

@ -109,6 +109,9 @@ void CParticleTextureWidget::removeTexture()
void CParticleTextureWidget::updateTexture() void CParticleTextureWidget::updateTexture()
{ {
_ui.nameLabel->setText(tr("Name:"));
_ui.sizeLabel->setText(tr("Size:"));
_ui.depthLabel->setText(tr("Depth:"));
if (!_Texture) if (!_Texture)
{ {
_ui.imageLabel->setPixmap(QPixmap()); _ui.imageLabel->setPixmap(QPixmap());
@ -119,7 +122,12 @@ void CParticleTextureWidget::updateTexture()
std::string texName = (static_cast<NL3D::CTextureFile *>(_Wrapper->get()))->getFileName().c_str(); std::string texName = (static_cast<NL3D::CTextureFile *>(_Wrapper->get()))->getFileName().c_str();
_ui.nameLabel->setText(tr("Name: %1").arg(texName.c_str())); _ui.nameLabel->setText(tr("Name: %1").arg(texName.c_str()));
if (!NLMISC::CFile::getFilename(texName).empty()) 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 else
_ui.imageLabel->setPixmap(QPixmap()); _ui.imageLabel->setPixmap(QPixmap());
} }

21
code/nel/tools/3d/object_viewer_qt/src/particle_zone_form.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>210</width> <width>198</width>
<height>302</height> <height>310</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -15,10 +15,10 @@
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin"> <property name="margin">
<number>9</number> <number>6</number>
</property> </property>
<property name="spacing"> <property name="spacing">
<number>6</number> <number>3</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
@ -129,19 +129,6 @@
<item row="7" column="0" colspan="3"> <item row="7" column="0" colspan="3">
<widget class="NLQT::CEditRangeFloatWidget" name="bounceFactorWidget" native="true"/> <widget class="NLQT::CEditRangeFloatWidget" name="bounceFactorWidget" native="true"/>
</item> </item>
<item row="8" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>1</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>