Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 630 vs 631 for /trunk/assets/shaders/GLSL/lighting.glsl

Diff revisions: vs.
  @@ -45,21 +45,21 @@
45 45 vec4 mappingNormal(){
46 46 return mix(getPixelColor(VAR._texCoord, getTBNNormal(VAR._texCoord)),
47 47 mappingFlat(),
48 - dvd_lodLevel > 1);
48 + vec4(dvd_lodLevel > 1));
49 49 }
50 50
51 51 //subroutine(MappingRoutineType)
52 52 vec4 mappingRelief(){
53 53 return mix(ReliefMapping(bumpMapLightID, VAR._texCoord),
54 54 mappingFlat(),
55 - dvd_lodLevel > 1);
55 + vec4(dvd_lodLevel > 1));
56 56 }
57 57
58 58 //subroutine(MappingRoutineType)
59 59 vec4 mappingParallax(){
60 60 return mix(ParallaxMapping(bumpMapLightID, VAR._texCoord),
61 61 mappingFlat(),
62 - dvd_lodLevel > 1);
62 + vec4(dvd_lodLevel > 1));
63 63 }
64 64 #endif
65 65