Skip to content

Commit

Permalink
Remove husl-glsl.fsh
Browse files Browse the repository at this point in the history
  • Loading branch information
rbn42 committed Nov 27, 2019
1 parent 826bb8c commit 4a8bdce
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 291 deletions.
5 changes: 4 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "SoundCard"]
path = SoundCard
path = third_party/SoundCard
url = https://github.com/bastibe/SoundCard
[submodule "hsluv-glsl"]
path = third_party/hsluv-glsl
url = https://github.com/williammalo/hsluv-glsl
15 changes: 14 additions & 1 deletion PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,23 @@ md5sums=('SKIP')

package() {
cd "${srcdir}/${_basename}"

# Download SoundCard and hsluv-glsl
git submodule update --init

# Remove shader examples
rm ./kde/plasmoid/contents/shaders/example-*

install -Dm644 LICENSE "$pkgdir/usr/share/licenses/${_basename%-*}/LICENSE"
install -Dm644 third_party/hsluv-glsl/LICENCE.md "$pkgdir/usr/share/licenses/${_basename%-*}/hsluv-glsl/LICENCE.md"
install -Dm644 third_party/SoundCard/LICENSE "$pkgdir/usr/share/licenses/${_basename%-*}/SoundCard/LICENSE"

cd kde
kpackagetool5 -p "$pkgdir/usr/share/plasma/plasmoids/" -t Plasma/Applet -i plasmoid
rm "$pkgdir/usr/share/plasma/plasmoids/kpluginindex.json"

# If an index is generated, remove it.
path_index="$pkgdir/usr/share/plasma/plasmoids/kpluginindex.json"
if [ -e "$path_index" ];then
rm "$path_index"
fi
}
3 changes: 1 addition & 2 deletions README.org
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ sudo apt-get install qml-module-qt-websockets \
#+BEGIN_SRC sh
git clone https://github.com/rbn42/panon.git
cd panon/kde
# Download SoundCard
# Download SoundCard and hsluv-glsl
git submodule update --init
# To install
kpackagetool5 -t Plasma/Applet --install plasmoid
Expand Down Expand Up @@ -111,7 +111,6 @@ Then plasmoidviewer will run your shader and show the errors, if exist, in the c
** Credits
| Files | Source | Licensed under |
| [[file:panon/source.py][source.py]] and [[file:panon/spectrum.py][spectrum.py]] | adapted from [[https://github.com/ajalt/PyVisualizer][PyVisualizer]] | |
| [[file:kde/plasmoid/contents/shaders/husl-glsl.fsh][husl-glsl.fsh]] | copied from [[https://github.com/williammalo/hsluv-glsl][hsluv-glsl]] | |
| =hsv2rgb= in [[file:kde/plasmoid/contents/shaders/utils.fsh][utils.fsh]] | copied from [[https://gist.github.com/patriciogonzalezvivo/114c1653de9e3da6e1e3][GLSL-color.md]] | |
| [[file:kde/plasmoid/contents/shaders/example-shadertoy.frag][example-shadertoy.frag]] | copied from [[https://www.shadertoy.com/view/lldyDs][shadertoy]] | [[https://www.shadertoy.com/terms][CC BY-NC-SA 3.0]] |
| [[file:kde/plasmoid/contents/shaders/example-shadertoy-fractal-tiling.frag][example-shadertoy-fractal-tiling.frag]] | copied from [[example-shadertoy-fractal-tiling.frag][shadertoy]] | [[https://www.shadertoy.com/terms][CC BY-NC-SA 3.0]] |
1 change: 1 addition & 0 deletions kde/plasmoid/contents/shaders/hsluv-glsl.fsh
282 changes: 0 additions & 282 deletions kde/plasmoid/contents/shaders/husl-glsl.fsh

This file was deleted.

2 changes: 1 addition & 1 deletion kde/plasmoid/contents/shaders/utils.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ vec3 getRGB(float x) {
if(colorSpaceHSL) {
return hsv2rgb(vec3(x*(hueTo-hueFrom)/360.0+hueFrom/360.0,saturation/100.0,lightness/100.0));
} else if(colorSpaceHSLuv) {
return huslToRgb(vec3(x*(hueTo-hueFrom)+hueFrom,saturation,lightness));
return hsluvToRgb(vec3(x*(hueTo-hueFrom)+hueFrom,saturation,lightness));
}
}
4 changes: 2 additions & 2 deletions kde/plasmoid/contents/ui/ShaderSource.qml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ PlasmaCore.DataSource {

engine: 'executable'
connectedSources: [
Utils.read_shader('husl-glsl.fsh'),
Utils.read_shader('hsluv-glsl.fsh'),
Utils.read_shader('utils.fsh'),
Utils.read_shader('shadertoy-api-head.fsh'),
Utils.read_shader(shader_name),
Expand All @@ -42,7 +42,7 @@ PlasmaCore.DataSource {
onNewData:{
if(sourceName==sh_get_shader_list){
shader_list=data.stdout.substr(0,data.stdout.length-1).split('\n')
}else if(sourceName==Utils.read_shader('husl-glsl.fsh'))
}else if(sourceName==Utils.read_shader('hsluv-glsl.fsh'))
src_head1=data.stdout
else if(sourceName==Utils.read_shader('utils.fsh'))
src_head2=data.stdout
Expand Down
2 changes: 1 addition & 1 deletion panon/pulseaudio.py
2 changes: 1 addition & 1 deletion panon/pulseaudio.py.h
1 change: 1 addition & 0 deletions third_party/hsluv-glsl
Submodule hsluv-glsl added at 0ca50a

0 comments on commit 4a8bdce

Please sign in to comment.