Bug fixes for Komplex Engine

package/contents/ui/KomplexModel.qml

@@ -56,13 +56,22 @@ Item
 
     id: mainItem
 
+    Item
+    {
+        id: data
+        property var channels: []
+    }
+
     Komplex.ShaderPackModel
     {
         id: shaderPackModel
         onJsonChanged: 
         {
+            // clean up old channels
+            while(data.channels.length > 0)
+                data.channels.pop().destroy()
+                
             // Handle the JSON change if needed
-            console.log("Shader pack JSON changed:", shaderPackModel.json);
             mainItem.parsePack(shaderPackModel.json);
         }
     }
@@ -161,21 +170,27 @@ Item
 
         var source = getFilePath(channel.source)
 
-        var result = Qt.createQmlObject(`ShaderChannel
-        {
-            z: 0
-            invert: ${channel.invert || true}
-            iTimeScale: ${channel.time_scale || 1.0}
-            iResolutionScale: ${channel.resolution_scale || 1.0}
-            visible: false
-            anchors.fill: parent
-            source: "file://" + "${source || ''}"
-            type: ${channel.type || 0}
-            iTime: mainItem.iTime * ${channel.time_scale || 1.0}
-            iMouse: mainItem.iMouse
-            mouseBias: ${channel.mouse_scale || 1.0}
-            iResolution: Qt.vector3d(${(channel.resolution_x || mainItem.width) * (channel.resolution_scale || 1.0)}, ${(channel.resolution_y || mainItem.width) * (channel.resolution_scale || 1.0)}, pixelRatio)
-        }`, mainItem);
+        // Qt.createQmlObject() method was not working the same inside plasma
+        // as it was inside a QMLEngine instance. This resulted in the Loader
+        // object being undefined and thus breaking the Komplex wallpaper mode. (oops)
+
+        // Instead, use Qt.createComponent() then manually setup bindings
+        var component = Qt.createComponent("./ShaderChannel.qml")
+        var result
+
+        if (component.status === Component.Ready) {
+            result = component.createObject(mainItem, { x: 100, y: 100 });
+}
+        result.type = channel.type
+        result.anchors.fill = mainItem
+        result.visible = false
+        result.iMouse = Qt.binding(function () { return mainItem.iMouse; })
+        result.iTime = Qt.binding(function() { return mainItem.iTime; })
+        result.iResolution = Qt.vector3d(channel.resolution_x || mainItem.width, channel.resolution_y || mainItem.height, 1.0)
+        result.mouseBias = channel.mouse_scale ? channel.mouse_scale : 1.0
+        result.iTimeScale = channel.time_scale ? channel.time_scale : 1.0
+        result.invert = channel.invert ? channel.invert : false
+        result.source = source
 
         if (channel.channel0)
             result.iChannel0 = parseChannel(channel.channel0);
@@ -186,26 +201,28 @@ Item
         if (channel.channel3)
             result.iChannel3 = parseChannel(channel.channel3);
 
+        data.channels.push(result) // save for destroying
+
         return result;
     }
 
     function getFilePath(source)
     {
-        if(source === "") 
+        if(source === undefined || source === "") 
             return "";
 
         // Ensure the source path is correctly resolved for relative paths
         if(source.startsWith("./"))
         {
             var temp = source.replace("./", "file://" + shaderPackModel.shaderPackPath + "/")
-            return Qt.resolvedUrl(temp);
+            return temp;
         }
         else if(source.startsWith("$/"))
         {
             var temp = source.replace("$/", "file://" + StandardPaths.writableLocation(StandardPaths.HomeLocation) + "/.local/share/komplex/")
-            return Qt.resolvedUrl(temp);
+            return temp;
         }
         else if(!source.startsWith("file://"))
-            return Qt.resolvedUrl("file://" + source);
+            return "file://" + source;
     }
 }

package/contents/ui/main.qml

@@ -45,12 +45,12 @@ WallpaperItem
             id: pageLoader
             anchors.fill: parent
             active: true
-            sourceComponent: shaderToysContent
+            sourceComponent: wallpaper.configuration.komplex_mode === 0 ? shaderToysContent : packContent
 
             states: [
                 State
                 {
-                    when: wallpaper.komplex_mode === 0
+                    when: wallpaper.configuration.komplex_mode === 0
                     PropertyChanges
                     {
                         pageLoader.sourceComponent: shaderToysContent
@@ -58,7 +58,7 @@ WallpaperItem
                 },
                 State
                 {
-                    when: wallpaper.komplex_mode === 1
+                    when: wallpaper.configuration.komplex_mode === 1
                     PropertyChanges
                     {
                         pageLoader.sourceComponent: packContent

plugin/ShaderPackModel.cpp

@@ -20,12 +20,13 @@ void ShaderPackModel::loadJson(const QString &filePath)
     setState(Loading); // Set the state to Loading
 
     // Open the file and read its contents
-    QFile file(filePath);
+    QFile file(QUrl(filePath).toLocalFile());
 
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) 
     {
         setState(Idle); // Reset state to Idle
         qWarning("Could not open file %s for reading", qPrintable(filePath));
+        qWarning(file.errorString().toStdString().c_str());
         return;
     }
 
@@ -49,10 +50,11 @@ void ShaderPackModel::loadJson(const QString &filePath)
     // Check if the JSON content has changed
     if (json != m_json) 
     {
+        QFileInfo info(file);
+        setShaderPackPath(info.absolutePath()); // Update the shader pack path
+
         m_json = json;
         Q_EMIT jsonChanged();
-
-        setShaderPackPath(filePath); // Update the shader pack path
     }
 
     setState(Idle); // Reset state to Idle
@@ -73,14 +75,14 @@ void ShaderPackModel::refreshShaderPacks()
     setState(Loading);
 
     // check for and create the directory if it doesn't exist
-    QDir dir(m_shaderPackPath);
+    QDir dir(m_shaderPackInstallPath);
 
     if (!dir.exists())
     {
-        if (!dir.mkpath(m_shaderPackPath))
+        if (!dir.mkpath(m_shaderPackInstallPath))
         {
             setState(Idle); // Reset state to Idle
-            qWarning("Failed to create shader pack directory: %s", qPrintable(m_shaderPackPath));
+            qWarning("Failed to create shader pack directory: %s", qPrintable(m_shaderPackInstallPath));
             return;
         }
     }