Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 330 vs 331 for /trunk/assets/shaders/GLSL/fragmentAtoms/terrainSplatting.frag

Diff revisions: vs.
  @@ -22,27 +22,39 @@
22 22 }
23 23
24 24 vec4 getFinalColor2(const in vec4 blendMap, const in uint index, const in vec4 diffSize){
25 - return mix(getFinalColor1(blendMap, index, diffSize), texture(texTileMaps[index], vec3(_texCoord * diffSize.g, 1)), blendMap.g);
25 + return mix(getFinalColor1(blendMap, index, diffSize),
26 + texture(texTileMaps[index], vec3(_texCoord * diffSize.g, 1)),
27 + blendMap.g);
26 28 }
27 29
28 30 vec3 getFinalTBN2(const in vec4 blendMap, const in uint index, const in vec4 normSize){
29 - return mix(getFinalTBN1(blendMap, index, normSize), texture(texNormalMaps[index], vec3(_texCoord * normSize.g, 1)).rgb, blendMap.g);
31 + return mix(getFinalTBN1(blendMap, index, normSize),
32 + texture(texNormalMaps[index], vec3(_texCoord * normSize.g, 1)).rgb,
33 + blendMap.g);
30 34 }
31 35
32 36 vec4 getFinalColor3(const in vec4 blendMap, const in uint index, const in vec4 diffSize){
33 - return mix(getFinalColor2(blendMap, index, diffSize), texture(texTileMaps[index], vec3(_texCoord * diffSize.b, 2)), blendMap.b);
37 + return mix(getFinalColor2(blendMap, index, diffSize),
38 + texture(texTileMaps[index], vec3(_texCoord * diffSize.b, 2)),
39 + blendMap.b);
34 40 }
35 41
36 42 vec3 getFinalTBN3(const in vec4 blendMap, const in uint index, const in vec4 normSize){
37 - return mix(getFinalTBN2(blendMap, index, normSize), texture(texNormalMaps[index], vec3(_texCoord * normSize.b, 2)).rgb, blendMap.b);
43 + return mix(getFinalTBN2(blendMap, index, normSize),
44 + texture(texNormalMaps[index], vec3(_texCoord * normSize.b, 2)).rgb,
45 + blendMap.b);
38 46 }
39 47
40 48 vec4 getFinalColor4(const in vec4 blendMap, const in uint index, const in vec4 diffSize){
41 - return mix(getFinalColor3(blendMap, index, diffSize), texture(texTileMaps[index], vec3(_texCoord * diffSize.a, 3)), blendMap.a);
49 + return mix(getFinalColor3(blendMap, index, diffSize),
50 + texture(texTileMaps[index], vec3(_texCoord * diffSize.a, 3)),
51 + blendMap.a);
42 52 }
43 53
44 54 vec3 getFinalTBN4(const in vec4 blendMap, const in uint index, const in vec4 normSize){
45 - return mix(getFinalTBN3(blendMap, index, normSize), texture(texNormalMaps[index], vec3(_texCoord * normSize.a, 3)).rgb, blendMap.a);
55 + return mix(getFinalTBN3(blendMap, index, normSize),
56 + texture(texNormalMaps[index], vec3(_texCoord * normSize.a, 3)).rgb,
57 + blendMap.a);
46 58 }
47 59
48 60 void getColorAndTBNNormal(inout vec4 color, inout vec3 tbn){