games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-24 03:47:18 +02:00
Code Issues Releases Activity

fix image creation

Browse Source
This commit is contained in:
Laserlicht 2024-11-30 15:03:58 +01:00
parent 9c0aef6ca2
commit 3967c70bf2
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/mapView/MapRenderer.cpp
View File

@ -135,7 +135,7 @@ MapRendererTerrain::MapRendererTerrain()
{ {
logGlobal->debug("Loading map terrains"); logGlobal->debug("Loading map terrains");
for(const auto & terrain : VLC->terrainTypeHandler->objects) for(const auto & terrain : VLC->terrainTypeHandler->objects)
storage.load(terrain->getIndex(), terrain->tilesFilename, EImageBlitMode::OPAQUE); storage.load(terrain->getIndex(), AnimationPath::builtin(terrain->tilesFilename.getName() + (terrain->paletteAnimation.size() ? "_Shifted": "")), EImageBlitMode::OPAQUE);
logGlobal->debug("Done loading map terrains"); logGlobal->debug("Done loading map terrains");
} }
@ -156,8 +156,8 @@ void MapRendererTerrain::renderTile(IMapRendererContext & context, Canvas & targ
return; return;
} }
// for( auto const & element : mapTile.getTerrain()->paletteAnimation) for( auto const & element : mapTile.getTerrain()->paletteAnimation)
// image->shiftPalette(element.start, element.length, context.terrainImageIndex(element.length)); image->shiftPalette(element.start, element.length, context.terrainImageIndex(element.length));
target.draw(image, Point(0, 0)); target.draw(image, Point(0, 0));
} }
@ -176,7 +176,7 @@ MapRendererRiver::MapRendererRiver()
{ {
logGlobal->debug("Loading map rivers"); logGlobal->debug("Loading map rivers");
for(const auto & river : VLC->riverTypeHandler->objects) for(const auto & river : VLC->riverTypeHandler->objects)
storage.load(river->getIndex(), river->tilesFilename, EImageBlitMode::COLORKEY); storage.load(river->getIndex(), AnimationPath::builtin(river->tilesFilename.getName() + (river->paletteAnimation.size() ? "_Shifted": "")), EImageBlitMode::COLORKEY);
logGlobal->debug("Done loading map rivers"); logGlobal->debug("Done loading map rivers");
} }
@ -193,8 +193,8 @@ void MapRendererRiver::renderTile(IMapRendererContext & context, Canvas & target
const auto & image = storage.find(terrainIndex, rotationIndex, imageIndex); const auto & image = storage.find(terrainIndex, rotationIndex, imageIndex);
//for( auto const & element : mapTile.getRiver()->paletteAnimation) for( auto const & element : mapTile.getRiver()->paletteAnimation)
// image->shiftPalette(element.start, element.length, context.terrainImageIndex(element.length)); image->shiftPalette(element.start, element.length, context.terrainImageIndex(element.length));
target.draw(image, Point(0, 0)); target.draw(image, Point(0, 0));
} }

13
client/render/AssetGenerator.cpp
View File

@ -368,7 +368,7 @@ void AssetGenerator::createPaletteShiftedSprites()
auto filename = AnimationPath::builtin(sprite).addPrefix("SPRITES/"); auto filename = AnimationPath::builtin(sprite).addPrefix("SPRITES/");
auto filenameNew = AnimationPath::builtin(sprite + "_Shifted").addPrefix("SPRITES/"); auto filenameNew = AnimationPath::builtin(sprite + "_Shifted").addPrefix("SPRITES/");
if(CResourceHandler::get()->existsResource(ResourcePath(filenameNew))) // overridden by mod, no generation if(CResourceHandler::get()->existsResource(ResourcePath(filenameNew.getName(), EResType::JSON))) // overridden by mod, no generation
return; return;
auto anim = GH.renderHandler().loadAnimation(filename, EImageBlitMode::COLORKEY); auto anim = GH.renderHandler().loadAnimation(filename, EImageBlitMode::COLORKEY);
@ -409,12 +409,15 @@ void AssetGenerator::createPaletteShiftedSprites()
img->shiftPalette(tmp.start, tmp.length, l % tmp.length); img->shiftPalette(tmp.start, tmp.length, l % tmp.length);
} }
} }
img->exportBitmap(*CResourceHandler::get("local")->getResourceName(savePath)); Canvas canvas = Canvas(Point(32, 32), CanvasScalingPolicy::IGNORE);
canvas.draw(img, Point((32 - img->dimensions().x) / 2, (32 - img->dimensions().y) / 2));
std::shared_ptr<IImage> image = GH.renderHandler().createImage(canvas.getInternalSurface());
image->exportBitmap(*CResourceHandler::get("local")->getResourceName(savePath));
JsonNode node; JsonNode node;
node.Struct() = { node.Struct() = {
{ "group", JsonNode(std::to_string(l)) }, { "group", JsonNode(l) },
{ "frame", JsonNode(std::to_string(j)) }, { "frame", JsonNode(j) },
{ "file", JsonNode(spriteName) } { "file", JsonNode(spriteName) }
}; };
config["images"].Vector().push_back(node); config["images"].Vector().push_back(node);
@ -425,7 +428,7 @@ void AssetGenerator::createPaletteShiftedSprites()
if(!CResourceHandler::get("local")->createResource(filenameNew.getOriginalName() + ".json")) if(!CResourceHandler::get("local")->createResource(filenameNew.getOriginalName() + ".json"))
return; return;
std::fstream file(CResourceHandler::get()->getResourceName(savePath)->c_str(), std::ofstream::out | std::ofstream::trunc); std::fstream file(CResourceHandler::get("local")->getResourceName(savePath)->c_str(), std::ofstream::out | std::ofstream::trunc);
file << config.toString(); file << config.toString();
} }
} }