Fixed proposed changes to Flare plugin #1781
Conversation
…tom layer properties
… paths not being output to the exported txt file.
…that put all objects one tile lower than they were placed
…very time the flare file is saved and not exported: resulted in ever-increasing height
… into flare_plugin - Fix indentation (tabs -> spaces)
src/plugins/flare/flareplugin.cpp
Outdated
| x = loc[0].toFloat()*map->tileWidth(); | ||
| y = loc[1].toFloat()*map->tileHeight(); | ||
| x = (loc[0].toFloat())*map->tileWidth(); | ||
| y = (loc[1].toFloat())*map->tileHeight(); |
There was a problem hiding this comment.
Please don't add superfluous parenthesis here. I'd rather have spaces around the * operator.
src/plugins/flare/flareplugin.cpp
Outdated
| @@ -285,6 +300,8 @@ bool FlarePlugin::write(const Tiled::Map *map, const QString &fileName) | |||
| } | |||
|
|
|||
| QTextStream out(file.device()); | |||
| QColor backgroundColor; | |||
| backgroundColor = map->backgroundColor(); | |||
There was a problem hiding this comment.
Please merge these into one line.
src/plugins/flare/flareplugin.cpp
Outdated
| Properties::const_iterator it = tileLayer->properties().constBegin(); | ||
| Properties::const_iterator it_end = tileLayer->properties().constEnd(); | ||
| for (; it != it_end; ++it) { | ||
| if(it->userType() == filePathTypeId()){ |
There was a problem hiding this comment.
Coding style: should have space after if and before the {. Also below.
src/plugins/flare/flareplugin.cpp
Outdated
| if(it->userType() == filePathTypeId()){ | ||
| out << it.key() << "=" << mapDir.relativeFilePath(toExportValue(it.value()).toString()) << "\n"; | ||
| } | ||
| else{ |
There was a problem hiding this comment.
Coding style: should be } else {. Also below.
|
I've made the requested fixes. And feel free to squash the commits. |
src/plugins/flare/flareplugin.cpp
Outdated
| out << it.key() << "=" << it.value().toString() << "\n"; | ||
| QVariantMap propsMap = o->properties(); | ||
| for (QVariantMap::const_iterator it = propsMap.constBegin(); it != propsMap.constEnd(); ++it) { | ||
| if(it->userType() == filePathTypeId()){ |
There was a problem hiding this comment.
Sorry to be such a nitpick, but please also add the spaces here and adjust the else below as well.
There was a problem hiding this comment.
No worries. Just pushed a fix.
src/plugins/flare/flareplugin.cpp
Outdated
| out << it.key() << "=" << mapDir.relativeFilePath(toExportValue(it.value()).toString()) << "\n"; | ||
| } else { | ||
| out << it.key() << "=" << toExportValue(it.value()).toString() << "\n"; | ||
| } |
There was a problem hiding this comment.
On closer inspection, I believe this could be simplified to just:
out << it.key() << "=" << toExportValue(it.value(), mapDir).toString() << "\n";The same goes for the writing of layer properties.
The version of toExportValue taking an additional map directory is new and will handle the file path case.
There was a problem hiding this comment.
You're right. That syntax is even used on line 324. I fixed the two spots that needed it.
|
Thanks! |
#1417 appears to have been untouched for the passed 9 months or so. I've fixed the merge conflicts, as well as making a few style changes based on how we format data for Flare. The output we want is
background_color=R,G,B,A, where RGBA are 8-bit integers.