소스 검색

fixed sky display, more env filtering

ncannasse 7 년 전
부모
커밋
2fb497b4dc
2개의 변경된 파일2개의 추가작업 그리고 8개의 파일을 삭제
  1. 1 7
      h3d/scene/pbr/Environment.hx
  2. 1 1
      h3d/shader/pbr/Lighting.hx

+ 1 - 7
h3d/scene/pbr/Environment.hx

@@ -145,12 +145,6 @@ class IrradLut extends IrradBase {
 			output.color = vec4(a / numSamples, b / numSamples, 0, 1);
 		}
 	}
-
-	public function new() {
-		super();
-		samplesBits = 10;
-	}
-
 }
 
 class IrradEquiProj extends h3d.shader.ScreenShader {
@@ -220,7 +214,7 @@ class Environment  {
 		}
 		diffSize = 64;
 		specSize = 256;
-		sampleBits = 10;
+		sampleBits = 12;
 	}
 
 	public function dispose() {

+ 1 - 1
h3d/shader/pbr/Lighting.hx

@@ -19,7 +19,7 @@ class Indirect extends PropsDefinition {
 			var isSky = normal.dot(normal) <= 0;
 			if( isSky ) {
 				if( showSky ) {
-					normal = (vec3( (calculatedUV - 0.5) * vec2(10,-10) /*?*/ , 1. ) * cameraInvViewProj.mat3x4()).normalize();
+					normal = (vec3( uvToScreen(calculatedUV) * 5. /*?*/ , 1. ) * cameraInvViewProj.mat3x4()).normalize();
 					pixelColor.rgb = skyMap.get(normal).rgb.pow(vec3(2.)) * irrPower;
 				} else
 					discard;