From 255c7715f58b84cd42349be255d379999b49e510 Mon Sep 17 00:00:00 2001 From: dnk-88 Date: Thu, 27 Jan 2011 15:20:49 +0200 Subject: [PATCH] Changed: #1193 Tune MRM dialog. --- .../src/images/ico_light_group.png | Bin 5583 -> 5398 bytes .../3d/object_viewer_qt/src/main_window.cpp | 4 +- .../3d/object_viewer_qt/src/object_viewer.cpp | 8 ++-- .../object_viewer_qt/src/tune_mrm_dialog.cpp | 31 +++++++++++- .../3d/object_viewer_qt/src/tune_mrm_dialog.h | 4 +- .../3d/object_viewer_qt/src/tune_mrm_form.ui | 44 ++++++------------ 6 files changed, 55 insertions(+), 36 deletions(-) diff --git a/code/nel/tools/3d/object_viewer_qt/src/images/ico_light_group.png b/code/nel/tools/3d/object_viewer_qt/src/images/ico_light_group.png index 312f08a0f0dde4f44b14dfa837065a90123a719a..49ad8830a421ce5d27cf31a2217ba30738642028 100644 GIT binary patch delta 5354 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 IM6N<$g6r5tA^-pY delta 5538 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 diff --git a/code/nel/tools/3d/object_viewer_qt/src/main_window.cpp b/code/nel/tools/3d/object_viewer_qt/src/main_window.cpp index d2db507a3..a283eea3a 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/main_window.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/main_window.cpp @@ -398,7 +398,7 @@ void CMainWindow::createMenus() _toolsMenu->addAction(_SunColorDialog->toggleViewAction()); - //_toolsMenu->addAction(_TuneMRMDialog->toggleViewAction()); + _toolsMenu->addAction(_TuneMRMDialog->toggleViewAction()); _TuneMRMDialog->toggleViewAction()->setIcon(QIcon(":/images/ico_mrm_mesh.png")); connect(_ParticleControlDialog->toggleViewAction(), SIGNAL(triggered(bool)), @@ -442,7 +442,7 @@ void CMainWindow::createToolBars() _toolsBar->addAction(_VegetableDialog->toggleViewAction()); _toolsBar->addAction(_GlobalWindDialog->toggleViewAction()); _toolsBar->addAction(_SkeletonScaleDialog->toggleViewAction()); -// _toolsBar->addAction(_TuneMRMDialog->toggleViewAction()); + _toolsBar->addAction(_TuneMRMDialog->toggleViewAction()); } void CMainWindow::createStatusBar() diff --git a/code/nel/tools/3d/object_viewer_qt/src/object_viewer.cpp b/code/nel/tools/3d/object_viewer_qt/src/object_viewer.cpp index 37df70475..ac34152fa 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/object_viewer.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/object_viewer.cpp @@ -89,6 +89,11 @@ void CObjectViewer::init(nlWindow wnd, uint16 w, uint16 h) // initialize the window with config file values _Driver->setDisplay(wnd, NL3D::UDriver::CMode(w, h, 32)); + + // Create a scene + _Scene = _Driver->createScene(false); + _Scene->setPolygonBalancingMode(NL3D::UScene::PolygonBalancingClamp); + _Driver->enableUsedTextureMemorySum(); _Light = ULight::createLight(); @@ -106,9 +111,6 @@ void CObjectViewer::init(nlWindow wnd, uint16 w, uint16 h) _Driver->setLight(0, *_Light); _Driver->enableLight(0); - // Create a scene - _Scene = _Driver->createScene(false); - _PlayListManager = _Scene->createPlayListManager(); _Scene->enableLightingSystem(true); diff --git a/code/nel/tools/3d/object_viewer_qt/src/tune_mrm_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/tune_mrm_dialog.cpp index 81af1eae3..493cfb577 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/tune_mrm_dialog.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/tune_mrm_dialog.cpp @@ -20,17 +20,46 @@ #include "stdpch.h" #include "tune_mrm_dialog.h" +// NeL includes +#include + +// Project includes +#include "modules.h" + +const int sliderStepSize = 5000; + namespace NLQT { CTuneMRMDialog::CTuneMRMDialog(QWidget *parent) : QDockWidget(parent) { - ui.setupUi(this); + _ui.setupUi(this); + + connect(_ui.maxValueSlider, SIGNAL(valueChanged(int)), this, SLOT(setMaxValue(int))); + connect(_ui.currentValueSlider, SIGNAL(valueChanged(int)), this, SLOT(setCurrentValue(int))); + + _ui.maxValueSlider->setValue(_ui.maxValueSlider->maximum()); } CTuneMRMDialog::~CTuneMRMDialog() { } +void CTuneMRMDialog::setMaxValue(int value) +{ + int actualMaxValue = value * sliderStepSize; + int actualValue = float(actualMaxValue) * _ui.currentValueSlider->value() / _ui.currentValueSlider->maximum(); + + _ui.currentValueSlider->setMaximum(actualMaxValue); + _ui.currentValueSlider->setValue(actualValue); + _ui.maxValueSpinBox->setValue(actualMaxValue); +} + +void CTuneMRMDialog::setCurrentValue(int value) +{ + Modules::objView().getScene()->setGroupLoadMaxPolygon("Skin", value); + _ui.currentValueSpinBox->setValue(value); +} + } /* namespace NLQT */ diff --git a/code/nel/tools/3d/object_viewer_qt/src/tune_mrm_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/tune_mrm_dialog.h index 74b3c9bae..c0e00d9f4 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/tune_mrm_dialog.h +++ b/code/nel/tools/3d/object_viewer_qt/src/tune_mrm_dialog.h @@ -40,10 +40,12 @@ public: ~CTuneMRMDialog(); private Q_SLOTS: + void setMaxValue(int value); + void setCurrentValue(int value); private: - Ui::CTuneMRMDialog ui; + Ui::CTuneMRMDialog _ui; }; /* class CTuneMRMDialog */ diff --git a/code/nel/tools/3d/object_viewer_qt/src/tune_mrm_form.ui b/code/nel/tools/3d/object_viewer_qt/src/tune_mrm_form.ui index ba6bd4d5e..4f5b22c84 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/tune_mrm_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/tune_mrm_form.ui @@ -7,13 +7,13 @@ 0 0 576 - 87 + 92 476 - 87 + 92 @@ -47,7 +47,7 @@ - + true @@ -87,7 +87,7 @@ - + true @@ -105,29 +105,32 @@ - + - 100000 + 20 - 5000 + 1 - 10000 + 5 - 100000 + 20 Qt::Horizontal + + QSlider::TicksAbove + - 5000 + 1 - + 100000 @@ -143,22 +146,5 @@ - - - horizontalSlider - valueChanged(int) - spinBox - setValue(int) - - - 214 - 67 - - - 232 - 47 - - - - +