Differential D28222

Add ShadowedImage and ShadowedTexture items
ClosedPublic
Actions

Authored by ahiemstra on Mar 23 2020, 4:47 PM.

Details

Reviewers

mart

Group Reviewers

Kirigami

Commits

R169:0c7ba88d3970: Add ShadowedImage and ShadowedTexture items

Summary

This adds the ShadowedImage and ShadowedTexture items. The first is a
QML-only item that makes use of the second. The second is a
ShadowedRectangle that uses a texture as color source for the item
instead of just a color.

It also does some cleanup on the scenegraph/shader related bits
introduced with ShadowedRectangle. Most importantly, it removes the
mostly duplicated core shaders in favour of a simple solution using
a #define.

Test Plan

There's a manual test included. It should look like this:

Diff Detail

Repository

R169 Kirigami

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

ahiemstra created this revision.Mar 23 2020, 4:47 PM

Restricted Application added a project: Kirigami. · View Herald TranscriptMar 23 2020, 4:47 PM

Restricted Application added a subscriber: plasma-devel. · View Herald Transcript

ahiemstra requested review of this revision.Mar 23 2020, 4:47 PM

Harbormaster completed remote builds in B24109: Diff 78294.Mar 23 2020, 4:47 PM

ahiemstra edited the test plan for this revision. (Show Details)Mar 23 2020, 4:48 PM

+100, works very well here.
an api question. it was supposed to be possible to have the corners with independent radius (to have things like an image rounded only at top) would it still be possible with that approach? i guess would be expanding roundedrectangle to have independent radiuses?

Yeah if we split the radius into 4 that should be doable. The shader supports it, just need to bubble everything up all the way to the items.

this one i think is good to go, then afterwards, the independent radii

This revision is now accepted and ready to land.Mar 27 2020, 9:34 AM

Closed by commit R169:0c7ba88d3970: Add ShadowedImage and ShadowedTexture items (authored by ahiemstra). · Explain WhyMar 31 2020, 1:25 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

		Path
M		kirigami.qrc (1 line)
M		src/CMakeLists.txt (6 lines)
A	M	src/controls/ShadowedImage.qml (26 lines)
M		src/kirigamiplugin.cpp (4 lines)
V		src/scenegraph/{ → shaders}/header_desktop.glsl
V		src/scenegraph/{ → shaders}/header_desktop_core.glsl
V		src/scenegraph/{ → shaders}/header_es.glsl
D	M	src/scenegraph/shaders.qrc (15 lines)
V		src/scenegraph/{shaders ← }/header_desktop.glsl
V		src/scenegraph/{shaders ← }/header_desktop_core.glsl (2 lines)
V		src/scenegraph/{shaders ← }/header_es.glsl
A	M	src/scenegraph/shaders/sdf.glsl (276 lines)
A	M	src/scenegraph/shaders/shaders.qrc (21 lines)
V		src/scenegraph/{shaders ← }/shadowedborderrectangle.frag (50 lines)
V		src/scenegraph/{shaders/shadowedbordertexture.frag ← shadowedborderrectangle_core.frag} (62 lines)
V		src/scenegraph/{shaders/shadowedrectangle.frag ← shadowedrectangle_core.frag} (38 lines)
V		src/scenegraph/{shaders ← }/shadowedrectangle.vert (8 lines)
V		src/scenegraph/{shaders/shadowedtexture.frag ← shadowedrectangle.frag} (54 lines)
V		src/scenegraph/{ → shaders}/shadowedborderrectangle.frag
V		src/scenegraph/{shadowedborderrectangle_core.frag → shaders/shadowedbordertexture.frag}
M		src/scenegraph/shadowedborderrectanglematerial.cpp (1 line)
A	M	src/scenegraph/shadowedbordertexturematerial.h (34 lines)
A	M	src/scenegraph/shadowedbordertexturematerial.cpp (74 lines)
V		src/scenegraph/{shadowedrectangle.frag → shaders/shadowedtexture.frag}
V		src/scenegraph/{ → shaders}/shadowedrectangle.vert
V		src/scenegraph/{shadowedrectangle_core.frag → shaders/shadowedrectangle.frag}
D	M	src/scenegraph/shadowedrectangle_core.vert (19 lines)
M		src/scenegraph/shadowedrectanglematerial.cpp (1 line)
M		src/scenegraph/shadowedrectanglenode.h (12 lines)
M		src/scenegraph/shadowedrectanglenode.cpp (36 lines)
A	M	src/scenegraph/shadowedtexturematerial.h (40 lines)
A	M	src/scenegraph/shadowedtexturematerial.cpp (74 lines)
A	M	src/scenegraph/shadowedtexturenode.h (42 lines)
A	M	src/scenegraph/shadowedtexturenode.cpp (81 lines)
M		src/shadowedrectangle.h (9 lines)
M		src/shadowedrectangle.cpp (59 lines)
A	M	src/shadowedtexture.h (43 lines)
A	M	src/shadowedtexture.cpp (111 lines)
A	M	tests/ShadowedImageTest.qml (83 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	78294	d545a71		Mar 23 2020, 4:47 PM	★	★
Diff 2	78987	9b6ec04	R169:0c7ba88d39704aac0155c4aa52bc402c8fcffa9a	Mar 31 2020, 1:25 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
bb9a3e0a48fb	1f735d37137d	114f9cd6294d	Arjen Hiemstra	Add ShadowedImage	Mar 23 2020, 4:35 PM
114f9cd6294d	dc56197240de	726d792edaee	Arjen Hiemstra	Add ShadowedTexture	Mar 23 2020, 4:34 PM
726d792edaee	c1715b4b1faa	1a662e3dbf77	Arjen Hiemstra	Make ShadowedRectangleNode subclassable	Mar 23 2020, 4:33 PM
1a662e3dbf77	97a1da31190f	13df21fdbf39	Arjen Hiemstra	Remove separate core shaders, use a simple #define	Mar 23 2020, 4:31 PM
13df21fdbf39	8267ee19c35c	d545a7155e71	Arjen Hiemstra	Move shaders to shaders subdir in scenegraph dir	Mar 18 2020, 10:54 AM

Add ShadowedImage and ShadowedTexture itemsClosedPublicActions

Details

Diff Detail

Revision ContentsChangeset List

Diff 78987

kirigami.qrc

src/CMakeLists.txt

src/controls/ShadowedImage.qml

src/kirigamiplugin.cpp

src/scenegraph/header_desktop.glsl

src/scenegraph/header_desktop_core.glsl

src/scenegraph/header_es.glsl

src/scenegraph/shaders.qrc

src/scenegraph/shaders/header_desktop.glsl

src/scenegraph/shaders/header_desktop_core.glsl

src/scenegraph/shaders/header_es.glsl

src/scenegraph/shaders/sdf.glsl

src/scenegraph/shaders/shaders.qrc

src/scenegraph/shaders/shadowedborderrectangle.frag

src/scenegraph/shaders/shadowedbordertexture.frag

src/scenegraph/shaders/shadowedrectangle.frag

src/scenegraph/shaders/shadowedrectangle.vert

src/scenegraph/shaders/shadowedtexture.frag

src/scenegraph/shadowedborderrectangle.frag

src/scenegraph/shadowedborderrectangle_core.frag

src/scenegraph/shadowedborderrectanglematerial.cpp

src/scenegraph/shadowedbordertexturematerial.h

src/scenegraph/shadowedbordertexturematerial.cpp

src/scenegraph/shadowedrectangle.frag

src/scenegraph/shadowedrectangle.vert

src/scenegraph/shadowedrectangle_core.frag

src/scenegraph/shadowedrectangle_core.vert

src/scenegraph/shadowedrectanglematerial.cpp

src/scenegraph/shadowedrectanglenode.h

src/scenegraph/shadowedrectanglenode.cpp

src/scenegraph/shadowedtexturematerial.h

src/scenegraph/shadowedtexturematerial.cpp

src/scenegraph/shadowedtexturenode.h

src/scenegraph/shadowedtexturenode.cpp

src/shadowedrectangle.h

src/shadowedrectangle.cpp

src/shadowedtexture.h

src/shadowedtexture.cpp

tests/ShadowedImageTest.qml

Add ShadowedImage and ShadowedTexture items
ClosedPublic
Actions

Revision Contents
Changeset List