Skip to content

Instantly share code, notes, and snippets.

@marklundin

marklundin/original

Forked from Samsy/branch one
Last active May 3, 2016 16:04
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save marklundin/fa56178a04d3776c1d86bf5ed1f60e5d to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save marklundin/fa56178a04d3776c1d86bf5ed1f60e5d to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. marklundin revised this gist May 3, 2016. 3 changed files with 2 additions and 27 deletions.
    10 changes: 0 additions & 10 deletions branch one
    View file
    Original file line number Diff line number Diff line change
    @@ -1,10 +0,0 @@
    varying vec2 vUv;
    uniform sampler2D tDiffuse;
    uniform float isPicking;

    void main() {

    vec3 color = texture2D(tDiffuse, vUv).rgb;

    gl_FragColor = vec4(color, 1.0);
    }
    9 changes: 0 additions & 9 deletions branch two
    View file
    Original file line number Diff line number Diff line change
    @@ -1,9 +0,0 @@
    varying vec2 vUv;
    uniform sampler2D tDiffuse;
    uniform float isPicking;

    void main() {

    gl_FragColor = vec4(pickingColor, 1.0);

    }
    10 changes: 2 additions & 8 deletions original
    View file
    Original file line number Diff line number Diff line change
    @@ -4,16 +4,10 @@ uniform float isPicking;

    void main() {

    if( isPicking == 0.0 ) {

    vec3 color = texture2D(tDiffuse, vUv).rgb;
    vec3 color = texture2D(tDiffuse, vUv).rgb;

    gl_FragColor = vec4(color, 1.0);
    }
    gl_FragColor = vec4( mix( color, pickingColor, isPicking ), 1.0);

    else {

    gl_FragColor = vec4(pickingColor, 1.0);
    }

    }
  2. @Samsy Samsy created this gist May 3, 2016.
    10 changes: 10 additions & 0 deletions branch one
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,10 @@
    varying vec2 vUv;
    uniform sampler2D tDiffuse;
    uniform float isPicking;

    void main() {

    vec3 color = texture2D(tDiffuse, vUv).rgb;

    gl_FragColor = vec4(color, 1.0);
    }
    9 changes: 9 additions & 0 deletions branch two
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,9 @@
    varying vec2 vUv;
    uniform sampler2D tDiffuse;
    uniform float isPicking;

    void main() {

    gl_FragColor = vec4(pickingColor, 1.0);

    }
    19 changes: 19 additions & 0 deletions original
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,19 @@
    varying vec2 vUv;
    uniform sampler2D tDiffuse;
    uniform float isPicking;

    void main() {

    if( isPicking == 0.0 ) {

    vec3 color = texture2D(tDiffuse, vUv).rgb;

    gl_FragColor = vec4(color, 1.0);
    }

    else {

    gl_FragColor = vec4(pickingColor, 1.0);
    }

    }