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

Fix animations in editor which use copy-pasted code from client

Browse Source
This commit is contained in:
Ivan Savenko 2023-06-19 11:16:57 +03:00
parent 9b5e81929f
commit 738ace99cb
3 changed files with 51 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
mapeditor/Animation.cpp
View File

@ -539,7 +539,6 @@ bool Animation::loadFrame(size_t frame, size_t group)
return true; return true;
} }
} }
return false;
// still here? image is missing // still here? image is missing
printError(frame, group, "LoadFrame"); printError(frame, group, "LoadFrame");
@ -547,7 +546,14 @@ bool Animation::loadFrame(size_t frame, size_t group)
} }
else //load from separate file else //load from separate file
{ {
images[group][frame] = getFromExtraDef(source[group][frame]["file"].String());; auto img = getFromExtraDef(source[group][frame]["file"].String());
if(!img)
{
auto bitmap = BitmapHandler::loadBitmap(source[group][frame]["file"].String());
img.reset(new QImage(bitmap));
}
images[group][frame] = img;
return true; return true;
} }
return false; return false;
@ -577,7 +583,6 @@ void Animation::init()
source[defEntry.first].resize(defEntry.second); source[defEntry.first].resize(defEntry.second);
} }
#if 0 //this code is not used but maybe requred if there will be configurable sprites
ResourceID resID(std::string("SPRITES/") + name, EResType::TEXT); ResourceID resID(std::string("SPRITES/") + name, EResType::TEXT);
//if(vstd::contains(graphics->imageLists, resID.getName())) //if(vstd::contains(graphics->imageLists, resID.getName()))
@ -593,9 +598,47 @@ void Animation::init()
const JsonNode config((char*)textData.get(), stream->getSize()); const JsonNode config((char*)textData.get(), stream->getSize());
//initFromJson(config); initFromJson(config);
}
}
void Animation::initFromJson(const JsonNode & config)
{
std::string basepath;
basepath = config["basepath"].String();
JsonNode base(JsonNode::JsonType::DATA_STRUCT);
base["margins"] = config["margins"];
base["width"] = config["width"];
base["height"] = config["height"];
for(const JsonNode & group : config["sequences"].Vector())
{
size_t groupID = group["group"].Integer();//TODO: string-to-value conversion("moving" -> MOVING)
source[groupID].clear();
for(const JsonNode & frame : group["frames"].Vector())
{
JsonNode toAdd(JsonNode::JsonType::DATA_STRUCT);
JsonUtils::inherit(toAdd, base);
toAdd["file"].String() = basepath + frame.String();
source[groupID].push_back(toAdd);
}
}
for(const JsonNode & node : config["images"].Vector())
{
size_t group = node["group"].Integer();
size_t frame = node["frame"].Integer();
if (source[group].size() <= frame)
source[group].resize(frame+1);
JsonNode toAdd(JsonNode::JsonType::DATA_STRUCT);
JsonUtils::inherit(toAdd, base);
toAdd["file"].String() = basepath + node["file"].String();
source[group][frame] = toAdd;
} }
#endif
} }
void Animation::printError(size_t frame, size_t group, std::string type) const void Animation::printError(size_t frame, size_t group, std::string type) const

2
mapeditor/Animation.h
View File

@ -44,7 +44,7 @@ private:
bool unloadFrame(size_t frame, size_t group); bool unloadFrame(size_t frame, size_t group);
//initialize animation from file //initialize animation from file
//void initFromJson(const JsonNode & input); void initFromJson(const JsonNode & input);
void init(); void init();
//to get rid of copy-pasting error message :] //to get rid of copy-pasting error message :]

1
mapeditor/BitmapHandler.cpp
View File

@ -131,6 +131,7 @@ namespace BitmapHandler
c = qRgb(qRed(c), qGreen(c), qBlue(c)); c = qRgb(qRed(c), qGreen(c), qBlue(c));
image.setColorTable(colorTable); image.setColorTable(colorTable);
} }
return image;
} }
else else
{ {