ShiroSmith před 6 roky
rodič
revize
680e326409
1 změnil soubory, kde provedl 11 přidání a 11 odebrání
  1. 11 11
      h3d/shader/pbr/VolumeDecal.hx

+ 11 - 11
h3d/shader/pbr/VolumeDecal.hx

@@ -115,8 +115,8 @@ class VolumeDecal extends hxsl.Shader {
 			if(	outsideBounds() )
 			if(	outsideBounds() )
 				discard;
 				discard;
 
 
-			strength = vec4(0);
-			prbValues = vec4(0);
+			strength = vec4(0,0,0,0);
+			prbValues = vec4(0,0,0,0);
 
 
 			if( USE_ALBEDO ) {
 			if( USE_ALBEDO ) {
 				var albedo = albedoTexture.get(calculatedUV);
 				var albedo = albedoTexture.get(calculatedUV);
@@ -124,14 +124,6 @@ class VolumeDecal extends hxsl.Shader {
 				strength.r = albedoStrength;
 				strength.r = albedoStrength;
 			}
 			}
 
 
-			if( USE_PBR ) {
-				var pbr = pbrTexture.get(calculatedUV).rgb;
-				prbValues.r = pbr.r;
-				prbValues.g = 1 - pbr.g * pbr.g;
-				prbValues.b = pbr.b;
-				strength.g = pbrStrength;
-			}
-
 			if( USE_NORMAL ) {
 			if( USE_NORMAL ) {
 				var worldPos = getWorlPos(screenPos);
 				var worldPos = getWorlPos(screenPos);
 				var ddx = worldPos - getWorlPos(screenPos + vec2(global.pixelSize.x, 0));
 				var ddx = worldPos - getWorlPos(screenPos + vec2(global.pixelSize.x, 0));
@@ -144,7 +136,15 @@ class VolumeDecal extends hxsl.Shader {
 				var tanX = worldTangent.xyz.normalize();
 				var tanX = worldTangent.xyz.normalize();
 				var tanY = n.cross(tanX) * -1;
 				var tanY = n.cross(tanX) * -1;
 				transformedNormal = (nf.x * tanX + nf.y * tanY + nf.z * n).normalize();
 				transformedNormal = (nf.x * tanX + nf.y * tanY + nf.z * n).normalize();
-				strength.b = normalStrength;
+				strength.g = normalStrength;
+			}
+
+			if( USE_PBR ) {
+				var pbr = pbrTexture.get(calculatedUV).rgb;
+				prbValues.r = pbr.r;
+				prbValues.g = 1 - pbr.g * pbr.g;
+				prbValues.b = pbr.b;
+				strength.b = pbrStrength;
 			}
 			}
 
 
 			output.color = pixelColor;
 			output.color = pixelColor;