X-Git-Url: https://git-public.kairo.at//?a=blobdiff_plain;f=js%2Fmap.js;h=024eaf4e655b9a9f34df5e227070bfc87678b716;hb=d7310ee2c8b72539147c6879be811a960fd2938a;hp=cf095cb13f3d199e4226791a4fbde8dfa5ebcb9c;hpb=0c7de38028c2e5a599ba6e3c18f2a6b00061439a;p=lantea.git diff --git a/js/map.js b/js/map.js index cf095cb..024eaf4 100644 --- a/js/map.js +++ b/js/map.js @@ -121,12 +121,14 @@ function loadPrefs(aEvent) { document.getElementById("body").addEventListener("keydown", mapEvHandler, false); + console.log("Events added."); document.getElementById("copyright").innerHTML = gMapStyles[gMap.activeMap].copyright; gLoadingTile = new Image(); gLoadingTile.src = "style/loading.png"; gLoadingTile.onload = function() { + console.log("Loading Tile loaded."); var throwEv = new CustomEvent("prefload-done"); gAction.dispatchEvent(throwEv); }; @@ -235,7 +237,7 @@ var gMap = { ' gl_Position = vec4(clipSpace * vec2(1, -1), 0, 1);\n' + ' vTextureCoord = aTextureCoord;\n' + '}'; }, - getFragShaderSource:function() { + getFragShaderSource: function() { return 'varying highp vec2 vTextureCoord;\n\n' + 'uniform sampler2D uImage;\n\n' + 'void main(void) {\n' + @@ -244,12 +246,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 +273,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 +288,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 +309,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);