@rtzh/engine 0.0.5 → 0.0.6

package/Source/Scene/Model/WireframePipelineStage.js

@@ -1,122 +1,122 @@
-import Buffer from "../../Renderer/Buffer.js";
-import BufferUsage from "../../Renderer/BufferUsage.js";
-import defined from "../../Core/defined.js";
-import IndexDatatype from "../../Core/IndexDatatype.js";
-import ModelUtility from "./ModelUtility.js";
-import PrimitiveType from "../../Core/PrimitiveType.js";
-import ShaderDestination from "../../Renderer/ShaderDestination.js";
-import VertexAttributeSemantic from "../VertexAttributeSemantic.js";
-import WireframeIndexGenerator from "../../Core/WireframeIndexGenerator.js";
-
-/**
- * The wireframe pipeline stage generates a new index buffer for rendering the
- * structure of the mesh with gl.LINES.
- *
- * @namespace WireframePipelineStage
- * @private
- */
-const WireframePipelineStage = {
-  name: "WireframePipelineStage", // Helps with debugging
-};
-
-/**
- * Process a primitive. This modifies the render resources as follows:
- * <ul>
- *   <li>Adds a define to the fragment shader to prevent extra shading of the lines.</li>
- *   <li>Adds a separate index buffer for wireframe indices</li>
- *   <li>Updates the primitive type and count for rendering with gl.LINES</li>
- * </ul>
- *
- * @param {PrimitiveRenderResources} renderResources The render resources for this node
- * @param {ModelComponents.primitive} primitive The primitive
- * @param {FrameState} frameState The frame state
- */
-WireframePipelineStage.process = function (
-  renderResources,
-  primitive,
-  frameState,
-) {
-  const model = renderResources.model;
-
-  if (model.debugWireframeMode === "barycentric") {
-    return;
-  }
-
-  // Applying normal mapping to the lines will result in rendering
-  // errors on Linux. This define is added to disable normal
-  // mapping in the shader.
-  const shaderBuilder = renderResources.shaderBuilder;
-  shaderBuilder.addDefine(
-    "HAS_WIREFRAME",
-    undefined,
-    ShaderDestination.FRAGMENT,
-  );
-  const wireframeIndexBuffer = createWireframeIndexBuffer(
-    primitive,
-    renderResources.indices,
-    frameState,
-  );
-  model._pipelineResources.push(wireframeIndexBuffer);
-  renderResources.wireframeIndexBuffer = wireframeIndexBuffer;
-
-  // We only need to count memory for the generated buffer. In WebGL 1, the CPU
-  // copy of the original indices is already counted in the geometry stage,
-  // and in WebGL 2, the CPU copy of the original indices (generated from the
-  // data of the original buffer) is discarded after generating the wireframe
-  // indices.
-  const hasCpuCopy = false;
-  model.statistics.addBuffer(wireframeIndexBuffer, hasCpuCopy);
-
-  // Update render resources so we render LINES with the correct index count
-  const originalPrimitiveType = renderResources.primitiveType;
-  const originalCount = renderResources.count;
-  renderResources.primitiveType = PrimitiveType.LINES;
-  renderResources.count = WireframeIndexGenerator.getWireframeIndicesCount(
-    originalPrimitiveType,
-    originalCount,
-  );
-};
-
-function createWireframeIndexBuffer(primitive, indices, frameState) {
-  const positionAttribute = ModelUtility.getAttributeBySemantic(
-    primitive,
-    VertexAttributeSemantic.POSITION,
-  );
-  const vertexCount = positionAttribute.count;
-  const webgl2 = frameState.context.webgl2;
-
-  let originalIndices;
-  if (defined(indices)) {
-    const indicesBuffer = indices.buffer;
-    const indicesCount = indices.count;
-    if (defined(indicesBuffer) && webgl2) {
-      const useUint8Array = indicesBuffer.sizeInBytes === indicesCount;
-      originalIndices = useUint8Array
-        ? new Uint8Array(indicesCount)
-        : IndexDatatype.createTypedArray(vertexCount, indicesCount);
-
-      indicesBuffer.getBufferData(originalIndices);
-    } else {
-      originalIndices = indices.typedArray;
-    }
-  }
-
-  const primitiveType = primitive.primitiveType;
-  const wireframeIndices = WireframeIndexGenerator.createWireframeIndices(
-    primitiveType,
-    vertexCount,
-    originalIndices,
-  );
-  const indexDatatype = IndexDatatype.fromSizeInBytes(
-    wireframeIndices.BYTES_PER_ELEMENT,
-  );
-
-  return Buffer.createIndexBuffer({
-    context: frameState.context,
-    typedArray: wireframeIndices,
-    usage: BufferUsage.STATIC_DRAW,
-    indexDatatype: indexDatatype,
-  });
-}
-
-export default WireframePipelineStage;
+import Buffer from "../../Renderer/Buffer.js";
+import BufferUsage from "../../Renderer/BufferUsage.js";
+import defined from "../../Core/defined.js";
+import IndexDatatype from "../../Core/IndexDatatype.js";
+import ModelUtility from "./ModelUtility.js";
+import PrimitiveType from "../../Core/PrimitiveType.js";
+import ShaderDestination from "../../Renderer/ShaderDestination.js";
+import VertexAttributeSemantic from "../VertexAttributeSemantic.js";
+import WireframeIndexGenerator from "../../Core/WireframeIndexGenerator.js";
+
+/**
+ * The wireframe pipeline stage generates a new index buffer for rendering the
+ * structure of the mesh with gl.LINES.
+ *
+ * @namespace WireframePipelineStage
+ * @private
+ */
+const WireframePipelineStage = {
+  name: "WireframePipelineStage", // Helps with debugging
+};
+
+/**
+ * Process a primitive. This modifies the render resources as follows:
+ * <ul>
+ *   <li>Adds a define to the fragment shader to prevent extra shading of the lines.</li>
+ *   <li>Adds a separate index buffer for wireframe indices</li>
+ *   <li>Updates the primitive type and count for rendering with gl.LINES</li>
+ * </ul>
+ *
+ * @param {PrimitiveRenderResources} renderResources The render resources for this node
+ * @param {ModelComponents.primitive} primitive The primitive
+ * @param {FrameState} frameState The frame state
+ */
+WireframePipelineStage.process = function (
+  renderResources,
+  primitive,
+  frameState,
+) {
+  const model = renderResources.model;
+
+  if (model.debugWireframeMode === "barycentric") {
+    return;
+  }
+
+  // Applying normal mapping to the lines will result in rendering
+  // errors on Linux. This define is added to disable normal
+  // mapping in the shader.
+  const shaderBuilder = renderResources.shaderBuilder;
+  shaderBuilder.addDefine(
+    "HAS_WIREFRAME",
+    undefined,
+    ShaderDestination.FRAGMENT,
+  );
+  const wireframeIndexBuffer = createWireframeIndexBuffer(
+    primitive,
+    renderResources.indices,
+    frameState,
+  );
+  model._pipelineResources.push(wireframeIndexBuffer);
+  renderResources.wireframeIndexBuffer = wireframeIndexBuffer;
+
+  // We only need to count memory for the generated buffer. In WebGL 1, the CPU
+  // copy of the original indices is already counted in the geometry stage,
+  // and in WebGL 2, the CPU copy of the original indices (generated from the
+  // data of the original buffer) is discarded after generating the wireframe
+  // indices.
+  const hasCpuCopy = false;
+  model.statistics.addBuffer(wireframeIndexBuffer, hasCpuCopy);
+
+  // Update render resources so we render LINES with the correct index count
+  const originalPrimitiveType = renderResources.primitiveType;
+  const originalCount = renderResources.count;
+  renderResources.primitiveType = PrimitiveType.LINES;
+  renderResources.count = WireframeIndexGenerator.getWireframeIndicesCount(
+    originalPrimitiveType,
+    originalCount,
+  );
+};
+
+function createWireframeIndexBuffer(primitive, indices, frameState) {
+  const positionAttribute = ModelUtility.getAttributeBySemantic(
+    primitive,
+    VertexAttributeSemantic.POSITION,
+  );
+  const vertexCount = positionAttribute.count;
+  const webgl2 = frameState.context.webgl2;
+
+  let originalIndices;
+  if (defined(indices)) {
+    const indicesBuffer = indices.buffer;
+    const indicesCount = indices.count;
+    if (defined(indicesBuffer) && webgl2) {
+      const useUint8Array = indicesBuffer.sizeInBytes === indicesCount;
+      originalIndices = useUint8Array
+        ? new Uint8Array(indicesCount)
+        : IndexDatatype.createTypedArray(vertexCount, indicesCount);
+
+      indicesBuffer.getBufferData(originalIndices);
+    } else {
+      originalIndices = indices.typedArray;
+    }
+  }
+
+  const primitiveType = primitive.primitiveType;
+  const wireframeIndices = WireframeIndexGenerator.createWireframeIndices(
+    primitiveType,
+    vertexCount,
+    originalIndices,
+  );
+  const indexDatatype = IndexDatatype.fromSizeInBytes(
+    wireframeIndices.BYTES_PER_ELEMENT,
+  );
+
+  return Buffer.createIndexBuffer({
+    context: frameState.context,
+    typedArray: wireframeIndices,
+    usage: BufferUsage.STATIC_DRAW,
+    indexDatatype: indexDatatype,
+  });
+}
+
+export default WireframePipelineStage;

package/Source/Shaders/Model/ModelFS.glsl

@@ -135,8 +135,10 @@ void main()
 
     #ifdef WIREFRAME_OVERLAY
     color.rgb = mix(u_wireframeColor.rgb, color.rgb, edge);
+    color.a *= u_wireframeFillAlpha;
     #else
-    color = mix(u_wireframeColor, color, edge);
+    color.rgb = mix(u_wireframeColor.rgb, color.rgb, edge);
+    color.a = mix(u_wireframeColor.a, color.a * u_wireframeFillAlpha, edge);
     #endif
     #endif
 

package/Source/Shaders/Model/ModelFS.js

@@ -136,8 +136,10 @@ void main()\n\
 \n\
     #ifdef WIREFRAME_OVERLAY\n\
     color.rgb = mix(u_wireframeColor.rgb, color.rgb, edge);\n\
+    color.a *= u_wireframeFillAlpha;\n\
     #else\n\
-    color = mix(u_wireframeColor, color, edge);\n\
+    color.rgb = mix(u_wireframeColor.rgb, color.rgb, edge);\n\
+    color.a = mix(u_wireframeColor.a, color.a * u_wireframeFillAlpha, edge);\n\
     #endif\n\
     #endif\n\
 \n\