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

Changed: #1171 OVQT weather & sun color dock window

Browse source
This commit is contained in:
aquiles 2010-11-07 19:33:26 +01:00
parent a98974d660
commit 6166dde8ee
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/nel/tools/3d/object_viewer_qt/src/global_wind_dialog.cpp
View file

@ -30,9 +30,9 @@ CGlobalWindDialog::CGlobalWindDialog(QWidget *parent)
: QDockWidget(parent) : QDockWidget(parent)
{ {
_ui.setupUi(this); _ui.setupUi(this);
//_ui.directionWidget->setWrapper(&_DirectionWrapper); //_ui.directionWidget->setWrapper(&_DirectionWrapper);
connect(_ui.horizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(setWndPower(int))); connect(_ui.horizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(setWndPower(int)));
connect(this, SIGNAL(visibilityChanged(bool)), this, SLOT(updateWnd(bool))); connect(this, SIGNAL(visibilityChanged(bool)), this, SLOT(updateWnd(bool)));
} }
@ -50,7 +50,7 @@ void CGlobalWindDialog::setWndPower(int value)
void CGlobalWindDialog::updateWnd(bool visible) void CGlobalWindDialog::updateWnd(bool visible)
{ {
if (!visible) if (!visible || !Modules::objView().getScene())
return; return;
_ui.horizontalSlider->setValue(int(Modules::objView().getScene()->getGlobalWindPower() * _ui.horizontalSlider->maximum())); _ui.horizontalSlider->setValue(int(Modules::objView().getScene()->getGlobalWindPower() * _ui.horizontalSlider->maximum()));

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

@ -57,7 +57,7 @@ CObjectViewer::CObjectViewer()
_phi(0), _psi(0),_dist(20), _phi(0), _psi(0),_dist(20),
_CameraFocal(75), _CameraFocal(75),
_CurrentInstance(""), _CurrentInstance(""),
_BloomEffect(false) _BloomEffect(false), _Scene(0)
{ {
} }

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

@ -45,7 +45,7 @@ CSunColorDialog::~CSunColorDialog()
void CSunColorDialog::updateSunColor(bool visible) void CSunColorDialog::updateSunColor(bool visible)
{ {
if (!visible) if (!visible || !Modules::objView().getScene())
return; return;
_ui.ambientWidget->setColor(Modules::objView().getScene()->getSunAmbient()); _ui.ambientWidget->setColor(Modules::objView().getScene()->getSunAmbient());