vireglass 2.3.0 → 2.3.1

package/dist/index.d.cts

@@ -1,8 +1,8 @@
 import { V as VireGlassOptics } from './material-CnUmdKg1.cjs';
 export { A as ADAPT_RADIUS, b as ALL_EFFECTS_ON, D as DEBUG_MODES, E as EFFECTS, L as LEGACY_NAMES, c as LEGACY_OPTICS, d as LegacyOpticsName, M as MATERIAL_PRESETS, e as MATERIAL_RANGES, f as MaterialPresetName, P as PRESET_NAMES, g as PRODUCT_DIM, h as VIREGLASS_CLEAR_MATERIAL, i as VIREGLASS_CONTROL_MATERIAL, j as VIREGLASS_LYRICS_MATERIAL, k as VIREGLASS_MATERIAL, l as VIREGLASS_MATERIAL_V4, m as VIREGLASS_MATERIAL_V5, n as VIREGLASS_SHEET_MATERIAL, o as VireGlassDebugMode, p as VireGlassEffect, a as VireGlassMaterial, q as VireGlassNumericKey, r as VireGlassTint, s as VireGlassToggles, t as activeMaterial, u as applyToggles, v as debugIndex, w as materialForInk, x as resolveMaterial, y as resolveOptics } from './material-CnUmdKg1.cjs';
 export { M as MAX_BEVEL_FRACTION, a as MAX_STRETCH, R as RIM_FRACTION, V as VireGlassGeometry, b as bevelDp, c as bevelFraction, d as capsuleGeometry, e as circleGeometry, h as halfMinDp, l as lensPadDp, m as morphReachDp, r as rimDp, f as roundedRectGeometry, s as shadowOpacity, g as shadowOpacityFrom, i as shadowReachDp, j as sizeDp, k as sizeGain, n as surfacePadDp, t as thicknessDp } from './geometry-RhKd7CM5.cjs';
-import { V as VireGlassAccent } from './adapters-DugC6Qri.cjs';
-export { A as ACCENT_AMOUNT, D as DYNAMIC_UNIFORMS, I as ICON_UNIFORMS, O as OVERLAY_UNIFORMS, R as REST_LIGHT, S as SURFACE_LENGTH_UNIFORMS, a as SurfaceUniforms, b as VireGlassMorph, c as VireGlassTouch, l as lensMagnify, m as morphBetween, d as morphOutOf, t as toDeviceSurfaceUniforms, e as toLensProps, f as toSurfaceUniforms } from './adapters-DugC6Qri.cjs';
+import { V as VireGlassAccent } from './adapters-BOPIRMnL.cjs';
+export { A as ACCENT_AMOUNT, D as DYNAMIC_UNIFORMS, I as ICON_UNIFORMS, O as OVERLAY_UNIFORMS, R as REST_LIGHT, S as SURFACE_LENGTH_UNIFORMS, a as SurfaceUniforms, b as VireGlassMorph, c as VireGlassTouch, l as lensMagnify, m as morphBetween, d as morphOutOf, t as toDeviceSurfaceUniforms, e as toLensProps, f as toSurfaceUniforms } from './adapters-BOPIRMnL.cjs';
 export { a as GRADIENT, b as GroupDecision, c as GroupMember, G as GroupPlane, d as GroupSink, e as GroupState, M as MorphShape, N as NO_ACCESSIBILITY, f as SCROLL_EDGE_ENGAGE_DP, g as SETTLE, h as SMOOTH, S as ScrollEdgeStyle, T as TouchWarp, i as VG_FALLOFF, j as VG_SDF, V as VireGlassAccessibility, k as aggregate, l as applyAccessibility, m as contrastRimLuma, n as createGroupState, o as elasticAllowed, p as neckToBridge, q as probeValuesAt, s as sceneDistance, r as sceneGradient, t as scrollEdgeReachDp, u as scrollEdgeStrength, v as scrollEdgeStyle, w as sdfRoundedRect, x as sdfRoundedRectGradient, y as smin, z as smoothPlane, A as touchWarp } from './group-model-DwtixGhG.cjs';
 export { B as BackdropSample, C as CONFIRMATIONS, F as FADE_MS, a as FLIP_LUMA, I as INK_DARK, b as INK_LIGHT, R as RETURN_LUMA, c as ambientFrom, d as decisiveLuma, s as shouldInkBeLight } from './adaptation-BSbbdExK.cjs';
 
@@ -275,11 +275,16 @@ declare function convertShaderUniforms(src: string): string;
  * parentheses inside.
  */
 declare function convertEvalCalls(src: string): string;
+/** Comments are prose, and the rewrites here are regexes over raw text: a comment mentioning
+ *  "return" became one, and a brace in a comment ended the entry point early. Newlines inside
+ *  block comments survive, so a compile error still points at the source line. */
+declare function stripComments(src: string): string;
 /**
  * Early `return <expression>;` inside `main` → `fragColor = <expression>; return;`. Takes ONLY
  * the body of main (see `convertEntryPoint`) — ordinary `return`s in helper functions live
  * outside this text and are untouched. Expressions never contain a `;` of their own (shaders have
- * none — the only `;` lives inside `for(...)`, which isn't a return), so `[^;]+` is safe.
+ * none — the only `;` lives inside `for(...)`, which isn't a return), so `[^;]+` is safe once
+ * comments are gone (`stripComments`).
  */
 declare function convertReturns(mainBody: string): string;
 /**
@@ -304,4 +309,4 @@ declare function addPrologue(src: string): string;
  *  found. */
 declare function toGLSL(shaderSource: string): string;
 
-export { type DeformOptions, type DeformSample, FRESNEL_EXPONENT, GLASS_SCALE_DEFAULT, LENS_SHADER, SURFACE_SHADER, type ShapeParent, type ShapeSpec, VireGlassAccent, VireGlassOptics, absorption, accentAmount, accentTone, addPrologue, applyAppear, applyGlassScale, blur, bodyDensity, colorPickup, concentricFit, concentricInset, concentricRadius, convertEntryPoint, convertEvalCalls, convertHalfTypes, convertReturns, convertShaderUniforms, convertVecTypes, createDeform, diffraction, dispersion, edgeDensity, edgeLight, fresnelF0, fresnelStrength, gatherRadius, iorSpread, iridescence, mediumTint, raiseIntoGlass, refractionScale, refractionStrength, resolveShape, shadowTint, specularPower, specularStrength, toAGSL, toGLSL };
+export { type DeformOptions, type DeformSample, FRESNEL_EXPONENT, GLASS_SCALE_DEFAULT, LENS_SHADER, SURFACE_SHADER, type ShapeParent, type ShapeSpec, VireGlassAccent, VireGlassOptics, absorption, accentAmount, accentTone, addPrologue, applyAppear, applyGlassScale, blur, bodyDensity, colorPickup, concentricFit, concentricInset, concentricRadius, convertEntryPoint, convertEvalCalls, convertHalfTypes, convertReturns, convertShaderUniforms, convertVecTypes, createDeform, diffraction, dispersion, edgeDensity, edgeLight, fresnelF0, fresnelStrength, gatherRadius, iorSpread, iridescence, mediumTint, raiseIntoGlass, refractionScale, refractionStrength, resolveShape, shadowTint, specularPower, specularStrength, stripComments, toAGSL, toGLSL };

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import { V as VireGlassOptics } from './material-CnUmdKg1.js';
 export { A as ADAPT_RADIUS, b as ALL_EFFECTS_ON, D as DEBUG_MODES, E as EFFECTS, L as LEGACY_NAMES, c as LEGACY_OPTICS, d as LegacyOpticsName, M as MATERIAL_PRESETS, e as MATERIAL_RANGES, f as MaterialPresetName, P as PRESET_NAMES, g as PRODUCT_DIM, h as VIREGLASS_CLEAR_MATERIAL, i as VIREGLASS_CONTROL_MATERIAL, j as VIREGLASS_LYRICS_MATERIAL, k as VIREGLASS_MATERIAL, l as VIREGLASS_MATERIAL_V4, m as VIREGLASS_MATERIAL_V5, n as VIREGLASS_SHEET_MATERIAL, o as VireGlassDebugMode, p as VireGlassEffect, a as VireGlassMaterial, q as VireGlassNumericKey, r as VireGlassTint, s as VireGlassToggles, t as activeMaterial, u as applyToggles, v as debugIndex, w as materialForInk, x as resolveMaterial, y as resolveOptics } from './material-CnUmdKg1.js';
 export { M as MAX_BEVEL_FRACTION, a as MAX_STRETCH, R as RIM_FRACTION, V as VireGlassGeometry, b as bevelDp, c as bevelFraction, d as capsuleGeometry, e as circleGeometry, h as halfMinDp, l as lensPadDp, m as morphReachDp, r as rimDp, f as roundedRectGeometry, s as shadowOpacity, g as shadowOpacityFrom, i as shadowReachDp, j as sizeDp, k as sizeGain, n as surfacePadDp, t as thicknessDp } from './geometry-GvXtt-_S.js';
-import { V as VireGlassAccent } from './adapters-BfeAopGO.js';
-export { A as ACCENT_AMOUNT, D as DYNAMIC_UNIFORMS, I as ICON_UNIFORMS, O as OVERLAY_UNIFORMS, R as REST_LIGHT, S as SURFACE_LENGTH_UNIFORMS, a as SurfaceUniforms, b as VireGlassMorph, c as VireGlassTouch, l as lensMagnify, m as morphBetween, d as morphOutOf, t as toDeviceSurfaceUniforms, e as toLensProps, f as toSurfaceUniforms } from './adapters-BfeAopGO.js';
+import { V as VireGlassAccent } from './adapters-B_amRBqc.js';
+export { A as ACCENT_AMOUNT, D as DYNAMIC_UNIFORMS, I as ICON_UNIFORMS, O as OVERLAY_UNIFORMS, R as REST_LIGHT, S as SURFACE_LENGTH_UNIFORMS, a as SurfaceUniforms, b as VireGlassMorph, c as VireGlassTouch, l as lensMagnify, m as morphBetween, d as morphOutOf, t as toDeviceSurfaceUniforms, e as toLensProps, f as toSurfaceUniforms } from './adapters-B_amRBqc.js';
 export { a as GRADIENT, b as GroupDecision, c as GroupMember, G as GroupPlane, d as GroupSink, e as GroupState, M as MorphShape, N as NO_ACCESSIBILITY, f as SCROLL_EDGE_ENGAGE_DP, g as SETTLE, h as SMOOTH, S as ScrollEdgeStyle, T as TouchWarp, i as VG_FALLOFF, j as VG_SDF, V as VireGlassAccessibility, k as aggregate, l as applyAccessibility, m as contrastRimLuma, n as createGroupState, o as elasticAllowed, p as neckToBridge, q as probeValuesAt, s as sceneDistance, r as sceneGradient, t as scrollEdgeReachDp, u as scrollEdgeStrength, v as scrollEdgeStyle, w as sdfRoundedRect, x as sdfRoundedRectGradient, y as smin, z as smoothPlane, A as touchWarp } from './group-model-z4N27qsC.js';
 export { B as BackdropSample, C as CONFIRMATIONS, F as FADE_MS, a as FLIP_LUMA, I as INK_DARK, b as INK_LIGHT, R as RETURN_LUMA, c as ambientFrom, d as decisiveLuma, s as shouldInkBeLight } from './adaptation-BSbbdExK.js';
 
@@ -275,11 +275,16 @@ declare function convertShaderUniforms(src: string): string;
  * parentheses inside.
  */
 declare function convertEvalCalls(src: string): string;
+/** Comments are prose, and the rewrites here are regexes over raw text: a comment mentioning
+ *  "return" became one, and a brace in a comment ended the entry point early. Newlines inside
+ *  block comments survive, so a compile error still points at the source line. */
+declare function stripComments(src: string): string;
 /**
  * Early `return <expression>;` inside `main` → `fragColor = <expression>; return;`. Takes ONLY
  * the body of main (see `convertEntryPoint`) — ordinary `return`s in helper functions live
  * outside this text and are untouched. Expressions never contain a `;` of their own (shaders have
- * none — the only `;` lives inside `for(...)`, which isn't a return), so `[^;]+` is safe.
+ * none — the only `;` lives inside `for(...)`, which isn't a return), so `[^;]+` is safe once
+ * comments are gone (`stripComments`).
  */
 declare function convertReturns(mainBody: string): string;
 /**
@@ -304,4 +309,4 @@ declare function addPrologue(src: string): string;
  *  found. */
 declare function toGLSL(shaderSource: string): string;
 
-export { type DeformOptions, type DeformSample, FRESNEL_EXPONENT, GLASS_SCALE_DEFAULT, LENS_SHADER, SURFACE_SHADER, type ShapeParent, type ShapeSpec, VireGlassAccent, VireGlassOptics, absorption, accentAmount, accentTone, addPrologue, applyAppear, applyGlassScale, blur, bodyDensity, colorPickup, concentricFit, concentricInset, concentricRadius, convertEntryPoint, convertEvalCalls, convertHalfTypes, convertReturns, convertShaderUniforms, convertVecTypes, createDeform, diffraction, dispersion, edgeDensity, edgeLight, fresnelF0, fresnelStrength, gatherRadius, iorSpread, iridescence, mediumTint, raiseIntoGlass, refractionScale, refractionStrength, resolveShape, shadowTint, specularPower, specularStrength, toAGSL, toGLSL };
+export { type DeformOptions, type DeformSample, FRESNEL_EXPONENT, GLASS_SCALE_DEFAULT, LENS_SHADER, SURFACE_SHADER, type ShapeParent, type ShapeSpec, VireGlassAccent, VireGlassOptics, absorption, accentAmount, accentTone, addPrologue, applyAppear, applyGlassScale, blur, bodyDensity, colorPickup, concentricFit, concentricInset, concentricRadius, convertEntryPoint, convertEvalCalls, convertHalfTypes, convertReturns, convertShaderUniforms, convertVecTypes, createDeform, diffraction, dispersion, edgeDensity, edgeLight, fresnelF0, fresnelStrength, gatherRadius, iorSpread, iridescence, mediumTint, raiseIntoGlass, refractionScale, refractionStrength, resolveShape, shadowTint, specularPower, specularStrength, stripComments, toAGSL, toGLSL };

package/dist/index.js

@@ -1,7 +1,7 @@
-export { SURFACE_SHADER, addPrologue, convertEntryPoint, convertEvalCalls, convertHalfTypes, convertReturns, convertShaderUniforms, convertVecTypes, toGLSL } from './chunk-PM2SWCSF.js';
+export { SURFACE_SHADER, addPrologue, convertEntryPoint, convertEvalCalls, convertHalfTypes, convertReturns, convertShaderUniforms, convertVecTypes, stripComments, toGLSL } from './chunk-UDPJLNFW.js';
 export { GLASS_SCALE_DEFAULT, GRADIENT, NO_ACCESSIBILITY, SCROLL_EDGE_ENGAGE_DP, SETTLE, SMOOTH, accentAmount, accentTone, aggregate, applyAccessibility, applyAppear, applyGlassScale, concentricFit, concentricInset, concentricRadius, contrastRimLuma, createDeform, createGroupState, elasticAllowed, probeValuesAt, raiseIntoGlass, resolveShape, scrollEdgeReachDp, scrollEdgeStrength, scrollEdgeStyle, shadowTint, smoothPlane } from './chunk-CTTZNZFV.js';
 export { CONFIRMATIONS, FADE_MS, FLIP_LUMA, INK_DARK, INK_LIGHT, RETURN_LUMA, ambientFrom, decisiveLuma, shouldInkBeLight } from './chunk-JNRZNMJJ.js';
-export { ACCENT_AMOUNT, ADAPT_RADIUS, ALL_EFFECTS_ON, DEBUG_MODES, DYNAMIC_UNIFORMS, EFFECTS, FRESNEL_EXPONENT, ICON_UNIFORMS, LEGACY_NAMES, LEGACY_OPTICS, LENS_SHADER, MATERIAL_PRESETS, MATERIAL_RANGES, OVERLAY_UNIFORMS, PRESET_NAMES, PRODUCT_DIM, REST_LIGHT, SURFACE_LENGTH_UNIFORMS, VG_FALLOFF, VG_SDF, VIREGLASS_CLEAR_MATERIAL, VIREGLASS_CONTROL_MATERIAL, VIREGLASS_LYRICS_MATERIAL, VIREGLASS_MATERIAL, VIREGLASS_MATERIAL_V4, VIREGLASS_MATERIAL_V5, VIREGLASS_SHEET_MATERIAL, absorption, activeMaterial, applyToggles, blur, bodyDensity, colorPickup, debugIndex, diffraction, dispersion, edgeDensity, edgeLight, fresnelF0, fresnelStrength, gatherRadius, iorSpread, iridescence, lensMagnify, materialForInk, mediumTint, morphBetween, morphOutOf, neckToBridge, refractionScale, refractionStrength, resolveMaterial, resolveOptics, sceneDistance, sceneGradient, sdfRoundedRect, sdfRoundedRectGradient, smin, specularPower, specularStrength, toDeviceSurfaceUniforms, toLensProps, toSurfaceUniforms, touchWarp } from './chunk-H5QTBF67.js';
+export { ACCENT_AMOUNT, ADAPT_RADIUS, ALL_EFFECTS_ON, DEBUG_MODES, DYNAMIC_UNIFORMS, EFFECTS, FRESNEL_EXPONENT, ICON_UNIFORMS, LEGACY_NAMES, LEGACY_OPTICS, LENS_SHADER, MATERIAL_PRESETS, MATERIAL_RANGES, OVERLAY_UNIFORMS, PRESET_NAMES, PRODUCT_DIM, REST_LIGHT, SURFACE_LENGTH_UNIFORMS, VG_FALLOFF, VG_SDF, VIREGLASS_CLEAR_MATERIAL, VIREGLASS_CONTROL_MATERIAL, VIREGLASS_LYRICS_MATERIAL, VIREGLASS_MATERIAL, VIREGLASS_MATERIAL_V4, VIREGLASS_MATERIAL_V5, VIREGLASS_SHEET_MATERIAL, absorption, activeMaterial, applyToggles, blur, bodyDensity, colorPickup, debugIndex, diffraction, dispersion, edgeDensity, edgeLight, fresnelF0, fresnelStrength, gatherRadius, iorSpread, iridescence, lensMagnify, materialForInk, mediumTint, morphBetween, morphOutOf, neckToBridge, refractionScale, refractionStrength, resolveMaterial, resolveOptics, sceneDistance, sceneGradient, sdfRoundedRect, sdfRoundedRectGradient, smin, specularPower, specularStrength, toDeviceSurfaceUniforms, toLensProps, toSurfaceUniforms, touchWarp } from './chunk-V47YU75P.js';
 export { MAX_BEVEL_FRACTION, MAX_STRETCH, RIM_FRACTION, bevelDp, bevelFraction, capsuleGeometry, circleGeometry, halfMinDp, lensPadDp, morphReachDp, rimDp, roundedRectGeometry, shadowOpacity, shadowOpacityFrom, shadowReachDp, sizeDp, sizeGain, surfacePadDp, thicknessDp } from './chunk-SLRPHDV7.js';
 import './chunk-MMPK6DCK.js';
 

package/dist/web/index.cjs

@@ -1459,6 +1459,26 @@ function convertEvalCalls(src) {
   out += src.slice(cursor);
   return out;
 }
+function stripComments(src) {
+  let out = "";
+  let i = 0;
+  while (i < src.length) {
+    if (src.startsWith("//", i)) {
+      const end = src.indexOf("\n", i);
+      i = end < 0 ? src.length : end;
+    } else if (src.startsWith("/*", i)) {
+      const end = src.indexOf("*/", i + 2);
+      if (end < 0) throw new Error("vireglass/targets/glsl: unterminated block comment");
+      const stop = end + 2;
+      out += src.slice(i, stop).replace(/[^\n]/g, "");
+      i = stop;
+    } else {
+      out += src[i];
+      i += 1;
+    }
+  }
+  return out;
+}
 function convertReturns(mainBody) {
   return mainBody.replace(/\breturn\s+([^;]+);/g, "fragColor = $1; return;");
 }
@@ -1489,7 +1509,7 @@ function addPrologue(src) {
   return "#version 300 es\nprecision highp float;\n\nout vec4 fragColor;\nuniform vec2 u_resolution;\n\n" + src;
 }
 function toGLSL(shaderSource) {
-  let out = shaderSource;
+  let out = stripComments(shaderSource);
   out = convertEntryPoint(out);
   out = convertShaderUniforms(out);
   out = convertEvalCalls(out);