|
19673 | 19673 |
|
19674 | 19674 | } |
19675 | 19675 |
|
19676 | | - function getDepthMaterialVariant( useMorphing, useSkinning ) { |
| 19676 | + function getDepthMaterialVariant( useMorphing, useSkinning, useInstancing ) { |
19677 | 19677 |
|
19678 | | - var index = useMorphing << 0 | useSkinning << 1; |
| 19678 | + var index = useMorphing << 0 | useSkinning << 1 | useInstancing << 2; |
19679 | 19679 |
|
19680 | 19680 | var material = _depthMaterials[ index ]; |
19681 | 19681 |
|
|
19698 | 19698 |
|
19699 | 19699 | } |
19700 | 19700 |
|
19701 | | - function getDistanceMaterialVariant( useMorphing, useSkinning ) { |
| 19701 | + function getDistanceMaterialVariant( useMorphing, useSkinning, useInstancing ) { |
19702 | 19702 |
|
19703 | | - var index = useMorphing << 0 | useSkinning << 1; |
| 19703 | + var index = useMorphing << 0 | useSkinning << 1 | useInstancing << 2; |
19704 | 19704 |
|
19705 | 19705 | var material = _distanceMaterials[ index ]; |
19706 | 19706 |
|
|
19771 | 19771 |
|
19772 | 19772 | } |
19773 | 19773 |
|
19774 | | - result = getMaterialVariant( useMorphing, useSkinning ); |
| 19774 | + var useInstancing = object.isInstancedMesh === true; |
| 19775 | + |
| 19776 | + result = getMaterialVariant( useMorphing, useSkinning, useInstancing ); |
19775 | 19777 |
|
19776 | 19778 | } else { |
19777 | 19779 |
|
|
23700 | 23702 |
|
23701 | 23703 | // vr |
23702 | 23704 |
|
23703 | | - var vr = ( typeof navigator !== 'undefined' && 'xr' in navigator && 'supportsSession' in navigator.xr ) ? new WebXRManager( _this, _gl ) : new WebVRManager( _this ); |
| 23705 | + var vr = ( typeof navigator !== 'undefined' && 'xr' in navigator && 'isSessionSupported' in navigator.xr ) ? new WebXRManager( _this, _gl ) : new WebVRManager( _this ); |
23704 | 23706 |
|
23705 | 23707 | this.vr = vr; |
23706 | 23708 |
|
|
32357 | 32359 |
|
32358 | 32360 |
|
32359 | 32361 | var Geometries = /*#__PURE__*/Object.freeze({ |
| 32362 | + __proto__: null, |
32360 | 32363 | WireframeGeometry: WireframeGeometry, |
32361 | 32364 | ParametricGeometry: ParametricGeometry, |
32362 | 32365 | ParametricBufferGeometry: ParametricBufferGeometry, |
|
33270 | 33273 |
|
33271 | 33274 |
|
33272 | 33275 | var Materials = /*#__PURE__*/Object.freeze({ |
| 33276 | + __proto__: null, |
33273 | 33277 | ShadowMaterial: ShadowMaterial, |
33274 | 33278 | SpriteMaterial: SpriteMaterial, |
33275 | 33279 | RawShaderMaterial: RawShaderMaterial, |
|
37504 | 37508 |
|
37505 | 37509 |
|
37506 | 37510 | var Curves = /*#__PURE__*/Object.freeze({ |
| 37511 | + __proto__: null, |
37507 | 37512 | ArcCurve: ArcCurve, |
37508 | 37513 | CatmullRomCurve3: CatmullRomCurve3, |
37509 | 37514 | CubicBezierCurve: CubicBezierCurve, |
|
0 commit comments