From 987ce3c10b728227b780752521c54877e8472aaf Mon Sep 17 00:00:00 2001 From: Michael Herzog Date: Wed, 22 Sep 2021 21:00:29 +0200 Subject: [PATCH] Examples: Fix broken PackedPhongMaterial. (#22569) --- examples/jsm/utils/PackedPhongMaterial.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/examples/jsm/utils/PackedPhongMaterial.js b/examples/jsm/utils/PackedPhongMaterial.js index 05f1044af9..5d8cf07667 100644 --- a/examples/jsm/utils/PackedPhongMaterial.js +++ b/examples/jsm/utils/PackedPhongMaterial.js @@ -35,10 +35,6 @@ class PackedPhongMaterial extends MeshPhongMaterial { 'varying vec3 vViewPosition;', - '#ifndef FLAT_SHADED', - 'varying vec3 vNormal;', - '#endif', - ShaderChunk.common, ShaderChunk.uv_pars_vertex, ShaderChunk.uv2_pars_vertex, @@ -46,6 +42,7 @@ class PackedPhongMaterial extends MeshPhongMaterial { ShaderChunk.envmap_pars_vertex, ShaderChunk.color_pars_vertex, ShaderChunk.fog_pars_vertex, + ShaderChunk.normal_pars_vertex, ShaderChunk.morphtarget_pars_vertex, ShaderChunk.skinning_pars_vertex, ShaderChunk.shadowmap_pars_vertex, @@ -142,10 +139,7 @@ class PackedPhongMaterial extends MeshPhongMaterial { ShaderChunk.skinbase_vertex, ShaderChunk.skinnormal_vertex, ShaderChunk.defaultnormal_vertex, - - '#ifndef FLAT_SHADED', - ' vNormal = normalize( transformedNormal );', - '#endif', + ShaderChunk.normal_vertex, ShaderChunk.begin_vertex, @@ -199,6 +193,7 @@ class PackedPhongMaterial extends MeshPhongMaterial { ShaderChunk.fog_pars_fragment, ShaderChunk.bsdfs, ShaderChunk.lights_pars_begin, + ShaderChunk.normal_pars_fragment, ShaderChunk.lights_phong_pars_fragment, ShaderChunk.shadowmap_pars_fragment, ShaderChunk.bumpmap_pars_fragment, -- GitLab