Browse Source

Merge pull request #16634 from higharc/normal-clipping-fix

Apply clipping planes in normal material
Mr.doob 6 years ago
parent
commit
4eb79077de

+ 2 - 0
src/renderers/shaders/ShaderLib/normal_frag.glsl.js

@@ -27,9 +27,11 @@ uniform float opacity;
 #include <bumpmap_pars_fragment>
 #include <bumpmap_pars_fragment>
 #include <normalmap_pars_fragment>
 #include <normalmap_pars_fragment>
 #include <logdepthbuf_pars_fragment>
 #include <logdepthbuf_pars_fragment>
+#include <clipping_planes_pars_fragment>
 
 
 void main() {
 void main() {
 
 
+	#include <clipping_planes_fragment>
 	#include <logdepthbuf_fragment>
 	#include <logdepthbuf_fragment>
 	#include <normal_fragment_begin>
 	#include <normal_fragment_begin>
 	#include <normal_fragment_maps>
 	#include <normal_fragment_maps>

+ 2 - 0
src/renderers/shaders/ShaderLib/normal_vert.glsl.js

@@ -25,6 +25,7 @@ export default /* glsl */`
 #include <morphtarget_pars_vertex>
 #include <morphtarget_pars_vertex>
 #include <skinning_pars_vertex>
 #include <skinning_pars_vertex>
 #include <logdepthbuf_pars_vertex>
 #include <logdepthbuf_pars_vertex>
+#include <clipping_planes_pars_vertex>
 
 
 void main() {
 void main() {
 
 
@@ -55,6 +56,7 @@ void main() {
 	#include <displacementmap_vertex>
 	#include <displacementmap_vertex>
 	#include <project_vertex>
 	#include <project_vertex>
 	#include <logdepthbuf_vertex>
 	#include <logdepthbuf_vertex>
+	#include <clipping_planes_vertex>
 
 
 #if defined( FLAT_SHADED ) || defined( USE_BUMPMAP ) || ( defined( USE_NORMALMAP ) && ! defined( OBJECTSPACE_NORMALMAP ) )
 #if defined( FLAT_SHADED ) || defined( USE_BUMPMAP ) || ( defined( USE_NORMALMAP ) && ! defined( OBJECTSPACE_NORMALMAP ) )