|
@@ -1372,11 +1372,6 @@ vec3 surfaceEmissiveColor = vEmissiveColor;
|
|
#endif
|
|
#endif
|
|
#endif
|
|
#endif
|
|
|
|
|
|
-#ifdef FOG
|
|
|
|
- float fog = CalcFogFactor();
|
|
|
|
- finalColor.rgb = fog * finalColor.rgb + (1.0 - fog) * vFogColor;
|
|
|
|
-#endif
|
|
|
|
-
|
|
|
|
finalColor = max(finalColor, 0.0);
|
|
finalColor = max(finalColor, 0.0);
|
|
|
|
|
|
#ifdef CAMERATONEMAP
|
|
#ifdef CAMERATONEMAP
|
|
@@ -1417,5 +1412,7 @@ vec3 surfaceEmissiveColor = vEmissiveColor;
|
|
//vec2 test = vEmissiveUV * 0.5 + 0.5;
|
|
//vec2 test = vEmissiveUV * 0.5 + 0.5;
|
|
//gl_FragColor = vec4(test.x, test.y, 1.0, 1.0);
|
|
//gl_FragColor = vec4(test.x, test.y, 1.0, 1.0);
|
|
|
|
|
|
|
|
+#include<fogFragment>(color, finalColor)
|
|
|
|
+
|
|
gl_FragColor = finalColor;
|
|
gl_FragColor = finalColor;
|
|
}
|
|
}
|