From 48e540fff8c736ff9ff91a2daa8d5609bb1f59c6 Mon Sep 17 00:00:00 2001 From: T1ti <40864460+T1ti@users.noreply.github.com> Date: Sat, 10 Aug 2024 03:06:45 +0200 Subject: [PATCH] remove gameview tool icon and optimize flightbounds render --- src/noggit/MapTile.h | 8 +++++--- src/noggit/MapView.cpp | 4 ++-- src/noggit/rendering/WorldRender.cpp | 5 ++++- src/noggit/texture_set.cpp | 6 +++++- src/noggit/ui/texturing_tool.cpp | 2 +- src/noggit/ui/tools/ViewToolbar/Ui/ViewToolbar.cpp | 5 ++--- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/noggit/MapTile.h b/src/noggit/MapTile.h index 39f661cf..bbf9ade3 100755 --- a/src/noggit/MapTile.h +++ b/src/noggit/MapTile.h @@ -112,6 +112,8 @@ public: bool isTile(int pX, int pZ); + bool hasFlightBounds() const { return mFlags & 1; }; + async_priority loading_priority() const override { return async_priority::high; @@ -185,9 +187,9 @@ private: glm::vec3 _center; float _cam_dist; - // MFBO: - glm::vec3 mMinimumValues[3 * 3]; - glm::vec3 mMaximumValues[3 * 3]; + // MFBO: requires mFlags & 1 + glm::vec3 mMinimumValues[3 * 3] = {}; + glm::vec3 mMaximumValues[3 * 3] = {}; unsigned _chunk_update_flags; diff --git a/src/noggit/MapView.cpp b/src/noggit/MapView.cpp index 5976b965..9df76321 100755 --- a/src/noggit/MapView.cpp +++ b/src/noggit/MapView.cpp @@ -2249,8 +2249,6 @@ void MapView::setupViewMenu() //! \todo space+h in object mode ADD_TOGGLE_NS (view_menu, "Hidden models", _draw_hidden_models); - ADD_TOGGLE_NS(view_menu, "Game Mode", _game_mode_camera); - auto debug_menu (view_menu->addMenu ("Debug")); ADD_TOGGLE_NS (debug_menu, "Occlusion boxes", _draw_occlusion_boxes); @@ -2260,6 +2258,8 @@ void MapView::setupViewMenu() ADD_TOGGLE (view_menu, "Show Node Editor", "Shift+N", _show_node_editor); + ADD_TOGGLE_NS(view_menu, "Game View", _game_mode_camera); + view_menu->addSeparator(); view_menu->addAction(createTextSeparator("Minimap")); view_menu->addSeparator(); diff --git a/src/noggit/rendering/WorldRender.cpp b/src/noggit/rendering/WorldRender.cpp index f83f93e0..b483813b 100755 --- a/src/noggit/rendering/WorldRender.cpp +++ b/src/noggit/rendering/WorldRender.cpp @@ -1026,7 +1026,10 @@ void WorldRender::draw (glm::mat4x4 const& model_view for (MapTile* tile : _world->mapIndex.loaded_tiles()) { - tile->flightBoundsRenderer()->draw(mfbo_shader); + if (tile->hasFlightBounds()) + { + tile->flightBoundsRenderer()->draw(mfbo_shader); + } } } diff --git a/src/noggit/texture_set.cpp b/src/noggit/texture_set.cpp index 47f9f39f..a3096b42 100755 --- a/src/noggit/texture_set.cpp +++ b/src/noggit/texture_set.cpp @@ -1405,6 +1405,8 @@ std::array TextureSet::get_textures_weight_for_unit(unsigned int unit_ void TextureSet::updateDoodadMapping() { + // NOTE : tempalphamap needs to be applied first with apply_alpha_changes() + std::array new_doodad_mapping{}; // std::array, 8> new_doodad_mapping{}; // for (auto& row : new_doodad_mapping) { @@ -1424,8 +1426,10 @@ void TextureSet::updateDoodadMapping() int very_innacurate_count = 0; int higher_count = 0; int lower_count = 0; - auto blizzard_mapping_readable = getDoodadMappingReadable(); + std::array, 8> blizzard_mapping_readable; bool debug_test = true; + if (debug_test) + blizzard_mapping_readable = getDoodadMappingReadable(); // 8x8 bits per unit for (int unit_x = 0; unit_x < 8; unit_x++) diff --git a/src/noggit/ui/texturing_tool.cpp b/src/noggit/ui/texturing_tool.cpp index bc6d914f..32164b6e 100755 --- a/src/noggit/ui/texturing_tool.cpp +++ b/src/noggit/ui/texturing_tool.cpp @@ -209,7 +209,7 @@ namespace Noggit tool_layout->setAlignment(quick_palette_btn, Qt::AlignTop); - auto geffect_tools_btn(new QPushButton("Ground Effect Tools", this)); + auto geffect_tools_btn(new QPushButton(/*"Ground Effect Tools"*/ "In developement", this)); tool_layout->addWidget(geffect_tools_btn); tool_layout->setAlignment(geffect_tools_btn, Qt::AlignTop); diff --git a/src/noggit/ui/tools/ViewToolbar/Ui/ViewToolbar.cpp b/src/noggit/ui/tools/ViewToolbar/Ui/ViewToolbar.cpp index 8568e69e..34488a23 100755 --- a/src/noggit/ui/tools/ViewToolbar/Ui/ViewToolbar.cpp +++ b/src/noggit/ui/tools/ViewToolbar/Ui/ViewToolbar.cpp @@ -132,9 +132,9 @@ ViewToolbar::ViewToolbar(MapView *mapView, ViewToolbar *tb) // normal view mode icon, and make them only 1 at a time out of the 3 view modes? // add_tool_icon(mapView, &mapView->_game_mode_camera, tr("Normal view"), FontNoggit::VIEW_AXIS, tb); - add_tool_icon(mapView, &mapView->_game_mode_camera, tr("Game view"), FontNoggit::VIEW_MODE_GAME, tb); + // add_tool_icon(mapView, &mapView->_game_mode_camera, tr("Game view"), FontNoggit::VIEW_MODE_GAME, tb); // add_tool_icon(mapView, &mapView->_game_mode_camera, tr("Tile view"), FontNoggit::VIEW_MODE_2D, tb); - addSeparator(); + // addSeparator(); add_tool_icon(mapView, &mapView->_show_minimap_window, tr("Show Minimap"),FontNoggit::TOOL_MINIMAP_EDITOR, tb); add_tool_icon(mapView, &mapView->_show_detail_info_window, tr("Details info"), FontNoggit::INFO, tb); @@ -412,7 +412,6 @@ void ViewToolbar::add_tool_icon(MapView* mapView, mapView->getCamera()->position.y = ground_pos.y + 2; } - action->setChecked(view_state->get()); });