浏览代码

Revert Emissive test changes

Sebastien Vandenberghe 7 年之前
父节点
当前提交
27d3104050
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      src/Shaders/default.fragment.fx

+ 2 - 2
src/Shaders/default.fragment.fx

@@ -86,7 +86,7 @@ varying vec4 vColor;
 	#else
 		varying vec2 vEmissiveUV;
 	#endif
-	uniform highp sampler3D emissiveSampler;
+	uniform sampler2D emissiveSampler;
 #endif
 
 #ifdef LIGHTMAP
@@ -366,7 +366,7 @@ vec3 reflectionColor = vec3(0., 0., 0.);
 	// Emissive
 	vec3 emissiveColor = vEmissiveColor;
 #ifdef EMISSIVE
-	emissiveColor += texture(emissiveSampler, vec3(vEmissiveUV + uvOffset, 0.)).rgb * vEmissiveInfos.y;
+	emissiveColor += texture2D(emissiveSampler, vEmissiveUV + uvOffset).rgb * vEmissiveInfos.y;
 #endif
 
 #ifdef EMISSIVEFRESNEL