Added button icons to the character editor
@ -55,6 +55,7 @@ CCharacterEditor::CCharacterEditor(QWidget *parent)
|
|||||||
connect(ui->ActionBindPose, SIGNAL(toggled(bool)), this, SLOT(ToggleBindPose(bool)));
|
connect(ui->ActionBindPose, SIGNAL(toggled(bool)), this, SLOT(ToggleBindPose(bool)));
|
||||||
connect(ui->ActionOrbit, SIGNAL(toggled(bool)), this, SLOT(ToggleOrbit(bool)));
|
connect(ui->ActionOrbit, SIGNAL(toggled(bool)), this, SLOT(ToggleOrbit(bool)));
|
||||||
connect(ui->ActionPlay, SIGNAL(triggered()), this, SLOT(TogglePlay()));
|
connect(ui->ActionPlay, SIGNAL(triggered()), this, SLOT(TogglePlay()));
|
||||||
|
connect(ui->ActionLoop, SIGNAL(toggled(bool)), this, SLOT(ToggleLoop(bool)));
|
||||||
connect(ui->ActionRewind, SIGNAL(triggered()), this, SLOT(Rewind()));
|
connect(ui->ActionRewind, SIGNAL(triggered()), this, SLOT(Rewind()));
|
||||||
connect(ui->ActionFastForward, SIGNAL(triggered()), this, SLOT(FastForward()));
|
connect(ui->ActionFastForward, SIGNAL(triggered()), this, SLOT(FastForward()));
|
||||||
connect(ui->ActionPrevAnim, SIGNAL(triggered()), this, SLOT(PrevAnim()));
|
connect(ui->ActionPrevAnim, SIGNAL(triggered()), this, SLOT(PrevAnim()));
|
||||||
@ -396,7 +397,11 @@ void CCharacterEditor::TogglePlay()
|
|||||||
|
|
||||||
mPlayAnim = !mPlayAnim;
|
mPlayAnim = !mPlayAnim;
|
||||||
QString NewText = (mPlayAnim ? "Pause" : "Play");
|
QString NewText = (mPlayAnim ? "Pause" : "Play");
|
||||||
ui->PlayPauseButton->setText(NewText);
|
ui->PlayPauseButton->setToolTip(NewText);
|
||||||
|
ui->ActionPlay->setText(NewText);
|
||||||
|
|
||||||
|
QIcon PlayPauseIcon = QIcon(mPlayAnim ? ":/icons/Pause_24px.png" : ":/icons/Play_24px.png");
|
||||||
|
ui->PlayPauseButton->setIcon(PlayPauseIcon);
|
||||||
|
|
||||||
if (ui->ActionPlay != sender())
|
if (ui->ActionPlay != sender())
|
||||||
{
|
{
|
||||||
@ -420,8 +425,26 @@ void CCharacterEditor::ToggleLoop(bool Loop)
|
|||||||
{
|
{
|
||||||
mLoopAnim = Loop;
|
mLoopAnim = Loop;
|
||||||
|
|
||||||
|
QString NewText = (Loop ? "Disable Loop" : "Loop");
|
||||||
|
ui->LoopButton->setToolTip(NewText);
|
||||||
|
ui->ActionLoop->setText(NewText);
|
||||||
|
|
||||||
|
QIcon ActionIcon = QIcon(Loop ? ":/icons/DontLoop_24px" : ":/icons/Loop_24px.png");
|
||||||
|
ui->ActionLoop->setIcon(ActionIcon);
|
||||||
|
|
||||||
if (sender() != ui->LoopButton)
|
if (sender() != ui->LoopButton)
|
||||||
|
{
|
||||||
|
ui->LoopButton->blockSignals(true);
|
||||||
ui->LoopButton->setChecked(Loop);
|
ui->LoopButton->setChecked(Loop);
|
||||||
|
ui->LoopButton->blockSignals(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (sender() != ui->ActionLoop)
|
||||||
|
{
|
||||||
|
ui->LoopButton->blockSignals(true);
|
||||||
|
ui->ActionLoop->setChecked(Loop);
|
||||||
|
ui->LoopButton->blockSignals(false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CCharacterEditor::Rewind()
|
void CCharacterEditor::Rewind()
|
||||||
|
@ -49,8 +49,8 @@
|
|||||||
<bool>false</bool>
|
<bool>false</bool>
|
||||||
</attribute>
|
</attribute>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QWidget" name="layoutWidget">
|
<widget class="QWidget" name="">
|
||||||
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
<item>
|
<item>
|
||||||
<widget class="CCharacterEditorViewport" name="Viewport" native="true">
|
<widget class="CCharacterEditorViewport" name="Viewport" native="true">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
@ -69,82 +69,201 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="LoopButton">
|
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||||
<property name="text">
|
<item>
|
||||||
<string>Loop</string>
|
<widget class="QPushButton" name="LoopButton">
|
||||||
</property>
|
<property name="minimumSize">
|
||||||
<property name="checkable">
|
<size>
|
||||||
<bool>true</bool>
|
<width>32</width>
|
||||||
</property>
|
<height>32</height>
|
||||||
<property name="checked">
|
</size>
|
||||||
<bool>true</bool>
|
</property>
|
||||||
</property>
|
<property name="toolTip">
|
||||||
</widget>
|
<string>Disable Loop</string>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
<property name="icon">
|
||||||
|
<iconset resource="../Icons.qrc">
|
||||||
|
<normaloff>:/icons/Loop_24px.png</normaloff>
|
||||||
|
<normalon>:/icons/DontLoop_24px.png</normalon>:/icons/Loop_24px.png</iconset>
|
||||||
|
</property>
|
||||||
|
<property name="iconSize">
|
||||||
|
<size>
|
||||||
|
<width>24</width>
|
||||||
|
<height>24</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="checkable">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="checked">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="horizontalSpacer_2">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeType">
|
||||||
|
<enum>QSizePolicy::Expanding</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="RewindButton">
|
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||||
<property name="text">
|
<item>
|
||||||
<string>Rewind</string>
|
<widget class="QPushButton" name="RewindButton">
|
||||||
</property>
|
<property name="minimumSize">
|
||||||
</widget>
|
<size>
|
||||||
|
<width>32</width>
|
||||||
|
<height>32</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Jump to Beginning</string>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
<property name="icon">
|
||||||
|
<iconset resource="../Icons.qrc">
|
||||||
|
<normaloff>:/icons/Beginning_24px.png</normaloff>:/icons/Beginning_24px.png</iconset>
|
||||||
|
</property>
|
||||||
|
<property name="iconSize">
|
||||||
|
<size>
|
||||||
|
<width>24</width>
|
||||||
|
<height>24</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="PlayPauseButton">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>32</width>
|
||||||
|
<height>32</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Pause</string>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
<property name="icon">
|
||||||
|
<iconset resource="../Icons.qrc">
|
||||||
|
<normaloff>:/icons/Pause_24px.png</normaloff>:/icons/Pause_24px.png</iconset>
|
||||||
|
</property>
|
||||||
|
<property name="iconSize">
|
||||||
|
<size>
|
||||||
|
<width>24</width>
|
||||||
|
<height>24</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="checkable">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
|
<property name="checked">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="FastForwardButton">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>32</width>
|
||||||
|
<height>32</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Jump to End</string>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
<property name="icon">
|
||||||
|
<iconset resource="../Icons.qrc">
|
||||||
|
<normaloff>:/icons/End_24px.png</normaloff>:/icons/End_24px.png</iconset>
|
||||||
|
</property>
|
||||||
|
<property name="iconSize">
|
||||||
|
<size>
|
||||||
|
<width>24</width>
|
||||||
|
<height>24</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="PlayPauseButton">
|
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||||
<property name="text">
|
<item>
|
||||||
<string>Pause</string>
|
<spacer name="horizontalSpacer">
|
||||||
</property>
|
<property name="orientation">
|
||||||
</widget>
|
<enum>Qt::Horizontal</enum>
|
||||||
</item>
|
</property>
|
||||||
<item>
|
<property name="sizeType">
|
||||||
<widget class="QPushButton" name="FastForwardButton">
|
<enum>QSizePolicy::Expanding</enum>
|
||||||
<property name="text">
|
</property>
|
||||||
<string>Fast Forward</string>
|
<property name="sizeHint" stdset="0">
|
||||||
</property>
|
<size>
|
||||||
</widget>
|
<width>40</width>
|
||||||
</item>
|
<height>20</height>
|
||||||
<item>
|
</size>
|
||||||
<spacer name="horizontalSpacer">
|
</property>
|
||||||
<property name="orientation">
|
</spacer>
|
||||||
<enum>Qt::Horizontal</enum>
|
</item>
|
||||||
</property>
|
<item>
|
||||||
<property name="sizeHint" stdset="0">
|
<widget class="QLabel" name="AnimSpeedLabel">
|
||||||
<size>
|
<property name="font">
|
||||||
<width>40</width>
|
<font>
|
||||||
<height>20</height>
|
<pointsize>10</pointsize>
|
||||||
</size>
|
</font>
|
||||||
</property>
|
</property>
|
||||||
</spacer>
|
<property name="text">
|
||||||
</item>
|
<string>Speed:</string>
|
||||||
<item>
|
</property>
|
||||||
<widget class="QLabel" name="AnimSpeedLabel">
|
</widget>
|
||||||
<property name="text">
|
</item>
|
||||||
<string>Speed:</string>
|
<item>
|
||||||
</property>
|
<widget class="WDraggableSpinBox" name="AnimSpeedSpinBox">
|
||||||
</widget>
|
<property name="suffix">
|
||||||
</item>
|
<string>x</string>
|
||||||
<item>
|
</property>
|
||||||
<widget class="WDraggableSpinBox" name="AnimSpeedSpinBox">
|
<property name="decimals">
|
||||||
<property name="suffix">
|
<number>1</number>
|
||||||
<string>x</string>
|
</property>
|
||||||
</property>
|
<property name="minimum">
|
||||||
<property name="decimals">
|
<double>-10.000000000000000</double>
|
||||||
<number>1</number>
|
</property>
|
||||||
</property>
|
<property name="maximum">
|
||||||
<property name="minimum">
|
<double>10.000000000000000</double>
|
||||||
<double>-10.000000000000000</double>
|
</property>
|
||||||
</property>
|
<property name="singleStep">
|
||||||
<property name="maximum">
|
<double>0.100000000000000</double>
|
||||||
<double>10.000000000000000</double>
|
</property>
|
||||||
</property>
|
<property name="value">
|
||||||
<property name="singleStep">
|
<double>1.000000000000000</double>
|
||||||
<double>0.100000000000000</double>
|
</property>
|
||||||
</property>
|
</widget>
|
||||||
<property name="value">
|
</item>
|
||||||
<double>1.000000000000000</double>
|
</layout>
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
@ -162,6 +281,11 @@
|
|||||||
<height>21</height>
|
<height>21</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="font">
|
||||||
|
<font>
|
||||||
|
<pointsize>10</pointsize>
|
||||||
|
</font>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Frame 0 / 0 (0.000s/0.000s)</string>
|
<string>Frame 0 / 0 (0.000s/0.000s)</string>
|
||||||
</property>
|
</property>
|
||||||
@ -205,6 +329,7 @@
|
|||||||
<addaction name="ActionOrbit"/>
|
<addaction name="ActionOrbit"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
<addaction name="ActionPlay"/>
|
<addaction name="ActionPlay"/>
|
||||||
|
<addaction name="ActionLoop"/>
|
||||||
<addaction name="ActionRewind"/>
|
<addaction name="ActionRewind"/>
|
||||||
<addaction name="ActionFastForward"/>
|
<addaction name="ActionFastForward"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
@ -236,7 +361,7 @@
|
|||||||
<action name="ActionOpen">
|
<action name="ActionOpen">
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset resource="../Icons.qrc">
|
<iconset resource="../Icons.qrc">
|
||||||
<normaloff>:/icons/Open.png</normaloff>:/icons/Open.png</iconset>
|
<normaloff>:/icons/Open_24px.png</normaloff>:/icons/Open_24px.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Open</string>
|
<string>Open</string>
|
||||||
@ -252,6 +377,10 @@
|
|||||||
<property name="checkable">
|
<property name="checkable">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="icon">
|
||||||
|
<iconset resource="../Icons.qrc">
|
||||||
|
<normaloff>:/icons/ShowSkeleton_24px.png</normaloff>:/icons/ShowSkeleton_24px.png</iconset>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Show Skeleton</string>
|
<string>Show Skeleton</string>
|
||||||
</property>
|
</property>
|
||||||
@ -269,6 +398,10 @@
|
|||||||
<property name="checked">
|
<property name="checked">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="icon">
|
||||||
|
<iconset resource="../Icons.qrc">
|
||||||
|
<normaloff>:/icons/ShowMesh_24px.png</normaloff>:/icons/ShowMesh_24px.png</iconset>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Show Mesh</string>
|
<string>Show Mesh</string>
|
||||||
</property>
|
</property>
|
||||||
@ -283,6 +416,10 @@
|
|||||||
<property name="checkable">
|
<property name="checkable">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="icon">
|
||||||
|
<iconset resource="../Icons.qrc">
|
||||||
|
<normaloff>:/icons/BindPose_24px.png</normaloff>:/icons/BindPose_24px.png</iconset>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Bind Pose</string>
|
<string>Bind Pose</string>
|
||||||
</property>
|
</property>
|
||||||
@ -300,6 +437,10 @@
|
|||||||
<property name="checked">
|
<property name="checked">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="icon">
|
||||||
|
<iconset resource="../Icons.qrc">
|
||||||
|
<normaloff>:/icons/OrbitCamera_24px.png</normaloff>:/icons/OrbitCamera_24px.png</iconset>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Orbit</string>
|
<string>Orbit</string>
|
||||||
</property>
|
</property>
|
||||||
@ -319,7 +460,7 @@
|
|||||||
</property>
|
</property>
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset resource="../Icons.qrc">
|
<iconset resource="../Icons.qrc">
|
||||||
<normaloff>:/icons/GridLight.png</normaloff>:/icons/GridLight.png</iconset>
|
<normaloff>:/icons/Grid_24px.png</normaloff>:/icons/Grid_24px.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Show Grid</string>
|
<string>Show Grid</string>
|
||||||
@ -351,29 +492,57 @@
|
|||||||
<property name="checked">
|
<property name="checked">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="icon">
|
||||||
|
<iconset resource="../Icons.qrc">
|
||||||
|
<normaloff>:/icons/Play_24px.png</normaloff>
|
||||||
|
<normalon>:/icons/Pause_24px.png</normalon>:/icons/Play_24px.png</iconset>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Play</string>
|
<string>Pause</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="shortcut">
|
<property name="shortcut">
|
||||||
<string>Space</string>
|
<string>Space</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="ActionRewind">
|
<action name="ActionRewind">
|
||||||
|
<property name="icon">
|
||||||
|
<iconset resource="../Icons.qrc">
|
||||||
|
<normaloff>:/icons/Beginning_24px.png</normaloff>:/icons/Beginning_24px.png</iconset>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Rewind</string>
|
<string>Jump to Beginning</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="shortcut">
|
<property name="shortcut">
|
||||||
<string>Ctrl+R</string>
|
<string>Ctrl+R</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="ActionFastForward">
|
<action name="ActionFastForward">
|
||||||
|
<property name="icon">
|
||||||
|
<iconset resource="../Icons.qrc">
|
||||||
|
<normaloff>:/icons/End_24px.png</normaloff>:/icons/End_24px.png</iconset>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Fast Forward</string>
|
<string>Jump to End</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="shortcut">
|
<property name="shortcut">
|
||||||
<string>Ctrl+F</string>
|
<string>Ctrl+F</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
|
<action name="ActionLoop">
|
||||||
|
<property name="checkable">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="checked">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="icon">
|
||||||
|
<iconset resource="../Icons.qrc">
|
||||||
|
<normaloff>:/icons/Loop_24px.png</normaloff>:/icons/Loop_24px.png</iconset>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Loop</string>
|
||||||
|
</property>
|
||||||
|
</action>
|
||||||
</widget>
|
</widget>
|
||||||
<customwidgets>
|
<customwidgets>
|
||||||
<customwidget>
|
<customwidget>
|
||||||
|
@ -5,8 +5,6 @@
|
|||||||
<file>icons/Material Highlight.png</file>
|
<file>icons/Material Highlight.png</file>
|
||||||
<file>icons/Minus v2.png</file>
|
<file>icons/Minus v2.png</file>
|
||||||
<file>icons/Minus.png</file>
|
<file>icons/Minus.png</file>
|
||||||
<file>icons/Orbit Camera v2.png</file>
|
|
||||||
<file>icons/Orbit Camera.png</file>
|
|
||||||
<file>icons/Plus.png</file>
|
<file>icons/Plus.png</file>
|
||||||
<file>icons/Rotate.png</file>
|
<file>icons/Rotate.png</file>
|
||||||
<file>icons/Samus Silhouette Gradient.png</file>
|
<file>icons/Samus Silhouette Gradient.png</file>
|
||||||
@ -19,7 +17,6 @@
|
|||||||
<file>icons/Highlight.png</file>
|
<file>icons/Highlight.png</file>
|
||||||
<file>icons/Model Preview.png</file>
|
<file>icons/Model Preview.png</file>
|
||||||
<file>icons/Show.png</file>
|
<file>icons/Show.png</file>
|
||||||
<file>icons/GridLight.png</file>
|
|
||||||
<file>icons/Create.png</file>
|
<file>icons/Create.png</file>
|
||||||
<file>icons/Display.png</file>
|
<file>icons/Display.png</file>
|
||||||
<file>icons/Instances.png</file>
|
<file>icons/Instances.png</file>
|
||||||
@ -44,5 +41,28 @@
|
|||||||
<file>icons/Edit_24px.png</file>
|
<file>icons/Edit_24px.png</file>
|
||||||
<file>icons/Edit_32px.png</file>
|
<file>icons/Edit_32px.png</file>
|
||||||
<file>icons/SaveAndRepack_32px.png</file>
|
<file>icons/SaveAndRepack_32px.png</file>
|
||||||
|
<file>icons/Play_32px.png</file>
|
||||||
|
<file>icons/Pause_32px.png</file>
|
||||||
|
<file>icons/End_32px.png</file>
|
||||||
|
<file>icons/Beginning_32px.png</file>
|
||||||
|
<file>icons/AnchorRoot_32px.png</file>
|
||||||
|
<file>icons/ShowSkeleton_32px.png</file>
|
||||||
|
<file>icons/BindPose_32px.png</file>
|
||||||
|
<file>icons/DontLoop_32px.png</file>
|
||||||
|
<file>icons/Loop_32px.png</file>
|
||||||
|
<file>icons/ShowSkeleton_24px.png</file>
|
||||||
|
<file>icons/BindPose_24px.png</file>
|
||||||
|
<file>icons/DontLoop_24px.png</file>
|
||||||
|
<file>icons/Loop_24px.png</file>
|
||||||
|
<file>icons/Beginning_24px.png</file>
|
||||||
|
<file>icons/End_24px.png</file>
|
||||||
|
<file>icons/Pause_24px.png</file>
|
||||||
|
<file>icons/Play_24px.png</file>
|
||||||
|
<file>icons/Open_24px.png</file>
|
||||||
|
<file>icons/ShowMesh_24px.png</file>
|
||||||
|
<file>icons/OrbitCamera_24px.png</file>
|
||||||
|
<file>icons/Grid_24px.png</file>
|
||||||
|
<file>icons/Grid_32px.png</file>
|
||||||
|
<file>icons/OrbitCamera_32px.png</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
@ -874,17 +874,11 @@ void CModelEditorWindow::ToggleCameraMode()
|
|||||||
CCamera *pCam = &ui->Viewport->Camera();
|
CCamera *pCam = &ui->Viewport->Camera();
|
||||||
|
|
||||||
if (pCam->MoveMode() == eOrbitCamera)
|
if (pCam->MoveMode() == eOrbitCamera)
|
||||||
{
|
|
||||||
pCam->SetMoveMode(eFreeCamera);
|
pCam->SetMoveMode(eFreeCamera);
|
||||||
ui->CameraModeButton->setIcon(QIcon(":/icons/Show.png"));
|
|
||||||
ui->CameraModeButton->setToolTip(QString("Free Camera"));
|
|
||||||
}
|
|
||||||
|
|
||||||
else if (pCam->MoveMode() == eFreeCamera)
|
else if (pCam->MoveMode() == eFreeCamera)
|
||||||
{
|
{
|
||||||
pCam->SetMoveMode(eOrbitCamera);
|
pCam->SetMoveMode(eOrbitCamera);
|
||||||
ui->CameraModeButton->setIcon(QIcon(":/icons/Orbit Camera.png"));
|
|
||||||
ui->CameraModeButton->setToolTip(QString("Orbit Camera"));
|
|
||||||
|
|
||||||
CVector3f Pos = pCam->Position();
|
CVector3f Pos = pCam->Position();
|
||||||
CVector3f Target = mpCurrentModelNode->AABox().Center();
|
CVector3f Target = mpCurrentModelNode->AABox().Center();
|
||||||
|
@ -2176,7 +2176,7 @@
|
|||||||
</property>
|
</property>
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset resource="../Icons.qrc">
|
<iconset resource="../Icons.qrc">
|
||||||
<normaloff>:/icons/GridLight.png</normaloff>:/icons/GridLight.png</iconset>
|
<normaloff>:/icons/Grid_32px.png</normaloff>:/icons/Grid_32px.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="iconSize">
|
<property name="iconSize">
|
||||||
<size>
|
<size>
|
||||||
@ -2205,7 +2205,7 @@
|
|||||||
</property>
|
</property>
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset resource="../Icons.qrc">
|
<iconset resource="../Icons.qrc">
|
||||||
<normaloff>:/icons/Orbit Camera.png</normaloff>:/icons/Orbit Camera.png</iconset>
|
<normaloff>:/icons/OrbitCamera_32px.png</normaloff>:/icons/OrbitCamera_32px.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="iconSize">
|
<property name="iconSize">
|
||||||
<size>
|
<size>
|
||||||
@ -2214,7 +2214,10 @@
|
|||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="checkable">
|
<property name="checkable">
|
||||||
<bool>false</bool>
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="checked">
|
||||||
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
<property name="flat">
|
<property name="flat">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
BIN
src/Editor/icons/Beginning_24px.png
Normal file
After Width: | Height: | Size: 2.9 KiB |
BIN
src/Editor/icons/Beginning_32px.png
Normal file
After Width: | Height: | Size: 3.0 KiB |
BIN
src/Editor/icons/BindPose_24px.png
Normal file
After Width: | Height: | Size: 2.9 KiB |
BIN
src/Editor/icons/BindPose_32px.png
Normal file
After Width: | Height: | Size: 3.0 KiB |
BIN
src/Editor/icons/DontLoop_24px.png
Normal file
After Width: | Height: | Size: 2.9 KiB |
BIN
src/Editor/icons/DontLoop_32px.png
Normal file
After Width: | Height: | Size: 3.0 KiB |
BIN
src/Editor/icons/End_24px.png
Normal file
After Width: | Height: | Size: 2.9 KiB |
BIN
src/Editor/icons/End_32px.png
Normal file
After Width: | Height: | Size: 3.0 KiB |
BIN
src/Editor/icons/Grid_24px.png
Normal file
After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
BIN
src/Editor/icons/Loop_24px.png
Normal file
After Width: | Height: | Size: 2.9 KiB |
BIN
src/Editor/icons/Loop_32px.png
Normal file
After Width: | Height: | Size: 3.0 KiB |
BIN
src/Editor/icons/Open_24px.png
Normal file
After Width: | Height: | Size: 2.9 KiB |
BIN
src/Editor/icons/OrbitCamera_24px.png
Normal file
After Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
BIN
src/Editor/icons/Pause_24px.png
Normal file
After Width: | Height: | Size: 2.8 KiB |
BIN
src/Editor/icons/Pause_32px.png
Normal file
After Width: | Height: | Size: 2.8 KiB |
BIN
src/Editor/icons/Play_24px.png
Normal file
After Width: | Height: | Size: 2.9 KiB |
BIN
src/Editor/icons/Play_32px.png
Normal file
After Width: | Height: | Size: 3.0 KiB |
BIN
src/Editor/icons/ShowMesh_24px.png
Normal file
After Width: | Height: | Size: 3.2 KiB |
BIN
src/Editor/icons/ShowSkeleton_24px.png
Normal file
After Width: | Height: | Size: 3.0 KiB |
BIN
src/Editor/icons/ShowSkeleton_32px.png
Normal file
After Width: | Height: | Size: 3.0 KiB |