@xeokit/xeokit-sdk 2.5.2-beta-11 → 2.5.2-beta-13

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 (52) hide show
  1. package/dist/xeokit-sdk.cjs.js +146 -132
  2. package/dist/xeokit-sdk.es.js +146 -132
  3. package/dist/xeokit-sdk.es5.js +84 -84
  4. package/dist/xeokit-sdk.min.cjs.js +1 -1
  5. package/dist/xeokit-sdk.min.es.js +1 -1
  6. package/dist/xeokit-sdk.min.es5.js +1 -1
  7. package/package.json +1 -1
  8. package/src/viewer/scene/model/SceneModel.js +1 -1
  9. package/src/viewer/scene/model/vbo/batching/triangles/VBOBatchingTrianglesLayer.js +1 -1
  10. package/src/viewer/scene/model/vbo/instancing/triangles/VBOInstancingTrianglesLayer.js +1 -1
  11. package/src/viewer/scene/webgl/Renderer.js +20 -19
  12. package/src/viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesColorRenderer.js +0 -238
  13. package/src/viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesColorTextureRenderer.js +0 -270
  14. package/src/viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesDepthRenderer.js +0 -126
  15. package/src/viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesEdgesColorRenderer.js +0 -127
  16. package/src/viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesEdgesRenderer.js +0 -133
  17. package/src/viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesFlatColorRenderer.js +0 -235
  18. package/src/viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesNormalsRenderer.js +0 -139
  19. package/src/viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesOcclusionRenderer.js +0 -125
  20. package/src/viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesPBRRenderer.js +0 -561
  21. package/src/viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesPickDepthRenderer.js +0 -144
  22. package/src/viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesPickMeshRenderer.js +0 -130
  23. package/src/viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesPickNormalsFlatRenderer.js +0 -121
  24. package/src/viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesPickNormalsRenderer.js +0 -131
  25. package/src/viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesRenderer.js +0 -33
  26. package/src/viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesRenderers.js +0 -375
  27. package/src/viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesShadowRenderer.js +0 -107
  28. package/src/viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesSilhouetteRenderer.js +0 -136
  29. package/src/viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesSnapInitRenderer.js +0 -311
  30. package/src/viewer/scene/model/vbo/batching/triangles/renderers/VBOBatchingTrianglesSnapRenderer.js +0 -308
  31. package/src/viewer/scene/model/vbo/batching/triangles/renderers/VBOSceneModelTriangleBatchingEdgesRenderer.js +0 -12
  32. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesColorRenderer.js +0 -253
  33. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesColorTextureRenderer.js +0 -278
  34. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesDepthRenderer.js +0 -126
  35. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesEdgesColorRenderer.js +0 -132
  36. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesEdgesRenderer.js +0 -134
  37. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesFlatColorRenderer.js +0 -244
  38. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesFlatNormalsRenderer.js +0 -130
  39. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesNormalsRenderer.js +0 -138
  40. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesOcclusionRenderer.js +0 -128
  41. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesPBRRenderer.js +0 -561
  42. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesPickDepthRenderer.js +0 -149
  43. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesPickMeshRenderer.js +0 -136
  44. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesPickNormalsFlatRenderer.js +0 -130
  45. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesPickNormalsRenderer.js +0 -145
  46. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesRenderers.js +0 -376
  47. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesShadowRenderer.js +0 -113
  48. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesSilhouetteRenderer.js +0 -139
  49. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesSnapInitRenderer.js +0 -342
  50. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/VBOInstancingTrianglesSnapRenderer.js +0 -325
  51. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/VBOSceneModelTriangleInstancingEdgesRenderer.js +0 -12
  52. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/VBOSceneModelTriangleInstancingRenderer.js +0 -29
@@ -1,376 +0,0 @@
1
- import {VBOInstancingTrianglesColorRenderer} from "./VBOInstancingTrianglesColorRenderer.js";
2
- import {VBOInstancingTrianglesFlatColorRenderer} from "./VBOInstancingTrianglesFlatColorRenderer.js";
3
- import {VBOInstancingTrianglesSilhouetteRenderer} from "./VBOInstancingTrianglesSilhouetteRenderer.js";
4
- import {VBOInstancingTrianglesEdgesRenderer} from "./VBOInstancingTrianglesEdgesRenderer.js";
5
- import {VBOInstancingTrianglesEdgesColorRenderer} from "./VBOInstancingTrianglesEdgesColorRenderer.js";
6
- import {VBOInstancingTrianglesPickMeshRenderer} from "./VBOInstancingTrianglesPickMeshRenderer.js";
7
- import {VBOInstancingTrianglesPickDepthRenderer} from "./VBOInstancingTrianglesPickDepthRenderer.js";
8
- import {VBOInstancingTrianglesPickNormalsRenderer} from "./VBOInstancingTrianglesPickNormalsRenderer.js";
9
- import {VBOInstancingTrianglesOcclusionRenderer} from "./VBOInstancingTrianglesOcclusionRenderer.js";
10
- import {VBOInstancingTrianglesDepthRenderer} from "./VBOInstancingTrianglesDepthRenderer.js";
11
- import {VBOInstancingTrianglesNormalsRenderer} from "./VBOInstancingTrianglesNormalsRenderer.js";
12
- import {VBOInstancingTrianglesShadowRenderer} from "./VBOInstancingTrianglesShadowRenderer.js";
13
- import {VBOInstancingTrianglesPBRRenderer} from "./VBOInstancingTrianglesPBRRenderer.js";
14
- import {VBOInstancingTrianglesPickNormalsFlatRenderer} from "./VBOInstancingTrianglesPickNormalsFlatRenderer.js";
15
- import {VBOInstancingTrianglesColorTextureRenderer} from "./VBOInstancingTrianglesColorTextureRenderer.js";
16
- import {VBOInstancingTrianglesSnapInitRenderer} from "./VBOInstancingTrianglesSnapInitRenderer.js";
17
- import {VBOInstancingTrianglesSnapRenderer} from "./VBOInstancingTrianglesSnapRenderer.js";
18
-
19
- /**
20
- * @private
21
- */
22
- class VBOInstancingTrianglesRenderers {
23
-
24
- constructor(scene) {
25
- this._scene = scene;
26
- }
27
-
28
- _compile() {
29
- if (this._colorRenderer && (!this._colorRenderer.getValid())) {
30
- this._colorRenderer.destroy();
31
- this._colorRenderer = null;
32
- }
33
- if (this._colorRendererWithSAO && (!this._colorRendererWithSAO.getValid())) {
34
- this._colorRendererWithSAO.destroy();
35
- this._colorRendererWithSAO = null;
36
- }
37
- if (this._flatColorRenderer && (!this._flatColorRenderer.getValid())) {
38
- this._flatColorRenderer.destroy();
39
- this._flatColorRenderer = null;
40
- }
41
- if (this._flatColorRendererWithSAO && (!this._flatColorRendererWithSAO.getValid())) {
42
- this._flatColorRendererWithSAO.destroy();
43
- this._flatColorRendererWithSAO = null;
44
- }
45
- if (this._pbrRenderer && (!this._pbrRenderer.getValid())) {
46
- this._pbrRenderer.destroy();
47
- this._pbrRenderer = null;
48
- }
49
- if (this._pbrRendererWithSAO && (!this._pbrRendererWithSAO.getValid())) {
50
- this._pbrRendererWithSAO.destroy();
51
- this._pbrRendererWithSAO = null;
52
- }
53
- if (this._colorTextureRenderer && (!this._colorTextureRenderer.getValid())) {
54
- this._colorTextureRenderer.destroy();
55
- this._colorTextureRenderer = null;
56
- }
57
- if (this._colorTextureRendererWithSAO && (!this._colorTextureRendererWithSAO.getValid())) {
58
- this._colorTextureRendererWithSAO.destroy();
59
- this._colorTextureRendererWithSAO = null;
60
- }
61
- if (this._depthRenderer && (!this._depthRenderer.getValid())) {
62
- this._depthRenderer.destroy();
63
- this._depthRenderer = null;
64
- }
65
- if (this._normalsRenderer && (!this._normalsRenderer.getValid())) {
66
- this._normalsRenderer.destroy();
67
- this._normalsRenderer = null;
68
- }
69
- if (this._silhouetteRenderer && (!this._silhouetteRenderer.getValid())) {
70
- this._silhouetteRenderer.destroy();
71
- this._silhouetteRenderer = null;
72
- }
73
- if (this._edgesRenderer && (!this._edgesRenderer.getValid())) {
74
- this._edgesRenderer.destroy();
75
- this._edgesRenderer = null;
76
- }
77
- if (this._edgesColorRenderer && (!this._edgesColorRenderer.getValid())) {
78
- this._edgesColorRenderer.destroy();
79
- this._edgesColorRenderer = null;
80
- }
81
- if (this._pickMeshRenderer && (!this._pickMeshRenderer.getValid())) {
82
- this._pickMeshRenderer.destroy();
83
- this._pickMeshRenderer = null;
84
- }
85
- if (this._pickDepthRenderer && (!this._pickDepthRenderer.getValid())) {
86
- this._pickDepthRenderer.destroy();
87
- this._pickDepthRenderer = null;
88
- }
89
- if (this._pickNormalsRenderer && this._pickNormalsRenderer.getValid() === false) {
90
- this._pickNormalsRenderer.destroy();
91
- this._pickNormalsRenderer = null;
92
- }
93
- if (this._pickNormalsFlatRenderer && (!this._pickNormalsFlatRenderer.getValid())) {
94
- this._pickNormalsFlatRenderer.destroy();
95
- this._pickNormalsFlatRenderer = null;
96
- }
97
- if (this._occlusionRenderer && this._occlusionRenderer.getValid() === false) {
98
- this._occlusionRenderer.destroy();
99
- this._occlusionRenderer = null;
100
- }
101
- if (this._shadowRenderer && (!this._shadowRenderer.getValid())) {
102
- this._shadowRenderer.destroy();
103
- this._shadowRenderer = null;
104
- }
105
- if (this._snapInitRenderer && (!this._snapInitRenderer.getValid())) {
106
- this._snapInitRenderer.destroy();
107
- this._snapInitRenderer = null;
108
- }
109
- if (this._snapRenderer && (!this._snapRenderer.getValid())) {
110
- this._snapRenderer.destroy();
111
- this._snapRenderer = null;
112
- }
113
- }
114
-
115
- eagerCreateRenders() {
116
-
117
- // Pre-initialize certain renderers that would otherwise be lazy-initialised
118
- // on user interaction, such as picking or emphasis, so that there is no delay
119
- // when user first begins interacting with the viewer.
120
-
121
- if (!this._silhouetteRenderer) { // Used for highlighting and selection
122
- this._silhouetteRenderer = new VBOInstancingTrianglesSilhouetteRenderer(this._scene);
123
- }
124
- if (!this._pickMeshRenderer) {
125
- this._pickMeshRenderer = new VBOInstancingTrianglesPickMeshRenderer(this._scene);
126
- }
127
- if (!this._pickDepthRenderer) {
128
- this._pickDepthRenderer = new VBOInstancingTrianglesPickDepthRenderer(this._scene);
129
- }
130
- if (!this._snapInitRenderer) {
131
- this._snapInitRenderer = new VBOInstancingTrianglesSnapInitRenderer(this._scene, false);
132
- }
133
- if (!this._snapRenderer) {
134
- this._snapRenderer = new VBOInstancingTrianglesSnapRenderer(this._scene);
135
- }
136
- }
137
-
138
- get colorRenderer() {
139
- if (!this._colorRenderer) {
140
- this._colorRenderer = new VBOInstancingTrianglesColorRenderer(this._scene, false);
141
- }
142
- return this._colorRenderer;
143
- }
144
-
145
- get colorRendererWithSAO() {
146
- if (!this._colorRendererWithSAO) {
147
- this._colorRendererWithSAO = new VBOInstancingTrianglesColorRenderer(this._scene, true);
148
- }
149
- return this._colorRendererWithSAO;
150
- }
151
-
152
- get flatColorRenderer() {
153
- if (!this._flatColorRenderer) {
154
- this._flatColorRenderer = new VBOInstancingTrianglesFlatColorRenderer(this._scene, false);
155
- }
156
- return this._flatColorRenderer;
157
- }
158
-
159
- get flatColorRendererWithSAO() {
160
- if (!this._flatColorRendererWithSAO) {
161
- this._flatColorRendererWithSAO = new VBOInstancingTrianglesFlatColorRenderer(this._scene, true);
162
- }
163
- return this._flatColorRendererWithSAO;
164
- }
165
-
166
- get pbrRenderer() {
167
- if (!this._pbrRenderer) {
168
- this._pbrRenderer = new VBOInstancingTrianglesPBRRenderer(this._scene, false);
169
- }
170
- return this._pbrRenderer;
171
- }
172
-
173
- get pbrRendererWithSAO() {
174
- if (!this._pbrRendererWithSAO) {
175
- this._pbrRendererWithSAO = new VBOInstancingTrianglesPBRRenderer(this._scene, true);
176
- }
177
- return this._pbrRendererWithSAO;
178
- }
179
-
180
- get colorTextureRenderer() {
181
- if (!this._colorTextureRenderer) {
182
- this._colorTextureRenderer = new VBOInstancingTrianglesColorTextureRenderer(this._scene, false);
183
- }
184
- return this._colorTextureRenderer;
185
- }
186
-
187
- get colorTextureRendererWithSAO() {
188
- if (!this._colorTextureRendererWithSAO) {
189
- this._colorTextureRendererWithSAO = new VBOInstancingTrianglesColorTextureRenderer(this._scene, true);
190
- }
191
- return this._colorTextureRendererWithSAO;
192
- }
193
-
194
- get silhouetteRenderer() {
195
- if (!this._silhouetteRenderer) {
196
- this._silhouetteRenderer = new VBOInstancingTrianglesSilhouetteRenderer(this._scene);
197
- }
198
- return this._silhouetteRenderer;
199
- }
200
-
201
- get depthRenderer() {
202
- if (!this._depthRenderer) {
203
- this._depthRenderer = new VBOInstancingTrianglesDepthRenderer(this._scene);
204
- }
205
- return this._depthRenderer;
206
- }
207
-
208
- get normalsRenderer() {
209
- if (!this._normalsRenderer) {
210
- this._normalsRenderer = new VBOInstancingTrianglesNormalsRenderer(this._scene);
211
- }
212
- return this._normalsRenderer;
213
- }
214
-
215
- get edgesRenderer() {
216
- if (!this._edgesRenderer) {
217
- this._edgesRenderer = new VBOInstancingTrianglesEdgesRenderer(this._scene);
218
- }
219
- return this._edgesRenderer;
220
- }
221
-
222
- get edgesColorRenderer() {
223
- if (!this._edgesColorRenderer) {
224
- this._edgesColorRenderer = new VBOInstancingTrianglesEdgesColorRenderer(this._scene);
225
- }
226
- return this._edgesColorRenderer;
227
- }
228
-
229
- get pickMeshRenderer() {
230
- if (!this._pickMeshRenderer) {
231
- this._pickMeshRenderer = new VBOInstancingTrianglesPickMeshRenderer(this._scene);
232
- }
233
- return this._pickMeshRenderer;
234
- }
235
-
236
- get pickNormalsRenderer() {
237
- if (!this._pickNormalsRenderer) {
238
- this._pickNormalsRenderer = new VBOInstancingTrianglesPickNormalsRenderer(this._scene);
239
- }
240
- return this._pickNormalsRenderer;
241
- }
242
-
243
- get pickNormalsFlatRenderer() {
244
- if (!this._pickNormalsFlatRenderer) {
245
- this._pickNormalsFlatRenderer = new VBOInstancingTrianglesPickNormalsFlatRenderer(this._scene);
246
- }
247
- return this._pickNormalsFlatRenderer;
248
- }
249
-
250
- get pickDepthRenderer() {
251
- if (!this._pickDepthRenderer) {
252
- this._pickDepthRenderer = new VBOInstancingTrianglesPickDepthRenderer(this._scene);
253
- }
254
- return this._pickDepthRenderer;
255
- }
256
-
257
- get occlusionRenderer() {
258
- if (!this._occlusionRenderer) {
259
- this._occlusionRenderer = new VBOInstancingTrianglesOcclusionRenderer(this._scene);
260
- }
261
- return this._occlusionRenderer;
262
- }
263
-
264
- get shadowRenderer() {
265
- if (!this._shadowRenderer) {
266
- this._shadowRenderer = new VBOInstancingTrianglesShadowRenderer(this._scene);
267
- }
268
- return this._shadowRenderer;
269
- }
270
-
271
- get snapInitRenderer() {
272
- if (!this._snapInitRenderer) {
273
- this._snapInitRenderer = new VBOInstancingTrianglesSnapInitRenderer(this._scene, false);
274
- }
275
- return this._snapInitRenderer;
276
- }
277
-
278
- get snapRenderer() {
279
- if (!this._snapRenderer) {
280
- this._snapRenderer = new VBOInstancingTrianglesSnapRenderer(this._scene);
281
- }
282
- return this._snapRenderer;
283
- }
284
-
285
- _destroy() {
286
- if (this._colorRenderer) {
287
- this._colorRenderer.destroy();
288
- }
289
- if (this._colorRendererWithSAO) {
290
- this._colorRendererWithSAO.destroy();
291
- }
292
- if (this._flatColorRenderer) {
293
- this._flatColorRenderer.destroy();
294
- }
295
- if (this._flatColorRendererWithSAO) {
296
- this._flatColorRendererWithSAO.destroy();
297
- }
298
- if (this._pbrRenderer) {
299
- this._pbrRenderer.destroy();
300
- }
301
- if (this._pbrRendererWithSAO) {
302
- this._pbrRendererWithSAO.destroy();
303
- }
304
- if (this._colorTextureRenderer) {
305
- this._colorTextureRenderer.destroy();
306
- }
307
- if (this._colorTextureRendererWithSAO) {
308
- this._colorTextureRendererWithSAO.destroy();
309
- }
310
- if (this._depthRenderer) {
311
- this._depthRenderer.destroy();
312
- }
313
- if (this._normalsRenderer) {
314
- this._normalsRenderer.destroy();
315
- }
316
- if (this._silhouetteRenderer) {
317
- this._silhouetteRenderer.destroy();
318
- }
319
- if (this._edgesRenderer) {
320
- this._edgesRenderer.destroy();
321
- }
322
- if (this._edgesColorRenderer) {
323
- this._edgesColorRenderer.destroy();
324
- }
325
- if (this._pickMeshRenderer) {
326
- this._pickMeshRenderer.destroy();
327
- }
328
- if (this._pickDepthRenderer) {
329
- this._pickDepthRenderer.destroy();
330
- }
331
- if (this._pickNormalsRenderer) {
332
- this._pickNormalsRenderer.destroy();
333
- }
334
- if (this._pickNormalsFlatRenderer) {
335
- this._pickNormalsFlatRenderer.destroy();
336
- }
337
- if (this._occlusionRenderer) {
338
- this._occlusionRenderer.destroy();
339
- }
340
- if (this._shadowRenderer) {
341
- this._shadowRenderer.destroy();
342
- }
343
- if (this._snapInitRenderer) {
344
- this._snapInitRenderer.destroy();
345
- }
346
- if (this._snapRenderer) {
347
- this._snapRenderer.destroy();
348
- }
349
- }
350
- }
351
-
352
- const cachedRenderers = {};
353
-
354
- /**
355
- * @private
356
- */
357
- export function getRenderers(scene) {
358
- const sceneId = scene.id;
359
- let instancingRenderers = cachedRenderers[sceneId];
360
- if (!instancingRenderers) {
361
- instancingRenderers = new VBOInstancingTrianglesRenderers(scene);
362
- cachedRenderers[sceneId] = instancingRenderers;
363
- instancingRenderers._compile();
364
- instancingRenderers.eagerCreateRenders();
365
- scene.on("compile", () => {
366
- instancingRenderers._compile();
367
- instancingRenderers.eagerCreateRenders();
368
- });
369
- scene.on("destroyed", () => {
370
- delete cachedRenderers[sceneId];
371
- instancingRenderers._destroy();
372
- });
373
- }
374
- return instancingRenderers;
375
- }
376
-
@@ -1,113 +0,0 @@
1
- import {VBOSceneModelTriangleInstancingRenderer} from "./VBOSceneModelTriangleInstancingRenderer.js";
2
-
3
- /**
4
- * Renders InstancingLayer fragment depths to a shadow map.
5
- *
6
- * @private
7
- */
8
- export class VBOInstancingTrianglesShadowRenderer extends VBOSceneModelTriangleInstancingRenderer {
9
-
10
- _buildVertexShader() {
11
- const scene = this._scene;
12
- const sectionPlanesState = scene._sectionPlanesState;
13
- const clipping = sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
14
- const src = [];
15
- src.push("#version 300 es");
16
- src.push("// Instancing geometry shadow drawing vertex shader");
17
- src.push("in vec3 position;");
18
- if (scene.entityOffsetsEnabled) {
19
- src.push("in vec3 offset;");
20
- }
21
- src.push("in vec4 color;");
22
- src.push("in float flags;");
23
- src.push("in vec4 modelMatrixCol0;");
24
- src.push("in vec4 modelMatrixCol1;");
25
- src.push("in vec4 modelMatrixCol2;");
26
- src.push("uniform mat4 shadowViewMatrix;");
27
- src.push("uniform mat4 shadowProjMatrix;");
28
-
29
- this._addMatricesUniformBlockLines(src);
30
-
31
- if (clipping) {
32
- src.push("out vec4 vWorldPosition;");
33
- src.push("out float vFlags;");
34
- }
35
- src.push("void main(void) {");
36
- src.push(`int colorFlag = int(flags) & 0xF;`);
37
- src.push("bool visible = (colorFlag > 0);");
38
- src.push("bool transparent = ((float(color.a) / 255.0) < 1.0);");
39
- src.push(`if (!visible || transparent) {`);
40
- src.push(" gl_Position = vec4(0.0, 0.0, 0.0, 0.0);"); // Cull vertex
41
- src.push("} else {");
42
- src.push(" vec4 worldPosition = positionsDecodeMatrix * vec4(position, 1.0); ");
43
- src.push(" worldPosition = vec4(dot(worldPosition, modelMatrixCol0), dot(worldPosition, modelMatrixCol1), dot(worldPosition, modelMatrixCol2), 1.0);");
44
- if (scene.entityOffsetsEnabled) {
45
- src.push(" worldPosition.xyz = worldPosition.xyz + offset;");
46
- }
47
- src.push(" vec4 viewPosition = shadowViewMatrix * worldPosition; ");
48
-
49
- if (clipping) {
50
- src.push("vWorldPosition = worldPosition;");
51
- src.push("vFlags = flags;");
52
- }
53
- src.push(" gl_Position = shadowProjMatrix * viewPosition;");
54
- src.push("}");
55
- src.push("}");
56
- return src;
57
- }
58
-
59
- _buildFragmentShader() {
60
- const scene = this._scene;
61
- const sectionPlanesState = scene._sectionPlanesState;
62
- const clipping = sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
63
- const src = [];
64
- src.push("#version 300 es");
65
- src.push("// Instancing geometry depth drawing fragment shader");
66
-
67
- src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
68
- src.push("precision highp float;");
69
- src.push("precision highp int;");
70
- src.push("#else");
71
- src.push("precision mediump float;");
72
- src.push("precision mediump int;");
73
- src.push("#endif");
74
- if (scene.logarithmicDepthBufferEnabled) {
75
- src.push("uniform float logDepthBufFC;");
76
- src.push("in float vFragDepth;");
77
- }
78
- if (clipping) {
79
- src.push("in vec4 vWorldPosition;");
80
- src.push("in float vFlags;");
81
- for (let i = 0, len = sectionPlanesState.getNumAllocatedSectionPlanes(); i < len; i++) {
82
- src.push("uniform bool sectionPlaneActive" + i + ";");
83
- src.push("uniform vec3 sectionPlanePos" + i + ";");
84
- src.push("uniform vec3 sectionPlaneDir" + i + ";");
85
- }
86
- }
87
- src.push("in vec3 vViewNormal;");
88
- src.push("vec3 packNormalToRGB( const in vec3 normal ) {");
89
- src.push(" return normalize( normal ) * 0.5 + 0.5;");
90
- src.push("}");
91
- src.push("out vec4 outColor;");
92
- src.push("void main(void) {");
93
- if (clipping) {
94
- src.push(" bool clippable = (int(vFlags) >> 16 & 0xF) == 1;");
95
- src.push(" if (clippable) {");
96
- src.push(" float dist = 0.0;");
97
- for (let i = 0, len = sectionPlanesState.getNumAllocatedSectionPlanes(); i < len; i++) {
98
- src.push("if (sectionPlaneActive" + i + ") {");
99
- src.push(" dist += clamp(dot(-sectionPlaneDir" + i + ".xyz, vWorldPosition.xyz - sectionPlanePos" + i + ".xyz), 0.0, 1000.0);");
100
- src.push("}");
101
- }
102
- src.push("if (dist > 0.0) { discard; }");
103
- src.push("}");
104
- }
105
- if (scene.logarithmicDepthBufferEnabled) {
106
- src.push("gl_FragDepth = log2( vFragDepth ) * logDepthBufFC * 0.5;");
107
- }
108
- src.push(" outColor = vec4(packNormalToRGB(vViewNormal), 1.0); ");
109
- src.push("}");
110
- return src;
111
- }
112
- }
113
-
@@ -1,139 +0,0 @@
1
- import {VBOSceneModelTriangleInstancingRenderer} from "./VBOSceneModelTriangleInstancingRenderer.js";
2
-
3
- /**
4
- * @private
5
- */
6
- export class VBOInstancingTrianglesSilhouetteRenderer extends VBOSceneModelTriangleInstancingRenderer {
7
-
8
- drawLayer(frameCtx, instancingLayer, renderPass) {
9
- // TODO color uniform true ???
10
- super.drawLayer(frameCtx, instancingLayer, renderPass, { colorUniform: true });
11
- }
12
-
13
- _buildVertexShader() {
14
- const scene = this._scene;
15
- const sectionPlanesState = scene._sectionPlanesState;
16
- const clipping = sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
17
- const src = [];
18
- src.push("#version 300 es");
19
- src.push("// Instancing silhouette vertex shader");
20
-
21
- src.push("uniform int renderPass;");
22
-
23
- src.push("in vec3 position;");
24
- if (scene.entityOffsetsEnabled) {
25
- src.push("in vec3 offset;");
26
- }
27
- src.push("in float flags;");
28
- src.push("in vec4 color;");
29
-
30
- src.push("in vec4 modelMatrixCol0;"); // Modeling matrix
31
- src.push("in vec4 modelMatrixCol1;");
32
- src.push("in vec4 modelMatrixCol2;");
33
-
34
- this._addMatricesUniformBlockLines(src);
35
-
36
- src.push("uniform vec4 silhouetteColor;");
37
-
38
- if (scene.logarithmicDepthBufferEnabled) {
39
- src.push("uniform float logDepthBufFC;");
40
- src.push("out float vFragDepth;");
41
- src.push("bool isPerspectiveMatrix(mat4 m) {");
42
- src.push(" return (m[2][3] == - 1.0);");
43
- src.push("}");
44
- src.push("out float isPerspective;");
45
- }
46
-
47
- if (clipping) {
48
- src.push("out vec4 vWorldPosition;");
49
- src.push("out float vFlags;");
50
- }
51
-
52
- src.push("out vec4 vColor;");
53
-
54
- src.push("void main(void) {");
55
-
56
- // silhouetteFlag = NOT_RENDERED | SILHOUETTE_HIGHLIGHTED | SILHOUETTE_SELECTED | | SILHOUETTE_XRAYED
57
- // renderPass = SILHOUETTE_HIGHLIGHTED | SILHOUETTE_SELECTED | | SILHOUETTE_XRAYED
58
-
59
- src.push(`int silhouetteFlag = int(flags) >> 4 & 0xF;`);
60
- src.push(`if (silhouetteFlag != renderPass) {`);
61
- src.push(" gl_Position = vec4(0.0, 0.0, 0.0, 0.0);"); // Cull vertex
62
-
63
- src.push("} else {");
64
-
65
- src.push("vec4 worldPosition = positionsDecodeMatrix * vec4(position, 1.0); ");
66
- src.push("worldPosition = worldMatrix * vec4(dot(worldPosition, modelMatrixCol0), dot(worldPosition, modelMatrixCol1), dot(worldPosition, modelMatrixCol2), 1.0);");
67
- if (scene.entityOffsetsEnabled) {
68
- src.push(" worldPosition.xyz = worldPosition.xyz + offset;");
69
- }
70
- src.push("vec4 viewPosition = viewMatrix * worldPosition; ");
71
-
72
- if (clipping) {
73
- src.push("vWorldPosition = worldPosition;");
74
- src.push("vFlags = flags;");
75
- }
76
- src.push("vColor = vec4(silhouetteColor.r, silhouetteColor.g, silhouetteColor.b, min(silhouetteColor.a, float(color.a) / 255.0));");
77
- src.push("vec4 clipPos = projMatrix * viewPosition;");
78
- if (scene.logarithmicDepthBufferEnabled) {
79
- src.push("vFragDepth = 1.0 + clipPos.w;");
80
- src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
81
- }
82
- src.push("gl_Position = clipPos;");
83
- src.push("}");
84
- src.push("}");
85
- return src;
86
- }
87
-
88
- _buildFragmentShader() {
89
- const scene = this._scene;
90
- const sectionPlanesState = scene._sectionPlanesState;
91
- const clipping = sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
92
- const src = [];
93
- src.push("#version 300 es");
94
- src.push("// Instancing fill fragment shader");
95
-
96
- src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
97
- src.push("precision highp float;");
98
- src.push("precision highp int;");
99
- src.push("#else");
100
- src.push("precision mediump float;");
101
- src.push("precision mediump int;");
102
- src.push("#endif");
103
- if (scene.logarithmicDepthBufferEnabled) {
104
- src.push("in float isPerspective;");
105
- src.push("uniform float logDepthBufFC;");
106
- src.push("in float vFragDepth;");
107
- }
108
- if (clipping) {
109
- src.push("in vec4 vWorldPosition;");
110
- src.push("in float vFlags;");
111
- for (let i = 0, len = sectionPlanesState.getNumAllocatedSectionPlanes(); i < len; i++) {
112
- src.push("uniform bool sectionPlaneActive" + i + ";");
113
- src.push("uniform vec3 sectionPlanePos" + i + ";");
114
- src.push("uniform vec3 sectionPlaneDir" + i + ";");
115
- }
116
- }
117
- src.push("in vec4 vColor;");
118
- src.push("out vec4 outColor;");
119
- src.push("void main(void) {");
120
- if (clipping) {
121
- src.push(" bool clippable = (int(vFlags) >> 16 & 0xF) == 1;");
122
- src.push(" if (clippable) {");
123
- src.push(" float dist = 0.0;");
124
- for (let i = 0, len = sectionPlanesState.getNumAllocatedSectionPlanes(); i < len; i++) {
125
- src.push("if (sectionPlaneActive" + i + ") {");
126
- src.push(" dist += clamp(dot(-sectionPlaneDir" + i + ".xyz, vWorldPosition.xyz - sectionPlanePos" + i + ".xyz), 0.0, 1000.0);");
127
- src.push("}");
128
- }
129
- src.push("if (dist > 0.0) { discard; }");
130
- src.push("}");
131
- }
132
- if (scene.logarithmicDepthBufferEnabled) {
133
- src.push(" gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
134
- }
135
- src.push("outColor = vColor;");
136
- src.push("}");
137
- return src;
138
- }
139
- }