mirror of
https://gitlab.com/kelteseth/ScreenPlay.git
synced 2024-09-18 08:22:33 +02:00
Cleanup shadertoy shader and files
This commit is contained in:
parent
0fa55884ac
commit
f6c6cf83ee
@ -3,27 +3,16 @@ import QtQuick.Controls 2.12
|
|||||||
|
|
||||||
ShaderEffect {
|
ShaderEffect {
|
||||||
id: root
|
id: root
|
||||||
property real speed: 1
|
|
||||||
|
|
||||||
readonly property vector3d defaultResolution: Qt.vector3d(
|
|
||||||
root.width, root.height,
|
|
||||||
root.width / root.height)
|
|
||||||
function calcResolution(channel) {
|
|
||||||
if (channel) {
|
|
||||||
return Qt.vector3d(channel.width, channel.height,
|
|
||||||
channel.width / channel.height)
|
|
||||||
} else {
|
|
||||||
return defaultResolution
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// based on shadertoy default variables
|
// based on shadertoy default variables
|
||||||
readonly property vector3d iResolution: defaultResolution
|
readonly property vector3d iResolution: defaultResolution
|
||||||
|
readonly property vector3d defaultResolution: Qt.vector3d(
|
||||||
|
root.width, root.height,
|
||||||
|
root.width / root.height)
|
||||||
property real iTime: 0
|
property real iTime: 0
|
||||||
property real iTimeDelta: 100
|
property real iTimeDelta: 100
|
||||||
property int iFrame: 10
|
property int iFrame: 10
|
||||||
property real iFrameRate
|
property real iFrameRate
|
||||||
property double shaderSpeed: 1.0
|
|
||||||
property vector4d iMouse
|
property vector4d iMouse
|
||||||
|
|
||||||
//only Image or ShaderEffectSource
|
//only Image or ShaderEffectSource
|
||||||
@ -38,6 +27,24 @@ ShaderEffect {
|
|||||||
property vector4d iDate
|
property vector4d iDate
|
||||||
property real iSampleRate: 44100
|
property real iSampleRate: 44100
|
||||||
|
|
||||||
|
property bool hoverEnabled: false
|
||||||
|
property bool running: true
|
||||||
|
|
||||||
|
function restart() {
|
||||||
|
root.iTime = 0
|
||||||
|
running = true
|
||||||
|
timer1.restart()
|
||||||
|
}
|
||||||
|
|
||||||
|
function calcResolution(channel) {
|
||||||
|
if (channel) {
|
||||||
|
return Qt.vector3d(channel.width, channel.height,
|
||||||
|
channel.width / channel.height)
|
||||||
|
} else {
|
||||||
|
return defaultResolution
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Image {
|
Image {
|
||||||
id: ich0
|
id: ich0
|
||||||
visible: false
|
visible: false
|
||||||
@ -55,13 +62,6 @@ ShaderEffect {
|
|||||||
visible: false
|
visible: false
|
||||||
}
|
}
|
||||||
|
|
||||||
property bool hoverEnabled: false
|
|
||||||
property bool running: true
|
|
||||||
function restart() {
|
|
||||||
root.iTime = 0
|
|
||||||
running = true
|
|
||||||
timer1.restart()
|
|
||||||
}
|
|
||||||
Timer {
|
Timer {
|
||||||
id: timer1
|
id: timer1
|
||||||
running: root.running
|
running: root.running
|
||||||
@ -69,9 +69,10 @@ ShaderEffect {
|
|||||||
interval: 16
|
interval: 16
|
||||||
repeat: true
|
repeat: true
|
||||||
onTriggered: {
|
onTriggered: {
|
||||||
root.iTime += 0.016 * speed
|
root.iTime += 0.016
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Timer {
|
Timer {
|
||||||
running: root.running
|
running: root.running
|
||||||
interval: 1000
|
interval: 1000
|
||||||
@ -155,12 +156,6 @@ uniform sampler2D iChannel3;"
|
|||||||
void main(void)
|
void main(void)
|
||||||
{
|
{
|
||||||
mainImage(gl_FragColor, vec2(vertex.x, iResolution.y - vertex.y));
|
mainImage(gl_FragColor, vec2(vertex.x, iResolution.y - vertex.y));
|
||||||
}"
|
|
||||||
|
|
||||||
readonly property string defaultPixelShader: "
|
|
||||||
void mainImage(out vec4 fragColor, in vec2 fragCoord)
|
|
||||||
{
|
|
||||||
fragColor = vec4(fragCoord, fragCoord.x, fragCoord.y);
|
|
||||||
}"
|
}"
|
||||||
|
|
||||||
property bool runShader: true
|
property bool runShader: true
|
||||||
|
BIN
ScreenPlayShader/assets/Shadertoy_Bayer.png
Normal file
BIN
ScreenPlayShader/assets/Shadertoy_Bayer.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 761 B |
BIN
ScreenPlayShader/assets/Shadertoy_Gray_Noise_Medium.png
Normal file
BIN
ScreenPlayShader/assets/Shadertoy_Gray_Noise_Medium.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 18 KiB |
BIN
ScreenPlayShader/assets/Shadertoy_Lichen.jpg
Normal file
BIN
ScreenPlayShader/assets/Shadertoy_Lichen.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 12 KiB |
@ -7,7 +7,6 @@
|
|||||||
<file>assets/Shadertoy_Bayer.png</file>
|
<file>assets/Shadertoy_Bayer.png</file>
|
||||||
<file>assets/Shadertoy_Gray_Noise_Medium.png</file>
|
<file>assets/Shadertoy_Gray_Noise_Medium.png</file>
|
||||||
<file>assets/Shadertoy_Lichen.jpg</file>
|
<file>assets/Shadertoy_Lichen.jpg</file>
|
||||||
<file>Noise_Watery.frag</file>
|
|
||||||
</qresource>
|
</qresource>
|
||||||
<qresource prefix="/ShaderWrapper">
|
<qresource prefix="/ShaderWrapper">
|
||||||
<file>ShadertoyShader.qml</file>
|
<file>ShadertoyShader.qml</file>
|
||||||
|
@ -19,3 +19,4 @@ ShaderLibrary::ShaderLibrary(QQuickItem* parent)
|
|||||||
ShaderLibrary::~ShaderLibrary()
|
ShaderLibrary::~ShaderLibrary()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -27,6 +27,7 @@ public:
|
|||||||
{
|
{
|
||||||
return m_fragment;
|
return m_fragment;
|
||||||
}
|
}
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void setVertex(QString vertex)
|
void setVertex(QString vertex)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user