@xeokit/xeokit-sdk 2.6.85-renderers-refactor-v2 → 2.6.86

package/src/viewer/utils/os.js

@@ -6,6 +6,15 @@ const os = {
 
         return isIphone && isSafari;
     },
+    isIphoneOrIpadSafari() {
+        const userAgent = window.navigator.userAgent;
+        const isIphoneOrIpad = /iPhone|iPad/i.test(userAgent) || (
+            // iPad detection: Check for touch support and macOS-like user agent
+            /Macintosh/i.test(userAgent) && navigator.maxTouchPoints && navigator.maxTouchPoints > 2
+        );
+        const isSafari = /Safari/i.test(userAgent) && !/Chrome/i.test(userAgent);
+        return isIphoneOrIpad && isSafari;
+    },
     isTouchDevice() {
         return (
             'ontouchstart' in window || //works for most devices

package/src/viewer/scene/mesh/draw/LambertShaderSource.js

@@ -1,35 +0,0 @@
-import {createLightSetup} from "../../webgl/WebGLRenderer.js";
-
-export const LambertShaderSource = function(meshDrawHash, programVariables, geometry, material, scene) {
-    const lightSetup       = createLightSetup(programVariables, scene._lightsState);
-    const colorize         = programVariables.createUniform("vec4",  "colorize",         (set, state) => set(state.meshColorize));
-    const materialAlpha    = programVariables.createUniform("float", "materialAlpha",    (set, state) => set(state.material.alpha));
-    const materialColor    = programVariables.createUniform("vec3",  "materialColor",    (set, state) => set(state.material.color));
-    const materialEmissive = programVariables.createUniform("vec3",  "materialEmissive", (set, state) => set(state.material.emissive));
-    const vColor           = programVariables.createVarying("vec4", "vColor", () => {
-        const attributes = geometry.attributes;
-        const lightComponents = [
-            lightSetup.getAmbientColor()
-        ].concat(attributes.normal
-                 ? lightSetup.directionalLights.map(
-                     light => `(max(dot(${attributes.normal.view}, ${light.getDirection(geometry.viewMatrix, attributes.position.view)}), 0.0) * ${light.getColor()})`)
-                 : [ ]);
-        return `${colorize} * vec4((${lightComponents.join(" + ")}) * ${materialColor} + ${materialEmissive}, ${materialAlpha});`; // TODO: How to have ambient bright enough for canvas BG but not too bright for scene?
-    });
-    const outColor = programVariables.createOutput("vec4", "outColor");
-
-    return {
-        getHash: () => [
-            meshDrawHash,
-            scene.gammaOutput ? "go" : "",
-            lightSetup.getHash(),
-            material._state.hash
-        ],
-        programName: "Lambert",
-        canActAsBackground: true,
-        discardPoints: true,
-        setupPointSize: true,
-        setsLineWidth: true,
-        appendFragmentOutputs: (src, getGammaOutputExpression) => src.push(`${outColor} = ${getGammaOutputExpression ? getGammaOutputExpression(vColor) : vColor};`)
-    };
-};

package/src/viewer/scene/mesh/emphasis/EmphasisShaderSource.js

@@ -1,34 +0,0 @@
-import {createLightSetup} from "../../webgl/WebGLRenderer.js";
-
-export const EmphasisShaderSource = function(meshHash, programVariables, geometry, scene, isFill) {
-    const lightSetup = isFill && createLightSetup(programVariables, scene._lightsState);
-    const uColor = programVariables.createUniform("vec3",  "uColor", (set, state) => set(isFill ? state.material.fillColor : state.material.edgeColor));
-    const uAlpha = programVariables.createUniform("float", "uAlpha", (set, state) => set(isFill ? state.material.fillAlpha : state.material.edgeAlpha));
-    const vColor = programVariables.createVarying("vec4", "vColor", () => {
-        const attributes = geometry.attributes;
-        const lightComponents = isFill && [
-            lightSetup.getAmbientColor()
-        ].concat(attributes.normal
-                 ? lightSetup.directionalLights.map(
-                     light => `(max(dot(${attributes.normal.view}, ${light.getDirection(geometry.viewMatrix, attributes.position.view)}), 0.0) * ${light.getColor()})`)
-                 : [ ]);
-        // TODO: A blending mode for emphasis materials, to select add/multiply/mix
-        // `vec4((mix(reflectedColor, ${uColor}, 0.7)), ${uAlpha})`
-        return `vec4(${uColor}${lightComponents ? ` * (${lightComponents.join(" + ")})` : ""}, ${uAlpha})`;
-        // `${vColor} = vec4(reflectedColor + ${uColor}, ${uAlpha})`
-    });
-
-    const outColor = programVariables.createOutput("vec4", "outColor");
-    return {
-        getHash: () => [
-            meshHash,
-            scene.gammaOutput ? "go" : "", // Gamma input not needed
-            lightSetup && lightSetup.getHash()
-        ],
-        programName: isFill ? "EmphasisFill" : "EmphasisEdges",
-        dontSetFrontFace: true,
-        discardPoints: isFill,
-        drawEdges: ! isFill,
-        appendFragmentOutputs: (src, getGammaOutputExpression) => src.push(`${outColor} = ${getGammaOutputExpression ? getGammaOutputExpression(vColor) : vColor};`)
-    };
-};