From cdc584506d5edad3f3f654e46e9a6b9bfa59e8ed Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Wed, 21 Apr 2021 11:21:22 +0200 Subject: [PATCH] move kirigami code --- examples/iot-dashboard/Box.cpp | 2 -- examples/iot-dashboard/Box.h | 2 -- examples/iot-dashboard/MainContent.cpp | 2 +- examples/iot-dashboard/iot-dashboard.pro | 22 +++++++++---------- .../scenegraph/paintedrectangleitem.cpp | 0 .../scenegraph/paintedrectangleitem.h | 0 .../scenegraph/shaders/header_desktop.glsl | 0 .../shaders/header_desktop_core.glsl | 0 .../scenegraph/shaders/header_es.glsl | 0 .../scenegraph/shaders/sdf.glsl | 0 .../scenegraph/shaders/sdf_lowpower.glsl | 0 .../scenegraph/shaders/shaders.qrc | 0 .../shaders/shadowedborderrectangle.frag | 0 .../shadowedborderrectangle_lowpower.frag | 0 .../shaders/shadowedbordertexture.frag | 0 .../shadowedbordertexture_lowpower.frag | 0 .../scenegraph/shaders/shadowedrectangle.frag | 0 .../scenegraph/shaders/shadowedrectangle.vert | 0 .../shaders/shadowedrectangle_lowpower.frag | 0 .../scenegraph/shaders/shadowedtexture.frag | 0 .../shaders/shadowedtexture_lowpower.frag | 0 .../shadowedborderrectanglematerial.cpp | 0 .../shadowedborderrectanglematerial.h | 0 .../scenegraph/shadowedrectanglematerial.cpp | 0 .../scenegraph/shadowedrectanglematerial.h | 0 .../scenegraph/shadowedrectanglenode.cpp | 0 .../scenegraph/shadowedrectanglenode.h | 0 .../{src => kirigami}/shadowedrectangle.cpp | 0 .../{src => kirigami}/shadowedrectangle.h | 0 29 files changed, 12 insertions(+), 16 deletions(-) rename examples/iot-dashboard/{src => kirigami}/scenegraph/paintedrectangleitem.cpp (100%) rename examples/iot-dashboard/{src => kirigami}/scenegraph/paintedrectangleitem.h (100%) rename examples/iot-dashboard/{src => kirigami}/scenegraph/shaders/header_desktop.glsl (100%) rename examples/iot-dashboard/{src => kirigami}/scenegraph/shaders/header_desktop_core.glsl (100%) rename examples/iot-dashboard/{src => kirigami}/scenegraph/shaders/header_es.glsl (100%) rename examples/iot-dashboard/{src => kirigami}/scenegraph/shaders/sdf.glsl (100%) rename examples/iot-dashboard/{src => kirigami}/scenegraph/shaders/sdf_lowpower.glsl (100%) rename examples/iot-dashboard/{src => kirigami}/scenegraph/shaders/shaders.qrc (100%) rename examples/iot-dashboard/{src => kirigami}/scenegraph/shaders/shadowedborderrectangle.frag (100%) rename examples/iot-dashboard/{src => kirigami}/scenegraph/shaders/shadowedborderrectangle_lowpower.frag (100%) rename examples/iot-dashboard/{src => kirigami}/scenegraph/shaders/shadowedbordertexture.frag (100%) rename examples/iot-dashboard/{src => kirigami}/scenegraph/shaders/shadowedbordertexture_lowpower.frag (100%) rename examples/iot-dashboard/{src => kirigami}/scenegraph/shaders/shadowedrectangle.frag (100%) rename examples/iot-dashboard/{src => kirigami}/scenegraph/shaders/shadowedrectangle.vert (100%) rename examples/iot-dashboard/{src => kirigami}/scenegraph/shaders/shadowedrectangle_lowpower.frag (100%) rename examples/iot-dashboard/{src => kirigami}/scenegraph/shaders/shadowedtexture.frag (100%) rename examples/iot-dashboard/{src => kirigami}/scenegraph/shaders/shadowedtexture_lowpower.frag (100%) rename examples/iot-dashboard/{src => kirigami}/scenegraph/shadowedborderrectanglematerial.cpp (100%) rename examples/iot-dashboard/{src => kirigami}/scenegraph/shadowedborderrectanglematerial.h (100%) rename examples/iot-dashboard/{src => kirigami}/scenegraph/shadowedrectanglematerial.cpp (100%) rename examples/iot-dashboard/{src => kirigami}/scenegraph/shadowedrectanglematerial.h (100%) rename examples/iot-dashboard/{src => kirigami}/scenegraph/shadowedrectanglenode.cpp (100%) rename examples/iot-dashboard/{src => kirigami}/scenegraph/shadowedrectanglenode.h (100%) rename examples/iot-dashboard/{src => kirigami}/shadowedrectangle.cpp (100%) rename examples/iot-dashboard/{src => kirigami}/shadowedrectangle.h (100%) diff --git a/examples/iot-dashboard/Box.cpp b/examples/iot-dashboard/Box.cpp index 0b4848d5..ef74da4d 100644 --- a/examples/iot-dashboard/Box.cpp +++ b/examples/iot-dashboard/Box.cpp @@ -1,8 +1,6 @@ #include "Box.h" #include "Skin.h" -#include "src/shadowedrectangle.h" - #include #include #include diff --git a/examples/iot-dashboard/Box.h b/examples/iot-dashboard/Box.h index 172d1de2..a2c23ea5 100644 --- a/examples/iot-dashboard/Box.h +++ b/examples/iot-dashboard/Box.h @@ -1,8 +1,6 @@ #ifndef CARD_H #define CARD_H -#include "src/shadowedrectangle.h" - #include class QskTextLabel; diff --git a/examples/iot-dashboard/MainContent.cpp b/examples/iot-dashboard/MainContent.cpp index 02fa0996..82d36ba9 100644 --- a/examples/iot-dashboard/MainContent.cpp +++ b/examples/iot-dashboard/MainContent.cpp @@ -17,7 +17,7 @@ #include #include -#include "src/shadowedrectangle.h" +#include "kirigami/shadowedrectangle.h" #include diff --git a/examples/iot-dashboard/iot-dashboard.pro b/examples/iot-dashboard/iot-dashboard.pro index 2ea361d3..c0864006 100644 --- a/examples/iot-dashboard/iot-dashboard.pro +++ b/examples/iot-dashboard/iot-dashboard.pro @@ -52,20 +52,20 @@ HEADERS += \ nodes/DiagramSegmentsNode.h HEADERS += \ -src/shadowedrectangle.h \ -src/scenegraph/paintedrectangleitem.h \ -src/scenegraph/shadowedborderrectanglematerial.h \ -src/scenegraph/shadowedrectanglematerial.h \ -src/scenegraph/shadowedrectanglenode.h +kirigami/shadowedrectangle.h \ +kirigami/scenegraph/paintedrectangleitem.h \ +kirigami/scenegraph/shadowedborderrectanglematerial.h \ +kirigami/scenegraph/shadowedrectanglematerial.h \ +kirigami/scenegraph/shadowedrectanglenode.h SOURCES += \ -src/shadowedrectangle.cpp \ -src/scenegraph/paintedrectangleitem.cpp \ -src/scenegraph/shadowedborderrectanglematerial.cpp \ -src/scenegraph/shadowedrectanglematerial.cpp \ -src/scenegraph/shadowedrectanglenode.cpp +kirigami/shadowedrectangle.cpp \ +kirigami/scenegraph/paintedrectangleitem.cpp \ +kirigami/scenegraph/shadowedborderrectanglematerial.cpp \ +kirigami/scenegraph/shadowedrectanglematerial.cpp \ +kirigami/scenegraph/shadowedrectanglenode.cpp RESOURCES += \ images.qrc \ fonts.qrc \ - src/scenegraph/shaders/shaders.qrc + kirigami/scenegraph/shaders/shaders.qrc diff --git a/examples/iot-dashboard/src/scenegraph/paintedrectangleitem.cpp b/examples/iot-dashboard/kirigami/scenegraph/paintedrectangleitem.cpp similarity index 100% rename from examples/iot-dashboard/src/scenegraph/paintedrectangleitem.cpp rename to examples/iot-dashboard/kirigami/scenegraph/paintedrectangleitem.cpp diff --git a/examples/iot-dashboard/src/scenegraph/paintedrectangleitem.h b/examples/iot-dashboard/kirigami/scenegraph/paintedrectangleitem.h similarity index 100% rename from examples/iot-dashboard/src/scenegraph/paintedrectangleitem.h rename to examples/iot-dashboard/kirigami/scenegraph/paintedrectangleitem.h diff --git a/examples/iot-dashboard/src/scenegraph/shaders/header_desktop.glsl b/examples/iot-dashboard/kirigami/scenegraph/shaders/header_desktop.glsl similarity index 100% rename from examples/iot-dashboard/src/scenegraph/shaders/header_desktop.glsl rename to examples/iot-dashboard/kirigami/scenegraph/shaders/header_desktop.glsl diff --git a/examples/iot-dashboard/src/scenegraph/shaders/header_desktop_core.glsl b/examples/iot-dashboard/kirigami/scenegraph/shaders/header_desktop_core.glsl similarity index 100% rename from examples/iot-dashboard/src/scenegraph/shaders/header_desktop_core.glsl rename to examples/iot-dashboard/kirigami/scenegraph/shaders/header_desktop_core.glsl diff --git a/examples/iot-dashboard/src/scenegraph/shaders/header_es.glsl b/examples/iot-dashboard/kirigami/scenegraph/shaders/header_es.glsl similarity index 100% rename from examples/iot-dashboard/src/scenegraph/shaders/header_es.glsl rename to examples/iot-dashboard/kirigami/scenegraph/shaders/header_es.glsl diff --git a/examples/iot-dashboard/src/scenegraph/shaders/sdf.glsl b/examples/iot-dashboard/kirigami/scenegraph/shaders/sdf.glsl similarity index 100% rename from examples/iot-dashboard/src/scenegraph/shaders/sdf.glsl rename to examples/iot-dashboard/kirigami/scenegraph/shaders/sdf.glsl diff --git a/examples/iot-dashboard/src/scenegraph/shaders/sdf_lowpower.glsl b/examples/iot-dashboard/kirigami/scenegraph/shaders/sdf_lowpower.glsl similarity index 100% rename from examples/iot-dashboard/src/scenegraph/shaders/sdf_lowpower.glsl rename to examples/iot-dashboard/kirigami/scenegraph/shaders/sdf_lowpower.glsl diff --git a/examples/iot-dashboard/src/scenegraph/shaders/shaders.qrc b/examples/iot-dashboard/kirigami/scenegraph/shaders/shaders.qrc similarity index 100% rename from examples/iot-dashboard/src/scenegraph/shaders/shaders.qrc rename to examples/iot-dashboard/kirigami/scenegraph/shaders/shaders.qrc diff --git a/examples/iot-dashboard/src/scenegraph/shaders/shadowedborderrectangle.frag b/examples/iot-dashboard/kirigami/scenegraph/shaders/shadowedborderrectangle.frag similarity index 100% rename from examples/iot-dashboard/src/scenegraph/shaders/shadowedborderrectangle.frag rename to examples/iot-dashboard/kirigami/scenegraph/shaders/shadowedborderrectangle.frag diff --git a/examples/iot-dashboard/src/scenegraph/shaders/shadowedborderrectangle_lowpower.frag b/examples/iot-dashboard/kirigami/scenegraph/shaders/shadowedborderrectangle_lowpower.frag similarity index 100% rename from examples/iot-dashboard/src/scenegraph/shaders/shadowedborderrectangle_lowpower.frag rename to examples/iot-dashboard/kirigami/scenegraph/shaders/shadowedborderrectangle_lowpower.frag diff --git a/examples/iot-dashboard/src/scenegraph/shaders/shadowedbordertexture.frag b/examples/iot-dashboard/kirigami/scenegraph/shaders/shadowedbordertexture.frag similarity index 100% rename from examples/iot-dashboard/src/scenegraph/shaders/shadowedbordertexture.frag rename to examples/iot-dashboard/kirigami/scenegraph/shaders/shadowedbordertexture.frag diff --git a/examples/iot-dashboard/src/scenegraph/shaders/shadowedbordertexture_lowpower.frag b/examples/iot-dashboard/kirigami/scenegraph/shaders/shadowedbordertexture_lowpower.frag similarity index 100% rename from examples/iot-dashboard/src/scenegraph/shaders/shadowedbordertexture_lowpower.frag rename to examples/iot-dashboard/kirigami/scenegraph/shaders/shadowedbordertexture_lowpower.frag diff --git a/examples/iot-dashboard/src/scenegraph/shaders/shadowedrectangle.frag b/examples/iot-dashboard/kirigami/scenegraph/shaders/shadowedrectangle.frag similarity index 100% rename from examples/iot-dashboard/src/scenegraph/shaders/shadowedrectangle.frag rename to examples/iot-dashboard/kirigami/scenegraph/shaders/shadowedrectangle.frag diff --git a/examples/iot-dashboard/src/scenegraph/shaders/shadowedrectangle.vert b/examples/iot-dashboard/kirigami/scenegraph/shaders/shadowedrectangle.vert similarity index 100% rename from examples/iot-dashboard/src/scenegraph/shaders/shadowedrectangle.vert rename to examples/iot-dashboard/kirigami/scenegraph/shaders/shadowedrectangle.vert diff --git a/examples/iot-dashboard/src/scenegraph/shaders/shadowedrectangle_lowpower.frag b/examples/iot-dashboard/kirigami/scenegraph/shaders/shadowedrectangle_lowpower.frag similarity index 100% rename from examples/iot-dashboard/src/scenegraph/shaders/shadowedrectangle_lowpower.frag rename to examples/iot-dashboard/kirigami/scenegraph/shaders/shadowedrectangle_lowpower.frag diff --git a/examples/iot-dashboard/src/scenegraph/shaders/shadowedtexture.frag b/examples/iot-dashboard/kirigami/scenegraph/shaders/shadowedtexture.frag similarity index 100% rename from examples/iot-dashboard/src/scenegraph/shaders/shadowedtexture.frag rename to examples/iot-dashboard/kirigami/scenegraph/shaders/shadowedtexture.frag diff --git a/examples/iot-dashboard/src/scenegraph/shaders/shadowedtexture_lowpower.frag b/examples/iot-dashboard/kirigami/scenegraph/shaders/shadowedtexture_lowpower.frag similarity index 100% rename from examples/iot-dashboard/src/scenegraph/shaders/shadowedtexture_lowpower.frag rename to examples/iot-dashboard/kirigami/scenegraph/shaders/shadowedtexture_lowpower.frag diff --git a/examples/iot-dashboard/src/scenegraph/shadowedborderrectanglematerial.cpp b/examples/iot-dashboard/kirigami/scenegraph/shadowedborderrectanglematerial.cpp similarity index 100% rename from examples/iot-dashboard/src/scenegraph/shadowedborderrectanglematerial.cpp rename to examples/iot-dashboard/kirigami/scenegraph/shadowedborderrectanglematerial.cpp diff --git a/examples/iot-dashboard/src/scenegraph/shadowedborderrectanglematerial.h b/examples/iot-dashboard/kirigami/scenegraph/shadowedborderrectanglematerial.h similarity index 100% rename from examples/iot-dashboard/src/scenegraph/shadowedborderrectanglematerial.h rename to examples/iot-dashboard/kirigami/scenegraph/shadowedborderrectanglematerial.h diff --git a/examples/iot-dashboard/src/scenegraph/shadowedrectanglematerial.cpp b/examples/iot-dashboard/kirigami/scenegraph/shadowedrectanglematerial.cpp similarity index 100% rename from examples/iot-dashboard/src/scenegraph/shadowedrectanglematerial.cpp rename to examples/iot-dashboard/kirigami/scenegraph/shadowedrectanglematerial.cpp diff --git a/examples/iot-dashboard/src/scenegraph/shadowedrectanglematerial.h b/examples/iot-dashboard/kirigami/scenegraph/shadowedrectanglematerial.h similarity index 100% rename from examples/iot-dashboard/src/scenegraph/shadowedrectanglematerial.h rename to examples/iot-dashboard/kirigami/scenegraph/shadowedrectanglematerial.h diff --git a/examples/iot-dashboard/src/scenegraph/shadowedrectanglenode.cpp b/examples/iot-dashboard/kirigami/scenegraph/shadowedrectanglenode.cpp similarity index 100% rename from examples/iot-dashboard/src/scenegraph/shadowedrectanglenode.cpp rename to examples/iot-dashboard/kirigami/scenegraph/shadowedrectanglenode.cpp diff --git a/examples/iot-dashboard/src/scenegraph/shadowedrectanglenode.h b/examples/iot-dashboard/kirigami/scenegraph/shadowedrectanglenode.h similarity index 100% rename from examples/iot-dashboard/src/scenegraph/shadowedrectanglenode.h rename to examples/iot-dashboard/kirigami/scenegraph/shadowedrectanglenode.h diff --git a/examples/iot-dashboard/src/shadowedrectangle.cpp b/examples/iot-dashboard/kirigami/shadowedrectangle.cpp similarity index 100% rename from examples/iot-dashboard/src/shadowedrectangle.cpp rename to examples/iot-dashboard/kirigami/shadowedrectangle.cpp diff --git a/examples/iot-dashboard/src/shadowedrectangle.h b/examples/iot-dashboard/kirigami/shadowedrectangle.h similarity index 100% rename from examples/iot-dashboard/src/shadowedrectangle.h rename to examples/iot-dashboard/kirigami/shadowedrectangle.h