Opacity adjustments

Opacity adjusted for tmxrasterizer and minimaprederer
jcbk101 · Aug 15, 2024 · b65718f · b65718f
1 parent e9fa5b9
commit b65718f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/docs/reference/json-map-format.rst b/docs/reference/json-map-format.rst
@@ -216,6 +216,7 @@ Object
     polyline,         array,            "Array of :ref:`Points <json-point>`, in case the object is a polyline"
     properties,       array,            "Array of :ref:`Properties <json-property>`"
     rotation,         double,           "Angle in degrees clockwise"
+    opacity,          double,           "The opacity of the object as a value from 0 to 1. Defaults to 1."
     template,         string,           "Reference to a template file, in case object is a :doc:`template instance </manual/using-templates>`"
     text,             :ref:`json-object-text`, "Only used for text objects"
     type,             string,           "The class of the object (was saved as ``class`` in 1.9, optional)"
@@ -241,6 +242,7 @@ Object Example
           "value":12
         }],
       "rotation":0,
+      "opacity":1,
       "type":"npc",
       "visible":true,
       "width":0,
@@ -259,6 +261,7 @@ Ellipse Example
       "id":13,
       "name":"",
       "rotation":0,
+      "opacity":1,
       "type":"",
       "visible":true,
       "width":248,
@@ -276,6 +279,7 @@ Rectangle Example
       "id":14,
       "name":"",
       "rotation":0,
+      "opacity":1,
       "type":"",
       "visible":true,
       "width":368,
@@ -294,6 +298,7 @@ Point Example
       "name":"",
       "point":true,
       "rotation":0,
+      "opacity":1,
       "type":"",
       "visible":true,
       "width":0,
@@ -332,6 +337,7 @@ Polygon Example
         "y":-288
       }],
       "rotation":0,
+      "opacity":1,
       "type":"",
       "visible":true,
       "width":0,
@@ -374,6 +380,7 @@ Polyline Example
         "y":0
       }],
       "rotation":0,
+      "opacity":1,
       "type":"",
       "visible":true,
       "width":0,
@@ -396,6 +403,7 @@ Text Example
         "wrap":true
       },
       "rotation":0,
+      "opacity":1,
       "type":"",
       "visible":true,
       "width":248,

diff --git a/docs/reference/tmx-map-format.rst b/docs/reference/tmx-map-format.rst
@@ -549,6 +549,8 @@ Can contain any number: :ref:`tmx-object`
 -  **height:** The height of the object in pixels. (defaults to 0)
 -  **rotation:** The rotation of the object in degrees clockwise around (x, y). 
    (defaults to 0)
+-  **opacity:** The opacity of the object as a value from 0 to 1. (defaults
+   to 1)
 -  **gid:** A reference to a tile. (optional)
 -  **visible:** Whether the object is shown (1) or hidden (0). (defaults to
    1)

diff --git a/src/libtiled/minimaprenderer.cpp b/src/libtiled/minimaprenderer.cpp
@@ -203,6 +203,8 @@ void MiniMapRenderer::renderToImage(QImage &image, RenderFlags renderFlags) cons
                             painter.translate(-origin);
                         }
 
+                        painter.setOpacity(object->opacity());
+
                         mRenderer->drawMapObject(&painter, object, object->effectiveColors());
 
                         if (object->rotation() != qreal(0))

diff --git a/src/tmxrasterizer/tmxrasterizer.cpp b/src/tmxrasterizer/tmxrasterizer.cpp
@@ -85,6 +85,8 @@ void TmxRasterizer::drawMapLayers(const MapRenderer &renderer,
                         painter.translate(-origin);
                     }
 
+                    painter.setOpacity(object->opacity());
+
                     renderer.drawMapObject(&painter, object, object->effectiveColors());
 
                     if (object->rotation() != qreal(0))