diff --git a/docs/manual/layers.rst b/docs/manual/layers.rst index c645b02a33..6fc6e7661d 100644 --- a/docs/manual/layers.rst +++ b/docs/manual/layers.rst @@ -235,7 +235,7 @@ calculation details. Mode SVG equivalent =========== =========================================================================== Normal `src-over `__ -Plus `plus `__ +Add `plus `__ Multiply `multiply `__ Screen `screen `__ Overlay `overlay `__ @@ -249,6 +249,13 @@ Difference `difference `__ =========== =========================================================================== +In OpenGL, these blend modes can be implemented using ``glBlendEquation`` with +values from the `KHR_blend_equation_advanced +`__ +extension. In Vulkan, they are part of the `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 index db6ffde2dd..251240f799 100644 --- 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 index aebb0b794c..3e46790559 100644 --- 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 index b35b00b4ba..b42a0692fb 100644 --- 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 index aa8f13a1c9..2c1e464974 100644 --- a/src/tiled/editablelayer.h +++ b/src/tiled/editablelayer.h @@ -37,7 +37,7 @@ namespace BlendModeNS { enum Value { Normal = static_cast(BlendMode::Normal), - Plus = static_cast(BlendMode::Plus), + Add = static_cast(BlendMode::Add), Multiply = static_cast(BlendMode::Multiply), Screen = static_cast(BlendMode::Screen), Overlay = static_cast(BlendMode::Overlay), diff --git a/src/tiled/propertieswidget.cpp b/src/tiled/propertieswidget.cpp index f18417c55e..6c5f059473 100644 --- a/src/tiled/propertieswidget.cpp +++ b/src/tiled/propertieswidget.cpp @@ -199,7 +199,7 @@ template<> EnumData enumData() { 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() }; static const QList values { static_cast(BlendMode::Normal), - static_cast(BlendMode::Plus), + static_cast(BlendMode::Add), static_cast(BlendMode::Multiply), static_cast(BlendMode::Screen), static_cast(BlendMode::Overlay),