Skip to content

Commit 4dc8b1f

Browse files
authored
Revert "fixed rendering error with degenerate UVs (#1078)" (#1145)
This reverts commit 2ebf335.
1 parent e0f782e commit 4dc8b1f

File tree

2 files changed

+4
-65
lines changed

2 files changed

+4
-65
lines changed

packages/model-viewer/src/three-components/gltf-instance/ModelViewerGLTFInstance.ts

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import {RoughnessMipmapper} from 'three/examples/jsm/utils/RoughnessMipmapper.js
2020
import {$clone, $prepare, GLTFInstance, PreparedGLTF} from '../GLTFInstance.js';
2121
import {Renderer} from '../Renderer.js';
2222
import {alphaChunk} from '../shader-chunk/alphatest_fragment.glsl.js';
23-
import {normalmapChunk} from '../shader-chunk/normalmap_pars_fragment.glsl.js';
2423

2524

2625
const $roughnessMipmapper = Symbol('roughnessMipmapper');
@@ -159,19 +158,15 @@ export class ModelViewerGLTFInstance extends GLTFInstance {
159158
// via onBeforeCompile.toString(), so these two functions do the same
160159
// thing but look different in order to force a proper recompile.
161160
const oldOnBeforeCompile = material.onBeforeCompile;
162-
const patchFragment = (shader: Shader) => {
163-
shader.fragmentShader =
164-
shader.fragmentShader
165-
.replace('#include <alphatest_fragment>', alphaChunk)
166-
.replace('#include <normalmap_pars_fragment>', normalmapChunk);
167-
};
168161
clone.onBeforeCompile = (material as any).isGLTFSpecularGlossinessMaterial ?
169162
(shader: Shader) => {
170163
oldOnBeforeCompile(shader, undefined as any);
171-
patchFragment(shader);
164+
shader.fragmentShader = shader.fragmentShader.replace(
165+
'#include <alphatest_fragment>', alphaChunk);
172166
} :
173167
(shader: Shader) => {
174-
patchFragment(shader);
168+
shader.fragmentShader = shader.fragmentShader.replace(
169+
'#include <alphatest_fragment>', alphaChunk);
175170
oldOnBeforeCompile(shader, undefined as any);
176171
};
177172
// This makes shadows better for non-manifold meshes

packages/model-viewer/src/three-components/shader-chunk/normalmap_pars_fragment.glsl.ts

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)