docs: Added reference to OpenGL and Vulkan extensions

Also renamed "Plus" to "Add" since it should be more recognizable.
mapeditor · Jan 20, 2025 · a084eef · a084eef
1 parent 79dea1f
commit a084eef
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/docs/manual/layers.rst b/docs/manual/layers.rst
@@ -235,7 +235,7 @@ calculation details.
 Mode         SVG equivalent
 ===========  ===========================================================================
 Normal       `src-over <https://www.w3.org/TR/SVGCompositing/#comp-op-src-over>`__
-Plus         `plus <https://www.w3.org/TR/SVGCompositing/#comp-op-plus>`__
+Add          `plus <https://www.w3.org/TR/SVGCompositing/#comp-op-plus>`__
 Multiply     `multiply <https://www.w3.org/TR/SVGCompositing/#comp-op-multiply>`__
 Screen       `screen <https://www.w3.org/TR/SVGCompositing/#comp-op-screen>`__
 Overlay      `overlay <https://www.w3.org/TR/SVGCompositing/#comp-op-overlay>`__
@@ -249,6 +249,13 @@ Difference   `difference <https://www.w3.org/TR/SVGCompositing/#comp-op-differen
 Exclusion    `exclusion <https://www.w3.org/TR/SVGCompositing/#comp-op-exclusion>`__
 ===========  ===========================================================================
 
+In OpenGL, these blend modes can be implemented using ``glBlendEquation`` with
+values from the `KHR_blend_equation_advanced
+<https://registry.khronos.org/OpenGL/extensions/KHR/KHR_blend_equation_advanced.txt>`__
+extension. In Vulkan, they are part of the `VK_EXT_blend_operation_advanced
+<https://www.khronos.org/registry/vulkan/specs/1.2-extensions/html/vkspec.html#VK_EXT_blend_operation_advanced>`__
+extension.
+
 
 .. topic:: Future Extensions
    :class: future

diff --git a/docs/scripting-doc/index.d.ts b/docs/scripting-doc/index.d.ts
@@ -2753,7 +2753,7 @@ declare enum BlendMode {
     /** SVG equivalant: [src-over](https://www.w3.org/TR/SVGCompositing/#comp-op-src-over) */
     Normal,
     /** SVG equivalant: [plus](https://www.w3.org/TR/SVGCompositing/#comp-op-plus) */
-    Plus,
+    Add,
     /** SVG equivalant: [multiply](https://www.w3.org/TR/SVGCompositing/#comp-op-multiply) */
     Multiply,
     /** SVG equivalant: [screen](https://www.w3.org/TR/SVGCompositing/#comp-op-screen) */

diff --git a/src/libtiled/tiled.cpp b/src/libtiled/tiled.cpp
@@ -237,7 +237,7 @@ static constexpr struct BlendModeMapping {
     const char *name;
 } blendModeMapping[] = {
     { Tiled::BlendMode::Normal,     "normal"        },
-    { Tiled::BlendMode::Plus,       "plus"          },
+    { Tiled::BlendMode::Add,        "add"           },
     { Tiled::BlendMode::Multiply,   "multiply"      },
     { Tiled::BlendMode::Screen,     "screen"        },
     { Tiled::BlendMode::Overlay,    "overlay"       },

diff --git a/src/libtiled/tiled.h b/src/libtiled/tiled.h
@@ -84,7 +84,7 @@ enum class BlendMode {
     Normal      = QPainter::CompositionMode_SourceOver,
 
     // For now we only support the SVG 1.2 blend modes
-    Plus        = QPainter::CompositionMode_Plus,
+    Add         = QPainter::CompositionMode_Plus,
     Multiply    = QPainter::CompositionMode_Multiply,
     Screen      = QPainter::CompositionMode_Screen,
     Overlay     = QPainter::CompositionMode_Overlay,

diff --git a/src/tiled/editablelayer.h b/src/tiled/editablelayer.h
@@ -37,7 +37,7 @@ namespace BlendModeNS {
 
     enum Value {
         Normal      = static_cast<int>(BlendMode::Normal),
-        Plus        = static_cast<int>(BlendMode::Plus),
+        Add         = static_cast<int>(BlendMode::Add),
         Multiply    = static_cast<int>(BlendMode::Multiply),
         Screen      = static_cast<int>(BlendMode::Screen),
         Overlay     = static_cast<int>(BlendMode::Overlay),

diff --git a/src/tiled/propertieswidget.cpp b/src/tiled/propertieswidget.cpp
@@ -199,7 +199,7 @@ template<> EnumData enumData<BlendMode>()
 {
     const QStringList names {
         QCoreApplication::translate("BlendMode", "Normal"),
-        QCoreApplication::translate("BlendMode", "Plus"),
+        QCoreApplication::translate("BlendMode", "Add"),
         QCoreApplication::translate("BlendMode", "Multiply"),
         QCoreApplication::translate("BlendMode", "Screen"),
         QCoreApplication::translate("BlendMode", "Overlay"),
@@ -214,7 +214,7 @@ template<> EnumData enumData<BlendMode>()
     };
     static const QList<int> values {
         static_cast<int>(BlendMode::Normal),
-        static_cast<int>(BlendMode::Plus),
+        static_cast<int>(BlendMode::Add),
         static_cast<int>(BlendMode::Multiply),
         static_cast<int>(BlendMode::Screen),
         static_cast<int>(BlendMode::Overlay),