Move color shaders to core

friction2d · Apr 8, 2024 · bf70d0e · bf70d0e
1 parent 18dd3d6
commit bf70d0e
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 16 deletions.
diff --git a/src/app/resources.qrc b/src/app/resources.qrc
@@ -13,21 +13,6 @@
         <file alias="cursor-pen.xpm">pixmaps/cursor-pen.xpm</file>
         <file alias="cursor-pencil.xpm">pixmaps/cursor-pencil.xpm</file>
     </qresource>
-    <qresource prefix="/colorwidgetshaders">
-        <file alias="alpha.frag">GUI/ColorWidgets/colorwidgetshaders/alpha.frag</file>
-        <file alias="blue.frag">GUI/ColorWidgets/colorwidgetshaders/blue.frag</file>
-        <file alias="border.frag">GUI/ColorWidgets/colorwidgetshaders/border.frag</file>
-        <file alias="doubleborder.frag">GUI/ColorWidgets/colorwidgetshaders/doubleborder.frag</file>
-        <file alias="gradient.frag">GUI/ColorWidgets/colorwidgetshaders/gradient.frag</file>
-        <file alias="green.frag">GUI/ColorWidgets/colorwidgetshaders/green.frag</file>
-        <file alias="hsl_saturation.frag">GUI/ColorWidgets/colorwidgetshaders/hsl_saturation.frag</file>
-        <file alias="hsv_saturation.frag">GUI/ColorWidgets/colorwidgetshaders/hsv_saturation.frag</file>
-        <file alias="hue.frag">GUI/ColorWidgets/colorwidgetshaders/hue.frag</file>
-        <file alias="lightness.frag">GUI/ColorWidgets/colorwidgetshaders/lightness.frag</file>
-        <file alias="plain.frag">GUI/ColorWidgets/colorwidgetshaders/plain.frag</file>
-        <file alias="red.frag">GUI/ColorWidgets/colorwidgetshaders/red.frag</file>
-        <file alias="value.frag">GUI/ColorWidgets/colorwidgetshaders/value.frag</file>
-    </qresource>
     <qresource prefix="/other"/>
     <qresource prefix="/checkbox">
         <file alias="Checkbox_checked_normal.png">pixmaps/Checkbox_checked_normal.png</file>

diff --git a/...olorWidgets/colorwidgetshaders/alpha.frag → src/core/colorshaders/alpha.frag b/...olorWidgets/colorwidgetshaders/alpha.frag → src/core/colorshaders/alpha.frag
diff --git a/...ColorWidgets/colorwidgetshaders/blue.frag → src/core/colorshaders/blue.frag b/...ColorWidgets/colorwidgetshaders/blue.frag → src/core/colorshaders/blue.frag
diff --git a/...lorWidgets/colorwidgetshaders/border.frag → src/core/colorshaders/border.frag b/...lorWidgets/colorwidgetshaders/border.frag → src/core/colorshaders/border.frag
diff --git a/...gets/colorwidgetshaders/doubleborder.frag → src/core/colorshaders/doubleborder.frag b/...gets/colorwidgetshaders/doubleborder.frag → src/core/colorshaders/doubleborder.frag
diff --git a/...rWidgets/colorwidgetshaders/gradient.frag → src/core/colorshaders/gradient.frag b/...rWidgets/colorwidgetshaders/gradient.frag → src/core/colorshaders/gradient.frag
diff --git a/...olorWidgets/colorwidgetshaders/green.frag → src/core/colorshaders/green.frag b/...olorWidgets/colorwidgetshaders/green.frag → src/core/colorshaders/green.frag
diff --git a/...ts/colorwidgetshaders/hsl_saturation.frag → src/core/colorshaders/hsl_saturation.frag b/...ts/colorwidgetshaders/hsl_saturation.frag → src/core/colorshaders/hsl_saturation.frag
diff --git a/...ts/colorwidgetshaders/hsv_saturation.frag → src/core/colorshaders/hsv_saturation.frag b/...ts/colorwidgetshaders/hsv_saturation.frag → src/core/colorshaders/hsv_saturation.frag
diff --git a/.../ColorWidgets/colorwidgetshaders/hue.frag → src/core/colorshaders/hue.frag b/.../ColorWidgets/colorwidgetshaders/hue.frag → src/core/colorshaders/hue.frag
diff --git a/...Widgets/colorwidgetshaders/lightness.frag → src/core/colorshaders/lightness.frag b/...Widgets/colorwidgetshaders/lightness.frag → src/core/colorshaders/lightness.frag
diff --git a/...olorWidgets/colorwidgetshaders/plain.frag → src/core/colorshaders/plain.frag b/...olorWidgets/colorwidgetshaders/plain.frag → src/core/colorshaders/plain.frag
diff --git a/.../ColorWidgets/colorwidgetshaders/red.frag → src/core/colorshaders/red.frag b/.../ColorWidgets/colorwidgetshaders/red.frag → src/core/colorshaders/red.frag
diff --git a/...olorWidgets/colorwidgetshaders/value.frag → src/core/colorshaders/value.frag b/...olorWidgets/colorwidgetshaders/value.frag → src/core/colorshaders/value.frag
diff --git a/src/core/coreresources.qrc b/src/core/coreresources.qrc
@@ -7,5 +7,18 @@
         <file alias="noisefadeeffect.frag">RasterEffects/noisefadeeffect.frag</file>
         <file alias="colorizeeffect.frag">RasterEffects/colorizeeffect.frag</file>
         <file alias="brightnesscontrasteffect.frag">RasterEffects/brightnesscontrasteffect.frag</file>
+        <file alias="alpha.frag">colorshaders/alpha.frag</file>
+        <file alias="blue.frag">colorshaders/blue.frag</file>
+        <file alias="border.frag">colorshaders/border.frag</file>
+        <file alias="doubleborder.frag">colorshaders/doubleborder.frag</file>
+        <file alias="gradient.frag">colorshaders/gradient.frag</file>
+        <file alias="green.frag">colorshaders/green.frag</file>
+        <file alias="hsl_saturation.frag">colorshaders/hsl_saturation.frag</file>
+        <file alias="hsv_saturation.frag">colorshaders/hsv_saturation.frag</file>
+        <file alias="hue.frag">colorshaders/hue.frag</file>
+        <file alias="lightness.frag">colorshaders/lightness.frag</file>
+        <file alias="plain.frag">colorshaders/plain.frag</file>
+        <file alias="red.frag">colorshaders/red.frag</file>
+        <file alias="value.frag">colorshaders/value.frag</file>
     </qresource>
 </RCC>
diff --git a/src/ui/widgets/colorwidgetshaders.cpp b/src/ui/widgets/colorwidgetshaders.cpp
@@ -133,7 +133,7 @@ void iniGradientProgram(QGL33 * const gl, const QString& colorShadersPath) {
 }
 
 void iniColorPrograms(QGL33 * const gl) {
-    const QString colorShadersPath = ":/colorwidgetshaders/";
+    const QString colorShadersPath = ":/shaders/";
 
     try {
         iniColorProgram(gl, HUE_PROGRAM, GL_PLAIN_VERT,