From db900864867d35eb48b8c2a5edac965b6a16a5ee Mon Sep 17 00:00:00 2001 From: T1ti Date: Wed, 5 Jul 2023 07:23:35 +0200 Subject: [PATCH] update icons --- resources/noggit_font.ttf | Bin 26632 -> 29504 bytes src/noggit/ui/FontNoggit.hpp | 18 ++++++++++++++++-- .../ui/tools/ViewToolbar/Ui/ViewToolbar.cpp | 6 +++--- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/resources/noggit_font.ttf b/resources/noggit_font.ttf index fce1dec9e1364443082c90f6d49d695e9ece3297..1ee856b5ff98e92399465cd9e8e22582678ff44b 100644 GIT binary patch delta 3671 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 QCBW8&?};CCV)BmOe}kU9H2?qr diff --git a/src/noggit/ui/FontNoggit.hpp b/src/noggit/ui/FontNoggit.hpp index 524f5d19..7005e45d 100755 --- a/src/noggit/ui/FontNoggit.hpp +++ b/src/noggit/ui/FontNoggit.hpp @@ -96,7 +96,7 @@ namespace Noggit VISIBILITY_FOG = 0xf8b2, VISIBILITY_WATER = 0xf8b3, VISIBILITY_GROUNDEFFECTS= 0xf8b4, - VISIBILITY_FLIGHT_BOUNDS = 0xf8b5, + // VISIBILITY_FLIGHT_BOUNDS = 0xf8b5, VISIBILITY_HIDDEN_MODELS = 0xf8b6, VISIBILITY_HOLE_LINES = 0xf8b7, VISIBILITY_ANIMATION = 0xf8b8, @@ -125,7 +125,21 @@ namespace Noggit GIZMO_VISIBILITY_ALL = 0xf8cf, TOOL_LIGHT = 0xf8d0, VISIBILITY_VERTEX_PAINTER = 0xf8d1, - VISIBILITY_CLIMB = 0xf8d2 + VISIBILITY_CLIMB = 0xf8d2, + VISIBILITY_BAKED_SHADOWS = 0xf8d3, + DOODAD = 0xf8d4, + CHARACTER_RADIUS = 0xf8d5, + SUN = 0xf8d6, + CHARACTER = 0xf8d7, + VIEW_MODE_GAME = 0xf8d8, + SOUND = 0xf8d9, // use for sound points + CUBE = 0xf8da, + POINTER = 0xf8db, + CREATURE = 0xf8dc, + CAMERA = 0xf8dd, + WINDOW = 0xf8de, + VISIBILITY_FLIGHT_BOUNDS = 0xf8df, + }; }; diff --git a/src/noggit/ui/tools/ViewToolbar/Ui/ViewToolbar.cpp b/src/noggit/ui/tools/ViewToolbar/Ui/ViewToolbar.cpp index a66f75ac..f98123b8 100755 --- a/src/noggit/ui/tools/ViewToolbar/Ui/ViewToolbar.cpp +++ b/src/noggit/ui/tools/ViewToolbar/Ui/ViewToolbar.cpp @@ -94,7 +94,7 @@ ViewToolbar::ViewToolbar(MapView *mapView, ViewToolbar *tb) add_tool_icon(mapView, &mapView->_draw_models, tr("Doodads"), FontNoggit::VISIBILITY_DOODADS, tb); add_tool_icon(mapView, &mapView->_draw_wmo, tr("WMOs"), FontNoggit::VISIBILITY_WMO, tb); add_tool_icon(mapView, &mapView->_draw_wmo_doodads, tr("WMO doodads"), FontNoggit::VISIBILITY_WMO_DOODADS, tb); - add_tool_icon(mapView, &mapView->_draw_wmo_exterior, tr("WMO exterior"), FontNoggit::GIZMO_VISIBILITY, tb); + add_tool_icon(mapView, &mapView->_draw_wmo_exterior, tr("WMO exterior"), FontNoggit::UI_TOGGLE, tb); add_tool_icon(mapView, &mapView->_draw_terrain, tr("Terrain"), FontNoggit::VISIBILITY_TERRAIN, tb); add_tool_icon(mapView, &mapView->_draw_water, tr("Water"), FontNoggit::VISIBILITY_WATER, tb); @@ -106,7 +106,7 @@ ViewToolbar::ViewToolbar(MapView *mapView, ViewToolbar *tb) add_tool_icon(mapView, &mapView->_draw_contour, tr("Contours"), FontNoggit::VISIBILITY_CONTOURS, tb); add_tool_icon(mapView, &mapView->_draw_climb, tr("Climb"), FontNoggit::VISIBILITY_CLIMB, tb, tb->_climb_secondary_tool); add_tool_icon(mapView, &mapView->_draw_vertex_color, tr("Vertex Color"), FontNoggit::VISIBILITY_VERTEX_PAINTER, tb); - add_tool_icon(mapView, &mapView->_draw_baked_shadows, tr("Baked Shadows"), FontNoggit::TOOL_AREA_DESIGNATOR, tb); // TODO : better icon + add_tool_icon(mapView, &mapView->_draw_baked_shadows, tr("Baked Shadows"), FontNoggit::VISIBILITY_BAKED_SHADOWS, tb); // TODO : better icon addSeparator(); @@ -131,7 +131,7 @@ 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::VISIBILITY_UNUSED, 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();