Merge pull request #171 from DavidLevinsky/master

Fixed dynamic labels size

package.json

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

src/core/core.js

@@ -580,7 +580,7 @@ string getCoreVersion()
 */
 
 function getCoreVersion(full) {
-    return (full ? 'Core: ' : '') + '2.22.5';
+    return (full ? 'Core: ' : '') + '2.22.6';
 }
 
 

src/core/renderer/draw.js

@@ -1709,7 +1709,7 @@ RendererDraw.prototype.drawGpuJob = function(gpu, gl, renderer, job, screenPixel
 
                     for(j = 0; j < points.length; j++) {
                         pp = renderer.project2(points[j], mvp, [0,0,0], true);
-                        this.drawCircle(pp, points[j][3] *renderer.camera.scaleFactor2(pp[3])*0.5*renderer.curSize[1], 1, [255, 0, 255, 255], null, null, null, null, null);
+                        this.drawCircle(pp, points[j][3] *renderer.camera.scaleFactor2(pp[3])*0.5*renderer.curSize[1]*(renderer.curSize[0]/renderer.curSize[1]), 1, [255, 0, 255, 255], null, null, null, null, null);
                     }
                 }
             }*/
@@ -2773,8 +2773,8 @@ RendererDraw.prototype.drawGpuSubJobLineLabel = function(gpu, gl, renderer, scre
             pp = renderer.project2(job.center2, renderer.camera.mvp, renderer.cameraPosition, true);                    
         }
 
-        var targetSize = job.labelSize * 0.5 * 0.5; //last 0.5 part is to make it compatible to 2D text
-        var sizeFactor = renderer.camera.scaleFactor2(pp[3])*0.5*renderer.curSize[1];
+        var targetSize = job.labelSize * 0.5; 
+        var sizeFactor = renderer.camera.scaleFactor2(pp[3])*0.5*renderer.curSize[1]*(renderer.curSize[0]/renderer.curSize[1]);
         var labelPoints = job.labelPoints;
         var labelIndex = job.labelIndex;
         var labelMorph = 0;

src/core/renderer/renderer.js

@@ -492,7 +492,7 @@ Renderer.prototype.getScreenRay = function(screenX, screenY) {
 
     this.camera.dirty = true; //???? why is projection matrix distored so I have to refresh
 
-    //conver screen coords
+    //convert screen coords
     var x = (2.0 * screenX) / this.curSize[0] - 1.0;
     var y = 1.0 - (2.0 * screenY) / this.curSize[1];
 
@@ -527,16 +527,17 @@ Renderer.prototype.getScreenRay = function(screenX, screenY) {
 Renderer.prototype.hitTestGeoLayers = function(screenX, screenY, secondTexture) {
     var gl = this.gpu.gl;
 
-    //conver screen coords to texture coords
-    if (gl.checkFramebufferStatus(gl.FRAMEBUFFER) != gl.FRAMEBUFFER_COMPLETE) {
-        return [false, 0,0,0,0];
-    }
+    //probably not needed
+    //if (gl.checkFramebufferStatus(gl.FRAMEBUFFER) != gl.FRAMEBUFFER_COMPLETE) {
+      //  return [false, 0,0,0,0];
+    //}
 
     var surfaceHit = false, pixel;
 
     if (screenX >= 0 && screenX < this.curSize[0] &&
         screenY >= 0 && screenY < this.curSize[1]) {
 
+        //convert screen coords to texture coords
         var x = 0, y = 0;
 
         //get screen coords
@@ -674,11 +675,12 @@ Renderer.prototype.hitTest = function(screenX, screenY) {
     var screenRay = this.getScreenRay(screenX, screenY);
     var cameraPos = this.camera.getPosition();
 
-    //conver screen coords to texture coords
-    if (gl.checkFramebufferStatus(gl.FRAMEBUFFER) != gl.FRAMEBUFFER_COMPLETE) {
-        return [0, 0, 0, null, screenRay, Number.MAX_VALUE, cameraPos];
-    }
+    //probably not needed
+    //if (gl.checkFramebufferStatus(gl.FRAMEBUFFER) != gl.FRAMEBUFFER_COMPLETE) {  
+      //  return [0, 0, 0, null, screenRay, Number.MAX_VALUE, cameraPos];
+    //}
 
+    //convert screen coords to texture coords
     var x = 0, y = 0;
 
     //get screen coords

src/core/renderer/rmap.js

@@ -363,8 +363,8 @@ RendererRMap.prototype.addLineLabel = function(subjob, checkDepthMap) {
     var index = 0, pindex = 0;
     var margin = job.noOverlap ? job.noOverlap[0] : 1;
 
-    var targetSize = job.labelSize * 0.5 * 0.5;
-    var sizeFactor = renderer.camera.scaleFactor2(subjob[5][3])*0.5*renderer.curSize[1];
+    var targetSize = job.labelSize * 0.5; 
+    var sizeFactor = renderer.camera.scaleFactor2(subjob[5][3])*0.5*renderer.curSize[1]*(renderer.curSize[0]/renderer.curSize[1]);
     var pointsIndex = subjob[9];
     var labelPoints = job.labelPoints;
     var labelIndex = job.labelIndex;