Skip to content

Commit

Permalink
working
Browse files Browse the repository at this point in the history
  • Loading branch information
rectalogic committed Apr 25, 2024
1 parent 8ef0970 commit a7aa80e
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/MediaFX/Transition/GL/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ endforeach()
qt_add_qml_module(gltransition
URI MediaFX.Transition.GL
QML_FILES
TransitionShaderEffect.qml
Doorway.qml
Ripple.qml
)
2 changes: 2 additions & 0 deletions src/MediaFX/Transition/GL/TransitionShaderEffect.qml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (C) 2024 Andrew Wason
// SPDX-License-Identifier: GPL-3.0-or-later

import QtQuick
import MediaFX.Transition as T

T.TransitionShaderEffect {
Expand All @@ -11,4 +12,5 @@ T.TransitionShaderEffect {

vertexShader: "qrc:/shaders/gltransition/gltransition.vert.qsb"
textureMirroring: ShaderEffectSource.NoMirroring
anchors.fill: parent
}
39 changes: 39 additions & 0 deletions tests/qml/gl-transitions.qml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// Copyright (C) 2024 Andrew Wason
// SPDX-License-Identifier: GPL-3.0-or-later

import QtQuick
import QtQuick.Effects
import QtMultimedia
import MediaFX
import MediaFX.Transition.GL

MediaSequence {
id: sequence

mediaTransitions: [
Component {
Doorway { }
},
Component {
Ripple { }
}
]

Component.onCompleted: {
sequence.mediaSequenceEnded.connect(sequence.RenderSession.session.endSession);
}

MediaClip {
source: Qt.resolvedUrl("../fixtures/assets/ednotsafe-320x180-15fps-1.53s-44100.nut")
audioRenderer: AudioRenderer {}
}
MediaClip {
endTime: 3000
source: Qt.resolvedUrl("../fixtures/assets/edjustforyou-320x180-15fps-5.2s-44100.nut")
audioRenderer: AudioRenderer {}
}
MediaClip {
source: Qt.resolvedUrl("../fixtures/assets/edquestions-320x180-15fps-2.4s-44100.nut")
audioRenderer: AudioRenderer {}
}
}

0 comments on commit a7aa80e

Please sign in to comment.