@itwin/core-frontend 4.0.0-dev.85 → 4.0.0-dev.87

package/lib/cjs/render/webgl/glsl/PointCloud.js

@@ -19,39 +19,39 @@ const Thematic_1 = require("./Thematic");
 const Surface_1 = require("./Surface");
 const Fragment_1 = require("./Fragment");
 // Revert components if color format is BGR instead of RGB.
-const computeColor = `
-  return u_pointCloud.y == 1.0 ? vec4(a_color.b, a_color.g, a_color.r, 1.0) : vec4(a_color, 1.0);
+const computeColor = `
+  return u_pointCloud.y == 1.0 ? vec4(a_color.b, a_color.g, a_color.r, 1.0) : vec4(a_color, 1.0);
 `;
 const computeBaseColor = "return v_color;";
 // Round the point unless drawing square points.
-const roundPointDiscard = `
-  if (u_pointCloudSettings.w == 1.0)
-    return false;
-
-  vec2 pointXY = (2.0 * gl_PointCoord - 1.0);
-  return dot(pointXY, pointXY) > 1.0;
+const roundPointDiscard = `
+  if (u_pointCloudSettings.w == 1.0)
+    return false;
+
+  vec2 pointXY = (2.0 * gl_PointCoord - 1.0);
+  return dot(pointXY, pointXY) > 1.0;
 `;
 const checkForClassifiedDiscard = "return baseColor.a == 0.0;";
-const computePosition = `
-  gl_PointSize = 1.0;
-  vec4 pos = MAT_MVP * rawPos;
-  if (u_pointCloudSettings.x > 0.0) {
-    // Size is specified in pixels.
-    gl_PointSize = u_pointCloudSettings.x;
-    return pos;
-  }
-
-  // Point size is in meters (voxel size).
-  if (pos.w <= 0.0) {
-    // Cannot perform perspective divide below.
-    return pos;
-  }
-
-  // Convert voxel size in meters into pixel size, then compute pixel size, taking perspective into account.
-  mat4 toView = u_viewportTransformation * MAT_MVP;
-  float scale = length(toView[0].xyz);
-  gl_PointSize = -u_pointCloudSettings.x * clamp(u_pointCloud.x * scale / pos.w, u_pointCloudSettings.y, u_pointCloudSettings.z);
-  return pos;
+const computePosition = `
+  gl_PointSize = 1.0;
+  vec4 pos = MAT_MVP * rawPos;
+  if (u_pointCloudSettings.x > 0.0) {
+    // Size is specified in pixels.
+    gl_PointSize = u_pointCloudSettings.x;
+    return pos;
+  }
+
+  // Point size is in meters (voxel size).
+  if (pos.w <= 0.0) {
+    // Cannot perform perspective divide below.
+    return pos;
+  }
+
+  // Convert voxel size in meters into pixel size, then compute pixel size, taking perspective into account.
+  mat4 toView = u_viewportTransformation * MAT_MVP;
+  float scale = length(toView[0].xyz);
+  gl_PointSize = -u_pointCloudSettings.x * clamp(u_pointCloud.x * scale / pos.w, u_pointCloudSettings.y, u_pointCloudSettings.z);
+  return pos;
 `;
 function createBuilder() {
     const builder = new ShaderBuilder_1.ProgramBuilder(AttributeMap_1.AttributeMap.findAttributeMap(2 /* TechniqueId.PointCloud */, false));

package/lib/cjs/render/webgl/glsl/PointCloud.js.map

@@ -1 +1 @@
-{"version":3,"file":"PointCloud.js","sourceRoot":"","sources":["../../../../../src/render/webgl/glsl/PointCloud.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module WebGL\r\n */\r\n\r\nimport { assert } from \"@itwin/core-bentley\";\r\nimport { AttributeMap } from \"../AttributeMap\";\r\nimport { FragmentShaderComponent, ProgramBuilder, VariableType, VertexShaderComponent } from \"../ShaderBuilder\";\r\nimport { FeatureMode, IsAnimated, IsClassified, IsThematic } from \"../TechniqueFlags\";\r\nimport { TechniqueId } from \"../TechniqueId\";\r\nimport { addUniformHiliter } from \"./FeatureSymbology\";\r\nimport { addColorPlanarClassifier, addFeaturePlanarClassifier, addHilitePlanarClassifier } from \"./PlanarClassification\";\r\nimport { addModelViewProjectionMatrix } from \"./Vertex\";\r\nimport { addViewportTransformation } from \"./Viewport\";\r\nimport { addThematicDisplay } from \"./Thematic\";\r\nimport { addTexture } from \"./Surface\";\r\nimport { assignFragColor } from \"./Fragment\";\r\n\r\n// Revert components if color format is BGR instead of RGB.\r\nconst computeColor = `\r\n  return u_pointCloud.y == 1.0 ? vec4(a_color.b, a_color.g, a_color.r, 1.0) : vec4(a_color, 1.0);\r\n`;\r\n\r\nconst computeBaseColor = \"return v_color;\";\r\n\r\n// Round the point unless drawing square points.\r\nconst roundPointDiscard = `\r\n  if (u_pointCloudSettings.w == 1.0)\r\n    return false;\r\n\r\n  vec2 pointXY = (2.0 * gl_PointCoord - 1.0);\r\n  return dot(pointXY, pointXY) > 1.0;\r\n`;\r\n\r\nconst checkForClassifiedDiscard = \"return baseColor.a == 0.0;\";\r\n\r\nconst computePosition = `\r\n  gl_PointSize = 1.0;\r\n  vec4 pos = MAT_MVP * rawPos;\r\n  if (u_pointCloudSettings.x > 0.0) {\r\n    // Size is specified in pixels.\r\n    gl_PointSize = u_pointCloudSettings.x;\r\n    return pos;\r\n  }\r\n\r\n  // Point size is in meters (voxel size).\r\n  if (pos.w <= 0.0) {\r\n    // Cannot perform perspective divide below.\r\n    return pos;\r\n  }\r\n\r\n  // Convert voxel size in meters into pixel size, then compute pixel size, taking perspective into account.\r\n  mat4 toView = u_viewportTransformation * MAT_MVP;\r\n  float scale = length(toView[0].xyz);\r\n  gl_PointSize = -u_pointCloudSettings.x * clamp(u_pointCloud.x * scale / pos.w, u_pointCloudSettings.y, u_pointCloudSettings.z);\r\n  return pos;\r\n`;\r\n\r\nfunction createBuilder(): ProgramBuilder {\r\n  const builder = new ProgramBuilder(AttributeMap.findAttributeMap(TechniqueId.PointCloud, false));\r\n  const vert = builder.vert;\r\n  addViewportTransformation(vert);\r\n  vert.set(VertexShaderComponent.ComputePosition, computePosition);\r\n  addModelViewProjectionMatrix(vert);\r\n\r\n  builder.frag.set(FragmentShaderComponent.CheckForEarlyDiscard, roundPointDiscard);\r\n\r\n  // Uniforms based on the PointCloudDisplaySettings.\r\n  builder.addUniform(\"u_pointCloudSettings\", VariableType.Vec4, (prog) => {\r\n    prog.addGraphicUniform(\"u_pointCloudSettings\", (uniform, params) => {\r\n      params.target.uniforms.realityModel.pointCloud.bind(uniform);\r\n    });\r\n  });\r\n\r\n  // Uniforms based on the PointCloudGeometry.\r\n  builder.vert.addUniform(\"u_pointCloud\", VariableType.Vec2, (prog) => {\r\n    prog.addGraphicUniform(\"u_pointCloud\", (uniform, params) => {\r\n      assert(params.geometry.asPointCloud !== undefined);\r\n      scratchPointCloud[0] = params.geometry.asPointCloud.voxelSize;\r\n      scratchPointCloud[1] = params.geometry.asPointCloud.colorIsBgr ? 1 : 0;\r\n      uniform.setUniform2fv(scratchPointCloud);\r\n    });\r\n  });\r\n\r\n  return builder;\r\n}\r\n\r\nconst scratchPointCloud = new Float32Array([0, 0]);\r\n\r\n/** @internal */\r\nexport function createPointCloudBuilder(classified: IsClassified, featureMode: FeatureMode, thematic: IsThematic): ProgramBuilder {\r\n  const builder = createBuilder();\r\n\r\n  builder.addVarying(\"v_color\", VariableType.Vec4);\r\n  builder.vert.set(VertexShaderComponent.ComputeBaseColor, computeColor);\r\n\r\n  builder.frag.set(FragmentShaderComponent.ComputeBaseColor, computeBaseColor);\r\n  if (classified) {\r\n    addColorPlanarClassifier(builder, false, thematic);\r\n    builder.frag.set(FragmentShaderComponent.CheckForDiscard, checkForClassifiedDiscard);\r\n\r\n    if (FeatureMode.None !== featureMode)\r\n      addFeaturePlanarClassifier(builder);\r\n  }\r\n\r\n  if (IsThematic.Yes === thematic) {\r\n    addThematicDisplay(builder, true);\r\n    addTexture(builder, IsAnimated.No, IsThematic.Yes, true, false);\r\n  }\r\n\r\n  return builder;\r\n}\r\n\r\n/** @internal */\r\nexport function createPointCloudHiliter(classified: IsClassified): ProgramBuilder {\r\n  const builder = createBuilder();\r\n  if (classified) {\r\n    addHilitePlanarClassifier(builder, false);\r\n    builder.frag.set(FragmentShaderComponent.AssignFragData, assignFragColor);\r\n  } else {\r\n    addUniformHiliter(builder);\r\n  }\r\n\r\n  return builder;\r\n}\r\n"]}
+{"version":3,"file":"PointCloud.js","sourceRoot":"","sources":["../../../../../src/render/webgl/glsl/PointCloud.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module WebGL\n */\n\nimport { assert } from \"@itwin/core-bentley\";\nimport { AttributeMap } from \"../AttributeMap\";\nimport { FragmentShaderComponent, ProgramBuilder, VariableType, VertexShaderComponent } from \"../ShaderBuilder\";\nimport { FeatureMode, IsAnimated, IsClassified, IsThematic } from \"../TechniqueFlags\";\nimport { TechniqueId } from \"../TechniqueId\";\nimport { addUniformHiliter } from \"./FeatureSymbology\";\nimport { addColorPlanarClassifier, addFeaturePlanarClassifier, addHilitePlanarClassifier } from \"./PlanarClassification\";\nimport { addModelViewProjectionMatrix } from \"./Vertex\";\nimport { addViewportTransformation } from \"./Viewport\";\nimport { addThematicDisplay } from \"./Thematic\";\nimport { addTexture } from \"./Surface\";\nimport { assignFragColor } from \"./Fragment\";\n\n// Revert components if color format is BGR instead of RGB.\nconst computeColor = `\n  return u_pointCloud.y == 1.0 ? vec4(a_color.b, a_color.g, a_color.r, 1.0) : vec4(a_color, 1.0);\n`;\n\nconst computeBaseColor = \"return v_color;\";\n\n// Round the point unless drawing square points.\nconst roundPointDiscard = `\n  if (u_pointCloudSettings.w == 1.0)\n    return false;\n\n  vec2 pointXY = (2.0 * gl_PointCoord - 1.0);\n  return dot(pointXY, pointXY) > 1.0;\n`;\n\nconst checkForClassifiedDiscard = \"return baseColor.a == 0.0;\";\n\nconst computePosition = `\n  gl_PointSize = 1.0;\n  vec4 pos = MAT_MVP * rawPos;\n  if (u_pointCloudSettings.x > 0.0) {\n    // Size is specified in pixels.\n    gl_PointSize = u_pointCloudSettings.x;\n    return pos;\n  }\n\n  // Point size is in meters (voxel size).\n  if (pos.w <= 0.0) {\n    // Cannot perform perspective divide below.\n    return pos;\n  }\n\n  // Convert voxel size in meters into pixel size, then compute pixel size, taking perspective into account.\n  mat4 toView = u_viewportTransformation * MAT_MVP;\n  float scale = length(toView[0].xyz);\n  gl_PointSize = -u_pointCloudSettings.x * clamp(u_pointCloud.x * scale / pos.w, u_pointCloudSettings.y, u_pointCloudSettings.z);\n  return pos;\n`;\n\nfunction createBuilder(): ProgramBuilder {\n  const builder = new ProgramBuilder(AttributeMap.findAttributeMap(TechniqueId.PointCloud, false));\n  const vert = builder.vert;\n  addViewportTransformation(vert);\n  vert.set(VertexShaderComponent.ComputePosition, computePosition);\n  addModelViewProjectionMatrix(vert);\n\n  builder.frag.set(FragmentShaderComponent.CheckForEarlyDiscard, roundPointDiscard);\n\n  // Uniforms based on the PointCloudDisplaySettings.\n  builder.addUniform(\"u_pointCloudSettings\", VariableType.Vec4, (prog) => {\n    prog.addGraphicUniform(\"u_pointCloudSettings\", (uniform, params) => {\n      params.target.uniforms.realityModel.pointCloud.bind(uniform);\n    });\n  });\n\n  // Uniforms based on the PointCloudGeometry.\n  builder.vert.addUniform(\"u_pointCloud\", VariableType.Vec2, (prog) => {\n    prog.addGraphicUniform(\"u_pointCloud\", (uniform, params) => {\n      assert(params.geometry.asPointCloud !== undefined);\n      scratchPointCloud[0] = params.geometry.asPointCloud.voxelSize;\n      scratchPointCloud[1] = params.geometry.asPointCloud.colorIsBgr ? 1 : 0;\n      uniform.setUniform2fv(scratchPointCloud);\n    });\n  });\n\n  return builder;\n}\n\nconst scratchPointCloud = new Float32Array([0, 0]);\n\n/** @internal */\nexport function createPointCloudBuilder(classified: IsClassified, featureMode: FeatureMode, thematic: IsThematic): ProgramBuilder {\n  const builder = createBuilder();\n\n  builder.addVarying(\"v_color\", VariableType.Vec4);\n  builder.vert.set(VertexShaderComponent.ComputeBaseColor, computeColor);\n\n  builder.frag.set(FragmentShaderComponent.ComputeBaseColor, computeBaseColor);\n  if (classified) {\n    addColorPlanarClassifier(builder, false, thematic);\n    builder.frag.set(FragmentShaderComponent.CheckForDiscard, checkForClassifiedDiscard);\n\n    if (FeatureMode.None !== featureMode)\n      addFeaturePlanarClassifier(builder);\n  }\n\n  if (IsThematic.Yes === thematic) {\n    addThematicDisplay(builder, true);\n    addTexture(builder, IsAnimated.No, IsThematic.Yes, true, false);\n  }\n\n  return builder;\n}\n\n/** @internal */\nexport function createPointCloudHiliter(classified: IsClassified): ProgramBuilder {\n  const builder = createBuilder();\n  if (classified) {\n    addHilitePlanarClassifier(builder, false);\n    builder.frag.set(FragmentShaderComponent.AssignFragData, assignFragColor);\n  } else {\n    addUniformHiliter(builder);\n  }\n\n  return builder;\n}\n"]}

package/lib/cjs/render/webgl/glsl/PointString.js

@@ -15,20 +15,20 @@ const Common_1 = require("./Common");
 const FeatureSymbology_1 = require("./FeatureSymbology");
 const Fragment_1 = require("./Fragment");
 const Vertex_1 = require("./Vertex");
-const computePosition = `
-  float lineWeight = computeLineWeight();
-  lineWeight += 0.5 * float(lineWeight > 4.0); // fudge factor for rounding fat points...
-  gl_PointSize = lineWeight;
-  return MAT_MVP * rawPos;
+const computePosition = `
+  float lineWeight = computeLineWeight();
+  lineWeight += 0.5 * float(lineWeight > 4.0); // fudge factor for rounding fat points...
+  gl_PointSize = lineWeight;
+  return MAT_MVP * rawPos;
 `;
 // gl_PointSize specifies coordinates of this fragment within the point in range [0,1].
 // This should be the most precise of the many approaches we've tried, but it still yields some asymmetry...
 // Discarding if it meets radius precisely seems to reduce that slightly...
 // ###TODO try point sprites?
-const roundCorners = `
-  const vec2 center = vec2(0.5, 0.5);
-  vec2 vt = gl_PointCoord - center;
-  return dot(vt, vt) * v_roundCorners >= 0.25; // meets or exceeds radius of circle
+const roundCorners = `
+  const vec2 center = vec2(0.5, 0.5);
+  vec2 vt = gl_PointCoord - center;
+  return dot(vt, vt) * v_roundCorners >= 0.25; // meets or exceeds radius of circle
 `;
 const computeRoundCorners = "  v_roundCorners = gl_PointSize > 4.0 ? 1.0 : 0.0;";
 function createBase(instanced, positionType) {

package/lib/cjs/render/webgl/glsl/PointString.js.map

@@ -1 +1 @@
-{"version":3,"file":"PointString.js","sourceRoot":"","sources":["../../../../../src/render/webgl/glsl/PointString.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAEH,kDAA+C;AAC/C,oDAAgH;AAGhH,mCAAmC;AACnC,qCAA0C;AAC1C,yDAAgD;AAChD,yCAAqD;AACrD,qCAAuE;AAEvE,MAAM,eAAe,GAAG;;;;;CAKvB,CAAC;AAEF,uFAAuF;AACvF,4GAA4G;AAC5G,2EAA2E;AAC3E,6BAA6B;AAC7B,MAAM,YAAY,GAAG;;;;CAIpB,CAAC;AAEF,MAAM,mBAAmB,GAAG,oDAAoD,CAAC;AAEjF,SAAS,UAAU,CAAC,SAAsB,EAAE,YAA0B;IACpE,MAAM,OAAO,GAAG,2BAAY,CAAC,gBAAgB,kCAA0B,4BAAoB,SAAS,CAAC,CAAC;IAEtG,MAAM,OAAO,GAAG,IAAI,8BAAc,CAAC,OAAO,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,4BAAoB,SAAS,EAAE,CAAC,CAAC;IACxG,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1B,IAAI,CAAC,GAAG,iDAAwC,eAAe,CAAC,CAAC;IACjE,IAAA,qCAA4B,EAAC,IAAI,CAAC,CAAC;IAEnC,IAAA,sBAAa,EAAC,IAAI,CAAC,CAAC;IACpB,OAAO,CAAC,wBAAwB,CAAC,gBAAgB,8BAAsB,mBAAmB,CAAC,CAAC;IAC5F,OAAO,CAAC,IAAI,CAAC,GAAG,uDAA+C,YAAY,CAAC,CAAC;IAE7E,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,gBAAgB;AAChB,SAAgB,wBAAwB,CAAC,SAAsB,EAAE,OAAqB;IACpF,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC/C,IAAA,6BAAU,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC1B,OAAO,OAAO,CAAC;AACjB,CAAC;AAJD,4DAIC;AAED,gBAAgB;AAChB,SAAgB,wBAAwB,CAAC,SAAsB,EAAE,OAAqB;IACpF,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC/C,IAAA,uBAAc,EAAC,OAAO,CAAC,CAAC;IACxB,IAAA,gBAAQ,EAAC,OAAO,CAAC,CAAC;IAClB,IAAA,kCAAuB,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,OAAO,OAAO,CAAC;AACjB,CAAC;AAND,4DAMC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module WebGL\r\n */\r\n\r\nimport { AttributeMap } from \"../AttributeMap\";\r\nimport { FragmentShaderComponent, ProgramBuilder, VariableType, VertexShaderComponent } from \"../ShaderBuilder\";\r\nimport { IsInstanced, PositionType } from \"../TechniqueFlags\";\r\nimport { TechniqueId } from \"../TechniqueId\";\r\nimport { addColor } from \"./Color\";\r\nimport { addShaderFlags } from \"./Common\";\r\nimport { addHiliter } from \"./FeatureSymbology\";\r\nimport { addWhiteOnWhiteReversal } from \"./Fragment\";\r\nimport { addLineWeight, addModelViewProjectionMatrix } from \"./Vertex\";\r\n\r\nconst computePosition = `\r\n  float lineWeight = computeLineWeight();\r\n  lineWeight += 0.5 * float(lineWeight > 4.0); // fudge factor for rounding fat points...\r\n  gl_PointSize = lineWeight;\r\n  return MAT_MVP * rawPos;\r\n`;\r\n\r\n// gl_PointSize specifies coordinates of this fragment within the point in range [0,1].\r\n// This should be the most precise of the many approaches we've tried, but it still yields some asymmetry...\r\n// Discarding if it meets radius precisely seems to reduce that slightly...\r\n// ###TODO try point sprites?\r\nconst roundCorners = `\r\n  const vec2 center = vec2(0.5, 0.5);\r\n  vec2 vt = gl_PointCoord - center;\r\n  return dot(vt, vt) * v_roundCorners >= 0.25; // meets or exceeds radius of circle\r\n`;\r\n\r\nconst computeRoundCorners = \"  v_roundCorners = gl_PointSize > 4.0 ? 1.0 : 0.0;\";\r\n\r\nfunction createBase(instanced: IsInstanced, positionType: PositionType): ProgramBuilder {\r\n  const attrMap = AttributeMap.findAttributeMap(TechniqueId.PointString, IsInstanced.Yes === instanced);\r\n\r\n  const builder = new ProgramBuilder(attrMap, { positionType, instanced: IsInstanced.Yes === instanced });\r\n  const vert = builder.vert;\r\n  vert.set(VertexShaderComponent.ComputePosition, computePosition);\r\n  addModelViewProjectionMatrix(vert);\r\n\r\n  addLineWeight(vert);\r\n  builder.addInlineComputedVarying(\"v_roundCorners\", VariableType.Float, computeRoundCorners);\r\n  builder.frag.set(FragmentShaderComponent.CheckForEarlyDiscard, roundCorners);\r\n\r\n  return builder;\r\n}\r\n\r\n/** @internal */\r\nexport function createPointStringHiliter(instanced: IsInstanced, posType: PositionType): ProgramBuilder {\r\n  const builder = createBase(instanced, posType);\r\n  addHiliter(builder, true);\r\n  return builder;\r\n}\r\n\r\n/** @internal */\r\nexport function createPointStringBuilder(instanced: IsInstanced, posType: PositionType): ProgramBuilder {\r\n  const builder = createBase(instanced, posType);\r\n  addShaderFlags(builder);\r\n  addColor(builder);\r\n  addWhiteOnWhiteReversal(builder.frag);\r\n  return builder;\r\n}\r\n"]}
+{"version":3,"file":"PointString.js","sourceRoot":"","sources":["../../../../../src/render/webgl/glsl/PointString.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAEH,kDAA+C;AAC/C,oDAAgH;AAGhH,mCAAmC;AACnC,qCAA0C;AAC1C,yDAAgD;AAChD,yCAAqD;AACrD,qCAAuE;AAEvE,MAAM,eAAe,GAAG;;;;;CAKvB,CAAC;AAEF,uFAAuF;AACvF,4GAA4G;AAC5G,2EAA2E;AAC3E,6BAA6B;AAC7B,MAAM,YAAY,GAAG;;;;CAIpB,CAAC;AAEF,MAAM,mBAAmB,GAAG,oDAAoD,CAAC;AAEjF,SAAS,UAAU,CAAC,SAAsB,EAAE,YAA0B;IACpE,MAAM,OAAO,GAAG,2BAAY,CAAC,gBAAgB,kCAA0B,4BAAoB,SAAS,CAAC,CAAC;IAEtG,MAAM,OAAO,GAAG,IAAI,8BAAc,CAAC,OAAO,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,4BAAoB,SAAS,EAAE,CAAC,CAAC;IACxG,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1B,IAAI,CAAC,GAAG,iDAAwC,eAAe,CAAC,CAAC;IACjE,IAAA,qCAA4B,EAAC,IAAI,CAAC,CAAC;IAEnC,IAAA,sBAAa,EAAC,IAAI,CAAC,CAAC;IACpB,OAAO,CAAC,wBAAwB,CAAC,gBAAgB,8BAAsB,mBAAmB,CAAC,CAAC;IAC5F,OAAO,CAAC,IAAI,CAAC,GAAG,uDAA+C,YAAY,CAAC,CAAC;IAE7E,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,gBAAgB;AAChB,SAAgB,wBAAwB,CAAC,SAAsB,EAAE,OAAqB;IACpF,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC/C,IAAA,6BAAU,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC1B,OAAO,OAAO,CAAC;AACjB,CAAC;AAJD,4DAIC;AAED,gBAAgB;AAChB,SAAgB,wBAAwB,CAAC,SAAsB,EAAE,OAAqB;IACpF,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC/C,IAAA,uBAAc,EAAC,OAAO,CAAC,CAAC;IACxB,IAAA,gBAAQ,EAAC,OAAO,CAAC,CAAC;IAClB,IAAA,kCAAuB,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,OAAO,OAAO,CAAC;AACjB,CAAC;AAND,4DAMC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module WebGL\n */\n\nimport { AttributeMap } from \"../AttributeMap\";\nimport { FragmentShaderComponent, ProgramBuilder, VariableType, VertexShaderComponent } from \"../ShaderBuilder\";\nimport { IsInstanced, PositionType } from \"../TechniqueFlags\";\nimport { TechniqueId } from \"../TechniqueId\";\nimport { addColor } from \"./Color\";\nimport { addShaderFlags } from \"./Common\";\nimport { addHiliter } from \"./FeatureSymbology\";\nimport { addWhiteOnWhiteReversal } from \"./Fragment\";\nimport { addLineWeight, addModelViewProjectionMatrix } from \"./Vertex\";\n\nconst computePosition = `\n  float lineWeight = computeLineWeight();\n  lineWeight += 0.5 * float(lineWeight > 4.0); // fudge factor for rounding fat points...\n  gl_PointSize = lineWeight;\n  return MAT_MVP * rawPos;\n`;\n\n// gl_PointSize specifies coordinates of this fragment within the point in range [0,1].\n// This should be the most precise of the many approaches we've tried, but it still yields some asymmetry...\n// Discarding if it meets radius precisely seems to reduce that slightly...\n// ###TODO try point sprites?\nconst roundCorners = `\n  const vec2 center = vec2(0.5, 0.5);\n  vec2 vt = gl_PointCoord - center;\n  return dot(vt, vt) * v_roundCorners >= 0.25; // meets or exceeds radius of circle\n`;\n\nconst computeRoundCorners = \"  v_roundCorners = gl_PointSize > 4.0 ? 1.0 : 0.0;\";\n\nfunction createBase(instanced: IsInstanced, positionType: PositionType): ProgramBuilder {\n  const attrMap = AttributeMap.findAttributeMap(TechniqueId.PointString, IsInstanced.Yes === instanced);\n\n  const builder = new ProgramBuilder(attrMap, { positionType, instanced: IsInstanced.Yes === instanced });\n  const vert = builder.vert;\n  vert.set(VertexShaderComponent.ComputePosition, computePosition);\n  addModelViewProjectionMatrix(vert);\n\n  addLineWeight(vert);\n  builder.addInlineComputedVarying(\"v_roundCorners\", VariableType.Float, computeRoundCorners);\n  builder.frag.set(FragmentShaderComponent.CheckForEarlyDiscard, roundCorners);\n\n  return builder;\n}\n\n/** @internal */\nexport function createPointStringHiliter(instanced: IsInstanced, posType: PositionType): ProgramBuilder {\n  const builder = createBase(instanced, posType);\n  addHiliter(builder, true);\n  return builder;\n}\n\n/** @internal */\nexport function createPointStringBuilder(instanced: IsInstanced, posType: PositionType): ProgramBuilder {\n  const builder = createBase(instanced, posType);\n  addShaderFlags(builder);\n  addColor(builder);\n  addWhiteOnWhiteReversal(builder.frag);\n  return builder;\n}\n"]}

package/lib/cjs/render/webgl/glsl/Polyline.js

@@ -22,108 +22,108 @@ const Fragment_1 = require("./Fragment");
 const Vertex_1 = require("./Vertex");
 const Viewport_1 = require("./Viewport");
 const checkForDiscard = "return discardByLineCode;";
-const applyLineCode = `
-  if (v_texc.x >= 0.0) { // v_texc = (-1,-1) for solid lines - don't bother with any of this
-    vec4 texColor = TEXTURE(u_lineCodeTexture, v_texc);
-    discardByLineCode = (0.0 == texColor.r);
-  }
-
-  if (v_lnInfo.w > 0.5) { // line needs pixel trimming
-    // calculate pixel distance from pixel center to expected line center, opposite dir from major
-    vec2 dxy = gl_FragCoord.xy - v_lnInfo.xy;
-    if (v_lnInfo.w < 1.5)  // not x-major
-      dxy = dxy.yx;
-
-    float dist = v_lnInfo.z * dxy.x - dxy.y;
-    float distA = abs(dist);
-    if (distA > 0.5 || (distA == 0.5 && dist < 0.0))
-      discardByLineCode = true;  // borrow this flag to force discard
-  }
-
-  return baseColor;
+const applyLineCode = `
+  if (v_texc.x >= 0.0) { // v_texc = (-1,-1) for solid lines - don't bother with any of this
+    vec4 texColor = TEXTURE(u_lineCodeTexture, v_texc);
+    discardByLineCode = (0.0 == texColor.r);
+  }
+
+  if (v_lnInfo.w > 0.5) { // line needs pixel trimming
+    // calculate pixel distance from pixel center to expected line center, opposite dir from major
+    vec2 dxy = gl_FragCoord.xy - v_lnInfo.xy;
+    if (v_lnInfo.w < 1.5)  // not x-major
+      dxy = dxy.yx;
+
+    float dist = v_lnInfo.z * dxy.x - dxy.y;
+    float distA = abs(dist);
+    if (distA > 0.5 || (distA == 0.5 && dist < 0.0))
+      discardByLineCode = true;  // borrow this flag to force discard
+  }
+
+  return baseColor;
 `;
-const computeTextureCoord = `
-vec2 computeLineCodeTextureCoords(vec2 windowDir, vec4 projPos, float adjust) {
-  vec2 texc;
-  float lineCode = computeLineCode();
-  if (0.0 == lineCode) {
-    // Solid line - tell frag shader not to bother.
-    texc = vec2(-1.0, -1.0);
-  } else {
-    const float imagesPerPixel = 1.0/32.0;
-    const float textureCoordinateBase = 8192.0; // Temp workardound for clipping problem in perspective views (negative values don't seem to interpolate correctly).
-
-    if (abs(windowDir.x) > abs(windowDir.y))
-      texc.x = textureCoordinateBase + imagesPerPixel * (projPos.x + adjust * windowDir.x);
-    else
-      texc.x = textureCoordinateBase + imagesPerPixel * (projPos.y + adjust * windowDir.y);
-
-    const float numLineCodes = 16.0; // NB: Actually only 10, but texture is 16px tall because it needs to be a power of 2.
-    const float rowsPerCode = 1.0;
-    const float numRows = numLineCodes*rowsPerCode;
-    const float centerY = 0.5/numRows;
-    const float stepY = rowsPerCode/numRows;
-    texc.y = stepY * lineCode + centerY;
-  }
-
-  return texc;
-}
+const computeTextureCoord = `
+vec2 computeLineCodeTextureCoords(vec2 windowDir, vec4 projPos, float adjust) {
+  vec2 texc;
+  float lineCode = computeLineCode();
+  if (0.0 == lineCode) {
+    // Solid line - tell frag shader not to bother.
+    texc = vec2(-1.0, -1.0);
+  } else {
+    const float imagesPerPixel = 1.0/32.0;
+    const float textureCoordinateBase = 8192.0; // Temp workardound for clipping problem in perspective views (negative values don't seem to interpolate correctly).
+
+    if (abs(windowDir.x) > abs(windowDir.y))
+      texc.x = textureCoordinateBase + imagesPerPixel * (projPos.x + adjust * windowDir.x);
+    else
+      texc.x = textureCoordinateBase + imagesPerPixel * (projPos.y + adjust * windowDir.y);
+
+    const float numLineCodes = 16.0; // NB: Actually only 10, but texture is 16px tall because it needs to be a power of 2.
+    const float rowsPerCode = 1.0;
+    const float numRows = numLineCodes*rowsPerCode;
+    const float centerY = 0.5/numRows;
+    const float stepY = rowsPerCode/numRows;
+    texc.y = stepY * lineCode + centerY;
+  }
+
+  return texc;
+}
 `;
 /** @internal */
-exports.adjustWidth = `
-void adjustWidth(inout float width, vec2 d2, vec2 org) {
-  if (u_aaSamples > 1) {
-    if (width < 5.0)
-      width += (5.0 - width) * 0.125;
-    return;
-  }
-
-  // calculate slope based width adjustment for non-AA lines, widths 1 to 4
-  vec2 d2A = abs(d2);
-  const float s_myFltEpsilon = 0.0001;  // limit test resolution to 4 digits in case 24 bit (s16e7) is used in hardware
-  if (d2A.y > s_myFltEpsilon && width < 4.5) {
-    float len = length(d2A);
-    float tan = d2A.x / d2A.y;
-
-    if (width < 1.5) { // width 1
-      if (tan <= 1.0)
-        width = d2A.y;
-      else
-        width = d2A.x;
-      // width 1 requires additional adjustment plus trimming in frag shader using v_lnInfo
-      width *= 1.01;
-      v_lnInfo.xy = org;
-      v_lnInfo.w = 1.0; // set flag to do trimming
-      // set slope in v_lnInfo.z
-      if (d2A.x - d2A.y > s_myFltEpsilon) {
-        v_lnInfo.z = d2.y / d2.x;
-        v_lnInfo.w += 2.0; // add in x-major flag
-      } else
-        v_lnInfo.z = d2.x / d2.y;
-
-    } else if (width < 2.5) { // width 2
-      if (tan <= 0.5)
-        width = 2.0 * d2A.y;
-      else
-        width = (d2A.y + 2.0 * d2A.x);
-
-    } else if (width < 3.5) { // width 3
-        if (tan <= 1.0)
-            width = (3.0 * d2A.y + d2A.x);
-        else
-            width = (d2A.y + 3.0 * d2A.x);
-
-    } else { // if (width < 4.5) // width 4
-      if (tan <= 0.5)
-        width = (4.0 * d2A.y + d2A.x);
-      else if (tan <= 2.0)
-        width = (3.0 * d2A.y + 3.0 * d2A.x);
-      else
-        width = (d2A.y + 4.0 * d2A.x);
-    }
-    width /= len;
-  }
-}
+exports.adjustWidth = `
+void adjustWidth(inout float width, vec2 d2, vec2 org) {
+  if (u_aaSamples > 1) {
+    if (width < 5.0)
+      width += (5.0 - width) * 0.125;
+    return;
+  }
+
+  // calculate slope based width adjustment for non-AA lines, widths 1 to 4
+  vec2 d2A = abs(d2);
+  const float s_myFltEpsilon = 0.0001;  // limit test resolution to 4 digits in case 24 bit (s16e7) is used in hardware
+  if (d2A.y > s_myFltEpsilon && width < 4.5) {
+    float len = length(d2A);
+    float tan = d2A.x / d2A.y;
+
+    if (width < 1.5) { // width 1
+      if (tan <= 1.0)
+        width = d2A.y;
+      else
+        width = d2A.x;
+      // width 1 requires additional adjustment plus trimming in frag shader using v_lnInfo
+      width *= 1.01;
+      v_lnInfo.xy = org;
+      v_lnInfo.w = 1.0; // set flag to do trimming
+      // set slope in v_lnInfo.z
+      if (d2A.x - d2A.y > s_myFltEpsilon) {
+        v_lnInfo.z = d2.y / d2.x;
+        v_lnInfo.w += 2.0; // add in x-major flag
+      } else
+        v_lnInfo.z = d2.x / d2.y;
+
+    } else if (width < 2.5) { // width 2
+      if (tan <= 0.5)
+        width = 2.0 * d2A.y;
+      else
+        width = (d2A.y + 2.0 * d2A.x);
+
+    } else if (width < 3.5) { // width 3
+        if (tan <= 1.0)
+            width = (3.0 * d2A.y + d2A.x);
+        else
+            width = (d2A.y + 3.0 * d2A.x);
+
+    } else { // if (width < 4.5) // width 4
+      if (tan <= 0.5)
+        width = (4.0 * d2A.y + d2A.x);
+      else if (tan <= 2.0)
+        width = (3.0 * d2A.y + 3.0 * d2A.x);
+      else
+        width = (d2A.y + 4.0 * d2A.x);
+    }
+    width /= len;
+  }
+}
 `;
 /** @internal */
 function addAdjustWidth(vert) {
@@ -187,122 +187,122 @@ function addCommon(prog) {
     (0, Vertex_1.addSamplePosition)(vert);
     vert.addFunction(decodePosition);
 }
-const decodePosition = `
-vec4 decodePosition(vec3 baseIndex) {
-  float index = decodeUInt24(baseIndex);
-  return samplePosition(index);
-}
+const decodePosition = `
+vec4 decodePosition(vec3 baseIndex) {
+  float index = decodeUInt24(baseIndex);
+  return samplePosition(index);
+}
 `;
-const decodeAdjacentPositions = `
-  g_prevPos = decodePosition(a_prevIndex);
-  g_nextPos = decodePosition(a_nextIndex);
+const decodeAdjacentPositions = `
+  g_prevPos = decodePosition(a_prevIndex);
+  g_nextPos = decodePosition(a_nextIndex);
 `;
-const computePosition = `
-  const float kNone = 0.0,
-              kSquare = 1.0*3.0,
-              kMiter = 2.0*3.0,
-              kMiterInsideOnly = 3.0*3.0,
-              kJointBase = 4.0*3.0,
-              kNegatePerp = 8.0*3.0,
-              kNegateAlong = 16.0*3.0,
-              kNoneAdjWt = 32.0*3.0;
-
-  v_lnInfo = vec4(0.0, 0.0, 0.0, 0.0);  // init and set flag to false
-
-  vec4 next = g_nextPos;
-  vec4 pos;
-  g_windowPos = modelToWindowCoordinates(rawPos, next, pos, v_eyeSpace);
-  if (g_windowPos.w == 0.0)
-    return g_windowPos;
-
-  float param = a_param;
-  float weight = computeLineWeight();
-  float scale = 1.0, directionScale = 1.0;
-
-  if (param >= kNoneAdjWt)
-    param -= kNoneAdjWt;
-
-  if (param >= kNegateAlong) {
-    directionScale = -directionScale;
-    param -= kNegateAlong;
-  }
-
-  if (param >= kNegatePerp) {
-    scale = -1.0;
-    param -= kNegatePerp;
-  }
-
-  vec4 otherPos;
-  vec3 otherMvPos;
-  vec4 projNext = modelToWindowCoordinates(next, rawPos, otherPos, otherMvPos);
-  g_windowDir = projNext.xy - g_windowPos.xy;
-
-  if (param < kJointBase) {
-    vec2 dir = (directionScale > 0.0) ? g_windowDir : -g_windowDir;
-    vec2 pos = (directionScale > 0.0) ? g_windowPos.xy : projNext.xy;
-    adjustWidth(weight, dir, pos);
-  }
-
-  if (kNone != param) {
-    vec2 delta = vec2(0.0);
-    vec4 prev   = g_prevPos;
-    vec4 projPrev = modelToWindowCoordinates(prev, rawPos, otherPos, otherMvPos);
-    vec2 prevDir   = g_windowPos.xy - projPrev.xy;
-    float thisLength = sqrt(g_windowDir.x * g_windowDir.x + g_windowDir.y * g_windowDir.y);
-    const float s_minNormalizeLength = 1.0E-5;  // avoid normalizing zero length vectors.
-    float dist = weight / 2.0;
-
-    if (thisLength > s_minNormalizeLength) {
-      g_windowDir /= thisLength;
-
-      float prevLength = sqrt(prevDir.x * prevDir.x + prevDir.y * prevDir.y);
-
-      if (prevLength > s_minNormalizeLength) {
-        prevDir /= prevLength;
-        const float     s_minParallelDot= -.9999, s_maxParallelDot = .9999;
-        float           prevNextDot  = dot(prevDir, g_windowDir);
-
-        if (prevNextDot < s_minParallelDot || prevNextDot > s_maxParallelDot)    // No miter if parallel or antiparallel.
-          param = kSquare;
-      } else
-        param = kSquare;
-    } else {
-      g_windowDir = -normalize(prevDir);
-      param = kSquare;
-    }
-
-    vec2 perp = scale * vec2(-g_windowDir.y, g_windowDir.x);
-
-    if (param == kSquare) {
-      delta = perp;
-    } else {
-      vec2 bisector = normalize(prevDir - g_windowDir);
-      float dotP = dot (bisector, perp);
-
-      if (dotP != 0.0) { // Should never occur - but avoid divide by zero.
-        const float maxMiter = 3.0;
-        float miterDistance = 1.0/dotP;
-
-        if (param == kMiter) { // Straight miter.
-          delta = (abs(miterDistance) > maxMiter) ? perp : bisector * miterDistance;
-
-        } else if (param == kMiterInsideOnly) { // Miter at inside, square at outside (to make room for joint).
-          delta = (dotP  > 0.0 || abs(miterDistance) > maxMiter) ? perp : bisector * miterDistance;
-
-        } else {
-          const float jointTriangleCount = 3.0;
-          float ratio = (param - kJointBase) / jointTriangleCount; // 3 triangles per half-joint as defined in Graphics.cpp
-          delta = normalize((1.0 - ratio) * bisector + (dotP < 0.0 ? -ratio : ratio) * perp); // Miter/Straight combination.
-        }
-      }
-    }
-
-    miterAdjust = dot(g_windowDir, delta) * dist; // Not actually used for hilite shader but meh.
-    pos.x += dist * delta.x * 2.0 * pos.w / u_viewport.x;
-    pos.y += dist * delta.y * 2.0 * pos.w / u_viewport.y;
-  }
-
-  return pos;
+const computePosition = `
+  const float kNone = 0.0,
+              kSquare = 1.0*3.0,
+              kMiter = 2.0*3.0,
+              kMiterInsideOnly = 3.0*3.0,
+              kJointBase = 4.0*3.0,
+              kNegatePerp = 8.0*3.0,
+              kNegateAlong = 16.0*3.0,
+              kNoneAdjWt = 32.0*3.0;
+
+  v_lnInfo = vec4(0.0, 0.0, 0.0, 0.0);  // init and set flag to false
+
+  vec4 next = g_nextPos;
+  vec4 pos;
+  g_windowPos = modelToWindowCoordinates(rawPos, next, pos, v_eyeSpace);
+  if (g_windowPos.w == 0.0)
+    return g_windowPos;
+
+  float param = a_param;
+  float weight = computeLineWeight();
+  float scale = 1.0, directionScale = 1.0;
+
+  if (param >= kNoneAdjWt)
+    param -= kNoneAdjWt;
+
+  if (param >= kNegateAlong) {
+    directionScale = -directionScale;
+    param -= kNegateAlong;
+  }
+
+  if (param >= kNegatePerp) {
+    scale = -1.0;
+    param -= kNegatePerp;
+  }
+
+  vec4 otherPos;
+  vec3 otherMvPos;
+  vec4 projNext = modelToWindowCoordinates(next, rawPos, otherPos, otherMvPos);
+  g_windowDir = projNext.xy - g_windowPos.xy;
+
+  if (param < kJointBase) {
+    vec2 dir = (directionScale > 0.0) ? g_windowDir : -g_windowDir;
+    vec2 pos = (directionScale > 0.0) ? g_windowPos.xy : projNext.xy;
+    adjustWidth(weight, dir, pos);
+  }
+
+  if (kNone != param) {
+    vec2 delta = vec2(0.0);
+    vec4 prev   = g_prevPos;
+    vec4 projPrev = modelToWindowCoordinates(prev, rawPos, otherPos, otherMvPos);
+    vec2 prevDir   = g_windowPos.xy - projPrev.xy;
+    float thisLength = sqrt(g_windowDir.x * g_windowDir.x + g_windowDir.y * g_windowDir.y);
+    const float s_minNormalizeLength = 1.0E-5;  // avoid normalizing zero length vectors.
+    float dist = weight / 2.0;
+
+    if (thisLength > s_minNormalizeLength) {
+      g_windowDir /= thisLength;
+
+      float prevLength = sqrt(prevDir.x * prevDir.x + prevDir.y * prevDir.y);
+
+      if (prevLength > s_minNormalizeLength) {
+        prevDir /= prevLength;
+        const float     s_minParallelDot= -.9999, s_maxParallelDot = .9999;
+        float           prevNextDot  = dot(prevDir, g_windowDir);
+
+        if (prevNextDot < s_minParallelDot || prevNextDot > s_maxParallelDot)    // No miter if parallel or antiparallel.
+          param = kSquare;
+      } else
+        param = kSquare;
+    } else {
+      g_windowDir = -normalize(prevDir);
+      param = kSquare;
+    }
+
+    vec2 perp = scale * vec2(-g_windowDir.y, g_windowDir.x);
+
+    if (param == kSquare) {
+      delta = perp;
+    } else {
+      vec2 bisector = normalize(prevDir - g_windowDir);
+      float dotP = dot (bisector, perp);
+
+      if (dotP != 0.0) { // Should never occur - but avoid divide by zero.
+        const float maxMiter = 3.0;
+        float miterDistance = 1.0/dotP;
+
+        if (param == kMiter) { // Straight miter.
+          delta = (abs(miterDistance) > maxMiter) ? perp : bisector * miterDistance;
+
+        } else if (param == kMiterInsideOnly) { // Miter at inside, square at outside (to make room for joint).
+          delta = (dotP  > 0.0 || abs(miterDistance) > maxMiter) ? perp : bisector * miterDistance;
+
+        } else {
+          const float jointTriangleCount = 3.0;
+          float ratio = (param - kJointBase) / jointTriangleCount; // 3 triangles per half-joint as defined in Graphics.cpp
+          delta = normalize((1.0 - ratio) * bisector + (dotP < 0.0 ? -ratio : ratio) * perp); // Miter/Straight combination.
+        }
+      }
+    }
+
+    miterAdjust = dot(g_windowDir, delta) * dist; // Not actually used for hilite shader but meh.
+    pos.x += dist * delta.x * 2.0 * pos.w / u_viewport.x;
+    pos.y += dist * delta.y * 2.0 * pos.w / u_viewport.y;
+  }
+
+  return pos;
 `;
 const lineCodeArgs = "g_windowDir, g_windowPos, miterAdjust";
 /** @internal */