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

minimap generator: add option to deselect all ADTs with right click

Browse Source 
settings: add default value to import.txt file
This commit is contained in:
Skarn
2020-10-22 14:23:11 +03:00
parent 94d2dd57e4
commit 5dd4ef755b
4 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/noggit/ui/MinimapCreator.cpp
View File

@@ -216,8 +216,8 @@ namespace noggit
{
if (world->mapIndex.hasTile(tile_index(x + i, y + j)))
{
_render_settings.selected_tiles[64 * (x + i) + (y + j)] = !QApplication::keyboardModifiers().testFlag(
Qt::ControlModifier);
_render_settings.selected_tiles[64 * (x + i) + (y + j)]
= !QApplication::keyboardModifiers().testFlag(Qt::ControlModifier);
}
}
@@ -227,8 +227,8 @@ namespace noggit
{
if (world->mapIndex.hasTile(tile_index(tile.x(), tile.y())))
{
_render_settings.selected_tiles[64 * tile.x() + tile.y()] = !QApplication::keyboardModifiers().testFlag(
Qt::ControlModifier);
_render_settings.selected_tiles[64 * tile.x() + tile.y()]
= !QApplication::keyboardModifiers().testFlag(Qt::ControlModifier);
}
}
@@ -236,6 +236,14 @@ namespace noggit
}
);
QObject::connect
( _minimap_widget, &minimap_widget::reset_selection
, [this, world] ()
{
_render_settings.selected_tiles.fill(false);
}
);
}
void MinimapCreator::changeRadius(float change)

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

@@ -212,7 +212,7 @@ namespace noggit
{
gamePathField->actual->setText (_settings->value ("project/game_path").toString());
projectPathField->actual->setText (_settings->value ("project/path").toString());
importPathField->actual->setText (_settings->value ("project/import_file").toString());
importPathField->actual->setText (_settings->value ("project/import_file", "import.txt").toString());
wmvLogPathField->actual->setText (_settings->value ("project/wmv_log_file").toString());
viewDistanceField->setValue (_settings->value ("view_distance", 1000.f).toFloat());
farZField->setValue (_settings->value ("farZ", 2048.f).toFloat());

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

@@ -208,9 +208,11 @@ namespace noggit
void minimap_widget::mousePressEvent(QMouseEvent* event)
{
if (event->button() != Qt::LeftButton)
if (event->button() == Qt::RightButton)
{
event->ignore();
_is_selecting = false;
emit reset_selection();
return;
}

5
src/noggit/ui/minimap_widget.hpp
View File

@@ -56,8 +56,9 @@ namespace noggit
QPoint locateTile(QMouseEvent* event);
signals:
void map_clicked (const ::math::vector_3d&);
void tile_clicked (const QPoint&);
void map_clicked(const ::math::vector_3d&);
void tile_clicked(const QPoint&);
void reset_selection();
private:
World const* _world;