From d713666329c0b40f972cd013b78772e5569cca98 Mon Sep 17 00:00:00 2001 From: Felicidad Abad Quintanilla Date: Tue, 29 Jan 2019 12:40:42 +0100 Subject: [PATCH] Falta el 9 --- basic_concepts/clear-canvas.html | 6 +-- basic_concepts/draw-a-point.html | 77 +++----------------------------- basic_concepts/prueba.js | 57 +++++++++++++++++++++++ basic_concepts/prueba1.vert | 4 ++ basic_concepts/prueba2.frag | 3 ++ 5 files changed, 74 insertions(+), 73 deletions(-) create mode 100644 basic_concepts/prueba.js create mode 100644 basic_concepts/prueba1.vert create mode 100644 basic_concepts/prueba2.frag diff --git a/basic_concepts/clear-canvas.html b/basic_concepts/clear-canvas.html index 7e469c1..f93393c 100644 --- a/basic_concepts/clear-canvas.html +++ b/basic_concepts/clear-canvas.html @@ -6,7 +6,7 @@ - + - \ No newline at end of file + diff --git a/basic_concepts/draw-a-point.html b/basic_concepts/draw-a-point.html index 9dd15b7..60a398f 100644 --- a/basic_concepts/draw-a-point.html +++ b/basic_concepts/draw-a-point.html @@ -9,76 +9,13 @@ - + - + - - // Init WebGL context - var gl = canvas.getContext("webgl"); - if (!gl) { - console.log("Failed to get the rendering context for WebGL"); - return; - } - - // Clear canvas - gl.clearColor(0.0, 0.0, 0.0, 1.0); - gl.clear(gl.COLOR_BUFFER_BIT); - - // Init shaders - var vs = document.getElementById('shaderVs').innerHTML; - var fs = document.getElementById('shaderFs').innerHTML; - initShaders(gl, vs, fs); - - // Draw a point - gl.drawArrays(gl.POINTS, 0, 1); - } - - - function initShaders(gl, vs_source, fs_source) { - // Compile shaders - var vertexShader = makeShader(gl, vs_source, gl.VERTEX_SHADER); - var fragmentShader = makeShader(gl, fs_source, gl.FRAGMENT_SHADER); - - // Create program - var glProgram = gl.createProgram(); - - // Attach and link shaders to the program - gl.attachShader(glProgram, vertexShader); - gl.attachShader(glProgram, fragmentShader); - gl.linkProgram(glProgram); - if (!gl.getProgramParameter(glProgram, gl.LINK_STATUS)) { - alert("Unable to initialize the shader program"); - return; - } - - // Use program - gl.useProgram(glProgram); - } - - function makeShader(gl, src, type) { - var shader = gl.createShader(type); - gl.shaderSource(shader, src); - gl.compileShader(shader); - if (!gl.getShaderParameter(shader, gl.COMPILE_STATUS)) { - alert("Error compiling shader: " + gl.getShaderInfoLog(shader)); - return; - } - return shader; - } - - - \ No newline at end of file + diff --git a/basic_concepts/prueba.js b/basic_concepts/prueba.js new file mode 100644 index 0000000..a7b760a --- /dev/null +++ b/basic_concepts/prueba.js @@ -0,0 +1,57 @@ + + function init() { + // Get canvas object from the DOM + var canvas = document.getElementById("myCanvas"); + + // Init WebGL context + var gl = canvas.getContext("webgl"); + if (!gl) { + console.log("Failed to get the rendering context for WebGL"); + return; + } + + // Clear canvas + gl.clearColor(0.0, 0.0, 0.0, 1.0); + gl.clear(gl.COLOR_BUFFER_BIT); + + // Init shaders + var vs = document.getElementById('shaderVs').innerHTML; + var fs = document.getElementById('shaderFs').innerHTML; + initShaders(gl, vs, fs); + + // Draw a point + gl.drawArrays(gl.POINTS, 0, 1); + } + + + function initShaders(gl, vs_source, fs_source) { + // Compile shaders + var vertexShader = makeShader(gl, vs_source, gl.VERTEX_SHADER); + var fragmentShader = makeShader(gl, fs_source, gl.FRAGMENT_SHADER); + + // Create program + var glProgram = gl.createProgram(); + + // Attach and link shaders to the program + gl.attachShader(glProgram, vertexShader); + gl.attachShader(glProgram, fragmentShader); + gl.linkProgram(glProgram); + if (!gl.getProgramParameter(glProgram, gl.LINK_STATUS)) { + alert("Unable to initialize the shader program"); + return; + } + + // Use program + gl.useProgram(glProgram); + } + + function makeShader(gl, src, type) { + var shader = gl.createShader(type); + gl.shaderSource(shader, src); + gl.compileShader(shader); + if (!gl.getShaderParameter(shader, gl.COMPILE_STATUS)) { + alert("Error compiling shader: " + gl.getShaderInfoLog(shader)); + return; + } + return shader; + } diff --git a/basic_concepts/prueba1.vert b/basic_concepts/prueba1.vert new file mode 100644 index 0000000..765c009 --- /dev/null +++ b/basic_concepts/prueba1.vert @@ -0,0 +1,4 @@ + void main() { + gl_Position = vec4(0.0, 0.0, 0.0, 1.0); + gl_PointSize = 10.0; + } diff --git a/basic_concepts/prueba2.frag b/basic_concepts/prueba2.frag new file mode 100644 index 0000000..709b577 --- /dev/null +++ b/basic_concepts/prueba2.frag @@ -0,0 +1,3 @@ + void main() { + gl_FragColor = vec4(1.0, 1.0, 0.5, 1.0); + }