Skip to content

Commit

Permalink
Improve test_webgl_triangle.html
Browse files Browse the repository at this point in the history
  • Loading branch information
MortimerGoro committed Oct 3, 2016
1 parent a07d6b3 commit 328dace
Showing 1 changed file with 22 additions and 4 deletions.
26 changes: 22 additions & 4 deletions tests/html/test_webgl_triangle.html
Expand Up @@ -31,6 +31,8 @@
</script>
<script type="text/javascript">

(function() {

var canvas;
function initWebGL()
{
Expand All @@ -41,6 +43,10 @@
}

var gl = initWebGL();
if (!gl) {
alert("No webgl context found!");
return;
}

// Setup Shaders:
var v = document.getElementById("vertexshader").firstChild.nodeValue;
Expand All @@ -54,24 +60,34 @@
gl.compileShader(vs);

if (!gl.getShaderParameter(vs, gl.COMPILE_STATUS)) {
alert(gl.getShaderInfoLog(vs));
alert("Shader failed to compile. Reason: " + gl.getShaderInfoLog(vs));
return;
}

var fs = gl.createShader(gl.FRAGMENT_SHADER);
gl.shaderSource(fs, f);
gl.compileShader(fs);

if (!gl.getShaderParameter(fs, gl.COMPILE_STATUS)) {
alert(gl.getShaderInfoLog(fs));
alert("Shader failed to compile. Reason: " + gl.getShaderInfoLog(fs));
return;
}

program = gl.createProgram();
gl.attachShader(program, vs);
gl.attachShader(program, fs);
gl.linkProgram(program);

// if (!gl.getProgramParameter(program, gl.LINK_STATUS))
// alert(gl.getProgramInfoLog(program));
if (!gl.getProgramParameter(program, gl.LINK_STATUS)) {
alert("Shader failed to link. Reason: " + gl.getProgramInfoLog(program));
return;
}

gl.validateProgram(program);
if (!gl.getProgramParameter( program, gl.VALIDATE_STATUS)) {
alert("Program failed to validate. Reason: " + gl.getProgramInfoLog(program));
return;
}

// Setup Geometry
var vertices = new Float32Array([
Expand Down Expand Up @@ -107,6 +123,8 @@

// Draw
gl.drawArrays(gl.TRIANGLES, 0, 3);

})();
</script>
</body>
</html>

0 comments on commit 328dace

Please sign in to comment.