mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-30 09:36:43 +00:00
Code Issues Releases Wiki Activity

Do in-class init. if possible, mLayoutSliderSize -> layoutSliderSize

Browse source
This commit is contained in:
Nelsson Huotari 2019-10-11 00:41:33 +03:00
parent a1348d94f9
commit 71eff60d22
4 changed files with 19 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/opencs/view/render/terrainshapemode.cpp
View file

@ -45,16 +45,7 @@
CSVRender::TerrainShapeMode::TerrainShapeMode (WorldspaceWidget *worldspaceWidget, osg::Group* parentNode, QWidget *parent) CSVRender::TerrainShapeMode::TerrainShapeMode (WorldspaceWidget *worldspaceWidget, osg::Group* parentNode, QWidget *parent)
: EditMode (worldspaceWidget, QIcon {":scenetoolbar/editing-terrain-shape"}, Mask_Terrain | Mask_Reference, "Terrain land editing", parent), : EditMode (worldspaceWidget, QIcon {":scenetoolbar/editing-terrain-shape"}, Mask_Terrain | Mask_Reference, "Terrain land editing", parent),
mBrushSize(1), mParentNode(parentNode)
mBrushShape(CSVWidget::BrushShape_Point),
mShapeBrushScenetool(nullptr),
mDragMode(InteractionType_None),
mParentNode(parentNode),
mIsEditing(false),
mTotalDiffY(0),
mShapeEditTool(ShapeEditTool_Drag),
mShapeEditToolStrength(8),
mTargetHeight(0)
{ {
} }

18
apps/opencs/view/render/terrainshapemode.hpp
View file

@ -141,20 +141,20 @@ namespace CSVRender
std::string mCellId; std::string mCellId;
std::string mBrushTexture; std::string mBrushTexture;
int mBrushSize; int mBrushSize = 1;
CSVWidget::BrushShape mBrushShape; CSVWidget::BrushShape mBrushShape = CSVWidget::BrushShape_Point;
std::vector<std::pair<int, int>> mCustomBrushShape; std::vector<std::pair<int, int>> mCustomBrushShape;
CSVWidget::SceneToolShapeBrush *mShapeBrushScenetool; CSVWidget::SceneToolShapeBrush *mShapeBrushScenetool = nullptr;
int mDragMode; int mDragMode = InteractionType_None;
osg::Group* mParentNode; osg::Group* mParentNode;
bool mIsEditing; bool mIsEditing = false;
std::unique_ptr<TerrainSelection> mTerrainShapeSelection; std::unique_ptr<TerrainSelection> mTerrainShapeSelection;
int mTotalDiffY; int mTotalDiffY = 0;
std::vector<CSMWorld::CellCoordinates> mAlteredCells; std::vector<CSMWorld::CellCoordinates> mAlteredCells;
osg::Vec3d mEditingPos; osg::Vec3d mEditingPos;
int mShapeEditTool; int mShapeEditTool = ShapeEditTool_Drag;
int mShapeEditToolStrength; int mShapeEditToolStrength = 8;
int mTargetHeight; int mTargetHeight = 0;
PagedWorldspaceWidget& getPagedWorldspaceWidget(); PagedWorldspaceWidget& getPagedWorldspaceWidget();

14
apps/opencs/view/widget/scenetoolshapebrush.cpp
View file

@ -35,10 +35,7 @@
CSVWidget::ShapeBrushSizeControls::ShapeBrushSizeControls(const QString &title, QWidget *parent) CSVWidget::ShapeBrushSizeControls::ShapeBrushSizeControls(const QString &title, QWidget *parent)
: QGroupBox(title, parent), : QGroupBox(title, parent)
mLayoutSliderSize(new QHBoxLayout),
mBrushSizeSlider(new QSlider(Qt::Horizontal)),
mBrushSizeSpinBox(new QSpinBox)
{ {
mBrushSizeSlider->setTickPosition(QSlider::TicksBothSides); mBrushSizeSlider->setTickPosition(QSlider::TicksBothSides);
mBrushSizeSlider->setTickInterval(10); mBrushSizeSlider->setTickInterval(10);
@ -48,19 +45,18 @@ CSVWidget::ShapeBrushSizeControls::ShapeBrushSizeControls(const QString &title,
mBrushSizeSpinBox->setRange(1, CSMPrefs::get()["3D Scene Editing"]["shapebrush-maximumsize"].toInt()); mBrushSizeSpinBox->setRange(1, CSMPrefs::get()["3D Scene Editing"]["shapebrush-maximumsize"].toInt());
mBrushSizeSpinBox->setSingleStep(1); mBrushSizeSpinBox->setSingleStep(1);
mLayoutSliderSize->addWidget(mBrushSizeSlider); QHBoxLayout *layoutSliderSize = new QHBoxLayout;
mLayoutSliderSize->addWidget(mBrushSizeSpinBox); layoutSliderSize->addWidget(mBrushSizeSlider);
layoutSliderSize->addWidget(mBrushSizeSpinBox);
connect(mBrushSizeSlider, SIGNAL(valueChanged(int)), mBrushSizeSpinBox, SLOT(setValue(int))); connect(mBrushSizeSlider, SIGNAL(valueChanged(int)), mBrushSizeSpinBox, SLOT(setValue(int)));
connect(mBrushSizeSpinBox, SIGNAL(valueChanged(int)), mBrushSizeSlider, SLOT(setValue(int))); connect(mBrushSizeSpinBox, SIGNAL(valueChanged(int)), mBrushSizeSlider, SLOT(setValue(int)));
setLayout(mLayoutSliderSize); setLayout(layoutSliderSize);
} }
CSVWidget::ShapeBrushWindow::ShapeBrushWindow(CSMDoc::Document& document, QWidget *parent) CSVWidget::ShapeBrushWindow::ShapeBrushWindow(CSMDoc::Document& document, QWidget *parent)
: QFrame(parent, Qt::Popup), : QFrame(parent, Qt::Popup),
mBrushShape(CSVWidget::BrushShape_Point),
mBrushSize(1),
mDocument(document) mDocument(document)
{ {
mButtonPoint = new QPushButton(QIcon (QPixmap (":scenetoolbar/brush-point")), "", this); mButtonPoint = new QPushButton(QIcon (QPixmap (":scenetoolbar/brush-point")), "", this);

9
apps/opencs/view/widget/scenetoolshapebrush.hpp
View file

@ -40,9 +40,8 @@ namespace CSVWidget
ShapeBrushSizeControls(const QString &title, QWidget *parent); ShapeBrushSizeControls(const QString &title, QWidget *parent);
private: private:
QHBoxLayout *mLayoutSliderSize; QSlider *mBrushSizeSlider = new QSlider(Qt::Horizontal);
QSlider *mBrushSizeSlider; QSpinBox *mBrushSizeSpinBox = new QSpinBox;
QSpinBox *mBrushSizeSpinBox;
friend class SceneToolShapeBrush; friend class SceneToolShapeBrush;
friend class CSVRender::TerrainShapeMode; friend class CSVRender::TerrainShapeMode;
@ -64,8 +63,8 @@ namespace CSVWidget
const QString toolTipCustom = "Paint with custom brush, defined by terrain selection"; const QString toolTipCustom = "Paint with custom brush, defined by terrain selection";
private: private:
CSVWidget::BrushShape mBrushShape; CSVWidget::BrushShape mBrushShape = CSVWidget::BrushShape_Point;
int mBrushSize; int mBrushSize = 1;
CSMDoc::Document& mDocument; CSMDoc::Document& mDocument;
QGroupBox *mHorizontalGroupBox; QGroupBox *mHorizontalGroupBox;
QComboBox *mToolSelector; QComboBox *mToolSelector;