X-Git-Url: https://git-public.kairo.at/?p=lantea.git;a=blobdiff_plain;f=js%2Fmap.js;h=043da92e0ae7a3d1c110d3705b018da6630ef08d;hp=ccfa87d419f74d138bd2d67923d72fbad74ce8f7;hb=b3a9fc52d3283a19f8bfb3c55cd77f10792d765c;hpb=d6ff68916ac5e2f067a940039df7ca0c86a9cb10 diff --git a/js/map.js b/js/map.js index ccfa87d..043da92 100644 --- a/js/map.js +++ b/js/map.js @@ -244,12 +244,14 @@ var gMap = { initGL: function() { // When called from the event listener, the "this" reference doesn't work, so use the object name. + console.log("Initializing WebGL..."); if (gMap.gl) { gMap.gl.viewport(0, 0, gMap.gl.drawingBufferWidth, gMap.gl.drawingBufferHeight); gMap.gl.clearColor(0.0, 0.0, 0.0, 0.5); // Set clear color to black, fully opaque. gMap.gl.clear(gMap.gl.COLOR_BUFFER_BIT|gMap.gl.DEPTH_BUFFER_BIT); // Clear the color. // Create and initialize the shaders. + console.log("Create and compile shaders..."); var vertShader = gMap.gl.createShader(gMap.gl.VERTEX_SHADER); var fragShader = gMap.gl.createShader(gMap.gl.FRAGMENT_SHADER); gMap.gl.shaderSource(vertShader, gMap.getVertShaderSource()); @@ -269,6 +271,7 @@ var gMap = { return null; } + console.log("Create and link shader program..."); gMap.glShaderProgram = gMap.gl.createProgram(); gMap.gl.attachShader(gMap.glShaderProgram, vertShader); gMap.gl.attachShader(gMap.glShaderProgram, fragShader); @@ -283,6 +286,7 @@ var gMap = { gMap.glTextureCoordAttr = gMap.gl.getAttribLocation(gMap.glShaderProgram, "aTextureCoord"); gMap.glResolutionAttr = gMap.gl.getUniformLocation(gMap.glShaderProgram, "uResolution"); + console.log("Set up vertex buffer..."); var tileVerticesBuffer = gMap.gl.createBuffer(); gMap.gl.bindBuffer(gMap.gl.ARRAY_BUFFER, tileVerticesBuffer); // The vertices are the coordinates of the corner points of the square. @@ -303,6 +307,7 @@ var gMap = { gMap.gl.uniform2f(gMap.glResolutionAttr, gGLMapCanvas.width, gGLMapCanvas.height); // Create a buffer for the position of the rectangle corners. + console.log("Set up coord buffer..."); var mapVerticesTextureCoordBuffer = gMap.gl.createBuffer(); gMap.gl.bindBuffer(gMap.gl.ARRAY_BUFFER, mapVerticesTextureCoordBuffer); gMap.gl.enableVertexAttribArray(gMap.glVertexPositionAttr); @@ -355,7 +360,7 @@ var gMap = { var imgObj = new Image(); imgObj.onload = function() { gMap.loadImageToTexture(imgObj, aTileKey); - requestAnimationFrame(function(aTimestamp) { gMap.drawGL() }); + window.requestAnimationFrame(function(aTimestamp) { gMap.drawGL() }); URL.revokeObjectURL(imgURL); } imgObj.src = imgURL; @@ -364,7 +369,7 @@ var gMap = { } } } - requestAnimationFrame(function(aTimestamp) { gMap.drawGL() }); + window.requestAnimationFrame(function(aTimestamp) { gMap.drawGL() }); }, drawGL: function() {