diff --git a/app/app.qmlproject.user b/app/app.qmlproject.user index a93d337..0047f2e 100644 --- a/app/app.qmlproject.user +++ b/app/app.qmlproject.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/app/frames/images/black-frame-original.png b/app/frames/images/black-frame-original.png new file mode 100644 index 0000000..04ef702 Binary files /dev/null and b/app/frames/images/black-frame-original.png differ diff --git a/app/frames/images/black-frame.png b/app/frames/images/black-frame.png index 04ef702..c702d75 100644 Binary files a/app/frames/images/black-frame.png and b/app/frames/images/black-frame.png differ diff --git a/app/frames/images/screen-frame-original.png b/app/frames/images/screen-frame-original.png new file mode 100644 index 0000000..329b838 Binary files /dev/null and b/app/frames/images/screen-frame-original.png differ diff --git a/app/frames/images/screen-frame.png b/app/frames/images/screen-frame.png index 329b838..dc5aa75 100644 Binary files a/app/frames/images/screen-frame.png and b/app/frames/images/screen-frame.png differ diff --git a/app/frames/utils/FrameShader.qml b/app/frames/utils/FrameShader.qml index ed990d9..04d3618 100644 --- a/app/frames/utils/FrameShader.qml +++ b/app/frames/utils/FrameShader.qml @@ -64,12 +64,10 @@ ShaderEffect{ vec4 txt_normal = texture2D(normals, coords); vec3 normal = normalize(txt_normal.rgb * 2.0 - 1.0); vec3 light_dir = normalize(vec3(0.5,0.5, 0.0) - vec3(qt_TexCoord0, 0.0)); - float reflection = (dot(normal, light_dir)); - float light = (reflection * 0.4 + 0.2) * brightness; - vec3 final_color = reflection_color.rgb * light * 0.5; - final_color += txt_color.rgb * ambient_light; + float reflection = dot(normal, light_dir) * 0.5 * txt_normal.a; float reflection_alpha = (1.0 - reflection*"+frame_reflection_strength.toFixed(1)+"); - gl_FragColor = vec4(final_color * txt_normal.a, txt_color.a * qt_Opacity * reflection_alpha); + vec4 dark_color = vec4(reflection_color.rgb * (reflection + 0.2) * 0.5, txt_normal.a * reflection_alpha); + gl_FragColor = mix(dark_color, txt_color, ambient_light); }" onStatusChanged: if (log) console.log(log) //Print warning messages diff --git a/app/main.qml b/app/main.qml index 0ac5503..095566f 100644 --- a/app/main.qml +++ b/app/main.qml @@ -143,17 +143,6 @@ ApplicationWindow{ anchors.fill: parent z: 1.9 } - RadialGradient{ - id: ambientreflection - z: 2.0 - anchors.fill: parent - cached: true - opacity: shadersettings.ambient_light * 0.4 - gradient: Gradient{ - GradientStop{position: 0.0; color: "white"} - GradientStop{position: 0.7; color: "#00000000"} - } - } Loader{ id: sizeoverlayloader z: 3