Merge pull request #1 from bjorn/master

Get latest changes from bjorn/tiled

Author: CaptainFrog

AUTHORS

@@ -126,6 +126,7 @@ Hiroki Utsunomiya        (Japanese)
 Jonatas de Moraes Junior (Portuguese, Brazil)
 jurkan                   (German)
 Jānis Kiršteins          (Latvian)
+Laete Meireles           (Portuguese, Brazil)
 Lyubomir Vasilev         (Bulgarian)
 Mauricio Muñoz Lucero    (Spanish)
 Petr Viktorin            (Czech)
@@ -135,6 +136,7 @@ Sébastien Burillard      (French)
 seeseekey                (German)
 Tamir Atias (KonoM)      (Hebrew)
 Thorbjørn Lindeijer      (Dutch)
+Tomasz Kubiak            (Polish)
 Yohann Ferreira          (French)
 Zhao Sting               (Chinese)
 

NEWS

@@ -1,3 +1,11 @@
+0.14.2 (12 October 2015)
+* Added Polish translation
+* Fixed layer offsets missing in the Lua export
+* Fixed JSON tileset format missing in 'Add External Tileset' action
+* Fixed language selection entries for Portuguese
+* Fixed an issue with copy/pasting when using image collection tilesets
+* Updated Brazilian Portuguese translation
+
 0.14.1 (28 September 2015)
 * Added missing 'renderorder' property to the Lua export
 * Fixed editing of properties of tiles captured from the map

README.md

@@ -28,7 +28,7 @@ Compiling
 
 Make sure the Qt (>= 5.1) development libraries are installed:
 
-* In Ubuntu/Debian: `apt-get install qt5-default qttools5-dev-tools zlib1g-dev`
+* In Ubuntu/Debian: `apt-get install qt5-default qttools5-dev-tools zlib1g-dev libqt5opengl5-dev`
 * In Fedora:        `yum install qt-devel`
 * In Arch Linux:    `pacman -S qt`
 * In Mac OS X with [Homebrew](http://brew.sh/): `brew install qt`

src/libtiled/mapformat.h

@@ -171,7 +171,7 @@ class FormatHelper
                  QString initialFilter)
         : mFilter(std::move(initialFilter))
     {
-        for (Format *format : PluginManager::objects<Format>()) {
+        PluginManager::each<Format>([this,capabilities](Format *format) {
             if (format->hasCapabilities(capabilities)) {
                 const QString nameFilter = format->nameFilter();
 
@@ -181,7 +181,7 @@ class FormatHelper
                 mFormats.append(format);
                 mFormatByNameFilter.insert(nameFilter, format);
             }
-        }
+        });
     }
 
     const QString &filter() const

src/libtiled/pluginmanager.h

@@ -35,6 +35,8 @@
 #include <QObject>
 #include <QString>
 
+#include <functional>
+
 namespace Tiled {
 
 struct LoadedPlugin
@@ -97,6 +99,17 @@ class TILEDSHARED_EXPORT PluginManager : public QObject
         return results;
     }
 
+    /**
+     * Calls the given function for each object implementing a given interface.
+     */
+    template<typename T>
+    static void each(std::function<void(T*)> function)
+    {
+        for (QObject *object : mInstance->mObjects)
+            if (T *result = qobject_cast<T*>(object))
+                function(result);
+    }
+
     const LoadedPlugin *pluginByFileName(const QString &pluginFileName) const;
 
 signals:

src/libtiled/tile.h

@@ -41,6 +41,29 @@ class ObjectGroup;
 class Terrain;
 class Tileset;
 
+/**
+ * Convenience function for creating tile terrain information.
+ */
+inline unsigned makeTerrain(int id)
+{
+    id &= 0xFF;
+    return id << 24 | id << 16 | id << 8 | id;
+}
+
+/**
+ * Convenience function for creating tile terrain information.
+ */
+inline unsigned makeTerrain(int topLeft,
+                            int topRight,
+                            int bottomLeft,
+                            int bottomRight)
+{
+    return (topLeft & 0xFF) << 24 |
+           (topRight & 0xFF) << 16 |
+           (bottomLeft & 0xFF) << 8 |
+           (bottomRight & 0xFF);
+}
+
 /**
  * Returns the given \a terrain with the \a corner modified to \a terrainId.
  */

src/libtiled/tileset.cpp

@@ -46,6 +46,11 @@ Tile *Tileset::tileAt(int id) const
     return (id < mTiles.size()) ? mTiles.at(id) : nullptr;
 }
 
+void Tileset::removeLastTile()
+{
+    delete mTiles.takeLast();
+}
+
 /**
  * Load this tileset from the given tileset \a image. This will replace
  * existing tile images in this tileset with new ones. If the new image
@@ -113,21 +118,54 @@ bool Tileset::loadFromImage(const QImage &image,
     return true;
 }
 
+static bool sameTileImages(const Tileset &a, const Tileset &b)
+{
+    Q_ASSERT(a.tileCount() == b.tileCount());
+
+    for (int i = 0; i < a.tileCount(); ++i) {
+        const Tile *tileA = a.tileAt(i);
+        const Tile *tileB = b.tileAt(i);
+        if (tileA->imageSource() != tileB->imageSource())
+            return false;
+    }
+
+    return true;
+}
+
 SharedTileset Tileset::findSimilarTileset(const QVector<SharedTileset> &tilesets) const
 {
     foreach (const SharedTileset &candidate, tilesets) {
-        if (candidate != this
-            && candidate->imageSource() == imageSource()
-            && candidate->tileWidth() == tileWidth()
-            && candidate->tileHeight() == tileHeight()
-            && candidate->tileSpacing() == tileSpacing()
-            && candidate->margin() == margin()) {
-                return candidate;
-        }
+        Q_ASSERT(candidate != this);
+
+        if (candidate->tileCount() != tileCount())
+            continue;
+        if (candidate->imageSource() != imageSource())
+            continue;
+        if (candidate->tileSize() != tileSize())
+            continue;
+        if (candidate->tileSpacing() != tileSpacing())
+            continue;
+        if (candidate->margin() != margin())
+            continue;
+        if (candidate->tileOffset() != tileOffset())
+            continue;
+
+        // For an image collection tileset, check the image sources
+        if (imageSource().isEmpty())
+            if (!sameTileImages(*this, *candidate))
+                continue;
+
+        return candidate;
     }
+
     return SharedTileset();
 }
 
+void Tileset::setImageSource(const QString &imageSource)
+{
+    mImageSource = imageSource;
+}
+
 int Tileset::columnCountForWidth(int width) const
 {
     Q_ASSERT(mTileWidth > 0);

src/libtiled/tileset.h

@@ -41,6 +41,7 @@
 #include <QPixmap>
 
 class QImage;
+class QPixmap;
 
 namespace Tiled {
 
@@ -190,6 +191,11 @@ class TILEDSHARED_EXPORT Tileset : public Object
      */
     int tileCount() const { return mTiles.size(); }
 
+    /**
+     * Removes (and deletes) the last tile from this set.
+     */
+    void removeLastTile();
+
     /**
      * Returns the number of tile columns in the tileset image.
      */
@@ -233,6 +239,11 @@ class TILEDSHARED_EXPORT Tileset : public Object
      */
     const QString &imageSource() const { return mImageSource; }
 
+    /**
+     * Sets the image source of this tileset. Does not reload any tiles!
+     */
+    void setImageSource(const QString &imageSource);
+
     /**
      * Returns the column count that this tileset would have if the tileset
      * image would have the given \a width. This takes into account the tile

src/plugins/lua/luaplugin.cpp

@@ -327,6 +327,11 @@ void LuaPlugin::writeTileLayer(LuaTableWriter &writer,
     writer.writeKeyAndValue("height", tileLayer->height());
     writer.writeKeyAndValue("visible", tileLayer->isVisible());
     writer.writeKeyAndValue("opacity", tileLayer->opacity());
+
+    const QPointF offset = tileLayer->offset();
+    writer.writeKeyAndValue("offsetx", offset.x());
+    writer.writeKeyAndValue("offsety", offset.y());
+
     writeProperties(writer, tileLayer->properties());
 
     switch (format) {
@@ -376,6 +381,11 @@ void LuaPlugin::writeObjectGroup(LuaTableWriter &writer,
     writer.writeKeyAndValue("name", objectGroup->name());
     writer.writeKeyAndValue("visible", objectGroup->isVisible());
     writer.writeKeyAndValue("opacity", objectGroup->opacity());
+
+    const QPointF offset = objectGroup->offset();
+    writer.writeKeyAndValue("offsetx", offset.x());
+    writer.writeKeyAndValue("offsety", offset.y());
+
     writeProperties(writer, objectGroup->properties());
 
     writer.writeStartTable("objects");

src/src.pro

@@ -4,4 +4,5 @@ CONFIG   += ordered
 SUBDIRS = libtiled tiled plugins \
     tmxviewer \
     tmxrasterizer \
-    automappingconverter
+    automappingconverter \
+    terraingenerator