浏览代码

Merge pull request #11623 from WestLangley/dev-displacement

Add displacementMap support to distanceRGBA shader
Mr.doob 8 年之前
父节点
当前提交
bd62b62583
共有 2 个文件被更改,包括 12 次插入0 次删除
  1. 1 0
      src/renderers/shaders/ShaderLib.js
  2. 11 0
      src/renderers/shaders/ShaderLib/distanceRGBA_vert.glsl

+ 1 - 0
src/renderers/shaders/ShaderLib.js

@@ -192,6 +192,7 @@ var ShaderLib = {
 
 		uniforms: UniformsUtils.merge( [
 			UniformsLib.common,
+			UniformsLib.displacementmap,
 			{
 				lightPos: { value: new Vector3() }
 			}

+ 11 - 0
src/renderers/shaders/ShaderLib/distanceRGBA_vert.glsl

@@ -2,6 +2,7 @@ varying vec4 vWorldPosition;
 
 #include <common>
 #include <uv_pars_vertex>
+#include <displacementmap_pars_vertex>
 #include <morphtarget_pars_vertex>
 #include <skinning_pars_vertex>
 #include <clipping_planes_pars_vertex>
@@ -11,9 +12,19 @@ void main() {
 	#include <uv_vertex>
 
 	#include <skinbase_vertex>
+
+	#ifdef USE_DISPLACEMENTMAP
+
+		#include <beginnormal_vertex>
+		#include <morphnormal_vertex>
+		#include <skinnormal_vertex>
+
+	#endif
+
 	#include <begin_vertex>
 	#include <morphtarget_vertex>
 	#include <skinning_vertex>
+	#include <displacementmap_vertex>
 	#include <project_vertex>
 	#include <worldpos_vertex>
 	#include <clipping_planes_vertex>