natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Stamp Tool shader. Again. Also remove Stamp Tool essential directories from settings.

Browse Source
This commit is contained in:
p620
2020-11-01 15:34:16 +03:00
parent d872514ec0
commit 5688bd67fb
4 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/glsl/terrain_frag.glsl
View File

@@ -220,7 +220,7 @@ void main()
* (1.0 - length(vary_position.xz - cursor_position.xz) / outer_cursor_radius));*/
out_color.rgb = mix(out_color.rgb, cursor_color.rgb, texture(stampBrush, rotatedTexcoord).r
* int(abs(vary_position.x - cursor_position.x) <= outer_cursor_radius
|| abs(vary_position.z - cursor_position.z) <= outer_cursor_radius));
&& abs(vary_position.z - cursor_position.z) <= outer_cursor_radius));
/*vec2 posRel = vary_position.xz - cursor_position.xz;
float pos_x = posRel.x * sin(angle) - posRel.y * cos(angle);
float pos_z = posRel.y * sin(angle) + posRel.x * cos(angle);

2
src/noggit/MapView.cpp
View File

@@ -1446,7 +1446,7 @@ auto MapView::populateImageModel(QStandardItemModel* model) const -> void
using namespace noggit::Red::StampMode::Ui::Model;
namespace fs = std::filesystem;
for(auto& image : fs::directory_iterator{_settings->value("stamping/samples").toString().toStdString()})
for(auto& image : fs::directory_iterator{"./Images"})
if(!image.is_directory())
{
auto item{new Item{image.path().string().c_str()}};

6
src/noggit/ui/SettingsPanel.cpp
View File

@@ -91,8 +91,6 @@ namespace noggit
browse_row (&projectPathField, "Project Path", "project/path", util::file_line_edit::directories);
browse_row (&importPathField, "Import Path", "project/import_file", util::file_line_edit::files);
browse_row (&wmvLogPathField, "WMV Log Path", "project/wmv_log_file", util::file_line_edit::files);
browse_row(&_stampingSamples, "Stamping samples root directory", "stamping/samples", util::file_line_edit::directories);
browse_row(&_stampingBrushes, "Stamping brush configs root directory", "stamping/brushes", util::file_line_edit::directories);
_mysql_box = new QGroupBox ("MySQL (uid storage)", this);
_mysql_box->setToolTip ("Store the maps' max model unique id (uid) in a mysql database to sync your uids with different computers/users to avoid duplications");
auto mysql_layout (new QFormLayout (_mysql_box));
@@ -271,8 +269,6 @@ namespace noggit
projectPathField->actual->setText (_settings->value ("project/path").toString());
importPathField->actual->setText (_settings->value ("project/import_file", "import.txt").toString());
wmvLogPathField->actual->setText (_settings->value ("project/wmv_log_file").toString());
_stampingSamples->actual->setText(_settings->value("stamping/samples").toString());
_stampingBrushes->actual->setText(_settings->value("stamping/brushes").toString());
viewDistanceField->setValue (_settings->value ("view_distance", 1000.f).toFloat());
farZField->setValue (_settings->value ("farZ", 2048.f).toFloat());
tabletModeCheck->setChecked (_settings->value ("tablet/enabled", false).toBool());
@@ -307,8 +303,6 @@ namespace noggit
_settings->setValue ("project/path", projectPathField->actual->text());
_settings->setValue ("project/import_file", importPathField->actual->text());
_settings->setValue ("project/wmv_log_file", wmvLogPathField->actual->text());
_settings->setValue("stamping/samples", _stampingSamples->actual->text());
_settings->setValue("stamping/brushes", _stampingBrushes->actual->text());
_settings->setValue ("farZ", farZField->value());
_settings->setValue ("view_distance", viewDistanceField->value());
_settings->setValue ("tablet/enabled", tabletModeCheck->isChecked());

2
src/noggit/ui/SettingsPanel.h
View File

@@ -42,8 +42,6 @@ namespace noggit
util::file_line_edit* projectPathField;
util::file_line_edit* importPathField;
util::file_line_edit* wmvLogPathField;
util::file_line_edit* _stampingSamples;
util::file_line_edit* _stampingBrushes;
QDoubleSpinBox* viewDistanceField;
QDoubleSpinBox* farZField;
QSpinBox* _adt_unload_dist;