HoshinoKoji/psychojs
1
0
Fork 0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-10 10:40:54 +00:00
Code Actions Packages Releases Activity

Merge pull request #534 from lightest/wgl1_shaders_derivatives_handling

Browse Source 
manual derivatives calculation for radial stim;
This commit is contained in:
Alain Pitiot 2022-10-08 09:05:03 +02:00 committed by GitHub
commit 0e659b0856
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/visual/GratingStim.js
View File

@ -2,7 +2,7 @@
* Grating Stimulus.
*
* @author Nikita Agafonov
* @version 2021.2.3
* @version 2022.3.0
* @copyright (c) 2017-2020 Ilixa Ltd. (http://ilixa.com) (c) 2020-2022 Open Science Tools Ltd. (https://opensciencetools.org)
* @license Distributed under the terms of the MIT License
*/
@ -380,6 +380,8 @@ export class GratingStim extends VisualStim
shader: radialStimWGL1,
uniforms: {
uFreq: 20.0,
uStep: .0017,
uDX: 1.,
uPhase: 0.0,
uColor: [1., 1., 1.],
uAlpha: 1.0

16
src/visual/shaders/wgl1/radialShader.frag
View File

@ -7,7 +7,6 @@
* @description Creates 2d radial grating image. Based on https://www.shadertoy.com/view/wtjGzt
* @usedby GratingStim.js
*/
precision mediump float;
varying vec2 vUvs;
@ -16,20 +15,27 @@ uniform float uFreq;
uniform float uPhase;
uniform vec3 uColor;
uniform float uAlpha;
uniform float uStep;
uniform float uDX;
#define M_PI 3.14159265358979
#define PI2 2.* M_PI
float aastep(float x) { // --- antialiased step(.5)
float w = fwidth(x); // pixel width. NB: x must not be discontinuous or factor discont out
float aastep(float x, float w) { // --- antialiased step(.5)
return smoothstep(.7,-.7,(abs(fract(x-.25)-.5)-.25)/w); // just use (offseted) smooth squares
}
void main() {
vec2 uv = vUvs * 2. - 1.;
float v = uFreq * atan(uv.y, uv.x) / 6.28;
// WGL1 has dFdx, dFdy and fwidth() defined as part of OES_standard_derivatives extension.
// BUT using this extension fails due to how currently used version of PIXI goes about shader program compilation.
// Calculating derivatives manually instead.
float dF_dx = (uFreq * (atan(uv.y, uv.x + uStep) - atan(uv.y, uv.x - uStep)) / 6.28) / uDX;
float dF_dy = (uFreq * (atan(uv.y + uStep, uv.x) - atan(uv.y - uStep, uv.x)) / 6.28) / uDX;
float w = abs(dF_dx) + abs(dF_dy);
// converting first to [-1, 1] space to get the proper color functionality
// then back to [0, 1]
float v = uFreq * atan(uv.y, uv.x) / 6.28;
float s = aastep(v) * 2. - 1.;
float s = aastep(v, w) * 2. - 1.;
gl_FragColor = vec4(vec3(s) * uColor * .5 + .5, 1.0) * uAlpha;
}