瀏覽代碼

Fixed Fire material, related to this thread : http://www.html5gamedevs.com/topic/21115-typeerror-in-the-materials-library/

Julien Moreau-Mathis 9 年之前
父節點
當前提交
301c9b4736

文件差異過大導致無法顯示
+ 2 - 2
materialsLibrary/dist/babylon.fireMaterial.js


文件差異過大導致無法顯示
+ 1 - 1
materialsLibrary/dist/babylon.fireMaterial.min.js


+ 2 - 0
materialsLibrary/materials/fire/fire.fragment.fx

@@ -21,9 +21,11 @@ uniform vec2 vDiffuseInfos;
 uniform sampler2D distortionSampler;
 uniform sampler2D opacitySampler;
 
+#ifdef DIFFUSE
 varying vec2 vDistortionCoords1;
 varying vec2 vDistortionCoords2;
 varying vec2 vDistortionCoords3;
+#endif
 
 #include<clipPlaneFragmentDeclaration>
 

+ 4 - 0
materialsLibrary/materials/fire/fire.vertex.fx

@@ -44,9 +44,11 @@ varying vec4 vColor;
 uniform float time;
 uniform float speed;
 
+#ifdef DIFFUSE
 varying vec2 vDistortionCoords1;
 varying vec2 vDistortionCoords2;
 varying vec2 vDistortionCoords3;
+#endif
 
 void main(void) {
 
@@ -80,6 +82,7 @@ void main(void) {
 	gl_PointSize = pointSize;
 #endif
 
+#ifdef DIFFUSE
 	// Fire
 	vec3 layerSpeed = vec3(-0.2, -0.52, -0.1) * speed;
 	
@@ -91,4 +94,5 @@ void main(void) {
 	
 	vDistortionCoords3.x = uv.x;
 	vDistortionCoords3.y = uv.y + layerSpeed.z * time / 1000.0;
+#endif
 }