Changed: #1193 Updated ovqt icons(thanks Kaetemi). Updated layout value gradient dialog. Added initial scheme bank work for particle system editor.

This commit is contained in:
dnk-88 2011-04-19 02:37:39 +03:00
parent bd1f293b5d
commit 8d42a10f4c
128 changed files with 1717 additions and 880 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

View file

@ -1,9 +1,15 @@
<RCC>
<qresource prefix="/core">
<file>images/list-add.png</file>
<file>images/list-remove.png</file>
<file>images/go-up.png</file>
<file>images/go-down.png</file>
<file>icons/ic_nel_add_item.png</file>
<file>icons/ic_nel_crash.png</file>
<file>icons/ic_nel_delete_item.png</file>
<file>icons/ic_nel_down_item.png</file>
<file>icons/ic_nel_generic_settings.png</file>
<file>icons/ic_nel_open.png</file>
<file>icons/ic_nel_path_settings.png</file>
<file>icons/ic_nel_pill.png</file>
<file>icons/ic_nel_reset_all.png</file>
<file>icons/ic_nel_up_item.png</file>
<file>images/nel.png</file>
<file>images/preferences.png</file>
</qresource>

View file

@ -70,6 +70,10 @@ const char * const ASSETS_PATH = "LevelDesignPath";
//resources
const char * const ICON_NEL = ":/core/images/nel.png";
const char * const ICON_SETTINGS = ":/core/images/preferences.png";
const char * const ICON_PILL = ":/core/icons/ic_nel_pill.png";
const char * const ICON_OPEN = ":/core/icons/ic_nel_open.png";
const char * const ICON_CRASH = ":/core/icons/ic_nel_crash.png";
} // namespace Constants
} // namespace Core

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

View file

@ -47,7 +47,7 @@ MainWindow::MainWindow(ExtensionSystem::IPluginManager *pluginManager, QWidget *
QCoreApplication::setOrganizationName(QLatin1String("RyzomCore"));
setObjectName(Constants::MAIN_WINDOW);
setWindowIcon(QIcon(Constants::ICON_NEL));
setWindowIcon(QIcon(Constants::ICON_PILL));
setWindowTitle(tr("Object Viewer Qt"));
m_pluginManager = pluginManager;
@ -173,7 +173,7 @@ void MainWindow::addContextObject(IContext *context)
void MainWindow::createActions()
{
m_openAction = new QAction(tr("&Open..."), this);
m_openAction->setIcon(QIcon(":/images/open-file.png"));
m_openAction->setIcon(QIcon(Constants::ICON_OPEN));
m_openAction->setShortcut(QKeySequence::Open);
m_openAction->setStatusTip(tr("Open an existing file"));
menuManager()->registerAction(m_openAction, Constants::OPEN);

View file

@ -74,6 +74,7 @@ QWidget *CSearchPathsSettingsPage::createPage(QWidget *parent)
connect(m_ui.removeToolButton, SIGNAL(clicked()), this, SLOT(delPath()));
connect(m_ui.upToolButton, SIGNAL(clicked()), this, SLOT(upPath()));
connect(m_ui.downToolButton, SIGNAL(clicked()), this, SLOT(downPath()));
connect(m_ui.resetToolButton, SIGNAL(clicked()), m_ui.pathsListWidget, SLOT(clear()));
return m_page;
}

View file

@ -53,12 +53,15 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Add</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="core.qrc">
<normaloff>:/core/images/list-add.png</normaloff>:/core/images/list-add.png</iconset>
<normaloff>:/core/icons/ic_nel_add_item.png</normaloff>:/core/icons/ic_nel_add_item.png</iconset>
</property>
<property name="iconSize">
<size>
@ -79,12 +82,15 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Delete</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="core.qrc">
<normaloff>:/core/images/list-remove.png</normaloff>:/core/images/list-remove.png</iconset>
<normaloff>:/core/icons/ic_nel_delete_item.png</normaloff>:/core/icons/ic_nel_delete_item.png</iconset>
</property>
<property name="iconSize">
<size>
@ -105,12 +111,15 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Up</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="core.qrc">
<normaloff>:/core/images/go-up.png</normaloff>:/core/images/go-up.png</iconset>
<normaloff>:/core/icons/ic_nel_up_item.png</normaloff>:/core/icons/ic_nel_up_item.png</iconset>
</property>
<property name="iconSize">
<size>
@ -131,12 +140,38 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Down</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="core.qrc">
<normaloff>:/core/images/go-down.png</normaloff>:/core/images/go-down.png</iconset>
<normaloff>:/core/icons/ic_nel_down_item.png</normaloff>:/core/icons/ic_nel_down_item.png</iconset>
</property>
<property name="iconSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="resetToolButton">
<property name="toolTip">
<string>Reset</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="core.qrc">
<normaloff>:/core/icons/ic_nel_reset_all.png</normaloff>:/core/icons/ic_nel_reset_all.png</iconset>
</property>
<property name="iconSize">
<size>

View file

@ -70,7 +70,8 @@ SET(OBJECT_VIEWER_PLUGIN_HDR object_viewer_plugin.h
camera_control.h
graphics_settings_page.h
sound_settings_page.h
vegetable_settings_page.h)
vegetable_settings_page.h
scheme_bank_dialog.h)
SET(OBJECT_VIEWER_PLUGIN_UIS animation_form.ui
animation_set_form.ui
@ -120,7 +121,9 @@ SET(OBJECT_VIEWER_PLUGIN_UIS animation_form.ui
tune_timer_form.ui
graphics_settings_page.ui
sound_settings_page.ui
vegetable_settings_page.ui)
vegetable_settings_page.ui
scheme_bank_form.ui
value_gradient_form.ui)
SET(OBJECT_VIEWER_PLUGIN_RCS object_viewer.qrc)

View file

@ -24,7 +24,7 @@
</property>
<property name="windowIcon">
<iconset resource="object_viewer.qrc">
<normaloff>:/images/animset.png</normaloff>:/images/animset.png</iconset>
<normaloff>:/icons/ic_nel_animset.png</normaloff>:/icons/ic_nel_animset.png</iconset>
</property>
<property name="windowTitle">
<string>Animation set manager</string>
@ -309,7 +309,7 @@
</property>
<property name="icon">
<iconset resource="object_viewer.qrc">
<normaloff>:/images/clear.png</normaloff>:/images/clear.png</iconset>
<normaloff>:/icons/ic_nel_reset_all.png</normaloff>:/icons/ic_nel_reset_all.png</iconset>
</property>
<property name="iconSize">
<size>
@ -355,7 +355,7 @@
</property>
<property name="icon">
<iconset resource="object_viewer.qrc">
<normaloff>:/images/list-add.png</normaloff>:/images/list-add.png</iconset>
<normaloff>:/icons/ic_nel_add_item.png</normaloff>:/icons/ic_nel_add_item.png</iconset>
</property>
<property name="iconSize">
<size>
@ -381,7 +381,7 @@
</property>
<property name="icon">
<iconset resource="object_viewer.qrc">
<normaloff>:/images/list-remove.png</normaloff>:/images/list-remove.png</iconset>
<normaloff>:/icons/ic_nel_delete_item.png</normaloff>:/icons/ic_nel_delete_item.png</iconset>
</property>
<property name="iconSize">
<size>
@ -404,7 +404,7 @@
</property>
<property name="icon">
<iconset resource="object_viewer.qrc">
<normaloff>:/images/go-up.png</normaloff>:/images/go-up.png</iconset>
<normaloff>:/icons/ic_nel_up_item.png</normaloff>:/icons/ic_nel_up_item.png</iconset>
</property>
<property name="iconSize">
<size>
@ -427,7 +427,7 @@
</property>
<property name="icon">
<iconset resource="object_viewer.qrc">
<normaloff>:/images/go-down.png</normaloff>:/images/go-down.png</iconset>
<normaloff>:/icons/ic_nel_down_item.png</normaloff>:/icons/ic_nel_down_item.png</iconset>
</property>
<property name="iconSize">
<size>
@ -471,7 +471,7 @@
</property>
<property name="icon">
<iconset resource="object_viewer.qrc">
<normaloff>:/images/time.png</normaloff>:/images/time.png</iconset>
<normaloff>:/icons/ic_nel_framedelay.png</normaloff>:/icons/ic_nel_framedelay.png</iconset>
</property>
<property name="iconSize">
<size>

View file

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>231</width>
<height>213</height>
<width>208</width>
<height>217</height>
</rect>
</property>
<property name="windowTitle">
@ -37,82 +37,83 @@
</item>
</widget>
</item>
<item row="2" column="0" colspan="3">
<widget class="NLQT::CBasicEditWidget" name="constAttribPlaneWidget" native="true"/>
</item>
<item row="3" column="0" colspan="3">
<widget class="NLQT::CColorEditWidget" name="constRGBAWidget" native="true"/>
</item>
<item row="4" column="0" colspan="3">
<widget class="NLQT::CEditRangeIntWidget" name="constRangeIntWidget" native="true"/>
</item>
<item row="5" column="0" colspan="3">
<widget class="NLQT::CEditRangeFloatWidget" name="constRangeFloatWidget" native="true"/>
</item>
<item row="6" column="0" colspan="3">
<widget class="NLQT::CEditRangeUIntWidget" name="constRangeUIntWidget" native="true"/>
</item>
<item row="7" column="0" rowspan="2" colspan="3">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<item row="0" column="1" colspan="3">
<widget class="QWidget" name="schemeEditWidget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>1</number>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="inputLabel">
<property name="text">
<string>Input mutliplier:</string>
<property name="margin">
<number>0</number>
</property>
</widget>
</item>
<item row="8" column="1" rowspan="2">
<spacer name="horizontalSpacer_2">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>108</width>
<height>20</height>
<width>5</width>
<height>5</height>
</size>
</property>
</spacer>
</item>
<item row="8" column="2" rowspan="2">
<widget class="QCheckBox" name="clampCheckBox">
<property name="enabled">
<bool>false</bool>
<item>
<widget class="QPushButton" name="editPushButton">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Clamp</string>
<string>E</string>
</property>
</widget>
</item>
<item row="10" column="0" colspan="3">
<widget class="NLQT::CEditRangeFloatWidget" name="inMultiplierWidget" native="true">
<item>
<widget class="QPushButton" name="userParamPushButton">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="11" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<property name="maximumSize">
<size>
<width>20</width>
<height>1</height>
<width>30</width>
<height>16777215</height>
</size>
</property>
</spacer>
<property name="text">
<string>U</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="3">
<item>
<widget class="QPushButton" name="bankButton">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>B</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0" colspan="4">
<widget class="QWidget" name="schemeWidget" native="true">
<property name="enabled">
<bool>true</bool>
@ -127,19 +128,6 @@
<item row="0" column="0">
<widget class="QComboBox" name="schemeComboBox"/>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="editPushButton">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>E</string>
</property>
</widget>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
@ -211,57 +199,84 @@
</item>
</layout>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="userParamPushButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>U</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QPushButton" name="putPushButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>P</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="getPushButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>G</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0" colspan="4">
<widget class="NLQT::CBasicEditWidget" name="constAttribPlaneWidget" native="true"/>
</item>
<item row="3" column="0" colspan="4">
<widget class="NLQT::CColorEditWidget" name="constRGBAWidget" native="true"/>
</item>
<item row="4" column="0" colspan="4">
<widget class="NLQT::CEditRangeIntWidget" name="constRangeIntWidget" native="true"/>
</item>
<item row="5" column="0" colspan="4">
<widget class="NLQT::CEditRangeFloatWidget" name="constRangeFloatWidget" native="true"/>
</item>
<item row="6" column="0" colspan="4">
<widget class="NLQT::CEditRangeUIntWidget" name="constRangeUIntWidget" native="true"/>
</item>
<item row="7" column="0" colspan="4">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="8" column="0" colspan="2">
<widget class="QLabel" name="inputLabel">
<property name="text">
<string>Input mutliplier:</string>
</property>
</widget>
</item>
<item row="8" column="2">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>108</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="8" column="3">
<widget class="QCheckBox" name="clampCheckBox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Clamp</string>
</property>
</widget>
</item>
<item row="9" column="0" colspan="4">
<widget class="NLQT::CEditRangeFloatWidget" name="inMultiplierWidget" native="true">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="10" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>1</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<customwidgets>

View file

@ -39,6 +39,7 @@
#include "value_from_emitter_dialog.h"
#include "spinner_dialog.h"
#include "follow_path_dialog.h"
#include "scheme_bank_dialog.h"
namespace NLQT
{
@ -59,6 +60,7 @@ CAttribWidget::CAttribWidget(QWidget *parent)
_ui.constRangeIntWidget->hide();
_ui.constRGBAWidget->hide();
_ui.schemeWidget->hide();
_ui.schemeEditWidget->hide();
_ui.inMultiplierWidget->setRange(0.1f, 10.1f);
_ui.inMultiplierWidget->enableLowerBound(0, true);;
@ -82,6 +84,7 @@ void CAttribWidget::init()
connect(_ui.schemeComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changeCurrentScheme(int)));
connect(_ui.srcComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(setCurrentSrc(int)));
connect(_ui.userParamPushButton, SIGNAL(clicked()), this, SLOT(setUserIndex()));
connect(_ui.bankButton, SIGNAL(clicked()), this, SLOT(openSchemeBankDialog()));
connect(_ui.comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changeUseScheme(int)));
}
@ -181,6 +184,16 @@ void CAttribWidget::changeUseScheme(int index)
}
}
void CAttribWidget::openSchemeBankDialog()
{
CSchemeBankDialog *dialog = new CSchemeBankDialog(this);
dialog->setModal(true);
dialog->show();
dialog->exec();
delete dialog;
//updateUi();
}
void CAttribWidget::inputValueUpdate(void)
{
if (useScheme() && getSchemeInput().InputType == NL3D::CPSInputType::attrUserParam)
@ -206,7 +219,7 @@ void CAttribWidget::schemeValueUpdate()
_ui.constRGBAWidget->hide();
_ui.schemeWidget->show();
_ui.schemeEditWidget->show();
sint k = getCurrentScheme();
if (k == -1) // unknow scheme ...
@ -312,11 +325,11 @@ QDialog *CAttribFloatWidget::editScheme(void)
if (dynamic_cast<NL3D::CPSFloatGradient *>(scheme))
{
CFloatGradientWrapper *wrapper = new CFloatGradientWrapper;
wrapper->MinRange = _MinRange;
wrapper->MaxRange = _MaxRange;
wrapper->Scheme = &(((NL3D::CPSFloatGradient *) (_SchemeWrapper->getScheme()) )->_F);
wrapper->m_minRange = _MinRange;
wrapper->m_maxRange = _MaxRange;
wrapper->m_scheme = &(((NL3D::CPSFloatGradient *) (_SchemeWrapper->getScheme()) )->_F);
CGradientDialog *gd = new CGradientDialog(_Node, wrapper, true, true, 2, this);
wrapper->DefaultValue = 0.f;
wrapper->m_defaultValue = 0.f;
return gd;
}
if (dynamic_cast<NL3D::CPSFloatMemory *>(scheme))
@ -423,6 +436,7 @@ sint CAttribFloatWidget::getCurrentScheme(void) const
void CAttribFloatWidget::cstValueUpdate()
{
_ui.schemeWidget->hide();
_ui.schemeEditWidget->hide();
_ui.inMultiplierWidget->setEnabled(false);
_ui.clampCheckBox->setEnabled(false);
_ui.inputLabel->setEnabled(false);
@ -473,11 +487,11 @@ QDialog *CAttribUIntWidget::editScheme(void)
if (dynamic_cast<const NL3D::CPSUIntGradient *>(scheme))
{
CUIntGradientWrapper *wrapper = new CUIntGradientWrapper;
wrapper->MinRange = _MinRange;
wrapper->MaxRange = _MaxRange;
wrapper->Scheme = &(((NL3D::CPSUIntGradient *) (_SchemeWrapper->getScheme()) )->_F);
wrapper->m_minRange = _MinRange;
wrapper->m_maxRange = _MaxRange;
wrapper->m_scheme = &(((NL3D::CPSUIntGradient *) (_SchemeWrapper->getScheme()) )->_F);
CGradientDialog *gd = new CGradientDialog(_Node, wrapper, true, true, 2, this);
wrapper->DefaultValue = 0;
wrapper->m_defaultValue = 0;
return gd;
}
@ -560,6 +574,7 @@ sint CAttribUIntWidget::getCurrentScheme(void) const
void CAttribUIntWidget::cstValueUpdate()
{
_ui.schemeWidget->hide();
_ui.schemeEditWidget->hide();
_ui.inMultiplierWidget->setEnabled(false);
_ui.clampCheckBox->setEnabled(false);
_ui.inputLabel->setEnabled(false);
@ -610,11 +625,11 @@ QDialog *CAttribIntWidget::editScheme(void)
if (dynamic_cast<const NL3D::CPSIntGradient *>(scheme))
{
CIntGradientWrapper *wrapper = new CIntGradientWrapper;
wrapper->MinRange = _MinRange;
wrapper->MaxRange = _MaxRange;
wrapper->Scheme = &(((NL3D::CPSIntGradient *) (_SchemeWrapper->getScheme()) )->_F);
wrapper->m_minRange = _MinRange;
wrapper->m_maxRange = _MaxRange;
wrapper->m_scheme = &(((NL3D::CPSIntGradient *) (_SchemeWrapper->getScheme()) )->_F);
CGradientDialog *gd = new CGradientDialog(_Node, wrapper, true, true, 2, this);
wrapper->DefaultValue = 0;
wrapper->m_defaultValue = 0;
return gd;
}
if (dynamic_cast<const NL3D::CPSIntMemory *>(scheme))
@ -695,6 +710,7 @@ sint CAttribIntWidget::getCurrentScheme(void) const
void CAttribIntWidget::cstValueUpdate()
{
_ui.schemeWidget->hide();
_ui.schemeEditWidget->hide();
_ui.inMultiplierWidget->setEnabled(false);
_ui.clampCheckBox->setEnabled(false);
_ui.inputLabel->setEnabled(false);
@ -737,9 +753,9 @@ QDialog *CAttribRGBAWidget::editScheme(void)
if (dynamic_cast<const NL3D::CPSColorGradient *>(scheme))
{
CColorGradientWrapper *wrapper = new CColorGradientWrapper;
wrapper->Scheme = &(((NL3D::CPSColorGradient *) (_SchemeWrapper->getScheme()) )->_F);
wrapper->m_scheme = &(((NL3D::CPSColorGradient *) (_SchemeWrapper->getScheme()) )->_F);
CGradientDialog *gd = new CGradientDialog(_Node, wrapper, true, true, 2, this);
wrapper->DefaultValue = NLMISC::CRGBA::White;
wrapper->m_defaultValue = NLMISC::CRGBA::White;
return gd;
}
if (dynamic_cast<const NL3D::CPSColorBlenderExact *>(scheme))
@ -827,6 +843,7 @@ sint CAttribRGBAWidget::getCurrentScheme(void) const
void CAttribRGBAWidget::cstValueUpdate()
{
_ui.schemeWidget->hide();
_ui.schemeEditWidget->hide();
_ui.inMultiplierWidget->setEnabled(false);
_ui.clampCheckBox->setEnabled(false);
_ui.inputLabel->setEnabled(false);
@ -861,9 +878,9 @@ QDialog *CAttribPlaneBasisWidget::editScheme(void)
if (dynamic_cast<NL3D::CPSPlaneBasisGradient *>(scheme))
{
CPlaneBasisGradientWrapper *wrapper = new CPlaneBasisGradientWrapper;
wrapper->Scheme = &(((NL3D::CPSPlaneBasisGradient *) (_SchemeWrapper->getScheme()) )->_F);
wrapper->m_scheme = &(((NL3D::CPSPlaneBasisGradient *) (_SchemeWrapper->getScheme()) )->_F);
CGradientDialog *gd = new CGradientDialog(_Node, wrapper, true, true, 2, this);
wrapper->DefaultValue = NL3D::CPlaneBasis(NLMISC::CVector::K);
wrapper->m_defaultValue = NL3D::CPlaneBasis(NLMISC::CVector::K);
return gd;
}
if (dynamic_cast<NL3D::CPSPlaneBasisFollowSpeed *>(scheme))
@ -964,6 +981,7 @@ sint CAttribPlaneBasisWidget::getCurrentScheme(void) const
void CAttribPlaneBasisWidget::cstValueUpdate()
{
_ui.schemeWidget->hide();
_ui.schemeEditWidget->hide();
_ui.inMultiplierWidget->setEnabled(false);
_ui.clampCheckBox->setEnabled(false);
_ui.inputLabel->setEnabled(false);

View file

@ -109,6 +109,7 @@ private Q_SLOTS:
virtual void setCurrentSrc(int index);
virtual void setUserIndex();
virtual void changeUseScheme(int index);
virtual void openSchemeBankDialog();
protected:

View file

@ -33,6 +33,7 @@
// Project includes
#include "modules.h"
#include "object_viewer_constants.h"
static int camId = 0;
@ -106,11 +107,13 @@ CCameraControl::CCameraControl(QWidget *parent)
{
_camToolBar = new QToolBar(tr("CameraControl"), parent);
_fpsAction = _camToolBar->addAction(tr("Fly"));
_fpsAction = _camToolBar->addAction(tr("Camera frs"));
_fpsAction->setIcon(QIcon(Constants::ICON_CAMERA_FPS));
_fpsAction->setStatusTip(tr("Set firstPerson camera mode"));
_fpsAction->setCheckable(true);
_edit3dAction = _camToolBar->addAction(tr("Edit"));
_edit3dAction = _camToolBar->addAction(tr("Camera 3dEdit"));
_edit3dAction->setIcon(QIcon(Constants::ICON_CAMERA_3DEDIT));
_edit3dAction->setStatusTip(tr("Set edit3d camera mode"));
_edit3dAction->setCheckable(true);
@ -160,12 +163,12 @@ CCameraControl::CCameraControl(QWidget *parent)
_camToolBar->addSeparator();
_addCamAction = _camToolBar->addAction(tr("Create camera"));
_addCamAction->setIcon(QIcon(":/images/cam_add.png"));
_addCamAction->setIcon(QIcon(Constants::ICON_CAMERA_ADD));
_addCamAction->setStatusTip(tr("Create new camera"));
connect(_addCamAction, SIGNAL(triggered()), this, SLOT(addCamera()));
_delCamAction = _camToolBar->addAction(tr("Delete camera"));
_delCamAction->setIcon(QIcon(":/images/cam_del.png"));
_delCamAction->setIcon(QIcon(Constants::ICON_CAMERA_DEL));
_delCamAction->setStatusTip(tr("Delete current camera"));
connect(_delCamAction, SIGNAL(triggered()), this, SLOT(delCamera()));
@ -176,6 +179,7 @@ CCameraControl::CCameraControl(QWidget *parent)
_camToolBar->addSeparator();
_resetCamAction = _camToolBar->addAction(tr("Reset camera"));
_resetCamAction->setIcon(QIcon(Constants::ICON_RESET_CAMERA));
_resetCamAction->setStatusTip(tr("Reset current camera"));
//_resetCamAction->setShortcut(tr("Ctrl+R"));
connect(_resetCamAction, SIGNAL(triggered()), this, SLOT(resetCamera()));

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5 KiB

Some files were not shown because too many files have changed in this diff Show more