@xeokit/xeokit-sdk 2.6.91 → 2.6.93

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 (184) hide show
  1. package/dist/xeokit-sdk.cjs.js +13128 -44669
  2. package/dist/xeokit-sdk.es.js +13129 -44668
  3. package/dist/xeokit-sdk.es5.js +1414 -3498
  4. package/dist/xeokit-sdk.min.cjs.js +8 -8
  5. package/dist/xeokit-sdk.min.es.js +8 -8
  6. package/dist/xeokit-sdk.min.es5.js +7 -7
  7. package/package.json +1 -1
  8. package/src/plugins/AngleMeasurementsPlugin/AngleMeasurement.js +21 -1
  9. package/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurement.js +32 -6
  10. package/src/viewer/Viewer.js +55 -103
  11. package/src/viewer/scene/canvas/Canvas.js +3 -43
  12. package/src/viewer/scene/geometry/ReadableGeometry.js +0 -25
  13. package/src/viewer/scene/lights/CubeTexture.js +0 -13
  14. package/src/viewer/scene/lights/DirLight.js +2 -1
  15. package/src/viewer/scene/lights/PointLight.js +2 -1
  16. package/src/viewer/scene/materials/Texture.js +0 -9
  17. package/src/viewer/scene/math/rtcCoords.js +1 -38
  18. package/src/viewer/scene/mesh/Mesh.js +454 -212
  19. package/src/viewer/scene/mesh/draw/DrawShaderSource.js +305 -1504
  20. package/src/viewer/scene/mesh/draw/LambertShaderSource.js +35 -0
  21. package/src/viewer/scene/mesh/emphasis/EmphasisShaderSource.js +34 -0
  22. package/src/viewer/scene/mesh/occlusion/OcclusionShaderSource.js +9 -158
  23. package/src/viewer/scene/mesh/pick/PickMeshShaderSource.js +21 -151
  24. package/src/viewer/scene/mesh/pick/PickTriangleShaderSource.js +12 -124
  25. package/src/viewer/scene/mesh/shadow/ShadowShaderSource.js +22 -97
  26. package/src/viewer/scene/model/SceneModel.js +248 -852
  27. package/src/viewer/scene/model/SceneModelEntity.js +4 -4
  28. package/src/viewer/scene/model/SceneModelMesh.js +3 -3
  29. package/src/viewer/scene/model/layer/DTXLayer.js +940 -0
  30. package/src/viewer/scene/model/layer/Layer.js +788 -0
  31. package/src/viewer/scene/model/layer/VBOLayer.js +1019 -0
  32. package/src/viewer/scene/model/layer/programs/ColorProgram.js +35 -0
  33. package/src/viewer/scene/model/layer/programs/ColorTextureProgram.js +46 -0
  34. package/src/viewer/scene/model/layer/programs/DepthProgram.js +11 -0
  35. package/src/viewer/scene/model/layer/programs/EdgesProgram.js +12 -0
  36. package/src/viewer/scene/model/layer/programs/FlatColorProgram.js +24 -0
  37. package/src/viewer/scene/model/layer/programs/OcclusionProgram.js +12 -0
  38. package/src/viewer/scene/model/layer/programs/PBRProgram.js +180 -0
  39. package/src/viewer/scene/model/layer/programs/PickDepthProgram.js +30 -0
  40. package/src/viewer/scene/model/layer/programs/PickMeshProgram.js +12 -0
  41. package/src/viewer/scene/model/layer/programs/PickNormalsProgram.js +18 -0
  42. package/src/viewer/scene/model/layer/programs/ShadowProgram.js +23 -0
  43. package/src/viewer/scene/model/layer/programs/SilhouetteProgram.js +15 -0
  44. package/src/viewer/scene/model/layer/programs/SnapProgram.js +29 -0
  45. package/src/viewer/scene/scene/Scene.js +21 -38
  46. package/src/viewer/scene/webgl/ArrayBuf.js +5 -20
  47. package/src/viewer/scene/webgl/FrameContext.js +14 -86
  48. package/src/viewer/scene/webgl/RenderBuffer.js +62 -262
  49. package/src/viewer/scene/webgl/Renderer.js +880 -843
  50. package/src/viewer/scene/webgl/WebGLRenderer.js +612 -0
  51. package/src/viewer/scene/webgl/occlusion/OcclusionLayer.js +60 -132
  52. package/src/viewer/scene/webgl/occlusion/OcclusionTester.js +167 -328
  53. package/src/viewer/scene/mesh/draw/DrawRenderer.js +0 -998
  54. package/src/viewer/scene/mesh/emphasis/EmphasisEdgesRenderer.js +0 -259
  55. package/src/viewer/scene/mesh/emphasis/EmphasisEdgesShaderSource.js +0 -160
  56. package/src/viewer/scene/mesh/emphasis/EmphasisFillRenderer.js +0 -286
  57. package/src/viewer/scene/mesh/emphasis/EmphasisFillShaderSource.js +0 -263
  58. package/src/viewer/scene/mesh/occlusion/OcclusionRenderer.js +0 -221
  59. package/src/viewer/scene/mesh/pick/PickMeshRenderer.js +0 -223
  60. package/src/viewer/scene/mesh/pick/PickTriangleRenderer.js +0 -200
  61. package/src/viewer/scene/mesh/shadow/ShadowRenderer.js +0 -214
  62. package/src/viewer/scene/model/RENDER_PASSES.js +0 -34
  63. package/src/viewer/scene/model/dtx/BindableDataTexture.js +0 -31
  64. package/src/viewer/scene/model/dtx/lines/DTXLinesBuffer.js +0 -27
  65. package/src/viewer/scene/model/dtx/lines/DTXLinesLayer.js +0 -897
  66. package/src/viewer/scene/model/dtx/lines/DTXLinesState.js +0 -46
  67. package/src/viewer/scene/model/dtx/lines/DTXLinesTextureFactory.js +0 -411
  68. package/src/viewer/scene/model/dtx/lines/dataTextureRamStats.js +0 -49
  69. package/src/viewer/scene/model/dtx/lines/rebucketPositions.js +0 -208
  70. package/src/viewer/scene/model/dtx/lines/renderers/DTXLinesColorRenderer.js +0 -389
  71. package/src/viewer/scene/model/dtx/lines/renderers/DTXLinesRenderers.js +0 -65
  72. package/src/viewer/scene/model/dtx/triangles/DTXTrianglesLayer.js +0 -1399
  73. package/src/viewer/scene/model/dtx/triangles/lib/DTXTrianglesBuffer.js +0 -46
  74. package/src/viewer/scene/model/dtx/triangles/lib/DTXTrianglesState.js +0 -250
  75. package/src/viewer/scene/model/dtx/triangles/lib/DTXTrianglesTextureFactory.js +0 -518
  76. package/src/viewer/scene/model/dtx/triangles/lib/dataTextureRamStats.js +0 -54
  77. package/src/viewer/scene/model/dtx/triangles/renderers/DTXTrianglesColorRenderer.js +0 -639
  78. package/src/viewer/scene/model/dtx/triangles/renderers/DTXTrianglesDepthRenderer.js +0 -464
  79. package/src/viewer/scene/model/dtx/triangles/renderers/DTXTrianglesEdgesColorRenderer.js +0 -423
  80. package/src/viewer/scene/model/dtx/triangles/renderers/DTXTrianglesEdgesRenderer.js +0 -431
  81. package/src/viewer/scene/model/dtx/triangles/renderers/DTXTrianglesNormalsRenderer.js +0 -345
  82. package/src/viewer/scene/model/dtx/triangles/renderers/DTXTrianglesOcclusionRenderer.js +0 -436
  83. package/src/viewer/scene/model/dtx/triangles/renderers/DTXTrianglesPickDepthRenderer.js +0 -466
  84. package/src/viewer/scene/model/dtx/triangles/renderers/DTXTrianglesPickMeshRenderer.js +0 -437
  85. package/src/viewer/scene/model/dtx/triangles/renderers/DTXTrianglesPickNormalsFlatRenderer.js +0 -460
  86. package/src/viewer/scene/model/dtx/triangles/renderers/DTXTrianglesPickNormalsRenderer.js +0 -437
  87. package/src/viewer/scene/model/dtx/triangles/renderers/DTXTrianglesRenderers.js +0 -307
  88. package/src/viewer/scene/model/dtx/triangles/renderers/DTXTrianglesSilhouetteRenderer.js +0 -472
  89. package/src/viewer/scene/model/dtx/triangles/renderers/DTXTrianglesSnapInitRenderer.js +0 -474
  90. package/src/viewer/scene/model/dtx/triangles/renderers/DTXTrianglesSnapRenderer.js +0 -435
  91. package/src/viewer/scene/model/vbo/ScratchMemory.js +0 -63
  92. package/src/viewer/scene/model/vbo/VBORenderer.js +0 -664
  93. package/src/viewer/scene/model/vbo/batching/lines/VBOBatchingLinesLayer.js +0 -704
  94. package/src/viewer/scene/model/vbo/batching/lines/lib/VBOBatchingLinesBuffer.js +0 -19
  95. package/src/viewer/scene/model/vbo/batching/lines/renderers/VBOBatchingLineSnapInitRenderer.js +0 -318
  96. package/src/viewer/scene/model/vbo/batching/lines/renderers/VBOBatchingLinesColorRenderer.js +0 -114
  97. package/src/viewer/scene/model/vbo/batching/lines/renderers/VBOBatchingLinesRenderers.js +0 -99
  98. package/src/viewer/scene/model/vbo/batching/lines/renderers/VBOBatchingLinesSilhouetteRenderer.js +0 -124
  99. package/src/viewer/scene/model/vbo/batching/lines/renderers/VBOBatchingLinesSnapInitRenderer.js +0 -313
  100. package/src/viewer/scene/model/vbo/batching/lines/renderers/VBOBatchingLinesSnapRenderer.js +0 -311
  101. package/src/viewer/scene/model/vbo/batching/lines/renderers/VBOSceneModelLineBatchingRenderer.js +0 -24
  102. package/src/viewer/scene/model/vbo/batching/points/VBOBatchingPointsLayer.js +0 -688
  103. package/src/viewer/scene/model/vbo/batching/points/VBOBatchingPointsRenderer.js +0 -24
  104. package/src/viewer/scene/model/vbo/batching/points/renderers/VBOBatchingPointsColorRenderer.js +0 -168
  105. package/src/viewer/scene/model/vbo/batching/points/renderers/VBOBatchingPointsOcclusionRenderer.js +0 -136
  106. package/src/viewer/scene/model/vbo/batching/points/renderers/VBOBatchingPointsPickDepthRenderer.js +0 -156
  107. package/src/viewer/scene/model/vbo/batching/points/renderers/VBOBatchingPointsPickMeshRenderer.js +0 -148
  108. package/src/viewer/scene/model/vbo/batching/points/renderers/VBOBatchingPointsRenderers.js +0 -144
  109. package/src/viewer/scene/model/vbo/batching/points/renderers/VBOBatchingPointsShadowRenderer.js +0 -107
  110. package/src/viewer/scene/model/vbo/batching/points/renderers/VBOBatchingPointsSilhouetteRenderer.js +0 -146
  111. package/src/viewer/scene/model/vbo/batching/points/renderers/VBOBatchingPointsSnapInitRenderer.js +0 -315
  112. package/src/viewer/scene/model/vbo/batching/points/renderers/VBOBatchingPointsSnapRenderer.js +0 -305
  113. package/src/viewer/scene/model/vbo/batching/triangles/VBOBatchingTrianglesBuffer.js +0 -24
  114. package/src/viewer/scene/model/vbo/batching/triangles/VBOBatchingTrianglesLayer.js +0 -1346
  115. package/src/viewer/scene/model/vbo/batching/triangles/renderers/EdgesColorRenderer.js +0 -131
  116. package/src/viewer/scene/model/vbo/batching/triangles/renderers/EdgesEmphasisRenderer.js +0 -135
  117. package/src/viewer/scene/model/vbo/batching/triangles/renderers/EdgesRenderer.js +0 -12
  118. package/src/viewer/scene/model/vbo/batching/triangles/renderers/Renderers.js +0 -403
  119. package/src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesBatchingRenderer.js +0 -35
  120. package/src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesColorRenderer.js +0 -252
  121. package/src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesColorTextureRenderer.js +0 -294
  122. package/src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesDepthRenderer.js +0 -115
  123. package/src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesFlatColorRenderer.js +0 -246
  124. package/src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesNormalsRenderer.js +0 -139
  125. package/src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesOcclusionRenderer.js +0 -125
  126. package/src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesPBRRenderer.js +0 -561
  127. package/src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesPickDepthRenderer.js +0 -144
  128. package/src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesPickMeshRenderer.js +0 -130
  129. package/src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesPickNormalsFlatRenderer.js +0 -121
  130. package/src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesPickNormalsRenderer.js +0 -131
  131. package/src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesShadowRenderer.js +0 -107
  132. package/src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesSilhouetteRenderer.js +0 -144
  133. package/src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesSnapInitRenderer.js +0 -313
  134. package/src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesSnapRenderer.js +0 -312
  135. package/src/viewer/scene/model/vbo/float16.js +0 -760
  136. package/src/viewer/scene/model/vbo/instancing/lines/VBOInstancingLinesLayer.js +0 -711
  137. package/src/viewer/scene/model/vbo/instancing/lines/renderers/VBOInstancingLinesColorRenderer.js +0 -148
  138. package/src/viewer/scene/model/vbo/instancing/lines/renderers/VBOInstancingLinesRenderer.js +0 -26
  139. package/src/viewer/scene/model/vbo/instancing/lines/renderers/VBOInstancingLinesRenderers.js +0 -139
  140. package/src/viewer/scene/model/vbo/instancing/lines/renderers/VBOInstancingLinesSilhouetteRenderer.js +0 -127
  141. package/src/viewer/scene/model/vbo/instancing/lines/renderers/VBOInstancingLinesSnapInitRenderer.js +0 -308
  142. package/src/viewer/scene/model/vbo/instancing/lines/renderers/VBOInstancingLinesSnapRenderer.js +0 -299
  143. package/src/viewer/scene/model/vbo/instancing/points/VBOInstancingPointsLayer.js +0 -733
  144. package/src/viewer/scene/model/vbo/instancing/points/renderers/VBOInstancingPointsColorRenderer.js +0 -174
  145. package/src/viewer/scene/model/vbo/instancing/points/renderers/VBOInstancingPointsDepthRenderer.js +0 -156
  146. package/src/viewer/scene/model/vbo/instancing/points/renderers/VBOInstancingPointsOcclusionRenderer.js +0 -149
  147. package/src/viewer/scene/model/vbo/instancing/points/renderers/VBOInstancingPointsPickDepthRenderer.js +0 -170
  148. package/src/viewer/scene/model/vbo/instancing/points/renderers/VBOInstancingPointsPickMeshRenderer.js +0 -152
  149. package/src/viewer/scene/model/vbo/instancing/points/renderers/VBOInstancingPointsRenderer.js +0 -26
  150. package/src/viewer/scene/model/vbo/instancing/points/renderers/VBOInstancingPointsRenderers.js +0 -174
  151. package/src/viewer/scene/model/vbo/instancing/points/renderers/VBOInstancingPointsShadowRenderer.js +0 -119
  152. package/src/viewer/scene/model/vbo/instancing/points/renderers/VBOInstancingPointsSilhouetteRenderer.js +0 -154
  153. package/src/viewer/scene/model/vbo/instancing/points/renderers/VBOInstancingPointsSnapInitRenderer.js +0 -307
  154. package/src/viewer/scene/model/vbo/instancing/points/renderers/VBOInstancingPointsSnapRenderer.js +0 -293
  155. package/src/viewer/scene/model/vbo/instancing/points/renderers/VBOInstancingTrianglesRenderer.js +0 -150
  156. package/src/viewer/scene/model/vbo/instancing/triangles/VBOInstancingTrianglesLayer.js +0 -1289
  157. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/EdgesColorRenderer.js +0 -135
  158. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/EdgesEmphasisRenderer.js +0 -137
  159. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/EdgesRenderer.js +0 -12
  160. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/Renderers.js +0 -403
  161. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesColorRenderer.js +0 -267
  162. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesColorTextureRenderer.js +0 -299
  163. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesDepthRenderer.js +0 -126
  164. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesFlatColorRenderer.js +0 -255
  165. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesFlatNormalsRenderer.js +0 -130
  166. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesInstancingRenderer.js +0 -32
  167. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesNormalsRenderer.js +0 -138
  168. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesOcclusionRenderer.js +0 -128
  169. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesPBRRenderer.js +0 -561
  170. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesPickDepthRenderer.js +0 -149
  171. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesPickMeshRenderer.js +0 -136
  172. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesPickNormalsFlatRenderer.js +0 -130
  173. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesPickNormalsRenderer.js +0 -145
  174. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesShadowRenderer.js +0 -113
  175. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesSilhouetteRenderer.js +0 -148
  176. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesSnapInitRenderer.js +0 -319
  177. package/src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesSnapRenderer.js +0 -310
  178. package/src/viewer/scene/webgl/Attribute.js +0 -23
  179. package/src/viewer/scene/webgl/Program.js +0 -181
  180. package/src/viewer/scene/webgl/RenderBufferManager.js +0 -34
  181. package/src/viewer/scene/webgl/Sampler.js +0 -18
  182. package/src/viewer/scene/webgl/Shader.js +0 -49
  183. package/src/viewer/scene/webgl/sao/SAODepthLimitedBlurRenderer.js +0 -324
  184. package/src/viewer/scene/webgl/sao/SAOOcclusionRenderer.js +0 -384
@@ -1,267 +0,0 @@
1
- import {TrianglesInstancingRenderer} from "./TrianglesInstancingRenderer.js";
2
-
3
- /**
4
- * @private
5
- */
6
- class TrianglesColorRenderer extends TrianglesInstancingRenderer {
7
- _getHash() {
8
- const scene = this._scene;
9
- return [scene._lightsState.getHash(), scene._sectionPlanesState.getHash(), (this._withSAO ? "sao" : "nosao")].join(";");
10
- }
11
-
12
- drawLayer(frameCtx, layer, renderPass) {
13
- super.drawLayer(frameCtx, layer, renderPass, { incrementDrawState: true });
14
- }
15
-
16
- _buildVertexShader() {
17
- const scene = this._scene;
18
- const sectionPlanesState = scene._sectionPlanesState;
19
- const lightsState = scene._lightsState;
20
- const clipping = sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
21
- let i;
22
- let len;
23
- let light;
24
- const src = [];
25
- src.push("#version 300 es");
26
- src.push("// Instancing geometry drawing vertex shader");
27
-
28
- src.push("uniform int renderPass;");
29
-
30
- src.push("in vec3 position;");
31
- src.push("in vec2 normal;");
32
- src.push("in vec4 color;");
33
- src.push("in float flags;");
34
-
35
- if (scene.entityOffsetsEnabled) {
36
- src.push("in vec3 offset;");
37
- }
38
-
39
- src.push("in vec4 modelMatrixCol0;"); // Modeling matrix
40
- src.push("in vec4 modelMatrixCol1;");
41
- src.push("in vec4 modelMatrixCol2;");
42
-
43
- src.push("in vec4 modelNormalMatrixCol0;");
44
- src.push("in vec4 modelNormalMatrixCol1;");
45
- src.push("in vec4 modelNormalMatrixCol2;");
46
-
47
- this._addMatricesUniformBlockLines(src, true);
48
-
49
- if (scene.logarithmicDepthBufferEnabled) {
50
- src.push("uniform float logDepthBufFC;");
51
- src.push("out float vFragDepth;");
52
- src.push("bool isPerspectiveMatrix(mat4 m) {");
53
- src.push(" return (m[2][3] == - 1.0);");
54
- src.push("}");
55
- src.push("out float isPerspective;");
56
- }
57
-
58
- src.push("uniform vec4 lightAmbient;");
59
-
60
- for (i = 0, len = lightsState.lights.length; i < len; i++) {
61
- light = lightsState.lights[i];
62
- if (light.type === "ambient") {
63
- continue;
64
- }
65
- src.push("uniform vec4 lightColor" + i + ";");
66
- if (light.type === "dir") {
67
- src.push("uniform vec3 lightDir" + i + ";");
68
- }
69
- if (light.type === "point") {
70
- src.push("uniform vec3 lightPos" + i + ";");
71
- }
72
- if (light.type === "spot") {
73
- src.push("uniform vec3 lightPos" + i + ";");
74
- src.push("uniform vec3 lightDir" + i + ";");
75
- }
76
- }
77
-
78
- src.push("vec3 octDecode(vec2 oct) {");
79
- src.push(" vec3 v = vec3(oct.xy, 1.0 - abs(oct.x) - abs(oct.y));");
80
- src.push(" if (v.z < 0.0) {");
81
- src.push(" v.xy = (1.0 - abs(v.yx)) * vec2(v.x >= 0.0 ? 1.0 : -1.0, v.y >= 0.0 ? 1.0 : -1.0);");
82
- src.push(" }");
83
- src.push(" return normalize(v);");
84
- src.push("}");
85
-
86
- if (clipping) {
87
- src.push("out vec4 vWorldPosition;");
88
- src.push("out float vFlags;");
89
- }
90
- src.push("out vec4 vColor;");
91
-
92
- src.push("void main(void) {");
93
-
94
- // colorFlag = NOT_RENDERED | COLOR_OPAQUE | COLOR_TRANSPARENT
95
- // renderPass = COLOR_OPAQUE | COLOR_TRANSPARENT
96
-
97
- src.push(`int colorFlag = int(flags) & 0xF;`);
98
- src.push(`if (colorFlag != renderPass) {`);
99
- src.push(" gl_Position = vec4(0.0, 0.0, 0.0, 0.0);"); // Cull vertex
100
-
101
- src.push("} else {");
102
-
103
- src.push("vec4 worldPosition = positionsDecodeMatrix * vec4(position, 1.0); ");
104
- src.push("worldPosition = worldMatrix * vec4(dot(worldPosition, modelMatrixCol0), dot(worldPosition, modelMatrixCol1), dot(worldPosition, modelMatrixCol2), 1.0);");
105
- if (scene.entityOffsetsEnabled) {
106
- src.push("worldPosition.xyz = worldPosition.xyz + offset;");
107
- }
108
-
109
- src.push("vec4 viewPosition = viewMatrix * worldPosition; ");
110
-
111
- src.push("vec4 modelNormal = vec4(octDecode(normal.xy), 0.0); ");
112
- src.push("vec4 worldNormal = worldNormalMatrix * vec4(dot(modelNormal, modelNormalMatrixCol0), dot(modelNormal, modelNormalMatrixCol1), dot(modelNormal, modelNormalMatrixCol2), 0.0);");
113
- src.push("vec3 viewNormal = normalize(vec4(viewNormalMatrix * worldNormal).xyz);");
114
-
115
- src.push("vec3 reflectedColor = vec3(0.0, 0.0, 0.0);");
116
- src.push("vec3 viewLightDir = vec3(0.0, 0.0, -1.0);");
117
-
118
- src.push("float lambertian = 1.0;");
119
- for (i = 0, len = lightsState.lights.length; i < len; i++) {
120
- light = lightsState.lights[i];
121
- if (light.type === "ambient") {
122
- continue;
123
- }
124
- if (light.type === "dir") {
125
- if (light.space === "view") {
126
- src.push("viewLightDir = normalize(lightDir" + i + ");");
127
- } else {
128
- src.push("viewLightDir = normalize((viewMatrix * vec4(lightDir" + i + ", 0.0)).xyz);");
129
- }
130
- } else if (light.type === "point") {
131
- if (light.space === "view") {
132
- src.push("viewLightDir = -normalize(lightPos" + i + " - viewPosition.xyz);");
133
- } else {
134
- src.push("viewLightDir = -normalize((viewMatrix * vec4(lightPos" + i + ", 0.0)).xyz);");
135
- }
136
- } else if (light.type === "spot") {
137
- if (light.space === "view") {
138
- src.push("viewLightDir = normalize(lightDir" + i + ");");
139
- } else {
140
- src.push("viewLightDir = normalize((viewMatrix * vec4(lightDir" + i + ", 0.0)).xyz);");
141
- }
142
- } else {
143
- continue;
144
- }
145
- src.push("lambertian = max(dot(-viewNormal, viewLightDir), 0.0);");
146
- src.push("reflectedColor += lambertian * (lightColor" + i + ".rgb * lightColor" + i + ".a);");
147
- }
148
-
149
- src.push("vec3 rgb = (vec3(float(color.r) / 255.0, float(color.g) / 255.0, float(color.b) / 255.0));");
150
- src.push("vColor = vec4((lightAmbient.rgb * lightAmbient.a * rgb) + (reflectedColor * rgb), float(color.a) / 255.0);");
151
-
152
- src.push("vec4 clipPos = projMatrix * viewPosition;");
153
- if (scene.logarithmicDepthBufferEnabled) {
154
- src.push("vFragDepth = 1.0 + clipPos.w;");
155
- src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
156
- }
157
-
158
- if (clipping) {
159
- src.push("vWorldPosition = worldPosition;");
160
- src.push("vFlags = flags;");
161
- }
162
-
163
- src.push("gl_Position = clipPos;");
164
- src.push("}");
165
- src.push("}");
166
- return src;
167
- }
168
-
169
- _buildFragmentShader() {
170
- const scene = this._scene;
171
- const sectionPlanesState = scene._sectionPlanesState;
172
- const clipping = sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
173
- const src = [];
174
- src.push("#version 300 es");
175
- src.push("// Instancing geometry drawing fragment shader");
176
-
177
- src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
178
- src.push("precision highp float;");
179
- src.push("precision highp int;");
180
- src.push("#else");
181
- src.push("precision mediump float;");
182
- src.push("precision mediump int;");
183
- src.push("#endif");
184
- if (scene.logarithmicDepthBufferEnabled) {
185
- src.push("in float isPerspective;");
186
- src.push("uniform float logDepthBufFC;");
187
- src.push("in float vFragDepth;");
188
- }
189
- if (this._withSAO) {
190
- src.push("uniform sampler2D uOcclusionTexture;");
191
- src.push("uniform vec4 uSAOParams;");
192
- src.push("const float packUpscale = 256. / 255.;");
193
- src.push("const float unpackDownScale = 255. / 256.;");
194
- src.push("const vec3 packFactors = vec3( 256. * 256. * 256., 256. * 256., 256. );");
195
- src.push("const vec4 unPackFactors = unpackDownScale / vec4( packFactors, 1. );");
196
-
197
- src.push("float unpackRGBToFloat( const in vec4 v ) {");
198
- src.push(" return dot( v, unPackFactors );");
199
- src.push("}");
200
- }
201
-
202
- if (clipping) {
203
- src.push("in vec4 vWorldPosition;");
204
- src.push("in float vFlags;");
205
- for (let i = 0, len = sectionPlanesState.getNumAllocatedSectionPlanes(); i < len; i++) {
206
- src.push("uniform bool sectionPlaneActive" + i + ";");
207
- src.push("uniform vec3 sectionPlanePos" + i + ";");
208
- src.push("uniform vec3 sectionPlaneDir" + i + ";");
209
- }
210
- src.push("uniform float sliceThickness;");
211
- src.push("uniform vec4 sliceColor;");
212
- }
213
- src.push("in vec4 vColor;");
214
- src.push("out vec4 outColor;");
215
- src.push("void main(void) {");
216
- src.push(" vec4 newColor;");
217
- src.push(" newColor = vColor;");
218
- if (clipping) {
219
- src.push(" bool clippable = (int(vFlags) >> 16 & 0xF) == 1;");
220
- src.push(" if (clippable) {");
221
- src.push(" float dist = 0.0;");
222
- for (let i = 0, len = sectionPlanesState.getNumAllocatedSectionPlanes(); i < len; i++) {
223
- src.push("if (sectionPlaneActive" + i + ") {");
224
- src.push(" dist += clamp(dot(-sectionPlaneDir" + i + ".xyz, vWorldPosition.xyz - sectionPlanePos" + i + ".xyz), 0.0, 1000.0);");
225
- src.push("}");
226
- }
227
- src.push(" if (dist > sliceThickness) { ");
228
- src.push(" discard;")
229
- src.push(" }");
230
- src.push(" if (dist > 0.0) { ");
231
- src.push(" newColor = sliceColor;");
232
- src.push(" }");
233
- src.push("}");
234
- }
235
-
236
- if (scene.logarithmicDepthBufferEnabled) {
237
- src.push(" float dx = dFdx(vFragDepth);")
238
- src.push(" float dy = dFdy(vFragDepth);")
239
- src.push(" float diff = sqrt(dx*dx+dy*dy);");
240
- src.push(" gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth + diff ) * logDepthBufFC * 0.5;");
241
- } else {
242
- src.push(" float dx = dFdx(gl_FragCoord.z);")
243
- src.push(" float dy = dFdy(gl_FragCoord.z);")
244
- src.push(" float diff = sqrt(dx*dx+dy*dy);");
245
- src.push(" gl_FragDepth = gl_FragCoord.z + diff;");
246
- }
247
-
248
- // Doing SAO blend in the main solid fill draw shader just so that edge lines can be drawn over the top
249
- // Would be more efficient to defer this, then render lines later, using same depth buffer for Z-reject
250
-
251
- if (this._withSAO) {
252
- src.push(" float viewportWidth = uSAOParams[0];");
253
- src.push(" float viewportHeight = uSAOParams[1];");
254
- src.push(" float blendCutoff = uSAOParams[2];");
255
- src.push(" float blendFactor = uSAOParams[3];");
256
- src.push(" vec2 uv = vec2(gl_FragCoord.x / viewportWidth, gl_FragCoord.y / viewportHeight);");
257
- src.push(" float ambient = smoothstep(blendCutoff, 1.0, unpackRGBToFloat(texture(uOcclusionTexture, uv))) * blendFactor;");
258
- src.push(" outColor = vec4(newColor.rgb * ambient, 1.0);");
259
- } else {
260
- src.push(" outColor = newColor;");
261
- }
262
- src.push("}");
263
- return src;
264
- }
265
- }
266
-
267
- export {TrianglesColorRenderer};
@@ -1,299 +0,0 @@
1
- import {TrianglesInstancingRenderer} from "./TrianglesInstancingRenderer.js";
2
-
3
- /**
4
- * @private
5
- */
6
-
7
- export class TrianglesColorTextureRenderer extends TrianglesInstancingRenderer {
8
- _getHash() {
9
- const scene = this._scene;
10
- return [scene.gammaOutput, scene._lightsState.getHash(), scene._sectionPlanesState.getHash(), (this._withSAO ? "sao" : "nosao")].join(";");
11
- }
12
-
13
- drawLayer(frameCtx, layer, renderPass) {
14
- super.drawLayer(frameCtx, layer, renderPass, { incrementDrawState: true });
15
- }
16
-
17
- _buildVertexShader() {
18
- const scene = this._scene;
19
- const sectionPlanesState = scene._sectionPlanesState;
20
- const clipping = sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
21
- const src = [];
22
- src.push("#version 300 es");
23
- src.push("// Instancing geometry drawing vertex shader");
24
-
25
- src.push("uniform int renderPass;");
26
-
27
- src.push("in vec3 position;");
28
- src.push("in vec4 color;");
29
- src.push("in vec2 uv;");
30
- src.push("in float flags;");
31
-
32
- if (scene.entityOffsetsEnabled) {
33
- src.push("in vec3 offset;");
34
- }
35
-
36
- src.push("in vec4 modelMatrixCol0;"); // Modeling matrix
37
- src.push("in vec4 modelMatrixCol1;");
38
- src.push("in vec4 modelMatrixCol2;");
39
-
40
- this._addMatricesUniformBlockLines(src);
41
-
42
- src.push("uniform mat3 uvDecodeMatrix;");
43
-
44
- if (scene.logarithmicDepthBufferEnabled) {
45
- src.push("uniform float logDepthBufFC;");
46
- src.push("out float vFragDepth;");
47
- src.push("bool isPerspectiveMatrix(mat4 m) {");
48
- src.push(" return (m[2][3] == - 1.0);");
49
- src.push("}");
50
- src.push("out float isPerspective;");
51
- }
52
-
53
- if (clipping) {
54
- src.push("out vec4 vWorldPosition;");
55
- src.push("out float vFlags;");
56
- }
57
- src.push("out vec4 vViewPosition;");
58
- src.push("out vec4 vColor;");
59
- src.push("out vec2 vUV;");
60
-
61
- src.push("void main(void) {");
62
-
63
- // colorFlag = NOT_RENDERED | COLOR_OPAQUE | COLOR_TRANSPARENT
64
- // renderPass = COLOR_OPAQUE | COLOR_TRANSPARENT
65
-
66
- src.push(`int colorFlag = int(flags) & 0xF;`);
67
- src.push(`if (colorFlag != renderPass) {`);
68
- src.push(" gl_Position = vec4(0.0, 0.0, 0.0, 0.0);"); // Cull vertex
69
-
70
- src.push("} else {");
71
-
72
- src.push("vec4 worldPosition = positionsDecodeMatrix * vec4(position, 1.0); ");
73
- src.push("worldPosition = worldMatrix * vec4(dot(worldPosition, modelMatrixCol0), dot(worldPosition, modelMatrixCol1), dot(worldPosition, modelMatrixCol2), 1.0);");
74
- if (scene.entityOffsetsEnabled) {
75
- src.push("worldPosition.xyz = worldPosition.xyz + offset;");
76
- }
77
-
78
- src.push("vec4 viewPosition = viewMatrix * worldPosition; ");
79
- src.push("vViewPosition = viewPosition;");
80
- src.push("vColor = vec4(float(color.r) / 255.0, float(color.g) / 255.0, float(color.b) / 255.0, float(color.a) / 255.0);");
81
- src.push("vUV = (uvDecodeMatrix * vec3(uv, 1.0)).xy;");
82
-
83
- src.push("vec4 clipPos = projMatrix * viewPosition;");
84
- if (scene.logarithmicDepthBufferEnabled) {
85
- src.push("vFragDepth = 1.0 + clipPos.w;");
86
- src.push("isPerspective = float (isPerspectiveMatrix(projMatrix));");
87
- }
88
-
89
- if (clipping) {
90
- src.push("vWorldPosition = worldPosition;");
91
- src.push("vFlags = flags;");
92
- }
93
-
94
- src.push("gl_Position = clipPos;");
95
- src.push("}");
96
- src.push("}");
97
- return src;
98
- }
99
-
100
- _buildFragmentShader() {
101
- const scene = this._scene;
102
- const gammaOutput = scene.gammaOutput; // If set, then it expects that all textures and colors need to be outputted in premultiplied gamma. Default is false.
103
- const lightsState = scene._lightsState;
104
- const sectionPlanesState = scene._sectionPlanesState;
105
- const clipping = sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
106
- const useAlphaCutoff = this._useAlphaCutoff;
107
- const src = [];
108
- src.push("#version 300 es");
109
- src.push("// Instancing geometry drawing fragment shader");
110
-
111
- src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
112
- src.push("precision highp float;");
113
- src.push("precision highp int;");
114
- src.push("#else");
115
- src.push("precision mediump float;");
116
- src.push("precision mediump int;");
117
- src.push("#endif");
118
-
119
- if (scene.logarithmicDepthBufferEnabled) {
120
- src.push("in float isPerspective;");
121
- src.push("uniform float logDepthBufFC;");
122
- src.push("in float vFragDepth;");
123
- }
124
- src.push("uniform sampler2D uColorMap;");
125
- if (this._withSAO) {
126
- src.push("uniform sampler2D uOcclusionTexture;");
127
- src.push("uniform vec4 uSAOParams;");
128
-
129
- src.push("const float packUpscale = 256. / 255.;");
130
- src.push("const float unpackDownScale = 255. / 256.;");
131
- src.push("const vec3 packFactors = vec3( 256. * 256. * 256., 256. * 256., 256. );");
132
- src.push("const vec4 unPackFactors = unpackDownScale / vec4( packFactors, 1. );");
133
-
134
- src.push("float unpackRGBToFloat( const in vec4 v ) {");
135
- src.push(" return dot( v, unPackFactors );");
136
- src.push("}");
137
- }
138
- src.push("uniform float gammaFactor;");
139
- src.push("vec4 linearToLinear( in vec4 value ) {");
140
- src.push(" return value;");
141
- src.push("}");
142
- src.push("vec4 sRGBToLinear( in vec4 value ) {");
143
- src.push(" return vec4( mix( pow( value.rgb * 0.9478672986 + vec3( 0.0521327014 ), vec3( 2.4 ) ), value.rgb * 0.0773993808, vec3( lessThanEqual( value.rgb, vec3( 0.04045 ) ) ) ), value.w );");
144
- src.push("}");
145
- src.push("vec4 gammaToLinear( in vec4 value) {");
146
- src.push(" return vec4( pow( value.xyz, vec3( gammaFactor ) ), value.w );");
147
- src.push("}");
148
- if (gammaOutput) {
149
- src.push("vec4 linearToGamma( in vec4 value, in float gammaFactor ) {");
150
- src.push(" return vec4( pow( value.xyz, vec3( 1.0 / gammaFactor ) ), value.w );");
151
- src.push("}");
152
- }
153
- if (clipping) {
154
- src.push("in vec4 vWorldPosition;");
155
- src.push("in float vFlags;");
156
- for (let i = 0, len = sectionPlanesState.getNumAllocatedSectionPlanes(); i < len; i++) {
157
- src.push("uniform bool sectionPlaneActive" + i + ";");
158
- src.push("uniform vec3 sectionPlanePos" + i + ";");
159
- src.push("uniform vec3 sectionPlaneDir" + i + ";");
160
- }
161
- src.push("uniform float sliceThickness;");
162
- src.push("uniform vec4 sliceColor;");
163
- }
164
- this._addMatricesUniformBlockLines(src);
165
-
166
- src.push("uniform vec4 lightAmbient;");
167
- for (let i = 0, len = lightsState.lights.length; i < len; i++) {
168
- const light = lightsState.lights[i];
169
- if (light.type === "ambient") {
170
- continue;
171
- }
172
- src.push("uniform vec4 lightColor" + i + ";");
173
- if (light.type === "dir") {
174
- src.push("uniform vec3 lightDir" + i + ";");
175
- }
176
- if (light.type === "point") {
177
- src.push("uniform vec3 lightPos" + i + ";");
178
- }
179
- if (light.type === "spot") {
180
- src.push("uniform vec3 lightPos" + i + ";");
181
- src.push("uniform vec3 lightDir" + i + ";");
182
- }
183
- }
184
-
185
- if (useAlphaCutoff) {
186
- src.push("uniform float materialAlphaCutoff;");
187
- }
188
-
189
- src.push("in vec4 vViewPosition;");
190
- src.push("in vec4 vColor;");
191
- src.push("in vec2 vUV;");
192
- src.push("out vec4 outColor;");
193
-
194
- src.push("void main(void) {");
195
- src.push(" vec4 newColor;");
196
- src.push(" newColor = vColor;");
197
- if (clipping) {
198
- src.push(" bool clippable = (int(vFlags) >> 16 & 0xF) == 1;");
199
- src.push(" if (clippable) {");
200
- src.push(" float dist = 0.0;");
201
- for (let i = 0, len = sectionPlanesState.getNumAllocatedSectionPlanes(); i < len; i++) {
202
- src.push("if (sectionPlaneActive" + i + ") {");
203
- src.push(" dist += clamp(dot(-sectionPlaneDir" + i + ".xyz, vWorldPosition.xyz - sectionPlanePos" + i + ".xyz), 0.0, 1000.0);");
204
- src.push("}");
205
- }
206
- src.push(" if (dist > sliceThickness) { ");
207
- src.push(" discard;")
208
- src.push(" }");
209
- src.push(" if (dist > 0.0) { ");
210
- src.push(" newColor = sliceColor;");
211
- src.push(" }");
212
- src.push("}");
213
- }
214
-
215
- src.push("vec3 reflectedColor = vec3(0.0, 0.0, 0.0);");
216
- src.push("vec3 viewLightDir = vec3(0.0, 0.0, -1.0);");
217
-
218
- src.push("float lambertian = 1.0;");
219
-
220
- src.push("vec3 xTangent = dFdx( vViewPosition.xyz );");
221
- src.push("vec3 yTangent = dFdy( vViewPosition.xyz );");
222
- src.push("vec3 viewNormal = normalize( cross( xTangent, yTangent ) );");
223
-
224
- for (let i = 0, len = lightsState.lights.length; i < len; i++) {
225
- const light = lightsState.lights[i];
226
- if (light.type === "ambient") {
227
- continue;
228
- }
229
- if (light.type === "dir") {
230
- if (light.space === "view") {
231
- src.push("viewLightDir = normalize(lightDir" + i + ");");
232
- } else {
233
- src.push("viewLightDir = normalize((viewMatrix * vec4(lightDir" + i + ", 0.0)).xyz);");
234
- }
235
- } else if (light.type === "point") {
236
- if (light.space === "view") {
237
- src.push("viewLightDir = -normalize(lightPos" + i + " - vViewPosition.xyz);");
238
- } else {
239
- src.push("viewLightDir = -normalize((viewMatrix * vec4(lightPos" + i + ", 0.0)).xyz);");
240
- }
241
- } else if (light.type === "spot") {
242
- if (light.space === "view") {
243
- src.push("viewLightDir = normalize(lightDir" + i + ");");
244
- } else {
245
- src.push("viewLightDir = normalize((viewMatrix * vec4(lightDir" + i + ", 0.0)).xyz);");
246
- }
247
- } else {
248
- continue;
249
- }
250
-
251
- src.push("lambertian = max(dot(-viewNormal, viewLightDir), 0.0);");
252
- src.push("reflectedColor += lambertian * (lightColor" + i + ".rgb * lightColor" + i + ".a);");
253
- }
254
-
255
- src.push("vec4 color = vec4((lightAmbient.rgb * lightAmbient.a * newColor.rgb) + (reflectedColor * newColor.rgb), newColor.a);");
256
-
257
- src.push("vec4 sampleColor = texture(uColorMap, vUV);");
258
-
259
- if (useAlphaCutoff) {
260
- src.push("if (sampleColor.a < materialAlphaCutoff) {");
261
- src.push(" discard;");
262
- src.push("}");
263
- }
264
-
265
- if (gammaOutput) {
266
- src.push("sampleColor = sRGBToLinear(sampleColor);");
267
- }
268
-
269
- src.push("vec4 colorTexel = color * sampleColor;");
270
-
271
- src.push("float opacity = color.a;");
272
-
273
- if (this._withSAO) {
274
- // Doing SAO blend in the main solid fill draw shader just so that edge lines can be drawn over the top
275
- // Would be more efficient to defer this, then render lines later, using same depth buffer for Z-reject
276
- src.push(" float viewportWidth = uSAOParams[0];");
277
- src.push(" float viewportHeight = uSAOParams[1];");
278
- src.push(" float blendCutoff = uSAOParams[2];");
279
- src.push(" float blendFactor = uSAOParams[3];");
280
- src.push(" vec2 uv = vec2(gl_FragCoord.x / viewportWidth, gl_FragCoord.y / viewportHeight);");
281
- src.push(" float ambient = smoothstep(blendCutoff, 1.0, unpackRGBToFloat(texture(uOcclusionTexture, uv))) * blendFactor;");
282
-
283
- src.push(" outColor = vec4(colorTexel.rgb * ambient, opacity);");
284
- } else {
285
- src.push(" outColor = vec4(colorTexel.rgb, opacity);");
286
- }
287
-
288
- if (gammaOutput) {
289
- src.push("outColor = linearToGamma(outColor, gammaFactor);");
290
- }
291
-
292
- if (scene.logarithmicDepthBufferEnabled) {
293
- src.push("gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
294
- }
295
-
296
- src.push("}");
297
- return src;
298
- }
299
- }