2194287150

Build # 2194287150

Build Type

github

Committed by GitHub

Commit Message

<a href="https://github.com/visgl/luma.gl/commit/<a class=hub.com/visgl/luma.gl/commit/<a class="double-link" href="https://git"><a class=hub.com/visgl/luma.gl/commit/<a class="double-link" href="https://git"><a class=hub.com/visgl/luma.gl/commit/<a class="double-link" href="https://git"><a class=hub.com/visgl/luma.gl/commit/774b5f0cf5f228388a0cc97bfe322d0c029f6099">774b5f0cf">&lt;a href=&quot;https://github.com/visgl/luma.gl/commit/</a><a class="double-link" href="https://github.com/visgl/luma.gl/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/visgl/luma.gl/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/visgl/luma.gl/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/visgl/luma.gl/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/visgl/luma.gl/commit/774b5f0cf5f228388a0cc97bfe322d0c029f6099">774b5f0cf</a><a href="https://github.com/visgl/luma.gl/commit/774b5f0cf5f228388a0cc97bfe322d0c029f6099">&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/visgl/luma.gl/commit/&lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/visgl/luma.gl/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/visgl/luma.gl/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/visgl/luma.gl/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/visgl/luma.gl/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/visgl/luma.gl/commit/774b5f0cf5f228388a0cc97bfe322d0c029f6099&quot;&gt;774b5f0cf&lt;/a&gt;&lt;a href=&quot;https://github.com/visgl/luma.gl/commit/774b5f0cf5f228388a0cc97bfe322d0c029f6099&quot;&gt;&amp;quot;&amp;gt;&amp;amp;lt;a href=&amp;amp;quot;https://github.com/visgl/luma.gl/commit/&amp;lt;/a&amp;gt;&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://github.com/visgl/luma.gl/commit/&amp;amp;lt;a class=&amp;amp;quot;double-link&amp;amp;quot; href=&amp;amp;quot;htt... (continued)

Pull Request Pull Request #1639: Cleanup generated textures

Run Details

1932 of 3667 branches covered (52.69%)

Branch coverage included in aggregate %.

1 of 1 new or added line in 1 file covered. (100.0%)

3930 of 6183 relevant lines covered (63.56%)

44.97 hits per line

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

42.98

/modules/experimental/src/gltf/gltf-material-parser.js

import {Texture2D, hasFeature, FEATURES, log} from '@luma.gl/webgl';

export default class GLTFMaterialParser {
  constructor(
    gl,
    {attributes, material, pbrDebug, imageBasedLightingEnvironment, lights, useTangents}
  ) {
    this.gl = gl;

    this.defines = {
      // TODO: Use EXT_sRGB if available (Standard in WebGL 2.0)
      MANUAL_SRGB: 1,
      SRGB_FAST_APPROXIMATION: 1
    };

    if (hasFeature(gl, FEATURES.GLSL_TEXTURE_LOD)) {
      this.defines.USE_TEX_LOD = 1;
    }

    this.uniforms = {
      // TODO: find better values?
      u_Camera: [0, 0, 0], // Model should override

      u_MetallicRoughnessValues: [1, 1] // Default is 1 and 1
    };

    this.parameters = {};
    this.generatedTextures = [];

    if (imageBasedLightingEnvironment) {
      this.uniforms.u_DiffuseEnvSampler = imageBasedLightingEnvironment.getDiffuseEnvSampler();
      this.uniforms.u_SpecularEnvSampler = imageBasedLightingEnvironment.getSpecularEnvSampler();
      this.uniforms.u_brdfLUT = imageBasedLightingEnvironment.getBrdfTexture();
      this.uniforms.u_ScaleIBLAmbient = [1, 1];
    }

    if (pbrDebug) {
      // Override final color for reference app visualization
      // of various parameters in the lighting equation.
      this.uniforms.u_ScaleDiffBaseMR = [0, 0, 0, 0];
      this.uniforms.u_ScaleFGDSpec = [0, 0, 0, 0];
    }

    this.defineIfPresent(attributes.NORMAL, 'HAS_NORMALS');
    this.defineIfPresent(attributes.TANGENT && useTangents, 'HAS_TANGENTS');
    this.defineIfPresent(attributes.TEXCOORD_0, 'HAS_UV');

    this.defineIfPresent(imageBasedLightingEnvironment, 'USE_IBL');
    this.defineIfPresent(lights, 'USE_LIGHTS');
    this.defineIfPresent(pbrDebug, 'PBR_DEBUG');

    if (material) {
      this.parseMaterial(material);
    }
  }

  defineIfPresent(value, name) {
    if (value) {
      this.defines[name] = 1;
    }
  }

  parseTexture(gltfTexture, name, define = null) {
    const parameters =
      (gltfTexture.texture &&
        gltfTexture.texture.sampler &&
        gltfTexture.texture.sampler.parameters) ||
      {};

    const image = gltfTexture.texture.source.image;
    let textureOptions;
    let specialTextureParameters = {};
    if (image.compressed) {
      textureOptions = image;
      specialTextureParameters = {
        [this.gl.TEXTURE_MIN_FILTER]:
          image.data.length > 1 ? this.gl.LINEAR_MIPMAP_NEAREST : this.gl.LINEAR
      };
    } else {
      // Texture2D accepts a promise that returns an image as data (Async Textures)
      textureOptions = {data: image};
    }

    const texture = new Texture2D(this.gl, {
      id: gltfTexture.name || gltfTexture.id,
      parameters: {
        ...parameters,
        ...specialTextureParameters
      },
      pixelStore: {
        [this.gl.UNPACK_FLIP_Y_WEBGL]: false
      },
      ...textureOptions
    });
    this.uniforms[name] = texture;
    this.defineIfPresent(define, define);
    this.generatedTextures.push(texture);
  }

  parsePbrMetallicRoughness(pbrMetallicRoughness) {
    if (pbrMetallicRoughness.baseColorTexture) {
      this.parseTexture(
        pbrMetallicRoughness.baseColorTexture,
        'u_BaseColorSampler',
        'HAS_BASECOLORMAP'
      );
    }
    this.uniforms.u_BaseColorFactor = pbrMetallicRoughness.baseColorFactor || [1, 1, 1, 1];

    if (pbrMetallicRoughness.metallicRoughnessTexture) {
      this.parseTexture(
        pbrMetallicRoughness.metallicRoughnessTexture,
        'u_MetallicRoughnessSampler',
        'HAS_METALROUGHNESSMAP'
      );
    }
    const {metallicFactor = 1, roughnessFactor = 1} = pbrMetallicRoughness;
    this.uniforms.u_MetallicRoughnessValues = [metallicFactor, roughnessFactor];
  }

  parseMaterial(material) {
    this.uniforms.pbr_uUnlit = Boolean(material.unlit);

    if (material.pbrMetallicRoughness) {
      this.parsePbrMetallicRoughness(material.pbrMetallicRoughness);
    }
    if (material.normalTexture) {
      this.parseTexture(material.normalTexture, 'u_NormalSampler', 'HAS_NORMALMAP');

      const {scale = 1} = material.normalTexture;
      this.uniforms.u_NormalScale = scale;
    }
    if (material.occlusionTexture) {
      this.parseTexture(material.occlusionTexture, 'u_OcclusionSampler', 'HAS_OCCLUSIONMAP');

      const {strength = 1} = material.occlusionTexture;
      this.uniforms.u_OcclusionStrength = strength;
    }
    if (material.emissiveTexture) {
      this.parseTexture(material.emissiveTexture, 'u_EmissiveSampler', 'HAS_EMISSIVEMAP');
      this.uniforms.u_EmissiveFactor = material.emissiveFactor || [0, 0, 0];
    }
    if (material.alphaMode === 'MASK') {
      const {alphaCutoff = 0.5} = material;
      this.defines.ALPHA_CUTOFF = 1;
      this.uniforms.u_AlphaCutoff = alphaCutoff;
    } else if (material.alphaMode === 'BLEND') {
      log.warn('BLEND alphaMode might not work well because it requires mesh sorting')();
      Object.assign(this.parameters, {
        blend: true,
        blendEquation: this.gl.FUNC_ADD,
        blendFunc: [
          this.gl.SRC_ALPHA,
          this.gl.ONE_MINUS_SRC_ALPHA,
          this.gl.ONE,
          this.gl.ONE_MINUS_SRC_ALPHA
        ]
      });
    }
  }

  /**
   * Destroy all generated resources to release memory.
   */
  delete() {
    this.generatedTextures.forEach(texture => texture.delete());
  }
}

1	import {Texture2D, hasFeature, FEATURES, log} from '@luma.gl/webgl';	5✔
2
3	export default class GLTFMaterialParser {
4	constructor(
5	gl,
6	{attributes, material, pbrDebug, imageBasedLightingEnvironment, lights, useTangents}
7	) {
8	this.gl = gl;	1✔
9
10	this.defines = {	1✔
11	// TODO: Use EXT_sRGB if available (Standard in WebGL 2.0)
12	MANUAL_SRGB: 1,
13	SRGB_FAST_APPROXIMATION: 1
14	};
15
16	if (hasFeature(gl, FEATURES.GLSL_TEXTURE_LOD)) {	1!
17	this.defines.USE_TEX_LOD = 1;	×
18	}
19
20	this.uniforms = {	1✔
21	// TODO: find better values?
22	u_Camera: [0, 0, 0], // Model should override
23
24	u_MetallicRoughnessValues: [1, 1] // Default is 1 and 1
25	};
26
27	this.parameters = {};	1✔
28	this.generatedTextures = [];	1✔
29
30	if (imageBasedLightingEnvironment) {	1!
31	this.uniforms.u_DiffuseEnvSampler = imageBasedLightingEnvironment.getDiffuseEnvSampler();	×
32	this.uniforms.u_SpecularEnvSampler = imageBasedLightingEnvironment.getSpecularEnvSampler();	×
33	this.uniforms.u_brdfLUT = imageBasedLightingEnvironment.getBrdfTexture();	×
34	this.uniforms.u_ScaleIBLAmbient = [1, 1];	×
35	}
36
37	if (pbrDebug) {	1!
38	// Override final color for reference app visualization
39	// of various parameters in the lighting equation.
40	this.uniforms.u_ScaleDiffBaseMR = [0, 0, 0, 0];	×
41	this.uniforms.u_ScaleFGDSpec = [0, 0, 0, 0];	×
42	}
43
44	this.defineIfPresent(attributes.NORMAL, 'HAS_NORMALS');	1✔
45	this.defineIfPresent(attributes.TANGENT && useTangents, 'HAS_TANGENTS');	1!
46	this.defineIfPresent(attributes.TEXCOORD_0, 'HAS_UV');	1✔
47
48	this.defineIfPresent(imageBasedLightingEnvironment, 'USE_IBL');	1✔
49	this.defineIfPresent(lights, 'USE_LIGHTS');	1✔
50	this.defineIfPresent(pbrDebug, 'PBR_DEBUG');	1✔
51
52	if (material) {	1!
53	this.parseMaterial(material);	1✔
54	}
55	}
56
57	defineIfPresent(value, name) {
58	if (value) {	6✔
59	this.defines[name] = 1;	2✔
60	}
61	}
62
63	parseTexture(gltfTexture, name, define = null) {	×
64	const parameters =
65	(gltfTexture.texture &&	×
66	gltfTexture.texture.sampler &&
67	gltfTexture.texture.sampler.parameters) \|\|
68	{};
69
70	const image = gltfTexture.texture.source.image;	×
71	let textureOptions;
72	let specialTextureParameters = {};	×
73	if (image.compressed) {	×
74	textureOptions = image;	×
75	specialTextureParameters = {	×
76	[this.gl.TEXTURE_MIN_FILTER]:
77	image.data.length > 1 ? this.gl.LINEAR_MIPMAP_NEAREST : this.gl.LINEAR	×
78	};
79	} else {
80	// Texture2D accepts a promise that returns an image as data (Async Textures)
81	textureOptions = {data: image};	×
82	}
83
84	const texture = new Texture2D(this.gl, {	×
85	id: gltfTexture.name \|\| gltfTexture.id,	×
86	parameters: {
87	...parameters,
88	...specialTextureParameters
89	},
90	pixelStore: {
91	[this.gl.UNPACK_FLIP_Y_WEBGL]: false
92	},
93	...textureOptions
94	});
95	this.uniforms[name] = texture;	×
96	this.defineIfPresent(define, define);	×
97	this.generatedTextures.push(texture);	×
98	}
99
100	parsePbrMetallicRoughness(pbrMetallicRoughness) {
101	if (pbrMetallicRoughness.baseColorTexture) {	1!
102	this.parseTexture(	×
103	pbrMetallicRoughness.baseColorTexture,
104	'u_BaseColorSampler',
105	'HAS_BASECOLORMAP'
106	);
107	}
108	this.uniforms.u_BaseColorFactor = pbrMetallicRoughness.baseColorFactor \|\| [1, 1, 1, 1];	1!
109
110	if (pbrMetallicRoughness.metallicRoughnessTexture) {	1!
111	this.parseTexture(	×
112	pbrMetallicRoughness.metallicRoughnessTexture,
113	'u_MetallicRoughnessSampler',
114	'HAS_METALROUGHNESSMAP'
115	);
116	}
117	const {metallicFactor = 1, roughnessFactor = 1} = pbrMetallicRoughness;	1!
118	this.uniforms.u_MetallicRoughnessValues = [metallicFactor, roughnessFactor];	1✔
119	}
120
121	parseMaterial(material) {
122	this.uniforms.pbr_uUnlit = Boolean(material.unlit);	1✔
123
124	if (material.pbrMetallicRoughness) {	1!
125	this.parsePbrMetallicRoughness(material.pbrMetallicRoughness);	1✔
126	}
127	if (material.normalTexture) {	1!
128	this.parseTexture(material.normalTexture, 'u_NormalSampler', 'HAS_NORMALMAP');	×
129
130	const {scale = 1} = material.normalTexture;	×
131	this.uniforms.u_NormalScale = scale;	×
132	}
133	if (material.occlusionTexture) {	1!
134	this.parseTexture(material.occlusionTexture, 'u_OcclusionSampler', 'HAS_OCCLUSIONMAP');	×
135
136	const {strength = 1} = material.occlusionTexture;	×
137	this.uniforms.u_OcclusionStrength = strength;	×
138	}
139	if (material.emissiveTexture) {	1!
140	this.parseTexture(material.emissiveTexture, 'u_EmissiveSampler', 'HAS_EMISSIVEMAP');	×
141	this.uniforms.u_EmissiveFactor = material.emissiveFactor \|\| [0, 0, 0];	×
142	}
143	if (material.alphaMode === 'MASK') {	1!
144	const {alphaCutoff = 0.5} = material;	×
145	this.defines.ALPHA_CUTOFF = 1;	×
146	this.uniforms.u_AlphaCutoff = alphaCutoff;	×
147	} else if (material.alphaMode === 'BLEND') {	1!
148	log.warn('BLEND alphaMode might not work well because it requires mesh sorting')();	×
149	Object.assign(this.parameters, {	×
150	blend: true,
151	blendEquation: this.gl.FUNC_ADD,
152	blendFunc: [
153	this.gl.SRC_ALPHA,
154	this.gl.ONE_MINUS_SRC_ALPHA,
155	this.gl.ONE,
156	this.gl.ONE_MINUS_SRC_ALPHA
157	]
158	});
159	}
160	}
161
162	/**
163	* Destroy all generated resources to release memory.
164	*/
165	delete() {
166	this.generatedTextures.forEach(texture => texture.delete());	×
167	}
168	}

visgl / luma.gl / 2194287150

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