@pirireis/webglobeplugins 0.17.0 → 1.0.2

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 (274) hide show
  1. package/Math/{angle-calculation.js → angle-calculation.ts} +18 -14
  2. package/Math/{arc-cdf-points.js → arc-cdf-points.ts} +329 -272
  3. package/Math/{arc-generate-points-exponantial.js → arc-generate-points-exponantial.ts} +299 -254
  4. package/Math/{arc.js → arc.ts} +421 -292
  5. package/Math/bounds/line-bbox.js +225 -186
  6. package/Math/{circle-cdf-points.js → circle-cdf-points.ts} +143 -78
  7. package/Math/{circle.js → circle.ts} +49 -33
  8. package/Math/{constants.js → constants.ts} +12 -4
  9. package/Math/contour/{quadtreecontours.js → quadtreecontours.ts} +371 -300
  10. package/Math/contour/quadtreecontours1.js +336 -298
  11. package/Math/{finite-line-2d.js → finite-line-2d.ts} +68 -58
  12. package/Math/haversine.ts +33 -0
  13. package/Math/index.js +0 -1
  14. package/Math/juction/{arc-plane.js → arc-plane.ts} +203 -143
  15. package/Math/juction/{line-sphere.js → line-sphere.ts} +32 -22
  16. package/Math/juction/{plane-plane.js → plane-plane.ts} +62 -53
  17. package/Math/{line.js → line.ts} +84 -52
  18. package/Math/matrix4.ts +0 -0
  19. package/Math/mesh/mapbox-delaunay.d.ts +74 -0
  20. package/Math/{methods.js → methods.ts} +182 -107
  21. package/Math/{plane.js → plane.ts} +92 -56
  22. package/Math/{quaternion.js → quaternion.ts} +128 -106
  23. package/Math/roadmap.md +10 -0
  24. package/Math/templete-shapes/{grid-visually-equal.js → grid-visually-equal.ts} +118 -65
  25. package/Math/tessellation/constants.ts +1 -0
  26. package/Math/tessellation/methods.ts +79 -0
  27. package/Math/tessellation/nearest-value-padding.ts +147 -0
  28. package/Math/tessellation/roadmap.md +48 -0
  29. package/Math/tessellation/spherical-triangle-area.ts +127 -0
  30. package/Math/tessellation/tile-merger.ts +578 -0
  31. package/Math/tessellation/triangle-tessellation.ts +533 -0
  32. package/Math/tessellation/types.ts +1 -0
  33. package/Math/types.ts +68 -0
  34. package/Math/utils.js +3 -2
  35. package/Math/{vec3.js → vec3.ts} +227 -151
  36. package/Math/xyz-tile.ts +26 -0
  37. package/algorithms/search-binary.js +14 -16
  38. package/altitude-locator/adaptors.js +0 -1
  39. package/altitude-locator/keymethod.js +0 -1
  40. package/altitude-locator/plugin.js +445 -345
  41. package/altitude-locator/types.js +26 -21
  42. package/compass-rose/compass-rose-padding-flat.js +274 -230
  43. package/compass-rose/{compass-text-writer.js → compass-text-writer.ts} +210 -155
  44. package/compass-rose/index.js +3 -3
  45. package/{constants.js → constants.ts} +8 -6
  46. package/heatwave/datamanager.js +168 -149
  47. package/heatwave/heatwave.js +261 -206
  48. package/heatwave/index.js +5 -5
  49. package/heatwave/isobar.js +340 -303
  50. package/heatwave/{texture-point-sampler.js → texture-point-sampler.ts} +220 -187
  51. package/investigation-tools/draw/tiles/adapters.ts +133 -0
  52. package/investigation-tools/draw/tiles/tiles.ts +162 -0
  53. package/jest.config.js +6 -7
  54. package/package.json +1 -1
  55. package/pin/pin-object-array1.js +381 -300
  56. package/pin/pin-point-totem1.js +77 -60
  57. package/programs/arrowfield/arrow-field.js +89 -60
  58. package/programs/arrowfield/logic.js +173 -141
  59. package/programs/data2legend/density-to-legend.js +86 -68
  60. package/programs/data2legend/point-to-density-texture.js +84 -67
  61. package/programs/float2legendwithratio/index.js +3 -2
  62. package/programs/float2legendwithratio/logic.js +144 -118
  63. package/programs/float2legendwithratio/object.js +141 -104
  64. package/programs/helpers/blender.js +73 -58
  65. package/programs/helpers/{fadeaway.js → fadeaway.ts} +73 -55
  66. package/programs/index.js +19 -20
  67. package/programs/line-on-globe/circle-accurate-3d.js +112 -85
  68. package/programs/line-on-globe/circle-accurate-flat.js +200 -148
  69. package/programs/line-on-globe/degree-padding-around-circle-3d.js +134 -102
  70. package/programs/line-on-globe/index.js +0 -1
  71. package/programs/line-on-globe/lines-color-instanced-flat.js +99 -80
  72. package/programs/line-on-globe/linestrip/data.ts +29 -0
  73. package/programs/line-on-globe/linestrip/{linestrip.js → linestrip.ts} +152 -93
  74. package/programs/line-on-globe/{naive-accurate-flexible.js → naive-accurate-flexible.ts} +175 -126
  75. package/programs/line-on-globe/util.js +8 -5
  76. package/programs/picking/pickable-polygon-renderer.js +129 -98
  77. package/programs/picking/pickable-renderer.js +130 -98
  78. package/programs/point-on-globe/element-globe-surface-glow.js +122 -93
  79. package/programs/point-on-globe/element-point-glow.js +114 -80
  80. package/programs/point-on-globe/square-pixel-point.js +139 -120
  81. package/programs/polygon-on-globe/roadmap.md +8 -0
  82. package/programs/polygon-on-globe/texture-dem-triangles.ts +290 -0
  83. package/programs/{programcache.js → programcache.ts} +134 -126
  84. package/programs/rings/index.js +1 -1
  85. package/programs/rings/partial-ring/{piece-of-pie.js → piece-of-pie.ts} +222 -152
  86. package/programs/totems/camera-totem-attactment-interface.ts +4 -0
  87. package/programs/totems/{camerauniformblock.js → camerauniformblock.ts} +326 -230
  88. package/programs/totems/{canvas-webglobe-info.js → canvas-webglobe-info.ts} +147 -132
  89. package/programs/totems/dem-textures-manager.ts +368 -0
  90. package/programs/totems/{globe-changes.js → globe-changes.ts} +79 -59
  91. package/programs/totems/gpu-selection-uniform-block.js +127 -99
  92. package/programs/totems/{index.js → index.ts} +2 -2
  93. package/programs/two-d/pixel-padding-for-compass.js +101 -87
  94. package/programs/util.js +19 -14
  95. package/programs/vectorfields/logics/{constants.js → constants.ts} +5 -4
  96. package/programs/vectorfields/logics/drawrectangleparticles.ts +182 -0
  97. package/programs/vectorfields/logics/index.js +4 -2
  98. package/programs/vectorfields/logics/particle-ubo.ts +23 -0
  99. package/programs/vectorfields/logics/{pixelbased.js → pixelbased.ts} +119 -84
  100. package/programs/vectorfields/logics/ubo.js +57 -51
  101. package/programs/vectorfields/{pingpongbuffermanager.js → pingpongbuffermanager.ts} +113 -73
  102. package/publish.bat +62 -0
  103. package/range-tools-on-terrain/bearing-line/{adapters.js → adapters.ts} +154 -114
  104. package/range-tools-on-terrain/bearing-line/{plugin.js → plugin.ts} +569 -457
  105. package/range-tools-on-terrain/bearing-line/types.ts +65 -0
  106. package/range-tools-on-terrain/circle-line-chain/{adapters.js → adapters.ts} +104 -85
  107. package/range-tools-on-terrain/circle-line-chain/{chain-list-map.js → chain-list-map.ts} +446 -382
  108. package/range-tools-on-terrain/circle-line-chain/{plugin.js → plugin.ts} +607 -464
  109. package/range-tools-on-terrain/circle-line-chain/types.ts +43 -0
  110. package/range-tools-on-terrain/range-ring/{adapters.js → adapters.ts} +114 -93
  111. package/range-tools-on-terrain/range-ring/{enum.js → enum.ts} +2 -2
  112. package/range-tools-on-terrain/range-ring/{plugin.js → plugin.ts} +444 -377
  113. package/range-tools-on-terrain/range-ring/rangeringangletext.ts +396 -0
  114. package/range-tools-on-terrain/range-ring/types.ts +30 -0
  115. package/semiplugins/interface.ts +14 -0
  116. package/semiplugins/lightweight/{line-plugin.js → line-plugin.ts} +342 -221
  117. package/semiplugins/lightweight/{piece-of-pie-plugin.js → piece-of-pie-plugin.ts} +275 -200
  118. package/semiplugins/shape-on-terrain/{arc-plugin.js → arc-plugin.ts} +616 -472
  119. package/semiplugins/shape-on-terrain/{circle-plugin.js → circle-plugin.ts} +588 -444
  120. package/semiplugins/shape-on-terrain/goal.md +12 -0
  121. package/semiplugins/shape-on-terrain/{padding-1-degree.js → padding-1-degree.ts} +713 -539
  122. package/semiplugins/shape-on-terrain/terrain-polygon/adapters.ts +69 -0
  123. package/semiplugins/shape-on-terrain/terrain-polygon/data/cache-shortcuts.md +20 -0
  124. package/semiplugins/shape-on-terrain/terrain-polygon/data/cache.ts +149 -0
  125. package/semiplugins/shape-on-terrain/terrain-polygon/data/index-polygon-map.ts +58 -0
  126. package/semiplugins/shape-on-terrain/terrain-polygon/data/manager.ts +4 -0
  127. package/semiplugins/shape-on-terrain/terrain-polygon/data/master-worker.js +196 -0
  128. package/semiplugins/shape-on-terrain/terrain-polygon/data/master-worker.ts +209 -0
  129. package/semiplugins/shape-on-terrain/terrain-polygon/data/polygon-to-triangles.ts +144 -0
  130. package/semiplugins/shape-on-terrain/terrain-polygon/data/random.ts +165 -0
  131. package/semiplugins/shape-on-terrain/terrain-polygon/data/readme.md +5 -0
  132. package/semiplugins/shape-on-terrain/terrain-polygon/data/types.ts +37 -0
  133. package/semiplugins/shape-on-terrain/terrain-polygon/data/worker-contact.ts +81 -0
  134. package/semiplugins/shape-on-terrain/terrain-polygon/data/worker.js +146 -0
  135. package/semiplugins/shape-on-terrain/terrain-polygon/notes.md +90 -0
  136. package/semiplugins/shape-on-terrain/terrain-polygon/terrain-polygon.ts +265 -0
  137. package/semiplugins/shape-on-terrain/terrain-polygon/types.ts +69 -0
  138. package/semiplugins/shell/bbox-renderer/index.ts +2 -0
  139. package/semiplugins/shell/bbox-renderer/{logic.js → logic.ts} +273 -249
  140. package/semiplugins/shell/bbox-renderer/object.ts +129 -0
  141. package/semiplugins/type.ts +8 -0
  142. package/semiplugins/utility/{container-plugin.js → container-plugin.ts} +126 -94
  143. package/semiplugins/utility/{object-pass-container-plugin.js → object-pass-container-plugin.ts} +101 -80
  144. package/shaders/fragment-toy/firework.js +1 -1
  145. package/shaders/fragment-toy/singularity.js +5 -2
  146. package/terrain-plugin.mmd +83 -0
  147. package/tests/Math/arc-sampling-test.js +367 -0
  148. package/tests/Math/arc-sampling-test.ts +429 -0
  149. package/tests/Math/arc.test.ts +77 -0
  150. package/tests/Math/junction/arc-limit.test.ts +7 -0
  151. package/tests/Math/junction/arc-plane-points.test.ts +196 -0
  152. package/tests/Math/junction/arc-plane.test.ts +172 -0
  153. package/tests/Math/junction/line-sphere.test.ts +127 -0
  154. package/tests/Math/junction/plane-plane.test.ts +91 -0
  155. package/tests/Math/plane-test.ts +17 -0
  156. package/tests/Math/plane.test.ts +43 -0
  157. package/tests/Math/vec3.test.ts +33 -0
  158. package/tracks/point-heat-map/adaptors/timetracksplugin-format-to-this.js +78 -63
  159. package/tracks/point-heat-map/index.js +0 -1
  160. package/tracks/point-heat-map/plugin-webworker.js +148 -121
  161. package/tracks/point-heat-map/point-to-heat-map-flow.js +150 -121
  162. package/tracks/point-heat-map/readme.md +15 -0
  163. package/tracks/point-tracks/key-methods.js +3 -2
  164. package/tracks/point-tracks/plugin.js +487 -393
  165. package/tracks/timetracks/adaptors-line-strip.js +79 -65
  166. package/tracks/timetracks/plugin-line-strip.js +295 -240
  167. package/tracks/timetracks/program-line-strip.js +495 -411
  168. package/tracks/timetracks/programpoint-line-strip.js +137 -109
  169. package/tracks/timetracks/readme.md +1 -0
  170. package/tsconfig.json +22 -0
  171. package/types/@pirireis/webglobe.d.ts +102 -0
  172. package/types/delaunator.d.ts +40 -0
  173. package/types/earcut.d.ts +11 -0
  174. package/types/rbush.d.ts +57 -0
  175. package/types.ts +319 -0
  176. package/util/account/bufferoffsetmanager.js +209 -176
  177. package/util/account/create-buffermap-orchastration.ts +85 -0
  178. package/util/account/index.js +6 -3
  179. package/util/account/single-attribute-buffer-management/{buffer-manager.js → buffer-manager.ts} +151 -117
  180. package/util/account/single-attribute-buffer-management/{buffer-orchestrator.js → buffer-orchestrator.ts} +238 -212
  181. package/util/account/single-attribute-buffer-management/{buffer-orchestrator1.js → buffer-orchestrator1.ts} +184 -159
  182. package/util/account/single-attribute-buffer-management/{index.js → index.ts} +11 -4
  183. package/util/account/single-attribute-buffer-management/{object-store.js → object-store.ts} +76 -55
  184. package/util/account/single-attribute-buffer-management/types.ts +43 -0
  185. package/util/account/util.js +22 -18
  186. package/util/algorithms/index.js +0 -1
  187. package/util/algorithms/search-binary.js +26 -25
  188. package/util/build-strategy/{static-dynamic.js → static-dynamic.ts} +50 -41
  189. package/util/check/index.js +0 -1
  190. package/util/check/typecheck.ts +74 -0
  191. package/util/{frame-counter-trigger.js → frame-counter-trigger.ts} +99 -84
  192. package/util/geometry/{index.js → index.ts} +155 -121
  193. package/util/gl-util/buffer/{attribute-loader.js → attribute-loader.ts} +84 -62
  194. package/util/gl-util/buffer/{index.js → index.ts} +6 -3
  195. package/util/gl-util/draw-options/{methods.js → methods.ts} +47 -32
  196. package/util/gl-util/uniform-block/{manager.js → manager.ts} +232 -190
  197. package/util/{webglobe/gldefaultstates.js → globe-default-gl-states.ts} +5 -4
  198. package/util/helper-methods.ts +9 -0
  199. package/util/index.js +9 -10
  200. package/util/interpolation/index.js +0 -1
  201. package/util/interpolation/timetrack/index.js +9 -2
  202. package/util/interpolation/timetrack/timetrack-interpolator.js +94 -79
  203. package/util/interpolation/timetrack/web-worker.js +51 -46
  204. package/util/picking/{fence.js → fence.ts} +47 -41
  205. package/util/picking/picker-displayer.ts +226 -0
  206. package/util/programs/draw-from-pixel-coords.js +201 -164
  207. package/util/programs/{draw-texture-on-canvas.js → draw-texture-on-canvas.ts} +92 -67
  208. package/util/programs/supersampletotextures.js +130 -97
  209. package/util/programs/texturetoglobe.js +153 -128
  210. package/util/shaderfunctions/{geometrytransformations.js → geometrytransformations.ts} +169 -41
  211. package/util/shaderfunctions/index.js +2 -2
  212. package/util/shaderfunctions/nodata.js +4 -2
  213. package/util/shaderfunctions/noisefunctions.js +10 -7
  214. package/util/{webglobjectbuilders.js → webglobjectbuilders.ts} +446 -358
  215. package/vectorfield/arrowfield/adaptor.js +11 -11
  216. package/vectorfield/arrowfield/index.js +3 -3
  217. package/vectorfield/arrowfield/plugin.js +128 -83
  218. package/vectorfield/waveparticles/adaptor.js +16 -15
  219. package/vectorfield/waveparticles/index.js +3 -3
  220. package/vectorfield/waveparticles/plugin.ts +506 -0
  221. package/vectorfield/wind/adapters/image-to-fields.ts +74 -0
  222. package/vectorfield/wind/adapters/types.ts +12 -0
  223. package/vectorfield/wind/{imagetovectorfieldandmagnitude.js → imagetovectorfieldandmagnitude.ts} +78 -56
  224. package/vectorfield/wind/index.js +5 -5
  225. package/vectorfield/wind/plugin-persistant copy.ts +461 -0
  226. package/vectorfield/wind/plugin-persistant.ts +483 -0
  227. package/vectorfield/wind/plugin.js +883 -671
  228. package/vectorfield/wind/vectorfieldimage.js +27 -23
  229. package/write-text/{context-text-bulk.js → context-text-bulk.ts} +285 -200
  230. package/write-text/context-text3.ts +252 -0
  231. package/write-text/{context-text4.js → context-text4.ts} +231 -145
  232. package/write-text/context-textDELETE.js +125 -94
  233. package/write-text/objectarraylabels/{index.js → index.ts} +2 -2
  234. package/write-text/objectarraylabels/objectarraylabels.d.ts +72 -0
  235. package/write-text/objectarraylabels/objectarraylabels.js +247 -200
  236. package/Math/matrix4.js +0 -1
  237. package/Math/tessellation/earcut/adapters.js +0 -37
  238. package/Math/tessellation/hybrid-triangle-tessellation-meta.js +0 -123
  239. package/Math/tessellation/methods.js +0 -46
  240. package/Math/tessellation/shred-input.js +0 -18
  241. package/Math/tessellation/tile-merger.js +0 -56
  242. package/Math/tessellation/tiler.js +0 -50
  243. package/Math/tessellation/triangle-tessellation-meta.js +0 -516
  244. package/Math/tessellation/triangle-tessellation.js +0 -14
  245. package/Math/tessellation/types.js +0 -1
  246. package/Math/tessellation/zoom-catch.js +0 -1
  247. package/Math/types.js +0 -1
  248. package/programs/line-on-globe/linestrip/data.js +0 -4
  249. package/programs/polygon-on-globe/partial-tesselation.js +0 -1
  250. package/programs/polygon-on-globe/texture-dem-triangle-test-plugin-triangle.js +0 -204
  251. package/programs/polygon-on-globe/texture-dem-triangle-test-plugin.js +0 -118
  252. package/programs/polygon-on-globe/texture-dem-triangles.js +0 -236
  253. package/programs/vectorfields/logics/drawrectangleparticles.js +0 -112
  254. package/programs/vectorfields/logics/ubo-new.js +0 -25
  255. package/range-tools-on-terrain/bearing-line/types.js +0 -1
  256. package/range-tools-on-terrain/circle-line-chain/types.js +0 -1
  257. package/range-tools-on-terrain/range-ring/rangeringangletext.js +0 -331
  258. package/range-tools-on-terrain/range-ring/types.js +0 -9
  259. package/semiplugins/interface.js +0 -1
  260. package/semiplugins/shape-on-terrain/terrain-cover/texture-dem-cover.js +0 -1
  261. package/semiplugins/shell/bbox-renderer/index.js +0 -2
  262. package/semiplugins/shell/bbox-renderer/object.js +0 -65
  263. package/semiplugins/type.js +0 -1
  264. package/types.js +0 -19
  265. package/util/account/create-buffermap-orchastration.js +0 -39
  266. package/util/account/single-attribute-buffer-management/types.js +0 -1
  267. package/util/check/typecheck.js +0 -66
  268. package/util/gl-util/uniform-block/types.js +0 -1
  269. package/util/picking/picker-displayer.js +0 -134
  270. package/util/webglobe/index.js +0 -2
  271. package/util/webglobe/rasteroverlay.js +0 -76
  272. package/vectorfield/waveparticles/plugin.js +0 -290
  273. package/write-text/attached-text-writer.js +0 -95
  274. package/write-text/context-text3.js +0 -167
@@ -1,19 +1,40 @@
1
- import { createProgram } from "../../../util/webglobjectbuilders";
2
- import { CameraUniformBlockString, CameraUniformBlockTotemCache } from "../../totems/index";
3
- import { cartesian3DToGLPosition, mercatorXYToGLPosition, } from "../../../util/shaderfunctions/geometrytransformations";
4
- import { noRegisterGlobeProgramCache } from "../../programcache";
5
- import { attributeLoader } from "../../../util/gl-util/buffer/attribute-loader";
6
- import { UniformBlockManager } from "../../../util/gl-util/uniform-block/manager";
7
- import { drawArrays } from "../../../util/gl-util/draw-options/methods";
8
- const ESCAPE_VALUE = -1;
9
- const uniformBindingPoints = {
10
- camera: 0,
11
- flexible: 1,
12
- };
13
- // const one = new Float32Array([1]);
14
- const flexibleBlockManager = new UniformBlockManager('FlexibleAttributes', [
15
- { name: "u_color", type: "vec4", value: new Float32Array([0.12, 1, 0.1, 1]) },
16
- ], uniformBindingPoints.flexible);
1
+ import { createProgram } from "../../../util/webglobjectbuilders";
2
+ import { ProgramInterface, DrawRangeIndexParams, UBOHandler, BufferInfo } from "../../../types";
3
+ import { CameraUniformBlockString, CameraUniformBlockTotemCache, CameraUniformBlockTotem } from "../../totems/index"
4
+
5
+ import {
6
+ cartesian3DToGLPosition,
7
+ mercatorXYToGLPosition,
8
+ } from "../../../util/shaderfunctions/geometrytransformations";
9
+
10
+ import { noRegisterGlobeProgramCache } from "../../programcache";
11
+ import { attributeLoader } from "../../../util/gl-util/buffer/attribute-loader";
12
+
13
+ import { UniformBlockManager } from "../../../util/gl-util/uniform-block/manager";
14
+
15
+ import { drawArrays } from "../../../util/gl-util/draw-options/methods";
16
+
17
+
18
+
19
+ const ESCAPE_VALUE = -1;
20
+
21
+ const uniformBindingPoints = {
22
+ camera: 0,
23
+ flexible: 1,
24
+ }
25
+
26
+ // const one = new Float32Array([1]);
27
+ const flexibleBlockManager = new UniformBlockManager(
28
+ 'FlexibleAttributes',
29
+ [
30
+ { name: "u_color", type: "vec4", value: new Float32Array([0.12, 1, 0.1, 1]) },
31
+ ],
32
+ uniformBindingPoints.flexible,
33
+ );
34
+
35
+
36
+
37
+
17
38
  const vertexShaderSource = `#version 300 es
18
39
  precision highp float;
19
40
 
@@ -46,7 +67,9 @@ void main() {
46
67
  v_flat_position = vec3( position2d, 0.0 );
47
68
  }
48
69
  gl_PointSize = 6.0;
49
- }`;
70
+ }`;
71
+
72
+
50
73
  const fragmentShaderSource = `#version 300 es
51
74
  precision highp float;
52
75
 
@@ -64,79 +87,115 @@ out vec4 outColor;
64
87
  void main() {
65
88
  outColor = vec4( v_color.rgb, v_color.a );
66
89
 
67
- }`;
68
- export class LineProgram {
69
- _vaosPublished = [];
70
- _ubosPublished = [];
71
- program;
72
- gl;
73
- globe;
74
- cameraBlockTotem;
75
- _defaultFlexibleUBO;
76
- _opacity = {
77
- value: 1,
78
- location: null
79
- };
80
- constructor(globe) {
81
- this.gl = globe.gl;
82
- this.globe = globe;
83
- this.program = createProgram(this.gl, vertexShaderSource, fragmentShaderSource);
84
- const currentProgram = this.gl.getParameter(this.gl.CURRENT_PROGRAM);
85
- this.gl.useProgram(this.program);
86
- this._opacity.location = this.gl.getUniformLocation(this.program, "u_opacity");
87
- this.gl.uniform1f(this._opacity.location, this._opacity.value);
88
- // bind attribute locations
89
- this.gl.bindAttribLocation(this.program, 0, "position3d");
90
- this.gl.bindAttribLocation(this.program, 1, "position2d");
91
- this.gl.bindAttribLocation(this.program, 2, "color");
92
- this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
93
- this.cameraBlockTotem.assignBindingPoint(this.program, uniformBindingPoints.camera);
94
- flexibleBlockManager.assignBindingPoint(this.gl, this.program);
95
- this._defaultFlexibleUBO = flexibleBlockManager.createUBO(this.gl);
96
- this.gl.useProgram(currentProgram);
97
- }
98
- createUBO(bufferReadType = "STATIC_DRAW") {
99
- const ubo = flexibleBlockManager.createUBO(this.gl, bufferReadType);
100
- this._ubosPublished.push(ubo);
101
- return ubo;
102
- }
103
- createVAO(position3D, position2D, color) {
104
- const { gl } = this;
105
- const vao = gl.createVertexArray();
106
- gl.bindVertexArray(vao);
107
- attributeLoader(gl, position3D, 0, 3);
108
- attributeLoader(gl, position2D, 1, 2);
109
- attributeLoader(gl, color, 2, 4, { escapeValues: [ESCAPE_VALUE, ESCAPE_VALUE, ESCAPE_VALUE, ESCAPE_VALUE] });
110
- gl.bindVertexArray(null);
111
- return vao;
112
- }
113
- draw(vao, drawOptions, opacity = 1, flexibleUBO = null) {
114
- const { gl, program, cameraBlockTotem } = this;
115
- gl.useProgram(program);
116
- if (opacity !== this._opacity.value) {
117
- this._opacity.value = opacity;
118
- this.gl.uniform1f(this._opacity.location, this._opacity.value);
119
- }
120
- const ubo = flexibleUBO || this._defaultFlexibleUBO;
121
- cameraBlockTotem.bind(uniformBindingPoints.camera);
122
- ubo.bind();
123
- gl.bindVertexArray(vao);
124
- // drawArrays(gl, gl.POINTS, drawOptions);
125
- drawArrays(gl, gl.LINE_STRIP, drawOptions);
126
- gl.bindVertexArray(null);
127
- ubo.unbind();
128
- cameraBlockTotem.unbind(uniformBindingPoints.camera);
129
- }
130
- free() {
131
- this._vaosPublished.forEach((vao) => this.gl.deleteVertexArray(vao));
132
- this._ubosPublished.forEach((ubo) => ubo.free());
133
- this.gl.deleteProgram(this.program);
134
- this._defaultFlexibleUBO.free();
135
- CameraUniformBlockTotemCache.release(this.globe);
136
- this.gl.deleteProgram(this.program);
137
- }
138
- }
139
- export const LineStripProgramCache = Object.freeze({
140
- get: (globe) => noRegisterGlobeProgramCache.getProgram(globe, LineProgram),
141
- release: (globe) => noRegisterGlobeProgramCache.releaseProgram(globe, LineProgram),
142
- });
90
+ }`;
91
+
92
+
93
+
94
+ export class LineProgram implements ProgramInterface {
95
+
96
+ _vaosPublished: object[] = [];
97
+ _ubosPublished: UBOHandler[] = [];
98
+ program: WebGLProgram;
99
+ gl: WebGL2RenderingContext;
100
+ globe: any;
101
+ cameraBlockTotem: CameraUniformBlockTotem;
102
+ _defaultFlexibleUBO: UBOHandler;
103
+ _opacity: {
104
+ value: number,
105
+ location: WebGLUniformLocation | null
106
+ } = {
107
+ value: 1,
108
+ location: null
109
+ };
110
+
111
+ constructor(globe: any) {
112
+ this.gl = globe.gl;
113
+
114
+ this.globe = globe;
115
+ this.program = createProgram(this.gl, vertexShaderSource, fragmentShaderSource) as WebGLProgram;
116
+ const currentProgram = this.gl.getParameter(this.gl.CURRENT_PROGRAM);
117
+ this.gl.useProgram(this.program);
118
+ this._opacity.location = this.gl.getUniformLocation(this.program, "u_opacity");
119
+ this.gl.uniform1f(this._opacity.location, this._opacity.value);
120
+
121
+
122
+ // bind attribute locations
123
+ this.gl.bindAttribLocation(this.program, 0, "position3d");
124
+ this.gl.bindAttribLocation(this.program, 1, "position2d");
125
+ this.gl.bindAttribLocation(this.program, 2, "color");
126
+
127
+
128
+
129
+ this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
130
+ this.cameraBlockTotem.assignBindingPoint(this.program, uniformBindingPoints.camera);
131
+
132
+ flexibleBlockManager.assignBindingPoint(this.gl, this.program);
133
+ this._defaultFlexibleUBO = flexibleBlockManager.createUBO(this.gl);
134
+
135
+ this.gl.useProgram(currentProgram);
136
+ }
137
+
138
+
139
+
140
+ createUBO(bufferReadType: "STATIC_DRAW" | "DYNAMIC_DRAW" | "STREAM_DRAW" = "STATIC_DRAW"): UBOHandler {
141
+ const ubo = flexibleBlockManager.createUBO(this.gl, bufferReadType);
142
+ this._ubosPublished.push(ubo);
143
+ return ubo;
144
+ }
145
+
146
+
147
+
148
+ createVAO(
149
+ position3D: BufferInfo, position2D: BufferInfo, color: BufferInfo
150
+ ): WebGLVertexArrayObject {
151
+ const { gl } = this;
152
+ const vao = gl.createVertexArray();
153
+ gl.bindVertexArray(vao);
154
+ attributeLoader(gl, position3D, 0, 3);
155
+ attributeLoader(gl, position2D, 1, 2);
156
+ attributeLoader(gl, color, 2, 4, { escapeValues: [ESCAPE_VALUE, ESCAPE_VALUE, ESCAPE_VALUE, ESCAPE_VALUE] });
157
+
158
+ gl.bindVertexArray(null);
159
+ return vao;
160
+ }
161
+
162
+
163
+
164
+ draw(vao: WebGLVertexArrayObject, drawOptions: DrawRangeIndexParams, opacity: number = 1, flexibleUBO: UBOHandler | null = null) {
165
+
166
+ const { gl, program, cameraBlockTotem } = this;
167
+
168
+ gl.useProgram(program);
169
+ if (opacity !== this._opacity.value) {
170
+ this._opacity.value = opacity;
171
+ this.gl.uniform1f(this._opacity.location, this._opacity.value);
172
+ }
173
+ const ubo = flexibleUBO || this._defaultFlexibleUBO;
174
+ cameraBlockTotem.bind(uniformBindingPoints.camera);
175
+ ubo.bind();
176
+ gl.bindVertexArray(vao);
177
+ // drawArrays(gl, gl.POINTS, drawOptions);
178
+ drawArrays(gl, gl.LINE_STRIP, drawOptions);
179
+ gl.bindVertexArray(null);
180
+ ubo.unbind();
181
+ cameraBlockTotem.unbind(uniformBindingPoints.camera);
182
+ }
183
+
184
+
185
+
186
+ free() {
187
+ this._vaosPublished.forEach((vao: WebGLVertexArrayObject) => this.gl.deleteVertexArray(vao));
188
+ this._ubosPublished.forEach((ubo: UBOHandler) => ubo.free());
189
+ this.gl.deleteProgram(this.program);
190
+ this._defaultFlexibleUBO.free();
191
+ CameraUniformBlockTotemCache.release(this.globe);
192
+ this.gl.deleteProgram(this.program);
193
+
194
+ }
195
+ }
196
+
197
+ export const LineStripProgramCache = Object.freeze({
198
+ get: (globe: any): LineProgram => noRegisterGlobeProgramCache.getProgram(globe, LineProgram),
199
+ release: (globe: any) => noRegisterGlobeProgramCache.releaseProgram(globe, LineProgram),
200
+ });
201
+
@@ -1,22 +1,39 @@
1
- import { CameraUniformBlockString, CameraUniformBlockTotemCache } from "../totems/camerauniformblock";
2
- import { slerp, POLE, R_3D, mercatorXYToGLPosition, cartesian3DToGLPosition } from "../../util/shaderfunctions/geometrytransformations";
3
- import { createProgram } from "../../util/webglobjectbuilders";
4
- import { noRegisterGlobeProgramCache } from "../programcache";
5
- import { attributeLoader } from "../../util/gl-util/buffer/attribute-loader";
6
- import { UniformBlockManager } from "../../util/gl-util/uniform-block/manager";
7
- import { drawInstanced } from "../../util/gl-util/draw-options/methods";
8
- const GLOBE_MIDPOINT_COUNT = 30;
9
- const escapeValue = -1.0;
10
- const uniformBindingPoints = {
11
- camera: 0,
12
- flexible: 1
13
- };
14
- const uniformBlockManager = new UniformBlockManager('FlexibleAttibutes', [
15
- { name: 'u_color', type: 'vec4', value: null },
16
- { name: 'u_dash_ratio', type: 'float', value: null },
17
- { name: 'u_dash_opacity', type: 'float', value: null }
18
- ], uniformBindingPoints.flexible);
19
- const vertexShader = `#version 300 es
1
+ import { CameraUniformBlockString, CameraUniformBlockTotemCache, CameraUniformBlockTotem } from "../totems/camerauniformblock";
2
+ import { slerp, POLE, R_3D, mercatorXYToGLPosition, cartesian3DToGLPosition } from "../../util/shaderfunctions/geometrytransformations";
3
+ import { createProgram } from "../../util/webglobjectbuilders";
4
+ import { noRegisterGlobeProgramCache } from "../programcache";
5
+ import { attributeLoader } from "../../util/gl-util/buffer/attribute-loader";
6
+ import { UniformBlockManager } from "../../util/gl-util/uniform-block/manager";
7
+
8
+ import { drawInstanced } from "../../util/gl-util/draw-options/methods";
9
+ import { UBOHandler, Globe, BufferAndReadInfo, DrawRangeIndexParams } from "../../types";
10
+
11
+
12
+ interface UniformBindingPoints {
13
+ camera: number;
14
+ flexible: number;
15
+ }
16
+
17
+ const GLOBE_MIDPOINT_COUNT: number = 30;
18
+
19
+ const escapeValue: number = -1.0;
20
+
21
+ const uniformBindingPoints: UniformBindingPoints = {
22
+ camera: 0,
23
+ flexible: 1
24
+ }
25
+
26
+ const uniformBlockManager = new UniformBlockManager(
27
+ 'FlexibleAttibutes',
28
+ [
29
+ { name: 'u_color', type: 'vec4', value: null },
30
+ { name: 'u_dash_ratio', type: 'float', value: null },
31
+ { name: 'u_dash_opacity', type: 'float', value: null }
32
+ ],
33
+ uniformBindingPoints.flexible
34
+ )
35
+
36
+ const vertexShader: string = `#version 300 es
20
37
  precision highp float;
21
38
 
22
39
  ${R_3D}
@@ -67,8 +84,9 @@ void main() {
67
84
  gl_Position = mercatorXYToGLPosition(longLat);
68
85
  }
69
86
  }
70
- `;
71
- const fragmentShader = `#version 300 es
87
+ `;
88
+
89
+ const fragmentShader: string = `#version 300 es
72
90
  ${POLE}
73
91
  precision highp float;
74
92
 
@@ -91,108 +109,139 @@ void main() {
91
109
  if (fract(interpolation / (2.0 * v_dash_ratio)) < 0.5) { color.a *= v_dash_opacity; }
92
110
 
93
111
  }
94
- `;
95
- class Logic {
96
- vaosPublished = [];
97
- isFreed = false;
98
- globe;
99
- gl;
100
- program;
101
- _lastOpacity;
102
- _opacityLocation;
103
- cameraBlockTotem;
104
- _ubosPublished;
105
- _defaultFlexibleUBO;
106
- constructor(globe) {
107
- this.globe = globe;
108
- this.gl = globe.gl;
109
- this.program = createProgram(this.gl, vertexShader, fragmentShader);
110
- this._lastOpacity = 1.0;
111
- const { gl, program } = this;
112
- const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
113
- gl.useProgram(program);
114
- // assign attribute locations
115
- gl.bindAttribLocation(program, 0, "start_position");
116
- gl.bindAttribLocation(program, 1, "start_position3d");
117
- gl.bindAttribLocation(program, 2, "end_position");
118
- gl.bindAttribLocation(program, 3, "end_position3d");
119
- gl.bindAttribLocation(program, 4, "dash_ratio");
120
- gl.bindAttribLocation(program, 5, "dash_opacity");
121
- gl.bindAttribLocation(program, 6, "color");
122
- this._opacityLocation = gl.getUniformLocation(program, "opacity");
123
- gl.uniform1f(this._opacityLocation, this._lastOpacity);
124
- gl.useProgram(currentProgram);
125
- this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
126
- this.cameraBlockTotem.assignBindingPoint(program, uniformBindingPoints.camera);
127
- this._ubosPublished = [];
128
- uniformBlockManager.assignBindingPoint(this.gl, this.program);
129
- this._defaultFlexibleUBO = this.createUBO();
130
- }
131
- /**
132
- * Draw method for rendering lines on globe
133
- * @param vao - WebGL Vertex Array Object
134
- * @param drawOptions - Draw range index parameters
135
- * @param opacity - Opacity value (0-1)
136
- * @param flexibleUBO - Optional flexible uniform buffer object
137
- */
138
- draw(vao, drawOptions, opacity, flexibleUBO = null) {
139
- const { gl, program, globe, cameraBlockTotem, _defaultFlexibleUBO } = this;
140
- gl.useProgram(program);
141
- cameraBlockTotem.bind(uniformBindingPoints.camera);
142
- gl.bindVertexArray(vao);
143
- if (opacity !== this._lastOpacity) {
144
- gl.uniform1f(this._opacityLocation, opacity);
145
- this._lastOpacity = opacity;
146
- }
147
- const vertexCount = globe.api_GetCurrentGeometry() === 0 ? GLOBE_MIDPOINT_COUNT : 2;
148
- const ubo = flexibleUBO || _defaultFlexibleUBO;
149
- ubo.bind();
150
- drawInstanced(gl, gl.LINE_STRIP, drawOptions, vertexCount);
151
- ubo.unbind();
152
- gl.bindVertexArray(null);
153
- cameraBlockTotem.unbind(uniformBindingPoints.camera);
154
- }
155
- createUBO(bufferReadType = "STATIC_DRAW") {
156
- const ubo = uniformBlockManager.createUBO(this.gl, bufferReadType);
157
- this._ubosPublished.push(ubo);
158
- ubo.update(new Map([
159
- ["u_color", [1, 1, 1, 1]],
160
- ["u_dash_ratio", [1]],
161
- ["u_dash_opacity", [1]]
162
- ]));
163
- return ubo;
164
- }
165
- createVAO(startPotision2DBufferObj, startPotision3DBufferObj, endPosition2DBufferObj, endPosition3DBufferObj, dashRatioBufferObj, dashOpacityBufferObj, colorBufferObj) {
166
- const { gl } = this;
167
- const vao = gl.createVertexArray();
168
- if (!vao) {
169
- throw new Error("Failed to create vertex array object");
170
- }
171
- gl.bindVertexArray(vao);
172
- const divisor = 1;
173
- attributeLoader(gl, startPotision2DBufferObj, 0, 2, { divisor });
174
- attributeLoader(gl, startPotision3DBufferObj, 1, 3, { divisor });
175
- attributeLoader(gl, endPosition2DBufferObj, 2, 2, { divisor });
176
- attributeLoader(gl, endPosition3DBufferObj, 3, 3, { divisor });
177
- attributeLoader(gl, dashRatioBufferObj, 4, 1, { divisor, escapeValues: [escapeValue] });
178
- attributeLoader(gl, dashOpacityBufferObj, 5, 1, { divisor, escapeValues: [escapeValue] });
179
- attributeLoader(gl, colorBufferObj, 6, 4, { divisor, escapeValues: [escapeValue, escapeValue, escapeValue, escapeValue] });
180
- gl.bindVertexArray(null);
181
- gl.bindBuffer(gl.ARRAY_BUFFER, null);
182
- this.vaosPublished.push(vao);
183
- return vao;
184
- }
185
- free() {
186
- if (this.isFreed)
187
- return;
188
- CameraUniformBlockTotemCache.release(this.globe);
189
- this.gl.deleteProgram(this.program);
190
- this.vaosPublished.forEach((vao) => this.gl.deleteVertexArray(vao));
191
- this._ubosPublished.forEach((ubo) => ubo.free());
192
- this.isFreed = true;
193
- }
194
- }
195
- export const LineOnGlobeCache = Object.freeze({
196
- get: (globe) => { return noRegisterGlobeProgramCache.getProgram(globe, Logic); },
197
- release: (globe) => { return noRegisterGlobeProgramCache.releaseProgram(globe, Logic); }
198
- });
112
+ `;
113
+
114
+ class Logic {
115
+ public vaosPublished: WebGLVertexArrayObject[] = [];
116
+ public isFreed: boolean = false;
117
+
118
+ private globe: Globe;
119
+ private gl: WebGL2RenderingContext;
120
+ private program: WebGLProgram;
121
+ private _lastOpacity: number;
122
+ private _opacityLocation: WebGLUniformLocation | null;
123
+ private cameraBlockTotem: CameraUniformBlockTotem;
124
+ private _ubosPublished: UBOHandler[];
125
+ private _defaultFlexibleUBO: UBOHandler;
126
+
127
+ constructor(globe: Globe) {
128
+ this.globe = globe;
129
+ this.gl = globe.gl;
130
+ this.program = createProgram(this.gl, vertexShader, fragmentShader);
131
+ this._lastOpacity = 1.0;
132
+ const { gl, program } = this;
133
+ const currentProgram = gl.getParameter(gl.CURRENT_PROGRAM);
134
+ gl.useProgram(program);
135
+
136
+ // assign attribute locations
137
+ gl.bindAttribLocation(program, 0, "start_position");
138
+ gl.bindAttribLocation(program, 1, "start_position3d");
139
+ gl.bindAttribLocation(program, 2, "end_position");
140
+ gl.bindAttribLocation(program, 3, "end_position3d");
141
+ gl.bindAttribLocation(program, 4, "dash_ratio");
142
+ gl.bindAttribLocation(program, 5, "dash_opacity");
143
+ gl.bindAttribLocation(program, 6, "color");
144
+ this._opacityLocation = gl.getUniformLocation(program, "opacity");
145
+
146
+ gl.uniform1f(this._opacityLocation, this._lastOpacity);
147
+
148
+ gl.useProgram(currentProgram);
149
+
150
+ this.cameraBlockTotem = CameraUniformBlockTotemCache.get(globe);
151
+ this.cameraBlockTotem.assignBindingPoint(program, uniformBindingPoints.camera);
152
+
153
+ this._ubosPublished = [];
154
+ uniformBlockManager.assignBindingPoint(this.gl, this.program);
155
+ this._defaultFlexibleUBO = this.createUBO();
156
+ }
157
+
158
+ /**
159
+ * Draw method for rendering lines on globe
160
+ * @param vao - WebGL Vertex Array Object
161
+ * @param drawOptions - Draw range index parameters
162
+ * @param opacity - Opacity value (0-1)
163
+ * @param flexibleUBO - Optional flexible uniform buffer object
164
+ */
165
+ draw(
166
+ vao: WebGLVertexArrayObject,
167
+ drawOptions: DrawRangeIndexParams,
168
+ opacity: number,
169
+ flexibleUBO: UBOHandler | null = null
170
+ ): void {
171
+ const { gl, program, globe, cameraBlockTotem, _defaultFlexibleUBO } = this;
172
+ gl.useProgram(program);
173
+ cameraBlockTotem.bind(uniformBindingPoints.camera);
174
+ gl.bindVertexArray(vao);
175
+ if (opacity !== this._lastOpacity) {
176
+ gl.uniform1f(this._opacityLocation, opacity);
177
+ this._lastOpacity = opacity;
178
+ }
179
+ const vertexCount: number = globe.api_GetCurrentGeometry() === 0 ? GLOBE_MIDPOINT_COUNT : 2;
180
+ const ubo: UBOHandler = flexibleUBO || _defaultFlexibleUBO;
181
+ ubo.bind();
182
+ drawInstanced(gl, gl.LINE_STRIP, drawOptions, vertexCount);
183
+ ubo.unbind();
184
+ gl.bindVertexArray(null);
185
+ cameraBlockTotem.unbind(uniformBindingPoints.camera);
186
+ }
187
+
188
+ createUBO(bufferReadType: string = "STATIC_DRAW"): UBOHandler {
189
+ const ubo: UBOHandler = uniformBlockManager.createUBO(this.gl, bufferReadType);
190
+ this._ubosPublished.push(ubo);
191
+ ubo.update(
192
+ new Map([
193
+ ["u_color", [1, 1, 1, 1]],
194
+ ["u_dash_ratio", [1]],
195
+ ["u_dash_opacity", [1]]
196
+ ])
197
+ );
198
+ return ubo;
199
+ }
200
+
201
+ createVAO(
202
+ startPotision2DBufferObj: BufferAndReadInfo | null,
203
+ startPotision3DBufferObj: BufferAndReadInfo | null,
204
+ endPosition2DBufferObj: BufferAndReadInfo | null,
205
+ endPosition3DBufferObj: BufferAndReadInfo | null,
206
+ dashRatioBufferObj: BufferAndReadInfo | null,
207
+ dashOpacityBufferObj: BufferAndReadInfo | null,
208
+ colorBufferObj: BufferAndReadInfo | null
209
+ ): WebGLVertexArrayObject {
210
+ const { gl } = this;
211
+ const vao: WebGLVertexArrayObject | null = gl.createVertexArray();
212
+ if (!vao) {
213
+ throw new Error("Failed to create vertex array object");
214
+ }
215
+
216
+ gl.bindVertexArray(vao);
217
+
218
+ const divisor: number = 1;
219
+
220
+ attributeLoader(gl, startPotision2DBufferObj, 0, 2, { divisor });
221
+ attributeLoader(gl, startPotision3DBufferObj, 1, 3, { divisor });
222
+ attributeLoader(gl, endPosition2DBufferObj, 2, 2, { divisor });
223
+ attributeLoader(gl, endPosition3DBufferObj, 3, 3, { divisor });
224
+ attributeLoader(gl, dashRatioBufferObj, 4, 1, { divisor, escapeValues: [escapeValue] });
225
+ attributeLoader(gl, dashOpacityBufferObj, 5, 1, { divisor, escapeValues: [escapeValue] });
226
+ attributeLoader(gl, colorBufferObj, 6, 4, { divisor, escapeValues: [escapeValue, escapeValue, escapeValue, escapeValue] });
227
+
228
+ gl.bindVertexArray(null);
229
+ gl.bindBuffer(gl.ARRAY_BUFFER, null);
230
+ this.vaosPublished.push(vao);
231
+ return vao;
232
+ }
233
+
234
+ free(): void {
235
+ if (this.isFreed) return;
236
+ CameraUniformBlockTotemCache.release(this.globe);
237
+ this.gl.deleteProgram(this.program);
238
+ this.vaosPublished.forEach((vao: WebGLVertexArrayObject) => this.gl.deleteVertexArray(vao));
239
+ this._ubosPublished.forEach((ubo: UBOHandler) => ubo.free());
240
+ this.isFreed = true;
241
+ }
242
+ }
243
+
244
+ export const LineOnGlobeCache = Object.freeze({
245
+ get: (globe: Globe): Logic => { return noRegisterGlobeProgramCache.getProgram(globe, Logic) },
246
+ release: (globe: Globe): void => { return noRegisterGlobeProgramCache.releaseProgram(globe, Logic) }
247
+ });
@@ -1,5 +1,8 @@
1
- const Z_ALPHA_MODE = Object.freeze({
2
- ON: 1,
3
- OFF: 0
4
- });
5
- export { Z_ALPHA_MODE };
1
+
2
+ const Z_ALPHA_MODE = Object.freeze({
3
+ ON: 1,
4
+ OFF: 0
5
+ });
6
+
7
+
8
+ export { Z_ALPHA_MODE }