Merge pull request #864 from SCIInstitute/brig_work

dcwhite · dcwhite · commit 218c3510c95a · 2015-02-12T10:42:32.000-07:00
Transparent edges with uniform now work.
diff --git a/src/Interface/Modules/Render/ES/shaders/UniformColor.fs b/src/Interface/Modules/Render/ES/shaders/UniformColor.fs
@@ -34,9 +34,11 @@
   #endif
 #endif
 
+uniform float uTransparency;
+
 varying vec4	fColor;
 
 void main()
 {
-	gl_FragColor 		= fColor;
+	gl_FragColor 		= vec4(fColor.xyz,uTransparency);
 }

Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,11 @@`
`34`	`34`	`#endif`
`35`	`35`	`#endif`
`36`	`36`
	`37`	`+uniform float uTransparency;`
	`38`	`+`
`37`	`39`	`varying vec4 fColor;`
`38`	`40`
`39`	`41`	`void main()`
`40`	`42`	`{`
`41`		`- gl_FragColor = fColor;`
	`43`	`+ gl_FragColor = vec4(fColor.xyz,uTransparency);`
`42`	`44`	`}`