graphics/paysages3d
1
0
Fork 0
Code Releases Activity

Improve terrain brush settings in dialog

Browse source
This commit is contained in:
Michaël Lemaire 2013-06-20 17:56:15 +02:00
parent 110d16e0b6
commit 87c428ea1a
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/editing/terrain/dialogterrainpainting.ui
View file

@ -546,7 +546,7 @@
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>Restore to default (F12)</string> <string>Restore to base shape (F12)</string>
</property> </property>
</item> </item>
</widget> </widget>
@ -560,14 +560,11 @@
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QSlider" name="input_brush_size"> <widget class="QSlider" name="input_brush_size">
<property name="minimum">
<number>5</number>
</property>
<property name="maximum"> <property name="maximum">
<number>100</number> <number>100</number>
</property> </property>
<property name="value"> <property name="value">
<number>20</number> <number>40</number>
</property> </property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -587,7 +584,7 @@
<number>100</number> <number>100</number>
</property> </property>
<property name="value"> <property name="value">
<number>80</number> <number>100</number>
</property> </property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -603,9 +600,6 @@
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="QSlider" name="input_brush_strength"> <widget class="QSlider" name="input_brush_strength">
<property name="minimum">
<number>10</number>
</property>
<property name="maximum"> <property name="maximum">
<number>100</number> <number>100</number>
</property> </property>

7
src/editing/terrain/paintingbrush.cpp
View file

@ -30,7 +30,8 @@ void PaintingBrush::setSize(double value)
void PaintingBrush::setSize(QAbstractSlider* slider) void PaintingBrush::setSize(QAbstractSlider* slider)
{ {
setSize(20.0 * (double)slider->value() / (double)slider->maximum()); double value = (double)slider->value() / (double)slider->maximum();
setSize(2.0 + value * value * 28.0);
} }
void PaintingBrush::setSmoothing(double value) void PaintingBrush::setSmoothing(double value)
@ -50,7 +51,7 @@ void PaintingBrush::setStrength(double value)
void PaintingBrush::setStrength(QAbstractSlider* slider) void PaintingBrush::setStrength(QAbstractSlider* slider)
{ {
setStrength((double)slider->value() / (double)slider->maximum()); setStrength(0.1 + 0.9 * (double)slider->value() / (double)slider->maximum());
} }
void PaintingBrush::randomizeNoise() void PaintingBrush::randomizeNoise()
@ -91,7 +92,7 @@ QString PaintingBrush::getHelpText()
case PAINTING_BRUSH_FLATTEN: case PAINTING_BRUSH_FLATTEN:
return QObject::tr("<strong>Left click</strong>: flatten at height picked with right click<br><br><strong>Right click</strong>: pick height at center"); return QObject::tr("<strong>Left click</strong>: flatten at height picked with right click<br><br><strong>Right click</strong>: pick height at center");
case PAINTING_BRUSH_RESTORE: case PAINTING_BRUSH_RESTORE:
return QObject::tr("<strong>Left click</strong>: cancel all modifications on terrain"); return QObject::tr("<strong>Left click</strong>: remove your manual modifications from terrain");
} }
return QString(""); return QString("");
} }