Merge pull request #116 from Malacath-92/master

Fullfill feature requests & Publish in CI

Author: stevensona

.github/workflows/CI.yml

@@ -5,6 +5,8 @@ on:
     branches: [ master ]
   pull_request:
     branches: [ master ]
+  release:
+    types: [ created ]
 
 jobs:
   build:
@@ -42,3 +44,8 @@ jobs:
       uses: GabrielBB/xvfb-action@v1.0
       with:
         run: npm test
+    - name: Publish
+      if: success() && startsWith(github.ref, 'refs/tags/releases/') && matrix.os == 'ubuntu-latest'
+      run: npm run deploy
+      env:
+        VSCE_PAT: ${{ secrets.VSCE_PAT }}

README.md

@@ -113,7 +113,8 @@ void main() {
   gl_FragColor = vec4(r, g, b, 1.0);
 }
 ```
-Note that compared to *shadertoy.com* `gl_FragCoord` replaces `fragCoord` and `gl_FragColor` replaces `fragColor` in the original demo. There is however a rudimentary support for inserting a trivial `void main()` which will delegate to a `void mainImage(out vec4, in vec2)` function. The definition of `void main()` is found by matching the regex `/void\s+main\s*\(\s*\)\s*\{/g`, thus if you require to define `void main()` in addition to the extension generating a definition you may define it as `void main(void)`. This might be necessary, for example, if your main definition would be processed away by the preprocessor and should thus not be picked up by the extension. 
+Note that compared to *shadertoy.com* `gl_FragCoord` replaces `fragCoord` and `gl_FragColor` replaces `fragColor` in the original demo. There is however a rudimentary support for inserting a trivial `void main()` which will delegate to a `void mainImage(out vec4, in vec2)` function. The definition of `void main()` is found by matching the regex `/void\s+main\s*\(\s*\)\s*\{/g`, thus if you require to define `void main()` in addition to the extension generating a definition you may define it as `void main(void)`. This might be necessary, for example, if your main definition would be processed away by the preprocessor and should thus not be picked up by the extension.
+Since compatibility is achieved with a simple regex match it is only semi-reliable. If you only use shaders from *shadertoy.com* that do things such as defining `mainImage` via macros you may want to enable the "Shader Toy Strict Compatibility" setting, which disables the ability to use shaders that define `void main()` and only allows shaders that define `mainImage` in some way. Alternatively you can use `#StrictCompatibility` in your shader to have this feature localized to just that shader.
 
 ### Integration of _glslify_
 You can enable support for _glslify_ in the settings, but because _glslify_ does not support line mappings pre and post its transform, line numbers on errors will unfortunately be disabled as long as you have the setting enabled. Using _glslify_ allows using a node.js-style module system for your shaders:
@@ -168,7 +169,10 @@ Contributions of any kind are welcome and encouraged.
 
 ### 0.10.12
 * Fix attributions of several demo shaders,
-* align default wrap mode with what is default on shader-toy.com
+* align default wrap mode with what is default on shadertoy.com,
+* allow control of filter and wrap mode for sampling other shaders,
+* add a strict compatibility mode for shadertoy.com,
+* add setting to skip all automatic recompilation and instead have a button in the webview for that.
 
 ### 0.10.11
 * Automatic dependency updates.

demos/multipass.glsl

@@ -3,6 +3,9 @@
 #iChannel0 "file://horizon.jpg"
 #iChannel1 "file://uv-warp.glsl"
 
+#iChannel1::MinFilter "Nearest"
+#iChannel1::MagFilter "Nearest"
+
 void main() {
     vec2 uv = gl_FragCoord.xy / iResolution.xy;
 

demos/raymarcher_88.glsl

@@ -0,0 +1,13 @@
+// Created by Xor - https://www.shadertoy.com/view/ld2BWK
+// Adapted for VS Code Shadertoy
+
+#StrictCompatibility
+
+#define mainImage(O,I)         \
+                        O -= O;\
+       for (int i; i++ < 99;)\
+O += ( length(cos(O/.1)) - 1.1)\
+* vec4( I/1e4, .1, 0)
+
+//82 Character version:       
+//#define mainImage(O,I) for(int i;i++<99;)O+=(length(cos(O/.1))-1.)*vec4(I/1e4,.1,0)

demos/swirl_spin.glsl

@@ -0,0 +1,15 @@
+// Created by TekF - https://www.shadertoy.com/view/XsyGzz
+// Adapted for VS Code Shadertoy
+
+#iChannel0 "self"
+
+void mainImage(out vec4 fragColor, in vec2 fragCoord)
+{
+    fragColor = texture(iChannel0, (fragCoord*.98 + iResolution.xy*.01 + (fragCoord-iResolution.xy/2.).yx*vec2(-.03,.03)) / iResolution.xy);
+    
+    float t = iTime*.5;
+
+    vec4 col = vec4(sin(t*vec3(13,11,17))*.5+.5,1);
+    float idx = .0+1.0*smoothstep( 6., 20., length( fragCoord - sin(vec2(11,13)*t)*60. - iResolution.xy/2. ) );
+    fragColor = mix( col, fragColor, idx );
+}