@openglobus/og 0.12.3 → 0.13.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (93) hide show
  1. package/README.md +0 -2
  2. package/dist/@openglobus/og.esm.js +2 -2
  3. package/dist/@openglobus/og.esm.js.map +1 -1
  4. package/dist/@openglobus/og.umd.js +2 -2
  5. package/dist/@openglobus/og.umd.js.map +1 -1
  6. package/package.json +7 -7
  7. package/src/og/Extent.js +3 -3
  8. package/src/og/Globe.js +277 -275
  9. package/src/og/ImageCanvas.js +3 -3
  10. package/src/og/LonLat.js +9 -9
  11. package/src/og/QueueArray.js +2 -2
  12. package/src/og/Rectangle.js +5 -5
  13. package/src/og/bv/Box.js +1 -1
  14. package/src/og/bv/Sphere.js +2 -2
  15. package/src/og/camera/Camera.js +1 -1
  16. package/src/og/camera/PlanetCamera.js +649 -646
  17. package/src/og/control/LayerSwitcher.js +1 -1
  18. package/src/og/control/MouseNavigation.js +22 -13
  19. package/src/og/control/MouseWheelZoomControl.js +2 -2
  20. package/src/og/control/ScaleControl.js +1 -1
  21. package/src/og/control/TouchNavigation.js +319 -319
  22. package/src/og/control/ZoomControl.js +132 -132
  23. package/src/og/control/visibleExtent/Segment.js +12 -12
  24. package/src/og/ellipsoid/Ellipsoid.js +577 -567
  25. package/src/og/entity/BillboardHandler.js +878 -1051
  26. package/src/og/entity/Entity.js +1 -1
  27. package/src/og/entity/EntityCollection.js +847 -857
  28. package/src/og/entity/GeoObjectHandler.js +2 -2
  29. package/src/og/entity/LabelHandler.js +888 -1040
  30. package/src/og/entity/LabelWorker.js +0 -6
  31. package/src/og/entity/PointCloud.js +495 -495
  32. package/src/og/entity/Polyline.js +2218 -2222
  33. package/src/og/entity/RayHandler.js +1 -1
  34. package/src/og/layer/CanvasTiles.js +6 -3
  35. package/src/og/layer/GeoImage.js +1 -1
  36. package/src/og/layer/KML.js +5 -5
  37. package/src/og/layer/Layer.js +804 -752
  38. package/src/og/layer/Vector.js +997 -1010
  39. package/src/og/layer/XYZ.js +359 -357
  40. package/src/og/math/Line2.js +4 -4
  41. package/src/og/math/Quat.js +2 -2
  42. package/src/og/math/Ray.js +2 -2
  43. package/src/og/math/Vec2.js +524 -524
  44. package/src/og/math/Vec3.js +900 -900
  45. package/src/og/math/Vec4.js +261 -261
  46. package/src/og/math.js +397 -398
  47. package/src/og/quadTree/EntityCollectionNode.js +389 -387
  48. package/src/og/renderer/Renderer.js +14 -20
  49. package/src/og/renderer/RendererEvents.js +1034 -1045
  50. package/src/og/scene/Planet.js +12 -9
  51. package/src/og/scene/RenderNode.js +347 -354
  52. package/src/og/segment/Segment.js +3 -1
  53. package/src/og/segment/SegmentLonLat.js +1 -4
  54. package/src/og/shaders/billboard.js +220 -204
  55. package/src/og/shaders/drawnode.js +603 -603
  56. package/src/og/shaders/label.js +595 -456
  57. package/src/og/shaders/polyline.js +365 -361
  58. package/src/og/terrain/MapboxTerrain.js +1 -1
  59. package/src/og/utils/FontAtlas.js +209 -200
  60. package/src/og/utils/GeoImageCreator.js +4 -5
  61. package/src/og/utils/TextureAtlas.js +4 -4
  62. package/src/og/utils/VectorTileCreator.js +414 -414
  63. package/src/og/utils/shared.js +1 -1
  64. package/src/og/webgl/Handler.js +28 -60
  65. package/src/og/webgl/Multisample.js +260 -260
  66. package/src/og/webgl/Program.js +411 -396
  67. package/types/bv/Box.d.ts +1 -1
  68. package/types/bv/Sphere.d.ts +1 -1
  69. package/types/camera/PlanetCamera.d.ts +3 -3
  70. package/types/control/LayerSwitcher.d.ts +1 -1
  71. package/types/ellipsoid/Ellipsoid.d.ts +9 -2
  72. package/types/entity/BillboardHandler.d.ts +0 -4
  73. package/types/entity/EntityCollection.d.ts +0 -8
  74. package/types/entity/LabelHandler.d.ts +0 -2
  75. package/types/entity/Polyline.d.ts +1 -1
  76. package/types/layer/KML.d.ts +11 -11
  77. package/types/layer/Layer.d.ts +5 -0
  78. package/types/layer/Vector.d.ts +1 -8
  79. package/types/math/Line2.d.ts +4 -4
  80. package/types/math/Ray.d.ts +2 -2
  81. package/types/math/Vec2.d.ts +1 -1
  82. package/types/math/Vec3.d.ts +1 -1
  83. package/types/math/Vec4.d.ts +2 -2
  84. package/types/math.d.ts +1 -1
  85. package/types/renderer/Renderer.d.ts +1 -1
  86. package/types/renderer/RendererEvents.d.ts +1 -1
  87. package/types/shaders/label.d.ts +1 -1
  88. package/types/utils/FontAtlas.d.ts +3 -2
  89. package/types/utils/TextureAtlas.d.ts +3 -3
  90. package/types/utils/VectorTileCreator.d.ts +4 -4
  91. package/types/utils/shared.d.ts +1 -1
  92. package/types/webgl/Handler.d.ts +6 -31
  93. package/types/webgl/Program.d.ts +2 -0
package/src/og/scene/Planet.js CHANGED
@@ -411,7 +411,7 @@ export class Planet extends RenderNode {
411
411
 
412
412
  this._terrainWorker = new TerrainWorker(3);
413
413
 
414
- this._plainSegmentWorker = new PlainSegmentWorker(4);
414
+ this._plainSegmentWorker = new PlainSegmentWorker(3);
415
415
 
416
416
  this._tileLoader = new Loader(options.loadingBatchSize || 12);
417
417
 
@@ -638,8 +638,11 @@ export class Planet extends RenderNode {
638
638
  var h = this.renderer.handler;
639
639
 
640
640
  h.addProgram(shaders.drawnode_screen_nl(), true);
641
- //h.addProgram(shaders.drawnode_screen_wl(), true);
642
- h.addProgram(shaders.drawnode_screen_wl_webgl2(), true);
641
+ if (h.isWebGl2()) {
642
+ h.addProgram(shaders.drawnode_screen_wl_webgl2(), true);
643
+ } else {
644
+ h.addProgram(shaders.drawnode_screen_wl(), true);
645
+ }
643
646
  h.addProgram(shaders.drawnode_colorPicking(), true);
644
647
  h.addProgram(shaders.drawnode_depth(), true);
645
648
  h.addProgram(shaders.drawnode_heightPicking(), true);
@@ -674,10 +677,10 @@ export class Planet extends RenderNode {
674
677
  !this._indexesCache[i][j] && (this._indexesCache[i][j] = new Array(TABLESIZE));
675
678
  for (var k = 0; k <= TABLESIZE; k++) {
676
679
  !this._indexesCache[i][j][k] &&
677
- (this._indexesCache[i][j][k] = new Array(TABLESIZE));
680
+ (this._indexesCache[i][j][k] = new Array(TABLESIZE));
678
681
  for (var m = 0; m <= TABLESIZE; m++) {
679
682
  !this._indexesCache[i][j][k][m] &&
680
- (this._indexesCache[i][j][k][m] = new Array(TABLESIZE));
683
+ (this._indexesCache[i][j][k][m] = new Array(TABLESIZE));
681
684
  for (var q = 0; q <= TABLESIZE; q++) {
682
685
  let ptr = {
683
686
  buffer: null
@@ -817,7 +820,7 @@ export class Planet extends RenderNode {
817
820
  _preRender() {
818
821
  // Zoom 0
819
822
  this._quadTree.createChildrenNodes();
820
- this._quadTree.segment.createPlainSegment();
823
+ this._quadTree.segment.createPlainSegment();
821
824
 
822
825
  // Zoom 1
823
826
  for (let i = 0; i < this._quadTree.nodes.length; i++) {
@@ -1340,15 +1343,15 @@ export class Planet extends RenderNode {
1340
1343
  rn[i].segment.colorPickingRendering(sh, sl[0], 0);
1341
1344
  }
1342
1345
 
1343
- gl.enable(gl.POLYGON_OFFSET_FILL);
1346
+ //gl.enable(gl.POLYGON_OFFSET_FILL);
1344
1347
  for (let j = 1, len = sl.length; j < len; j++) {
1345
1348
  i = rn.length;
1346
- gl.polygonOffset(0, -j);
1349
+ //gl.polygonOffset(0, -j);
1347
1350
  while (i--) {
1348
1351
  rn[i].segment.colorPickingRendering(sh, sl[j], j, this.transparentTexture, true);
1349
1352
  }
1350
1353
  }
1351
- gl.disable(gl.POLYGON_OFFSET_FILL);
1354
+ //gl.disable(gl.POLYGON_OFFSET_FILL);
1352
1355
 
1353
1356
  gl.disable(gl.BLEND);
1354
1357
  }