games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-13 01:20:34 +02:00
Code Issues Releases Activity

Fixed in-boat movement

Browse Source
This commit is contained in:
Ivan Savenko
2023-02-19 13:05:54 +02:00
parent ebe996fa74
commit b5ad3a0559
3 changed files with 67 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
client/adventureMap/MapRenderer.cpp
View File

@ -312,7 +312,7 @@ void MapRendererFow::renderTile(const IMapRendererContext & context, Canvas & ta
} }
} }
std::shared_ptr<CAnimation> MapRendererObjects::getAnimation(const CGObjectInstance * obj) std::shared_ptr<CAnimation> MapRendererObjects::getBaseAnimation(const CGObjectInstance* obj)
{ {
const auto & info = obj->appearance; const auto & info = obj->appearance;
@ -328,6 +328,16 @@ std::shared_ptr<CAnimation> MapRendererObjects::getAnimation(const CGObjectInsta
bool generateMovementGroups = (info->id == Obj::BOAT) || (info->id == Obj::HERO); bool generateMovementGroups = (info->id == Obj::BOAT) || (info->id == Obj::HERO);
//TODO: relocate to config file?
// Boat appearance files only contain single, unanimated image
// proper boat animations are actually in different file
static const std::vector<std::string> boatAnimations = {
"AB01_.def", "AB02_.def", "AB03_.def"
};
if (info->id == Obj::BOAT)
return getAnimation(boatAnimations[info->subid], generateMovementGroups);
return getAnimation(info->animationFile, generateMovementGroups); return getAnimation(info->animationFile, generateMovementGroups);
} }
@ -373,15 +383,34 @@ std::shared_ptr<CAnimation> MapRendererObjects::getFlagAnimation(const CGObjectI
assert(obj->tempOwner.isValidPlayer()); assert(obj->tempOwner.isValidPlayer());
return getAnimation(heroFlags[obj->tempOwner.getNum()], true); return getAnimation(heroFlags[obj->tempOwner.getNum()], true);
} }
if(obj->ID == Obj::BOAT) if(obj->ID == Obj::BOAT)
{ {
const auto * boat = dynamic_cast<const CGBoat *>(obj); const auto * boat = dynamic_cast<const CGBoat *>(obj);
assert(boat);
assert(boat->subID < boatFlags.size()); assert(boat->subID < boatFlags.size());
assert(!boat->hero || boat->hero->tempOwner.isValidPlayer());
if (boat->hero) if (boat->hero)
return getAnimation(boatFlags[obj->subID][boat->hero->tempOwner.getNum()], true); {
assert(boat->hero->tempOwner.isValidPlayer());
return getAnimation(boatFlags[boat->subID][boat->hero->tempOwner.getNum()], true);
}
}
return nullptr;
}
std::shared_ptr<CAnimation> MapRendererObjects::getOverlayAnimation(const CGObjectInstance * obj)
{
if(obj->ID == Obj::BOAT)
{
//TODO: relocate to config file?
// Boats have additional animation with waves around boat
static const std::vector<std::string> boatAnimations = {
"ABM01_.def", "ABM02_.def", "ABM03_.def"
};
const auto * boat = dynamic_cast<const CGBoat *>(obj);
if (boat->hero)
return getAnimation(boatAnimations[obj->subID], true);
} }
return nullptr; return nullptr;
} }
@ -406,7 +435,7 @@ void MapRendererObjects::renderImage(const IMapRendererContext & context, Canvas
if(!image) if(!image)
return; return;
uint8_t transparency = static_cast<uint8_t>(std::round(255 * context.objectTransparency(object->id))); auto transparency = static_cast<uint8_t>(std::round(255 * context.objectTransparency(object->id)));
if (transparency == 0) if (transparency == 0)
return; return;
@ -425,8 +454,9 @@ void MapRendererObjects::renderImage(const IMapRendererContext & context, Canvas
void MapRendererObjects::renderObject(const IMapRendererContext & context, Canvas & target, const int3 & coordinates, const CGObjectInstance* instance) void MapRendererObjects::renderObject(const IMapRendererContext & context, Canvas & target, const int3 & coordinates, const CGObjectInstance* instance)
{ {
renderImage(context, target, coordinates, instance, getImage(context, instance, getAnimation(instance))); renderImage(context, target, coordinates, instance, getImage(context, instance, getBaseAnimation(instance)));
renderImage(context, target, coordinates, instance, getImage(context, instance, getFlagAnimation(instance))); renderImage(context, target, coordinates, instance, getImage(context, instance, getFlagAnimation(instance)));
renderImage(context, target, coordinates, instance, getImage(context, instance, getOverlayAnimation(instance)));
} }
void MapRendererObjects::renderTile(const IMapRendererContext & context, Canvas & target, const int3 & coordinates) void MapRendererObjects::renderTile(const IMapRendererContext & context, Canvas & target, const int3 & coordinates)

4
client/adventureMap/MapRenderer.h
View File

@ -76,8 +76,10 @@ class MapRendererObjects
{ {
std::map<std::string, std::shared_ptr<CAnimation>> animations; std::map<std::string, std::shared_ptr<CAnimation>> animations;
std::shared_ptr<CAnimation> getBaseAnimation(const CGObjectInstance * obj);
std::shared_ptr<CAnimation> getFlagAnimation(const CGObjectInstance * obj); std::shared_ptr<CAnimation> getFlagAnimation(const CGObjectInstance * obj);
std::shared_ptr<CAnimation> getAnimation(const CGObjectInstance * obj); std::shared_ptr<CAnimation> getOverlayAnimation(const CGObjectInstance * obj);
std::shared_ptr<CAnimation> getAnimation(const std::string & filename, bool generateMovementGroups); std::shared_ptr<CAnimation> getAnimation(const std::string & filename, bool generateMovementGroups);
std::shared_ptr<IImage> getImage(const IMapRendererContext & context, const CGObjectInstance * obj, const std::shared_ptr<CAnimation> & animation) const; std::shared_ptr<IImage> getImage(const IMapRendererContext & context, const CGObjectInstance * obj, const std::shared_ptr<CAnimation> & animation) const;

47
client/adventureMap/MapView.cpp
View File

@ -11,35 +11,21 @@
#include "StdInc.h" #include "StdInc.h"
#include "MapView.h" #include "MapView.h"
#include <utility>
#include "MapRenderer.h" #include "MapRenderer.h"
#include "mapHandler.h" #include "mapHandler.h"
#include "CAdvMapInt.h" #include "CAdvMapInt.h"
#include "../CGameInfo.h" #include "../CGameInfo.h"
#include "../CMusicHandler.h"
#include "../CPlayerInterface.h" #include "../CPlayerInterface.h"
#include "../gui/CGuiHandler.h" #include "../gui/CGuiHandler.h"
#include "../render/CAnimation.h" #include "../render/CAnimation.h"
#include "../render/Canvas.h" #include "../render/Canvas.h"
#include "../render/Colors.h"
#include "../render/Graphics.h"
#include "../render/IImage.h"
#include "../renderSDL/SDL_Extensions.h" #include "../renderSDL/SDL_Extensions.h"
#include "../../CCallback.h" #include "../../CCallback.h"
#include "../../lib/CConfigHandler.h" #include "../../lib/CConfigHandler.h"
#include "../../lib/CGeneralTextHandler.h"
#include "../../lib/CRandomGenerator.h"
#include "../../lib/CStopWatch.h"
#include "../../lib/Color.h"
#include "../../lib/RiverHandler.h"
#include "../../lib/RoadHandler.h"
#include "../../lib/TerrainHandler.h"
#include "../../lib/mapObjects/CGHeroInstance.h" #include "../../lib/mapObjects/CGHeroInstance.h"
#include "../../lib/mapObjects/CObjectClassesHandler.h"
#include "../../lib/mapping/CMap.h" #include "../../lib/mapping/CMap.h"
MapViewCache::~MapViewCache() = default; MapViewCache::~MapViewCache() = default;
@ -414,9 +400,12 @@ size_t MapRendererContext::objectGroupIndex(ObjectInstanceID objectID) const
if(obj->ID == Obj::BOAT) if(obj->ID == Obj::BOAT)
{ {
const auto * boat = dynamic_cast<const CGBoat *>(obj); const auto * boat = dynamic_cast<const CGBoat *>(obj);
uint8_t direction = boat->hero ? boat->hero->moveDir : boat->direction;
if (movementAnimation && movementAnimation->target == objectID) if (movementAnimation && movementAnimation->target == objectID)
return moveGroups[boat->direction]; return moveGroups[direction];
return idleGroups[boat->direction]; return idleGroups[direction];
} }
return 0; return 0;
} }
@ -443,6 +432,19 @@ Point MapRendererContext::objectImageOffset(ObjectInstanceID objectID, const int
double MapRendererContext::objectTransparency(ObjectInstanceID objectID) const double MapRendererContext::objectTransparency(ObjectInstanceID objectID) const
{ {
const CGObjectInstance * object = getObject(objectID);
if (object && object->ID == Obj::HERO)
{
const auto * hero = dynamic_cast<const CGHeroInstance *>(object);
if (hero->inTownGarrison)
return 0;
if (hero->boat)
return 0;
}
if (fadeOutAnimation && objectID == fadeOutAnimation->target) if (fadeOutAnimation && objectID == fadeOutAnimation->target)
return 1.0 - fadeOutAnimation->progress; return 1.0 - fadeOutAnimation->progress;
@ -550,17 +552,22 @@ void MapViewController::onHeroTeleported(const CGHeroInstance * obj, const int3
void MapViewController::onHeroMoved(const CGHeroInstance * obj, const int3 & from, const int3 & dest) void MapViewController::onHeroMoved(const CGHeroInstance * obj, const int3 & from, const int3 & dest)
{ {
assert(!context->movementAnimation); assert(!context->movementAnimation);
context->removeObject(obj);
const CGObjectInstance * movingObject = obj;
if (obj->boat)
movingObject = obj->boat;
context->removeObject(movingObject);
if (settings["adventure"]["heroMoveTime"].Float() > 1) if (settings["adventure"]["heroMoveTime"].Float() > 1)
{ {
context->addMovingObject(obj, from, dest); context->addMovingObject(movingObject, from, dest);
context->movementAnimation = HeroAnimationState{ obj->id, from, dest, 0.0 }; context->movementAnimation = HeroAnimationState{ movingObject->id, from, dest, 0.0 };
} }
else else
{ {
// instant movement // instant movement
context->addObject(obj); context->addObject(movingObject);
} }
} }