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

Merge branch 'ground_effects_editor' of https://gitlab.com/T1ti/noggit-red into ground_effects_editor

Browse Source 
# Conflicts:
#	src/noggit/MapTile.cpp
#	src/noggit/MapView.cpp
This commit is contained in:
T1ti
2023-07-11 01:56:08 +02:00
parent a10763affb aef8130118
commit 8d7d02b510
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/noggit/MapTile.cpp
View File

@@ -1225,7 +1225,7 @@ QImage MapTile::getAlphamapImage(std::string const& filename)
return std::move(image);
}
void MapTile::setHeightmapImage(QImage const& baseimage, float multiplier, int mode, bool tiledEdges) // image
<<<<<<<<< Temporary merge branch 1
{
auto image = baseimage.convertToFormat(QImage::Format_Grayscale16);
@@ -1448,7 +1448,7 @@ QImage MapTile::getVertexColorsImage()
return std::move(image);
}
void MapTile::setVertexColorImage(QImage const& baseimage, int mode, bool tiledEdges)
<<<<<<<<< Temporary merge branch 1
{
QImage image = baseimage.convertToFormat(QImage::Format_RGBA8888);

2
src/noggit/MapView.cpp
View File

@@ -1827,7 +1827,6 @@ void MapView::setupAssistMenu()
makeCurrent();
OpenGL::context::scoped_setter const _(::gl, context());
NOGGIT_ACTION_MGR->beginAction(this, Noggit::ActionFlags::eCHUNKS_TERRAIN);
_world->importAllADTsHeightmaps(adt_import_height_params_multiplier->value(), adt_import_height_params_mode->currentIndex(), adt_import_height_tiled_edges->isChecked());
NOGGIT_ACTION_MGR->endAction();
)
@@ -1846,7 +1845,6 @@ void MapView::setupAssistMenu()
makeCurrent();
OpenGL::context::scoped_setter const _(::gl, context());
NOGGIT_ACTION_MGR->beginAction(this, Noggit::ActionFlags::eCHUNKS_VERTEX_COLOR);
_world->importAllADTVertexColorMaps(adt_import_vcol_params_mode->currentIndex(), adt_import_vcol_params_mode_tiled_edges->isChecked());
NOGGIT_ACTION_MGR->endAction();
)

3
src/noggit/ui/texture_swapper.cpp
View File

@@ -94,9 +94,8 @@ namespace Noggit
connect(swap_global, &QPushButton::clicked, [this, camera_pos, map_view]() {
if (_texture_to_swap)
{
// ActionManager::instance()->beginAction(map_view, ActionFlags::eCHUNKS_TEXTURE);
// TODO : action manager
_world->swapTextureGlobal(_texture_to_swap.value());
// ActionManager::instance()->endAction();
}
});