From a10d4860055f17a440da1876c3ab2ee9edd35181 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 15 Nov 2018 21:25:52 +1100
Subject: [PATCH] fixed some errors

---
 effects/test.xml             | 22 ----------------------
 effects/volumetriclight.frag | 18 +++++++++++-------
 effects/volumetriclight.xml  |  7 +++++++
 3 files changed, 18 insertions(+), 29 deletions(-)
 delete mode 100644 effects/test.xml
 create mode 100644 effects/volumetriclight.xml

diff --git a/effects/test.xml b/effects/test.xml
deleted file mode 100644
index 09da020b5..000000000
--- a/effects/test.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<effect name="Test">
-	<row name="value 1">
-		<field type="double" default="10" id="edge_thres"/>
-	</row>
-	<row name="value 2">
-		<field type="double" default="10" id="edge_thres2"/>
-	</row>
-	<row name="value 3">
-		<field type="double" default="10" id="mouse_x_offset"/>
-	</row>
-	<row name="value 4">
-		<field type="double" default="10" id="aperture"/>
-	</row>
-	<row name="value 5">
-		<field type="double" default="10" id="xoff"/>
-	</row>
-	<row name="value 6">
-		<field type="double" default="10" id="yoff"/>
-	</row>
-	<shader vert="common.vert" frag="toonify.frag"/>
-</effect>
\ No newline at end of file
diff --git a/effects/volumetriclight.frag b/effects/volumetriclight.frag
index 3ec626c77..cfeeb9252 100644
--- a/effects/volumetriclight.frag
+++ b/effects/volumetriclight.frag
@@ -4,12 +4,16 @@ uniform float amount;
 
 uniform sampler2D tex0;
 uniform vec2 resolution; // screen resolution
+varying vec2 vTexCoord;
 #define T texture2D(tex0,.5+(p.xy*=.992))
-void main() 
-{
-  vec3 p = gl_FragCoord.xyz/vec3(resolution, 1.0)-.5;
-  vec3 o = T.rgb;
-  for (float i=0.;i<amount;i++) 
-    p.z += pow(max(0.,.5-length(T.rg)),2.)*exp(-i*.08);
-  gl_FragColor=vec4(o*o+p.z,1);
+
+void main()  {
+	float alpha = texture2D(tex0, vTexCoord)[3];
+
+	vec3 p = gl_FragCoord.xyz/vec3(resolution, 1.0)-.5;
+	vec3 o = T.rgb;
+	for (float i=0.;i<amount;i++) {
+		p.z += pow(max(0.,.5-length(T.rg)),2.)*exp(-i*.08);
+	}
+	gl_FragColor=vec4(o*o+p.z, alpha);
 }
\ No newline at end of file
diff --git a/effects/volumetriclight.xml b/effects/volumetriclight.xml
new file mode 100644
index 000000000..bc2ee42fb
--- /dev/null
+++ b/effects/volumetriclight.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<effect name="Invert" category="Color">
+	<row name="Amount">
+		<field type="double" min="0" default="100" max="100" id="amount"/>
+	</row>
+	<shader vert="common.vert" frag="invert.frag"/>
+</effect>
\ No newline at end of file