Merge pull request #47 from DavidLevinsky/master

Fixed fog

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vts-browser-js",
-  "version": "2.4.2",
+  "version": "2.4.4",
   "description": "JavaScript WebGL 3D maps rendering engine",
   "main": "src/browser/index.js",
   "scripts": {

src/core/core.js

@@ -468,7 +468,7 @@ string getCoreVersion()
 */
 
 function getCoreVersion(full) {
-    return (full ? 'Core: ' : '') + '2.4.2';
+    return (full ? 'Core: ' : '') + '2.4.4';
 }
 
 

src/core/map/draw-tiles.js

@@ -23,11 +23,11 @@ var MapDrawTiles = function(map, draw) {
 
 
 MapDrawTiles.prototype.drawSurfaceTile = function(tile, node, cameraPos, pixelSize, priority, preventRedener, preventLoad, checkGpu) {
-    /*if (tile.id[0] == 12 &&
-        tile.id[1] == 690 &&
-        tile.id[2] == 1232) {
-        tile = tile;
-        //return true;
+    /*if (!(tile.id[0] == 14 &&
+        tile.id[1] == 4450 &&
+        tile.id[2] == 2749)) {
+        //tile = tile;
+        return true;
     }*/
 
     if (this.stats.gpuRenderUsed >= this.draw.maxGpuUsed) {

src/core/map/draw.js

@@ -466,7 +466,7 @@ MapDraw.prototype.drawMap = function(skipFreeLayers) {
 
         var t1 = 1.4, t2 = 1.6; //previous value t1=1.1
 
-        if (camera.height > 60000) { //don render ground color in aura
+        if (camera.height > 45000) { //don render ground color in aura
             t1 = 1.4, t2 = 1.8;
             params3 = [t2,1.0,t2,0];
         } else {
@@ -595,8 +595,6 @@ MapDraw.prototype.processDrawCommands = function(cameraPos, commands, priority,
             break;
 
         case 'submesh':
-                //this.renderer.gpu.setState(this.drawBlendedTileState);
-
             var mesh = command.mesh; 
             var texture = command.texture;
 

src/core/renderer/gpu/shaders.js

@@ -743,13 +743,14 @@ GpuShaders.tile3FragmentShader = 'precision mediump float;\n'+
 GpuShaders.fogTileVertexShader =
     'attribute vec3 aPosition;\n'+
     'uniform mat4 uMV, uProj;\n'+
-    'uniform float uFogDensity;\n'+
+//    'uniform float uFogDensity;\n'+
+    'uniform vec4 uParams;\n'+    //[zfactor, fogDensity, 0, 0]
     'varying float vFogFactor;\n'+
     'void main() {\n'+
         'vec4 camSpacePos = uMV * vec4(aPosition, 1.0);\n'+
         'gl_Position = uProj * camSpacePos;\n'+
         'float camDist = length(camSpacePos.xyz);\n'+
-        'vFogFactor = exp(uFogDensity * camDist);\n'+
+        'vFogFactor = exp(uParams[1] * camDist);\n'+
     '}';