@pirireis/webglobeplugins 1.0.2 → 1.0.3

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 (259) hide show
  1. package/Math/{angle-calculation.ts → angle-calculation.js} +14 -18
  2. package/Math/{arc-cdf-points.ts → arc-cdf-points.js} +272 -329
  3. package/Math/{arc-generate-points-exponantial.ts → arc-generate-points-exponantial.js} +254 -299
  4. package/Math/{arc.ts → arc.js} +292 -421
  5. package/Math/bounds/line-bbox.js +186 -225
  6. package/Math/{circle-cdf-points.ts → circle-cdf-points.js} +78 -143
  7. package/Math/{circle.ts → circle.js} +33 -49
  8. package/Math/{constants.ts → constants.js} +4 -12
  9. package/Math/contour/{quadtreecontours.ts → quadtreecontours.js} +300 -371
  10. package/Math/contour/quadtreecontours1.js +298 -336
  11. package/Math/{finite-line-2d.ts → finite-line-2d.js} +58 -68
  12. package/Math/{haversine.ts → haversine.js} +22 -33
  13. package/Math/index.js +1 -0
  14. package/Math/juction/{arc-plane.ts → arc-plane.js} +143 -203
  15. package/Math/juction/{line-sphere.ts → line-sphere.js} +22 -32
  16. package/Math/juction/{plane-plane.ts → plane-plane.js} +53 -62
  17. package/Math/{line.ts → line.js} +52 -84
  18. package/Math/matrix4.js +1 -0
  19. package/Math/{methods.ts → methods.js} +126 -182
  20. package/Math/{plane.ts → plane.js} +56 -92
  21. package/Math/{quaternion.ts → quaternion.js} +106 -128
  22. package/Math/templete-shapes/{grid-visually-equal.ts → grid-visually-equal.js} +65 -118
  23. package/Math/tessellation/constants.js +1 -0
  24. package/Math/tessellation/{methods.ts → methods.js} +49 -79
  25. package/Math/tessellation/{nearest-value-padding.ts → nearest-value-padding.js} +112 -147
  26. package/Math/tessellation/{spherical-triangle-area.ts → spherical-triangle-area.js} +99 -127
  27. package/Math/tessellation/{tile-merger.ts → tile-merger.js} +429 -578
  28. package/Math/tessellation/{triangle-tessellation.ts → triangle-tessellation.js} +386 -533
  29. package/Math/tessellation/types.js +1 -0
  30. package/Math/types.js +1 -0
  31. package/Math/utils.js +2 -3
  32. package/Math/{vec3.ts → vec3.js} +155 -227
  33. package/Math/{xyz-tile.ts → xyz-tile.js} +18 -26
  34. package/algorithms/search-binary.js +16 -14
  35. package/altitude-locator/adaptors.js +1 -0
  36. package/altitude-locator/keymethod.js +1 -0
  37. package/altitude-locator/plugin.js +344 -445
  38. package/altitude-locator/types.js +21 -26
  39. package/compass-rose/compass-rose-padding-flat.js +230 -274
  40. package/compass-rose/{compass-text-writer.ts → compass-text-writer.js} +155 -210
  41. package/compass-rose/index.js +3 -3
  42. package/{constants.ts → constants.js} +6 -8
  43. package/heatwave/datamanager.js +149 -168
  44. package/heatwave/heatwave.js +206 -261
  45. package/heatwave/index.js +5 -5
  46. package/heatwave/isobar.js +303 -340
  47. package/heatwave/{texture-point-sampler.ts → texture-point-sampler.js} +187 -220
  48. package/investigation-tools/draw/tiles/adapters.js +67 -0
  49. package/investigation-tools/draw/tiles/{tiles.ts → tiles.js} +128 -162
  50. package/jest.config.js +7 -6
  51. package/package.json +1 -1
  52. package/pin/pin-object-array1.js +300 -381
  53. package/pin/pin-point-totem1.js +60 -77
  54. package/programs/arrowfield/arrow-field.js +60 -89
  55. package/programs/arrowfield/logic.js +141 -173
  56. package/programs/data2legend/density-to-legend.js +68 -86
  57. package/programs/data2legend/point-to-density-texture.js +67 -84
  58. package/programs/float2legendwithratio/index.js +2 -3
  59. package/programs/float2legendwithratio/logic.js +118 -144
  60. package/programs/float2legendwithratio/object.js +104 -141
  61. package/programs/helpers/blender.js +58 -73
  62. package/programs/helpers/{fadeaway.ts → fadeaway.js} +60 -73
  63. package/programs/index.js +20 -19
  64. package/programs/line-on-globe/circle-accurate-3d.js +85 -112
  65. package/programs/line-on-globe/circle-accurate-flat.js +148 -200
  66. package/programs/line-on-globe/degree-padding-around-circle-3d.js +102 -134
  67. package/programs/line-on-globe/index.js +1 -0
  68. package/programs/line-on-globe/lines-color-instanced-flat.js +80 -99
  69. package/programs/line-on-globe/linestrip/data.js +4 -0
  70. package/programs/line-on-globe/linestrip/{linestrip.ts → linestrip.js} +93 -152
  71. package/programs/line-on-globe/{naive-accurate-flexible.ts → naive-accurate-flexible.js} +126 -175
  72. package/programs/line-on-globe/util.js +5 -8
  73. package/programs/picking/pickable-polygon-renderer.js +98 -129
  74. package/programs/picking/pickable-renderer.js +98 -130
  75. package/programs/point-on-globe/element-globe-surface-glow.js +93 -122
  76. package/programs/point-on-globe/element-point-glow.js +80 -114
  77. package/programs/point-on-globe/square-pixel-point.js +121 -139
  78. package/programs/polygon-on-globe/{texture-dem-triangles.ts → texture-dem-triangles.js} +163 -207
  79. package/programs/{programcache.ts → programcache.js} +126 -134
  80. package/programs/rings/index.js +1 -1
  81. package/programs/rings/partial-ring/{piece-of-pie.ts → piece-of-pie.js} +152 -222
  82. package/programs/totems/camera-totem-attactment-interface.js +1 -0
  83. package/programs/totems/{camerauniformblock.ts → camerauniformblock.js} +225 -310
  84. package/programs/totems/{canvas-webglobe-info.ts → canvas-webglobe-info.js} +132 -147
  85. package/programs/totems/{dem-textures-manager.ts → dem-textures-manager.js} +257 -360
  86. package/programs/totems/{globe-changes.ts → globe-changes.js} +59 -79
  87. package/programs/totems/gpu-selection-uniform-block.js +99 -127
  88. package/programs/totems/{index.ts → index.js} +2 -2
  89. package/programs/two-d/pixel-padding-for-compass.js +87 -101
  90. package/programs/util.js +14 -19
  91. package/programs/vectorfields/logics/{constants.ts → constants.js} +4 -5
  92. package/programs/vectorfields/logics/{drawrectangleparticles.ts → drawrectangleparticles.js} +80 -115
  93. package/programs/vectorfields/logics/index.js +2 -4
  94. package/programs/vectorfields/logics/particle-ubo.js +16 -0
  95. package/programs/vectorfields/logics/{pixelbased.ts → pixelbased.js} +86 -115
  96. package/programs/vectorfields/logics/ubo.js +51 -57
  97. package/programs/vectorfields/{pingpongbuffermanager.ts → pingpongbuffermanager.js} +99 -113
  98. package/range-tools-on-terrain/bearing-line/{adapters.ts → adapters.js} +114 -154
  99. package/range-tools-on-terrain/bearing-line/{plugin.ts → plugin.js} +457 -569
  100. package/range-tools-on-terrain/bearing-line/types.js +1 -0
  101. package/range-tools-on-terrain/circle-line-chain/{adapters.ts → adapters.js} +85 -104
  102. package/range-tools-on-terrain/circle-line-chain/{chain-list-map.ts → chain-list-map.js} +382 -446
  103. package/range-tools-on-terrain/circle-line-chain/{plugin.ts → plugin.js} +464 -607
  104. package/range-tools-on-terrain/circle-line-chain/types.js +1 -0
  105. package/range-tools-on-terrain/range-ring/{adapters.ts → adapters.js} +93 -114
  106. package/range-tools-on-terrain/range-ring/{enum.ts → enum.js} +2 -2
  107. package/range-tools-on-terrain/range-ring/{plugin.ts → plugin.js} +377 -444
  108. package/range-tools-on-terrain/range-ring/rangeringangletext.js +331 -0
  109. package/range-tools-on-terrain/range-ring/types.js +9 -0
  110. package/semiplugins/interface.js +1 -0
  111. package/semiplugins/lightweight/{line-plugin.ts → line-plugin.js} +221 -342
  112. package/semiplugins/lightweight/{piece-of-pie-plugin.ts → piece-of-pie-plugin.js} +200 -275
  113. package/semiplugins/shape-on-terrain/{arc-plugin.ts → arc-plugin.js} +481 -616
  114. package/semiplugins/shape-on-terrain/{circle-plugin.ts → circle-plugin.js} +444 -588
  115. package/semiplugins/shape-on-terrain/{padding-1-degree.ts → padding-1-degree.js} +539 -713
  116. package/semiplugins/shape-on-terrain/terrain-polygon/{adapters.ts → adapters.js} +55 -69
  117. package/semiplugins/shape-on-terrain/terrain-polygon/data/{cache.ts → cache.js} +102 -149
  118. package/semiplugins/shape-on-terrain/terrain-polygon/data/{index-polygon-map.ts → index-polygon-map.js} +45 -58
  119. package/semiplugins/shape-on-terrain/terrain-polygon/data/{manager.ts → manager.js} +4 -4
  120. package/semiplugins/shape-on-terrain/terrain-polygon/data/master-worker.js +177 -196
  121. package/semiplugins/shape-on-terrain/terrain-polygon/data/{polygon-to-triangles.ts → polygon-to-triangles.js} +100 -144
  122. package/semiplugins/shape-on-terrain/terrain-polygon/data/{random.ts → random.js} +121 -165
  123. package/semiplugins/shape-on-terrain/terrain-polygon/data/types.js +1 -0
  124. package/semiplugins/shape-on-terrain/terrain-polygon/data/{worker-contact.ts → worker-contact.js} +63 -81
  125. package/semiplugins/shape-on-terrain/terrain-polygon/data/worker.js +125 -146
  126. package/semiplugins/shape-on-terrain/terrain-polygon/{terrain-polygon.ts → terrain-polygon.js} +219 -265
  127. package/semiplugins/shape-on-terrain/terrain-polygon/types.js +8 -0
  128. package/semiplugins/shell/bbox-renderer/index.js +2 -0
  129. package/semiplugins/shell/bbox-renderer/{logic.ts → logic.js} +209 -273
  130. package/semiplugins/shell/bbox-renderer/object.js +75 -0
  131. package/semiplugins/type.js +1 -0
  132. package/semiplugins/utility/{container-plugin.ts → container-plugin.js} +94 -126
  133. package/semiplugins/utility/{object-pass-container-plugin.ts → object-pass-container-plugin.js} +80 -101
  134. package/shaders/fragment-toy/firework.js +1 -1
  135. package/shaders/fragment-toy/singularity.js +2 -5
  136. package/tracks/point-heat-map/adaptors/timetracksplugin-format-to-this.js +63 -78
  137. package/tracks/point-heat-map/index.js +1 -0
  138. package/tracks/point-heat-map/plugin-webworker.js +121 -148
  139. package/tracks/point-heat-map/point-to-heat-map-flow.js +121 -150
  140. package/tracks/point-tracks/key-methods.js +2 -3
  141. package/tracks/point-tracks/plugin.js +401 -487
  142. package/tracks/timetracks/adaptors-line-strip.js +65 -79
  143. package/tracks/timetracks/plugin-line-strip.js +240 -295
  144. package/tracks/timetracks/program-line-strip.js +411 -495
  145. package/tracks/timetracks/programpoint-line-strip.js +109 -137
  146. package/types.js +19 -0
  147. package/util/account/bufferoffsetmanager.js +176 -209
  148. package/util/account/create-buffermap-orchastration.js +39 -0
  149. package/util/account/index.js +3 -6
  150. package/util/account/single-attribute-buffer-management/{buffer-manager.ts → buffer-manager.js} +119 -151
  151. package/util/account/single-attribute-buffer-management/{buffer-orchestrator.ts → buffer-orchestrator.js} +212 -238
  152. package/util/account/single-attribute-buffer-management/{buffer-orchestrator1.ts → buffer-orchestrator1.js} +159 -184
  153. package/util/account/single-attribute-buffer-management/{index.ts → index.js} +4 -11
  154. package/util/account/single-attribute-buffer-management/{object-store.ts → object-store.js} +55 -76
  155. package/util/account/single-attribute-buffer-management/types.js +1 -0
  156. package/util/account/util.js +18 -22
  157. package/util/algorithms/index.js +1 -0
  158. package/util/algorithms/search-binary.js +25 -26
  159. package/util/build-strategy/{static-dynamic.ts → static-dynamic.js} +41 -50
  160. package/util/check/index.js +1 -0
  161. package/util/check/typecheck.js +66 -0
  162. package/util/{frame-counter-trigger.ts → frame-counter-trigger.js} +84 -99
  163. package/util/geometry/{index.ts → index.js} +121 -155
  164. package/util/gl-util/buffer/{attribute-loader.ts → attribute-loader.js} +62 -84
  165. package/util/gl-util/buffer/{index.ts → index.js} +3 -6
  166. package/util/gl-util/draw-options/{methods.ts → methods.js} +32 -47
  167. package/util/gl-util/uniform-block/{manager.ts → manager.js} +200 -232
  168. package/util/{globe-default-gl-states.ts → globe-default-gl-states.js} +4 -5
  169. package/util/{helper-methods.ts → helper-methods.js} +8 -9
  170. package/util/index.js +10 -9
  171. package/util/interpolation/index.js +1 -0
  172. package/util/interpolation/timetrack/index.js +2 -9
  173. package/util/interpolation/timetrack/timetrack-interpolator.js +79 -94
  174. package/util/interpolation/timetrack/web-worker.js +46 -51
  175. package/util/picking/{fence.ts → fence.js} +43 -47
  176. package/util/picking/{picker-displayer.ts → picker-displayer.js} +176 -226
  177. package/util/programs/draw-from-pixel-coords.js +164 -201
  178. package/util/programs/{draw-texture-on-canvas.ts → draw-texture-on-canvas.js} +69 -91
  179. package/util/programs/supersampletotextures.js +97 -130
  180. package/util/programs/texturetoglobe.js +128 -153
  181. package/util/shaderfunctions/{geometrytransformations.ts → geometrytransformations.js} +44 -106
  182. package/util/shaderfunctions/index.js +2 -2
  183. package/util/shaderfunctions/nodata.js +2 -4
  184. package/util/shaderfunctions/noisefunctions.js +7 -10
  185. package/util/{webglobjectbuilders.ts → webglobjectbuilders.js} +358 -446
  186. package/vectorfield/arrowfield/adaptor.js +11 -11
  187. package/vectorfield/arrowfield/index.js +3 -3
  188. package/vectorfield/arrowfield/plugin.js +83 -128
  189. package/vectorfield/waveparticles/adaptor.js +15 -16
  190. package/vectorfield/waveparticles/index.js +3 -3
  191. package/vectorfield/waveparticles/{plugin.ts → plugin.js} +415 -506
  192. package/vectorfield/wind/adapters/{image-to-fields.ts → image-to-fields.js} +61 -74
  193. package/vectorfield/wind/adapters/types.js +1 -0
  194. package/vectorfield/wind/{imagetovectorfieldandmagnitude.ts → imagetovectorfieldandmagnitude.js} +53 -78
  195. package/vectorfield/wind/index.js +5 -5
  196. package/vectorfield/wind/{plugin-persistant copy.ts → plugin-persistant copy.js } +364 -461
  197. package/vectorfield/wind/{plugin-persistant.ts → plugin-persistant.js} +375 -483
  198. package/vectorfield/wind/plugin.js +685 -883
  199. package/vectorfield/wind/vectorfieldimage.js +23 -27
  200. package/write-text/{context-text-bulk.ts → context-text-bulk.js} +200 -285
  201. package/write-text/context-text3.js +167 -0
  202. package/write-text/{context-text4.ts → context-text4.js} +146 -231
  203. package/write-text/context-textDELETE.js +94 -125
  204. package/write-text/objectarraylabels/{index.ts → index.js} +2 -2
  205. package/write-text/objectarraylabels/objectarraylabels.js +200 -247
  206. package/Math/matrix4.ts +0 -0
  207. package/Math/mesh/mapbox-delaunay.d.ts +0 -74
  208. package/Math/roadmap.md +0 -10
  209. package/Math/tessellation/constants.ts +0 -1
  210. package/Math/tessellation/roadmap.md +0 -48
  211. package/Math/tessellation/types.ts +0 -1
  212. package/Math/types.ts +0 -68
  213. package/investigation-tools/draw/tiles/adapters.ts +0 -133
  214. package/programs/line-on-globe/linestrip/data.ts +0 -29
  215. package/programs/polygon-on-globe/roadmap.md +0 -8
  216. package/programs/totems/camera-totem-attactment-interface.ts +0 -4
  217. package/programs/vectorfields/logics/particle-ubo.ts +0 -23
  218. package/publish.bat +0 -62
  219. package/range-tools-on-terrain/bearing-line/types.ts +0 -65
  220. package/range-tools-on-terrain/circle-line-chain/types.ts +0 -43
  221. package/range-tools-on-terrain/range-ring/rangeringangletext.ts +0 -396
  222. package/range-tools-on-terrain/range-ring/types.ts +0 -30
  223. package/semiplugins/interface.ts +0 -14
  224. package/semiplugins/shape-on-terrain/goal.md +0 -12
  225. package/semiplugins/shape-on-terrain/terrain-polygon/data/cache-shortcuts.md +0 -20
  226. package/semiplugins/shape-on-terrain/terrain-polygon/data/master-worker.ts +0 -209
  227. package/semiplugins/shape-on-terrain/terrain-polygon/data/readme.md +0 -5
  228. package/semiplugins/shape-on-terrain/terrain-polygon/data/types.ts +0 -37
  229. package/semiplugins/shape-on-terrain/terrain-polygon/notes.md +0 -90
  230. package/semiplugins/shape-on-terrain/terrain-polygon/types.ts +0 -69
  231. package/semiplugins/shell/bbox-renderer/index.ts +0 -2
  232. package/semiplugins/shell/bbox-renderer/object.ts +0 -129
  233. package/semiplugins/type.ts +0 -8
  234. package/terrain-plugin.mmd +0 -83
  235. package/tests/Math/arc-sampling-test.js +0 -367
  236. package/tests/Math/arc-sampling-test.ts +0 -429
  237. package/tests/Math/arc.test.ts +0 -77
  238. package/tests/Math/junction/arc-limit.test.ts +0 -7
  239. package/tests/Math/junction/arc-plane-points.test.ts +0 -196
  240. package/tests/Math/junction/arc-plane.test.ts +0 -172
  241. package/tests/Math/junction/line-sphere.test.ts +0 -127
  242. package/tests/Math/junction/plane-plane.test.ts +0 -91
  243. package/tests/Math/plane-test.ts +0 -17
  244. package/tests/Math/plane.test.ts +0 -43
  245. package/tests/Math/vec3.test.ts +0 -33
  246. package/tracks/point-heat-map/readme.md +0 -15
  247. package/tracks/timetracks/readme.md +0 -1
  248. package/tsconfig.json +0 -22
  249. package/types/@pirireis/webglobe.d.ts +0 -102
  250. package/types/delaunator.d.ts +0 -40
  251. package/types/earcut.d.ts +0 -11
  252. package/types/rbush.d.ts +0 -57
  253. package/types.ts +0 -319
  254. package/util/account/create-buffermap-orchastration.ts +0 -85
  255. package/util/account/single-attribute-buffer-management/types.ts +0 -43
  256. package/util/check/typecheck.ts +0 -74
  257. package/vectorfield/wind/adapters/types.ts +0 -12
  258. package/write-text/context-text3.ts +0 -252
  259. package/write-text/objectarraylabels/objectarraylabels.d.ts +0 -72
@@ -1,40 +1,19 @@
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
-
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);
38
17
  const vertexShaderSource = `#version 300 es
39
18
  precision highp float;
40
19
 
@@ -67,9 +46,7 @@ void main() {
67
46
  v_flat_position = vec3( position2d, 0.0 );
68
47
  }
69
48
  gl_PointSize = 6.0;
70
- }`;
71
-
72
-
49
+ }`;
73
50
  const fragmentShaderSource = `#version 300 es
74
51
  precision highp float;
75
52
 
@@ -87,115 +64,79 @@ out vec4 outColor;
87
64
  void main() {
88
65
  outColor = vec4( v_color.rgb, v_color.a );
89
66
 
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
-
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
+ });
@@ -1,39 +1,22 @@
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
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
37
20
  precision highp float;
38
21
 
39
22
  ${R_3D}
@@ -84,9 +67,8 @@ void main() {
84
67
  gl_Position = mercatorXYToGLPosition(longLat);
85
68
  }
86
69
  }
87
- `;
88
-
89
- const fragmentShader: string = `#version 300 es
70
+ `;
71
+ const fragmentShader = `#version 300 es
90
72
  ${POLE}
91
73
  precision highp float;
92
74
 
@@ -109,139 +91,108 @@ void main() {
109
91
  if (fract(interpolation / (2.0 * v_dash_ratio)) < 0.5) { color.a *= v_dash_opacity; }
110
92
 
111
93
  }
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
- });
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
+ });
@@ -1,8 +1,5 @@
1
-
2
- const Z_ALPHA_MODE = Object.freeze({
3
- ON: 1,
4
- OFF: 0
5
- });
6
-
7
-
8
- export { Z_ALPHA_MODE }
1
+ const Z_ALPHA_MODE = Object.freeze({
2
+ ON: 1,
3
+ OFF: 0
4
+ });
5
+ export { Z_ALPHA_MODE };