Merge pull request #485 from laurennlam/fix_opengl_image_mapper

martinken · web-flow · commit 287cb8bc6b86 · 2018-01-05T11:03:02.000-05:00
fix(OpenGLImageMapper): shader modification to create a vec4
diff --git a/Sources/Rendering/OpenGL/ImageMapper/index.js b/Sources/Rendering/OpenGL/ImageMapper/index.js
@@ -144,9 +144,9 @@ function vtkOpenGLImageMapper(publicAPI, model) {
           '//VTK::TCoord::Impl',
           [
             'vec4 tcolor = scale*texture2D(texture1, tcoordVCVSOutput.st) + shift;',
-            'gl_FragData[0] = vec4(texture2D(colorTexture1, vec2(tcolor.r,0.5)),',
-            '  texture2D(colorTexture1, vec2(tcolor.g,0.5)),',
-            '  texture2D(colorTexture1, vec2(tcolor.b,0.5)), tcolor.a);',
+            'gl_FragData[0] = vec4(texture2D(colorTexture1, vec2(tcolor.r,0.5)).r,',
+            '  texture2D(colorTexture1, vec2(tcolor.g,0.5)).r,',
+            '  texture2D(colorTexture1, vec2(tcolor.b,0.5)).r, tcolor.a);',
           ]
         ).result;
     }

Original file line number	Diff line number	Diff line change
`@@ -144,9 +144,9 @@ function vtkOpenGLImageMapper(publicAPI, model) {`
`144`	`144`	`'//VTK::TCoord::Impl',`
`145`	`145`	`[`
`146`	`146`	`'vec4 tcolor = scale*texture2D(texture1, tcoordVCVSOutput.st) + shift;',`
`147`		`- 'gl_FragData[0] = vec4(texture2D(colorTexture1, vec2(tcolor.r,0.5)),',`
`148`		`- ' texture2D(colorTexture1, vec2(tcolor.g,0.5)),',`
`149`		`- ' texture2D(colorTexture1, vec2(tcolor.b,0.5)), tcolor.a);',`
	`147`	`+ 'gl_FragData[0] = vec4(texture2D(colorTexture1, vec2(tcolor.r,0.5)).r,',`
	`148`	`+ ' texture2D(colorTexture1, vec2(tcolor.g,0.5)).r,',`
	`149`	`+ ' texture2D(colorTexture1, vec2(tcolor.b,0.5)).r, tcolor.a);',`
`150`	`150`	`]`
`151`	`151`	`).result;`
`152`	`152`	`}`