bg2e-js 2.3.11 → 2.3.13

package/src/shaders/index.ts

@@ -1,37 +1,37 @@
-import BasicDiffuseColorShader from "./BasicDiffuseColorShader";
-import BasicPBRLightShader from "./BasicPBRLightShader";
-import DebugRenderShader from "./DebugRenderShader";
-import DepthRenderShader from "./DepthRenderShader";
-import IrradianceMapCubeShader from "./IrradianceMapCubeShader";
-import PBRLightIBLShader from "./PBRLightIBLShader";
-import PickSelectionShader from "./PickSelectionShader";
-import PresentDebugFramebufferShader from "./PresentDebugFramebufferShader";
-import PresentTextureShader from "./PresentTextureShader";
-import SelectionHighlightShader from "./SelectionHighlightShader";
-import ShaderFunction from "./ShaderFunction";
-import SkyCubeShader from "./SkyCubeShader";
-import SkySphereShader from "./SkySphereShader";
-import SpecularMapCubeShader from "./SpecularMapCubeShader";
-import TextureMergerShader from "./TextureMergerShader";
-import * as webgl_shader_lib from "./webgl_shader_lib";
-
-export default {
-    BasicDiffuseColorShader,
-    BasicPBRLightShader,
-    DebugRenderShader,
-    DepthRenderShader,
-    IrradianceMapCubeShader,
-    PBRLightIBLShader,
-    PickSelectionShader,
-    PresentDebugFramebufferShader,
-    PresentTextureShader,
-    SelectionHighlightShader,
-    ShaderFunction,
-    SkyCubeShader,
-    SkySphereShader,
-    SpecularMapCubeShader,
-    TextureMergerShader,
-    shaderLib: {
-        webgl: webgl_shader_lib
-    }
+import BasicDiffuseColorShader from "./BasicDiffuseColorShader";
+import BasicPBRLightShader from "./BasicPBRLightShader";
+import DebugRenderShader from "./DebugRenderShader";
+import DepthRenderShader from "./DepthRenderShader";
+import IrradianceMapCubeShader from "./IrradianceMapCubeShader";
+import PBRLightIBLShader from "./PBRLightIBLShader";
+import PickSelectionShader from "./PickSelectionShader";
+import PresentDebugFramebufferShader from "./PresentDebugFramebufferShader";
+import PresentTextureShader from "./PresentTextureShader";
+import SelectionHighlightShader from "./SelectionHighlightShader";
+import ShaderFunction from "./ShaderFunction";
+import SkyCubeShader from "./SkyCubeShader";
+import SkySphereShader from "./SkySphereShader";
+import SpecularMapCubeShader from "./SpecularMapCubeShader";
+import TextureMergerShader from "./TextureMergerShader";
+import * as webgl_shader_lib from "./webgl_shader_lib";
+
+export default {
+    BasicDiffuseColorShader,
+    BasicPBRLightShader,
+    DebugRenderShader,
+    DepthRenderShader,
+    IrradianceMapCubeShader,
+    PBRLightIBLShader,
+    PickSelectionShader,
+    PresentDebugFramebufferShader,
+    PresentTextureShader,
+    SelectionHighlightShader,
+    ShaderFunction,
+    SkyCubeShader,
+    SkySphereShader,
+    SpecularMapCubeShader,
+    TextureMergerShader,
+    shaderLib: {
+        webgl: webgl_shader_lib
+    }
 }

package/src/shaders/webgl/color_correction.glsl

@@ -1,47 +1,47 @@
-#ifndef COLOR_CORRECTION_GLSL
-#define COLOR_CORRECTION_GLSL
-
-// Convert lineal color to SRGB for shader output
-vec4 lineal2SRGB(vec4 color, float gamma)
-{
-    color = color / (color + vec4(1.0));
-    return vec4(pow(color.rgb, vec3(1.0 / gamma)), color.a);
-}
-
-vec3 lineal2SRGB(vec3 color, float gamma)
-{
-    color = color / (color + vec3(1.0));
-    return pow(color.rgb, vec3(1.0 / gamma));
-}
-
-// Convert SRGB textures to lineal color
-vec4 SRGB2Lineal(vec4 color, float gamma)
-{
-    return vec4(pow(color.rgb, vec3(gamma)), color.a);
-}
-
-vec3 SRGB2lLineal(vec3 color, float gamma)
-{
-    return pow(color, vec3(gamma));
-}
-
-vec4 brightnessContrast(vec4 color, float brightness, float contrast)
-{
-    mat4 brightnessMat = mat4(
-        1.0, 0.0, 0.0, 0.0,
-        0.0, 1.0, 0.0, 0.0,
-        0.0, 0.0, 1.0, 0.0,
-        brightness, brightness, brightness, 1.0
-    );
-    float t = (1.0 - contrast) / 2.0;
-    mat4 contrastMat = mat4(
-        contrast, 0.0, 0.0, 0.0,
-        0.0, contrast, 0.0, 0.0,
-        0.0, 0.0, contrast, 0.0,
-        t, t, t, 1.0
-    );
-    return contrastMat * brightnessMat * color;
-}
-
-#endif // COLOR_CORRECTION_GLSL
-
+#ifndef COLOR_CORRECTION_GLSL
+#define COLOR_CORRECTION_GLSL
+
+// Convert lineal color to SRGB for shader output
+vec4 lineal2SRGB(vec4 color, float gamma)
+{
+    color = color / (color + vec4(1.0));
+    return vec4(pow(color.rgb, vec3(1.0 / gamma)), color.a);
+}
+
+vec3 lineal2SRGB(vec3 color, float gamma)
+{
+    color = color / (color + vec3(1.0));
+    return pow(color.rgb, vec3(1.0 / gamma));
+}
+
+// Convert SRGB textures to lineal color
+vec4 SRGB2Lineal(vec4 color, float gamma)
+{
+    return vec4(pow(color.rgb, vec3(gamma)), color.a);
+}
+
+vec3 SRGB2lLineal(vec3 color, float gamma)
+{
+    return pow(color, vec3(gamma));
+}
+
+vec4 brightnessContrast(vec4 color, float brightness, float contrast)
+{
+    mat4 brightnessMat = mat4(
+        1.0, 0.0, 0.0, 0.0,
+        0.0, 1.0, 0.0, 0.0,
+        0.0, 0.0, 1.0, 0.0,
+        brightness, brightness, brightness, 1.0
+    );
+    float t = (1.0 - contrast) / 2.0;
+    mat4 contrastMat = mat4(
+        contrast, 0.0, 0.0, 0.0,
+        0.0, contrast, 0.0, 0.0,
+        0.0, 0.0, contrast, 0.0,
+        t, t, t, 1.0
+    );
+    return contrastMat * brightnessMat * color;
+}
+
+#endif // COLOR_CORRECTION_GLSL
+

package/src/shaders/webgl/constants.glsl

@@ -1,6 +1,6 @@
-
-#define PI 3.14159265359
-#define LIGHT_TYPE_POINT 5
-#define LIGHT_TYPE_DIRECTIONAL 4
-#define LIGHT_TYPE_SPOT 1
-#define LIGHT_TYPE_DISABLED 10
+
+#define PI 3.14159265359
+#define LIGHT_TYPE_POINT 5
+#define LIGHT_TYPE_DIRECTIONAL 4
+#define LIGHT_TYPE_SPOT 1
+#define LIGHT_TYPE_DISABLED 10

package/src/shaders/webgl/index.ts

@@ -1,70 +1,70 @@
-import colorCorrection from "./color_correction.glsl?raw";
-import constants from "./constants.glsl?raw";
-import normalMap from "./normal_map.glsl?raw";
-import pbr from "./pbr.glsl?raw";
-import uniforms from "./uniforms.glsl?raw";
-
-import ShaderFunction, {
-    generateShaderLibrary,
-    extractConstants,
-    processConstants,
-    type ConstantDefinition,
-    type DependencyItem
-} from "../ShaderFunction";
-
-let g_constants: ConstantDefinition[] | null = null;
-
-export function getConstants() {
-    if (!g_constants) {
-        // Extract constants all the GLSL files
-        g_constants = [
-            ...extractConstants(constants),
-            ...extractConstants(colorCorrection),
-            ...extractConstants(normalMap),
-            ...extractConstants(pbr),
-            ...extractConstants(uniforms)
-        ];
-    }
-    return g_constants;
-}
-
-let g_colorCorrectionFunctions: DependencyItem[] | null = null;
-export function getColorCorrectionFunctions() {
-    if (!g_colorCorrectionFunctions) {
-        g_colorCorrectionFunctions = generateShaderLibrary(colorCorrection);
-    }
-
-    return g_colorCorrectionFunctions;
-}
-
-let g_normalMapFunctions: DependencyItem[] | null = null;
-export function getNormalMapFunctions() {
-    if (!g_normalMapFunctions) {
-        g_normalMapFunctions = generateShaderLibrary(normalMap);
-    }
-
-    return g_normalMapFunctions;
-}
-
-let g_pbrFunctions: DependencyItem[] | null = null;
-export function getPBRFunctions() {
-    if (!g_pbrFunctions) {
-        g_pbrFunctions = generateShaderLibrary(pbr);
-    }
-
-    return g_pbrFunctions;
-}
-
-let g_uniformsFunctions: DependencyItem[] | null = null;
-export function getUniformsFunctions() {
-    if (!g_uniformsFunctions) {
-        g_uniformsFunctions = generateShaderLibrary(uniforms);
-    }
-
-    return g_uniformsFunctions;
-}
-
-export function replaceConstants(shaderCode: string): string {
-    const constants = getConstants();
-    return processConstants(shaderCode, constants);
-}
+import colorCorrection from "./color_correction.glsl?raw";
+import constants from "./constants.glsl?raw";
+import normalMap from "./normal_map.glsl?raw";
+import pbr from "./pbr.glsl?raw";
+import uniforms from "./uniforms.glsl?raw";
+
+import ShaderFunction, {
+    generateShaderLibrary,
+    extractConstants,
+    processConstants,
+    type ConstantDefinition,
+    type DependencyItem
+} from "../ShaderFunction";
+
+let g_constants: ConstantDefinition[] | null = null;
+
+export function getConstants() {
+    if (!g_constants) {
+        // Extract constants all the GLSL files
+        g_constants = [
+            ...extractConstants(constants),
+            ...extractConstants(colorCorrection),
+            ...extractConstants(normalMap),
+            ...extractConstants(pbr),
+            ...extractConstants(uniforms)
+        ];
+    }
+    return g_constants;
+}
+
+let g_colorCorrectionFunctions: DependencyItem[] | null = null;
+export function getColorCorrectionFunctions() {
+    if (!g_colorCorrectionFunctions) {
+        g_colorCorrectionFunctions = generateShaderLibrary(colorCorrection);
+    }
+
+    return g_colorCorrectionFunctions;
+}
+
+let g_normalMapFunctions: DependencyItem[] | null = null;
+export function getNormalMapFunctions() {
+    if (!g_normalMapFunctions) {
+        g_normalMapFunctions = generateShaderLibrary(normalMap);
+    }
+
+    return g_normalMapFunctions;
+}
+
+let g_pbrFunctions: DependencyItem[] | null = null;
+export function getPBRFunctions() {
+    if (!g_pbrFunctions) {
+        g_pbrFunctions = generateShaderLibrary(pbr);
+    }
+
+    return g_pbrFunctions;
+}
+
+let g_uniformsFunctions: DependencyItem[] | null = null;
+export function getUniformsFunctions() {
+    if (!g_uniformsFunctions) {
+        g_uniformsFunctions = generateShaderLibrary(uniforms);
+    }
+
+    return g_uniformsFunctions;
+}
+
+export function replaceConstants(shaderCode: string): string {
+    const constants = getConstants();
+    return processConstants(shaderCode, constants);
+}

package/src/shaders/webgl/normal_map.glsl

@@ -1,9 +1,9 @@
-
-mat3 TBNMatrix(mat4 model, vec3 normal, vec3 tangent)
-{
-    vec3 T = normalize(vec3(model * vec4(tangent, 0.0)));
-    vec3 B = normalize(vec3(model * vec4(cross(tangent, normal), 0.0)));
-    vec3 N = normalize(vec3(model * vec4(normal, 0.0)));
-    return mat3(T, B, N);
-}
-
+
+mat3 TBNMatrix(mat4 model, vec3 normal, vec3 tangent)
+{
+    vec3 T = normalize(vec3(model * vec4(tangent, 0.0)));
+    vec3 B = normalize(vec3(model * vec4(cross(tangent, normal), 0.0)));
+    vec3 N = normalize(vec3(model * vec4(normal, 0.0)));
+    return mat3(T, B, N);
+}
+