Merge pull request #112 from Malacath-92/master

Adam Stevenson · web-flow · commit 34b9706408fe · 2020-08-25T14:15:44.000-05:00
Fix Attributions
diff --git a/README.md b/README.md
@@ -166,6 +166,13 @@ Contributions of any kind are welcome and encouraged.
 
 ## Release Notes
 
+### 0.10.12
+* Fix attributions of several demo shaders,
+* align default wrap mode with what is default on shader-toy.com
+
+### 0.10.11
+* Automatic dependency updates.
+
 ### 0.10.10
 * Fix stats display,
 * fix includes and shader names resolving on only their filename,
diff --git a/demos/audio.glsl b/demos/audio.glsl
@@ -1,3 +1,6 @@
+// Created by inantop - https://www.shadertoy.com/view/XltSDX
+// Adapted for VS Code Shadertoy
+
 #iChannel0 "file://./outfoxing.mp3"
 
 void mainImage( out vec4 fragColor, in vec2 fragCoord )
diff --git a/demos/blending.glsl b/demos/blending.glsl
@@ -1,3 +1,5 @@
+// Example shader created for VS Code ShaderToy extension
+
 #iChannel0 "https://66.media.tumblr.com/tumblr_mcmeonhR1e1ridypxo1_500.jpg"
 #iChannel1 "https://static.wixstatic.com/media/5a6af3_59508f8a1ef6461abd9b97fba2e4a2ce~mv2.png"
 #iChannel1::WrapMode "Mirror"
diff --git a/demos/blobby.glsl b/demos/blobby.glsl
@@ -1,3 +1,6 @@
+// Created by liamboone - https://www.shadertoy.com/view/ldBBRV
+// Adapted for VS Code Shadertoy
+
 #include "common/blobby.glsl"
 
 float blob(vec2 pos, vec2 center, float power)
diff --git a/demos/cubemap.glsl b/demos/cubemap.glsl
@@ -1,10 +1,10 @@
+// Created by Klems - https://www.shadertoy.com/view/4dj3zV
+// Adapted for VS Code Shadertoy
+
 #iChannel0 "file://cubemap/yokohama_{}.jpg"
 #iChannel0::Type "CubeMap"
 #iChannel0::MinFilter "LinearMipMapLinear"
 
-// Created by Klems - https://www.shadertoy.com/view/4dj3zV
-// Adapted for VS Code Shadertoy
-
 #define PI 					3.14159265359
 #define METABALLS 			7
 #define METABALLS_TRESHOLD 	1.0
diff --git a/demos/digital.glsl b/demos/digital.glsl
@@ -1,4 +1,4 @@
-// Created by tayloia at https://www.shadertoy.com/view/MdVcRd
+// Created by tayloia - https://www.shadertoy.com/view/MdVcRd
 // Adapted for VS Code Shadertoy
 
 // See https://www.shadertoy.com/view/ldKGRR
diff --git a/demos/duck.glsl b/demos/duck.glsl
@@ -1,3 +1,5 @@
+// Example shader created for VS Code ShaderToy extension
+
 #iChannel0 "https://cdn-images-1.medium.com/max/1200/1*eFjpoz8lhNKyd8XcSWv2OA.jpeg"
 #iChannel0::WrapMode "Repeat"
 
diff --git a/demos/feedback.glsl b/demos/feedback.glsl
@@ -1,3 +1,5 @@
+// Example shader created for VS Code ShaderToy extension
+
 #iChannel0 "file://self"
 
 void main() {
diff --git a/demos/frame.glsl b/demos/frame.glsl
@@ -1,3 +1,5 @@
+// Example shader created for VS Code ShaderToy extension
+
 #define BRANCHLESS
 
 void main() {
diff --git a/demos/glslify.glsl b/demos/glslify.glsl
@@ -1,3 +1,5 @@
+// Example shader created for VS Code ShaderToy extension
+
 #pragma glslify: snoise = require('glsl-noise/simplex/2d')
 
 float noise(in vec2 pt) {
diff --git a/demos/keyboard.glsl b/demos/keyboard.glsl
@@ -1,8 +1,8 @@
-#iKeyboard
-
-// Created by inigo quilez - iq/2013
+// Created by iq - https://www.shadertoy.com/view/lsXGzf
 // Adapted for VS Code Shadertoy
 
+#iKeyboard
+
 // An example showing how to use the keyboard input.
 //
 // Row 0: contain the current state of the 256 keys. 
diff --git a/demos/keyquest.glsl b/demos/keyquest.glsl
@@ -1,12 +1,13 @@
+// Created by TekF - https://www.shadertoy.com/view/XdS3RV
+// Adapted for VS Code Shadertoy
+
 #iKeyboard
 #iChannel0 "https://i.imgur.com/lX8OAQV.jpg"
 #iChannel1 "https://farm5.static.flickr.com/4541/38604095012_ab7a81b807_b.jpg"
 
 // Ben Quantock 2014
 // License Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
 
-// Adapted for shadertoy VS-Code from: https://www.shadertoy.com/view/XdS3RV
-
 // fit a coordinate system to xx
 vec4 screen; // coord*screen.z+screen.xy, coord e [-screen.w,screen.w
 vec2 pixel;
diff --git a/demos/metaballs.glsl b/demos/metaballs.glsl
@@ -1,3 +1,6 @@
+// Created by mu6k - https://www.shadertoy.com/view/Mss3WN
+// Adapted for VS Code Shadertoy
+
 /*by mu6k, Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
 
  I have no idea how I ended up here, but it demosceneish enough to publish.
diff --git a/demos/mouse.glsl b/demos/mouse.glsl
@@ -1,4 +1,4 @@
-// Created by foodini - 2018
+// Created by foodini - https://www.shadertoy.com/view/XlyBzt
 // Adapted for VS Code Shadertoy
 
 void mainImage( out vec4 fragColor, in vec2 fragCoord )
diff --git a/demos/multipass.glsl b/demos/multipass.glsl
@@ -1,3 +1,5 @@
+// Example shader created for VS Code ShaderToy extension
+
 #iChannel0 "file://horizon.jpg"
 #iChannel1 "file://uv-warp.glsl"
 
diff --git a/demos/plasma1.glsl b/demos/plasma1.glsl
@@ -1,3 +1,6 @@
+// Created by klk - https://www.shadertoy.com/view/XsVSzW
+// Adapted for VS Code Shadertoy
+
 // License Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
 // Created by S.Guillitte 
 void main()
diff --git a/demos/uv-warp.glsl b/demos/uv-warp.glsl
@@ -1,3 +1,5 @@
+// Example shader created for VS Code ShaderToy extension
+
 void main() {
     vec2 uv = gl_FragCoord.xy / iResolution.xy;
  
diff --git a/demos/volume_points_0.glsl b/demos/volume_points_0.glsl
@@ -1,3 +1,6 @@
+// Created by FlyGuy - https://www.shadertoy.com/view/MtdcDn
+// Adapted for VS Code Shadertoy
+
 #include "volume_points_common.glsl"
 
 vec3 iVResolution = vec3(0);
diff --git a/demos/volume_points_1.glsl b/demos/volume_points_1.glsl
@@ -1,5 +1,5 @@
-// Shader by Flyguy
-// Adapted for shadertoy VS-Code from: https://www.shadertoy.com/view/MtdcDn
+// Created by FlyGuy - https://www.shadertoy.com/view/MtdcDn
+// Adapted for VS Code Shadertoy
 
 #iChannel0 "volume_points_0.glsl"
 
diff --git a/demos/volume_points_common.glsl b/demos/volume_points_common.glsl
@@ -1,3 +1,6 @@
+// Created by FlyGuy - https://www.shadertoy.com/view/MtdcDn
+// Adapted for VS Code Shadertoy
+
 const float pi = atan(1.0) * 4.0;
 const float tau = atan(1.0) * 8.0;
  
diff --git a/src/bufferprovider.ts b/src/bufferprovider.ts
@@ -188,7 +188,7 @@ export class BufferProvider {
                             LocalTexture: depFile,
                             Mag: Types.TextureMagFilter.Linear,
                             Min: Types.TextureMinFilter.Linear,
-                            Wrap: Types.TextureWrapMode.Clamp
+                            Wrap: Types.TextureWrapMode.Repeat
                         });
                     }
                     else {
@@ -198,7 +198,7 @@ export class BufferProvider {
                             RemoteTexture: depFile,
                             Mag: Types.TextureMagFilter.Linear,
                             Min: Types.TextureMinFilter.Linear,
-                            Wrap: Types.TextureWrapMode.Clamp
+                            Wrap: Types.TextureWrapMode.Repeat
                         });
                     }
                     break;
@@ -239,7 +239,7 @@ export class BufferProvider {
                 texture.MagLine = pendingSettings.MagLine;
                 texture.Min = pendingSettings.Min || Types.TextureMinFilter.Linear;
                 texture.MinLine = pendingSettings.MinLine;
-                texture.Wrap = pendingSettings.Wrap || Types.TextureWrapMode.Clamp;
+                texture.Wrap = pendingSettings.Wrap || Types.TextureWrapMode.Repeat;
                 texture.WrapLine = pendingSettings.WrapLine;
                 texture.Type = pendingSettings.Type || Types.TextureType.Texture2D;
                 texture.TypeLine = pendingSettings.TypeLine;

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// Example shader created for VS Code ShaderToy extension`
	`2`	`+`
`1`	`3`	`#iChannel0 "https://66.media.tumblr.com/tumblr_mcmeonhR1e1ridypxo1_500.jpg"`
`2`	`4`	`#iChannel1 "https://static.wixstatic.com/media/5a6af3_59508f8a1ef6461abd9b97fba2e4a2ce~mv2.png"`
`3`	`5`	`#iChannel1::WrapMode "Mirror"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Created by tayloia at https://www.shadertoy.com/view/MdVcRd`
	`1`	`+// Created by tayloia - https://www.shadertoy.com/view/MdVcRd`
`2`	`2`	`// Adapted for VS Code Shadertoy`
`3`	`3`
`4`	`4`	`// See https://www.shadertoy.com/view/ldKGRR`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// Example shader created for VS Code ShaderToy extension`
	`2`	`+`
`1`	`3`	`#iChannel0 "https://cdn-images-1.medium.com/max/1200/1*eFjpoz8lhNKyd8XcSWv2OA.jpeg"`
`2`	`4`	`#iChannel0::WrapMode "Repeat"`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// Example shader created for VS Code ShaderToy extension`
	`2`	`+`
`1`	`3`	`#iChannel0 "file://self"`
`2`	`4`
`3`	`5`	`void main() {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// Example shader created for VS Code ShaderToy extension`
	`2`	`+`
`1`	`3`	`#define BRANCHLESS`
`2`	`4`
`3`	`5`	`void main() {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// Example shader created for VS Code ShaderToy extension`
	`2`	`+`
`1`	`3`	`#pragma glslify: snoise = require('glsl-noise/simplex/2d')`
`2`	`4`
`3`	`5`	`float noise(in vec2 pt) {`