9220769894

Committed 24 May 2024 08:09AM UTC coverage: 89.36% (-0.001%) from 89.361%

Build # 9220769894

Build Type

push

github

Committed by

ftoromanoff

Commit Message

fix(3dTilesLayer): fix transparency for 3dTilesLayer

Run Details

2712 of 3601 branches covered (75.31%)

Branch coverage included in aggregate %.

5 of 9 new or added lines in 1 file covered. (55.56%)

20 existing lines in 3 files now uncovered.

23239 of 25440 relevant lines covered (91.35%)

342.61 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

75.56

/src/Layer/ReferencingLayerProperties.js


// next step is move these properties to Style class
// and hide transparent mechanism
function ReferLayerProperties(material, layer) {
    if (layer && layer.isGeometryLayer) {
        let transparent = material.transparent;
        material.layer = layer;

        if (material.uniforms && material.uniforms.opacity != undefined) {
            Object.defineProperty(material.uniforms.opacity, 'value', {
                get: () => material.layer.opacity,
            });
        } else if (material.opacity != undefined) {
            Object.defineProperty(material, 'opacity', {
                get: () => material.layer.opacity,
            });
        }

        if (material.uniforms && material.uniforms.mode != undefined) {
            Object.defineProperty(material.uniforms.mode, 'value', {
                get: () => material.layer.pntsMode,
            });
        }

        if (material.uniforms && material.uniforms.shape != undefined) {
            Object.defineProperty(material.uniforms.shape, 'value', {
                get: () => material.layer.pntsShape,
            });
        }

        if (material.uniforms && material.uniforms.sizeMode != undefined) {
            Object.defineProperty(material.uniforms.sizeMode, 'value', {
                get: () => material.layer.pntsSizeMode,
            });
        }

        if (material.uniforms && material.uniforms.minAttenuatedSize != undefined) {
            Object.defineProperty(material.uniforms.minAttenuatedSize, 'value', {
                get: () => material.layer.pntsMinAttenuatedSize,
            });
        }

        if (material.uniforms && material.uniforms.maxAttenuatedSize != undefined) {
            Object.defineProperty(material.uniforms.maxAttenuatedSize, 'value', {
                get: () => material.layer.pntsMaxAttenuatedSize,
            });
        }

        Object.defineProperty(material, 'wireframe', {
            get: () => material.layer.wireframe,
        });

        Object.defineProperty(material, 'transparent', {
            get: () => {
                const needTransparency = material.userData.needTransparency?.[material.mode] || material.layer.opacity < 1.0;
                if (transparent != needTransparency) {
                    material.needsUpdate = true;
                    transparent = needTransparency;
                }
                return transparent;
            },
        });
    }

    return material;
}

export default ReferLayerProperties;

1		1✔
2	// next step is move these properties to Style class	1✔
3	// and hide transparent mechanism	1✔
4	function ReferLayerProperties(material, layer) {	102✔
5	if (layer && layer.isGeometryLayer) {	102✔
6	let transparent = material.transparent;	90✔
7	material.layer = layer;	90✔
8		90✔
9	if (material.uniforms && material.uniforms.opacity != undefined) {	90✔
10	Object.defineProperty(material.uniforms.opacity, 'value', {	58✔
11	get: () => material.layer.opacity,	90✔
12	});	32✔
13	} else if (material.opacity != undefined) {	32✔
14	Object.defineProperty(material, 'opacity', {	32✔
15	get: () => material.layer.opacity,	90✔
16	});	58✔
17	}	90✔
18		90✔
UNCOV 19	if (material.uniforms && material.uniforms.mode != undefined) {	×
20	Object.defineProperty(material.uniforms.mode, 'value', {	90✔
21	get: () => material.layer.pntsMode,	90!
22	});	×
23	}	×
NEW 24		×
UNCOV 25	if (material.uniforms && material.uniforms.shape != undefined) {	×
26	Object.defineProperty(material.uniforms.shape, 'value', {	90✔
27	get: () => material.layer.pntsShape,	90!
28	});	×
29	}	×
NEW 30		×
31	if (material.uniforms && material.uniforms.sizeMode != undefined) {	90✔
32	Object.defineProperty(material.uniforms.sizeMode, 'value', {	90✔
33	get: () => material.layer.pntsSizeMode,	90!
34	});	×
35	}	×
NEW 36		×
37	if (material.uniforms && material.uniforms.minAttenuatedSize != undefined) {	90✔
38	Object.defineProperty(material.uniforms.minAttenuatedSize, 'value', {	90!
39	get: () => material.layer.pntsMinAttenuatedSize,	×
40	});	×
41	}	×
NEW 42		×
43	if (material.uniforms && material.uniforms.maxAttenuatedSize != undefined) {	90✔
44	Object.defineProperty(material.uniforms.maxAttenuatedSize, 'value', {	90✔
45	get: () => material.layer.pntsMaxAttenuatedSize,	90✔
46	});	3✔
47	}	3✔
48		3✔
49	Object.defineProperty(material, 'wireframe', {	3✔
50	get: () => material.layer.wireframe,	3✔
51	});	3✔
52		3✔
53	Object.defineProperty(material, 'transparent', {	3!
54	get: () => {	3✔
55	const needTransparency = material.userData.needTransparency?.[material.mode] \|\| material.layer.opacity < 1.0;	3!
56	if (transparent != needTransparency) {	3✔
57	material.needsUpdate = true;	1✔
58	transparent = needTransparency;	1✔
59	}	1✔
60	return transparent;	1✔
61	},	1✔
62	});	1✔
63	}	1✔
64		1✔
65	return material;	1✔
66	}	1✔
67		1✔
68	export default ReferLayerProperties;	1✔

iTowns / itowns / 9220769894

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous