games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-03 14:52:11 +02:00
Code Issues Releases Activity

Add overlay that shows map objects and their name & status

Browse Source
This commit is contained in:
Ivan Savenko 2024-07-19 17:24:03 +00:00
parent 3c611ffa5b
commit 44f516d2fc
6 changed files with 138 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/mapView/IMapRendererContext.h
View File

@ -16,6 +16,7 @@ class Point;
class CGObjectInstance;
class ObjectInstanceID;
struct TerrainTile;
class ColorRGBA;
struct CGPath;
VCMI_LIB_NAMESPACE_END
@ -67,6 +68,12 @@ public:
/// returns index of image for overlay on specific tile, or numeric_limits::max if none
virtual size_t overlayImageIndex(const int3 & coordinates) const = 0;
/// returns text that should be used as overlay for current tile
virtual std::string overlayText(const int3 & coordinates) const = 0;
/// returns text that should be used as overlay for current tile
virtual ColorRGBA overlayTextColor(const int3 & coordinates) const = 0;
/// returns animation frame for terrain
virtual size_t terrainImageIndex(size_t groupSize) const = 0;
@ -80,7 +87,10 @@ public:
virtual bool showBorder() const = 0;
/// if true, world view overlay will be shown
virtual bool showOverlay() const = 0;
virtual bool showImageOverlay() const = 0;
// if true, new text overlay will be shown
virtual bool showTextOverlay() const = 0;
/// if true, map grid should be visible on map
virtual bool showGrid() const = 0;

77
client/mapView/MapRendererContext.cpp
View File

@ -156,6 +156,16 @@ size_t MapRendererBaseContext::overlayImageIndex(const int3 & coordinates) const
return std::numeric_limits<size_t>::max();
}
std::string MapRendererBaseContext::overlayText(const int3 & coordinates) const
{
return {};
}
ColorRGBA MapRendererBaseContext::overlayTextColor(const int3 & coordinates) const
{
return {};
}
double MapRendererBaseContext::viewTransitionProgress() const
{
return 0;
@ -181,7 +191,12 @@ bool MapRendererBaseContext::showBorder() const
return false;
}
bool MapRendererBaseContext::showOverlay() const
bool MapRendererBaseContext::showImageOverlay() const
{
return false;
}
bool MapRendererBaseContext::showTextOverlay() const
{
return false;
}
@ -253,6 +268,59 @@ size_t MapRendererAdventureContext::terrainImageIndex(size_t groupSize) const
return frameIndex;
}
std::string MapRendererAdventureContext::overlayText(const int3 & coordinates) const
{
if(!isVisible(coordinates))
return {};
const auto & tile = getMapTile(coordinates);
if (!tile.visitable)
return {};
return tile.visitableObjects.back()->getObjectName();
}
ColorRGBA MapRendererAdventureContext::overlayTextColor(const int3 & coordinates) const
{
if(!isVisible(coordinates))
return {};
const auto & tile = getMapTile(coordinates);
if (!tile.visitable)
return {};
auto * object = tile.visitableObjects.back();
if (object->getOwner() == LOCPLINT->playerID)
return { 0, 192, 0};
if (LOCPLINT->cb->getPlayerRelations(object->getOwner(), LOCPLINT->playerID) == PlayerRelations::ALLIES)
return { 0, 128, 255};
if (object->getOwner().isValidPlayer())
return { 255, 0, 0};
if (object->ID == MapObjectID::MONSTER)
return { 255, 0, 0};
auto hero = LOCPLINT->localState->getCurrentHero();
if (hero)
{
if (object->wasVisited(hero))
return { 160, 160, 160 };
}
else
{
if (object->wasVisited(LOCPLINT->playerID))
return { 160, 160, 160 };
}
return { 255, 192, 0 };
}
bool MapRendererAdventureContext::showBorder() const
{
return true;
@ -273,6 +341,11 @@ bool MapRendererAdventureContext::showBlocked() const
return settingShowBlocked;
}
bool MapRendererAdventureContext::showTextOverlay() const
{
return settingTextOverlay;
}
bool MapRendererAdventureContext::showSpellRange(const int3 & position) const
{
if (!settingSpellRange)
@ -411,7 +484,7 @@ MapRendererWorldViewContext::MapRendererWorldViewContext(const MapRendererContex
{
}
bool MapRendererWorldViewContext::showOverlay() const
bool MapRendererWorldViewContext::showImageOverlay() const
{
return true;
}

11
client/mapView/MapRendererContext.h
View File

@ -48,13 +48,16 @@ public:
size_t objectImageIndex(ObjectInstanceID objectID, size_t groupSize) const override;
size_t terrainImageIndex(size_t groupSize) const override;
size_t overlayImageIndex(const int3 & coordinates) const override;
std::string overlayText(const int3 & coordinates) const override;
ColorRGBA overlayTextColor(const int3 & coordinates) const override;
double viewTransitionProgress() const override;
bool filterGrayscale() const override;
bool showRoads() const override;
bool showRivers() const override;
bool showBorder() const override;
bool showOverlay() const override;
bool showImageOverlay() const override;
bool showTextOverlay() const override;
bool showGrid() const override;
bool showVisitable() const override;
bool showBlocked() const override;
@ -69,6 +72,7 @@ public:
bool settingShowVisitable = false;
bool settingShowBlocked = false;
bool settingSpellRange= false;
bool settingTextOverlay = false;
bool settingsAdventureObjectAnimation = true;
bool settingsAdventureTerrainAnimation = true;
@ -77,11 +81,14 @@ public:
const CGPath * currentPath() const override;
size_t objectImageIndex(ObjectInstanceID objectID, size_t groupSize) const override;
size_t terrainImageIndex(size_t groupSize) const override;
std::string overlayText(const int3 & coordinates) const override;
ColorRGBA overlayTextColor(const int3 & coordinates) const override;
bool showBorder() const override;
bool showGrid() const override;
bool showVisitable() const override;
bool showBlocked() const override;
bool showTextOverlay() const override;
bool showSpellRange(const int3 & position) const override;
};
@ -133,7 +140,7 @@ public:
explicit MapRendererWorldViewContext(const MapRendererContextState & viewState);
size_t overlayImageIndex(const int3 & coordinates) const override;
bool showOverlay() const override;
bool showImageOverlay() const override;
};
class MapRendererSpellViewContext : public MapRendererWorldViewContext

44
client/mapView/MapViewCache.cpp
View File

@ -18,9 +18,12 @@
#include "../render/CAnimation.h"
#include "../render/Canvas.h"
#include "../render/IImage.h"
#include "../render/IFont.h"
#include "../render/IRenderHandler.h"
#include "../render/Graphics.h"
#include "../gui/CGuiHandler.h"
#include "../widgets/TextControls.h"
#include "../../lib/mapObjects/CObjectHandler.h"
#include "../../lib/int3.h"
@ -30,6 +33,7 @@ MapViewCache::~MapViewCache() = default;
MapViewCache::MapViewCache(const std::shared_ptr<MapViewModel> & model)
: model(model)
, cachedLevel(0)
, overlayWasVisible(false)
, mapRenderer(new MapRenderer())
, iconsStorage(GH.renderHandler().loadAnimation(AnimationPath::builtin("VwSymbol"), EImageBlitMode::COLORKEY))
, intermediate(new Canvas(Point(32, 32)))
@ -137,7 +141,9 @@ void MapViewCache::update(const std::shared_ptr<IMapRendererContext> & context)
void MapViewCache::render(const std::shared_ptr<IMapRendererContext> & context, Canvas & target, bool fullRedraw)
{
bool mapMoved = (cachedPosition != model->getMapViewCenter());
bool lazyUpdate = !mapMoved && !fullRedraw && vstd::isAlmostZero(context->viewTransitionProgress());
bool overlayVisible = context->showImageOverlay() || context->showTextOverlay();
bool overlayVisibilityChanged = overlayVisible != overlayWasVisible;
bool lazyUpdate = !overlayVisibilityChanged && !mapMoved && !fullRedraw && vstd::isAlmostZero(context->viewTransitionProgress());
Rect dimensions = model->getTilesTotalRect();
@ -161,18 +167,18 @@ void MapViewCache::render(const std::shared_ptr<IMapRendererContext> & context,
}
}
if(context->showOverlay())
if(context->showImageOverlay())
{
for(int y = dimensions.top(); y < dimensions.bottom(); ++y)
{
for(int x = dimensions.left(); x < dimensions.right(); ++x)
{
int3 tile(x, y, model->getLevel());
Rect targetRect = model->getTargetTileArea(tile);
auto overlay = getOverlayImageForTile(context, tile);
if(overlay)
{
Rect targetRect = model->getTargetTileArea(tile);
Point position = targetRect.center() - overlay->dimensions() / 2;
target.draw(overlay, position);
}
@ -180,10 +186,42 @@ void MapViewCache::render(const std::shared_ptr<IMapRendererContext> & context,
}
}
if(context->showTextOverlay())
{
for(int y = dimensions.top(); y < dimensions.bottom(); ++y)
{
for(int x = dimensions.left(); x < dimensions.right(); ++x)
{
int3 tile(x, y, model->getLevel());
auto overlay = context->overlayText(tile);
if(!overlay.empty())
{
Rect targetRect = model->getTargetTileArea(tile);
Point position = targetRect.center();
if (x % 2 == 0)
position.y += targetRect.h / 4;
else
position.y -= targetRect.h / 4;
const auto font = graphics->fonts[EFonts::FONT_TINY];
Point dimensions(font->getStringWidth(overlay), font->getLineHeight());
Rect textRect = Rect(position - dimensions / 2, dimensions).resize(2);
target.drawColor(textRect, context->overlayTextColor(tile));
target.drawBorder(textRect, Colors::BRIGHT_YELLOW);
target.drawText(position, EFonts::FONT_TINY, Colors::BLACK, ETextAlignment::CENTER, overlay);
}
}
}
}
if(!vstd::isAlmostZero(context->viewTransitionProgress()))
target.drawTransparent(*terrainTransition, Point(0, 0), 1.0 - context->viewTransitionProgress());
cachedPosition = model->getMapViewCenter();
overlayWasVisible = overlayVisible;
}
void MapViewCache::createTransitionSnapshot(const std::shared_ptr<IMapRendererContext> & context)

1
client/mapView/MapViewCache.h
View File

@ -44,6 +44,7 @@ class MapViewCache
Point cachedSize;
Point cachedPosition;
int cachedLevel;
bool overlayWasVisible;
std::shared_ptr<MapViewModel> model;

1
client/mapView/MapViewController.cpp
View File

@ -224,6 +224,7 @@ void MapViewController::updateState()
adventureContext->settingShowVisitable = settings["session"]["showVisitable"].Bool();
adventureContext->settingShowBlocked = settings["session"]["showBlocked"].Bool();
adventureContext->settingSpellRange = settings["session"]["showSpellRange"].Bool();
adventureContext->settingTextOverlay = GH.isKeyboardAltDown();
}
}