added pbr renderer properties and sky view

h3d/scene/pbr/Renderer.hx

@@ -1,22 +1,36 @@
 package h3d.scene.pbr;
 
-enum DisplayMode {
+@:enum abstract DisplayMode(String) {
 	/*
 		Full PBR display
 	*/
-	Pbr;
+	var Pbr = "Pbr";
 	/*
 		Set Albedo = 0x808080
 	*/
-	Env;
+	var Env = "Env";
 	/*
 		Set Albedo = 0x808080, Roughness = 0, Metalness = 1
 	*/
-	MatCap;
+	var MatCap = "MatCap";
 	/*
 		Debug slides
 	*/
-	Slides;
+	var Debug = "Debug";
+}
+
+@:enum abstract SkyMode(String) {
+	var Hide = "Hide";
+	var Env = "Env";
+	var Irrad = "Irrad";
+}
+
+typedef PbrRenderProps = {
+	var mode : DisplayMode;
+	var env : String;
+	var envPower : Float;
+	var exposure : Float;
+	var sky : SkyMode;
 }
 
 class Renderer extends h3d.scene.Renderer {
@@ -32,6 +46,7 @@ class Renderer extends h3d.scene.Renderer {
 	var pbrDirect = new h3d.shader.pbr.Lighting.Direct();
 	var pbrProps = new h3d.shader.pbr.PropsImport();
 
+	public var skyMode : SkyMode = Hide;
 	public var displayMode : DisplayMode = Pbr;
 	public var env : Environment;
 	public var exposure(get,set) : Float;
@@ -55,6 +70,7 @@ class Renderer extends h3d.scene.Renderer {
 		allPasses.push(output);
 		allPasses.push(defaultPass);
 		allPasses.push(shadows);
+		refreshProps();
 	}
 
 	inline function get_exposure() return tonemap.shader.exposure;
@@ -144,6 +160,9 @@ class Renderer extends h3d.scene.Renderer {
 
 		pbrOut.setGlobals(ctx);
 		pbrDirect.doDiscard = false;
+		pbrOut.shader.showSky = skyMode != Hide;
+		pbrOut.shader.skyMap = skyMode == Irrad ? env.diffuse : env.env;
+		pbrOut.shader.cameraInvViewProj.load(ctx.camera.getInverseViewProj());
 		pbrOut.render();
 		pbrDirect.doDiscard = true;
 
@@ -176,7 +195,7 @@ class Renderer extends h3d.scene.Renderer {
 		case Pbr, Env, MatCap:
 			fxaa.apply(ldr);
 
-		case Slides:
+		case Debug:
 
 			slides.shader.shadowMap = ctx.textures.getNamed("shadowMap");
 			slides.shader.albedo = albedo;
@@ -185,7 +204,66 @@ class Renderer extends h3d.scene.Renderer {
 			slides.render();
 
 		}
+	}
 
+	// ---- PROPS
+
+	override function getDefaultProps( ?kind : String ):Any {
+		var props : PbrRenderProps = {
+			mode : Pbr,
+			env : null,
+			envPower : 1.,
+			exposure : 1.,
+			sky : Hide,
+		};
+		return props;
 	}
 
+	override function refreshProps() {
+		if( env == null )
+			return;
+		var props : PbrRenderProps = props;
+		if( props.env != null && props.env != env.source.name ) {
+			var t = hxd.res.Loader.currentInstance.load(props.env).toTexture();
+			var prev = env;
+			var env = new h3d.scene.pbr.Environment(t);
+			env.compute();
+			this.env = env;
+			prev.dispose();
+		}
+		displayMode = props.mode;
+		skyMode = props.sky;
+		exposure = props.exposure;
+		env.power = props.envPower;
+	}
+
+	#if js
+	override function editProps() {
+		var props : PbrRenderProps = props;
+		return new js.jquery.JQuery('
+			<dl>
+				<dt>Mode</dt>
+				<dd>
+					<select field="mode">
+						<option value="Pbr">PBR</option>
+						<option value="Env">Env</option>
+						<option value="MatCap">MatCap</option>
+						<option value="Debug">Debug</option>
+					</select>
+				</dd>
+				<dt>Env</dt>
+				<dd>
+					<input type="texturepath" field="env" style="width:165px"/>
+					<select field="sky" style="width:20px">
+						<option value="Hide">Hide</option>
+						<option value="Env">Show</option>
+						<option value="Irrad">Show Irrad</option>
+					</select>
+				</dd>
+				<dt>&nbsp;</dt><dd><input type="range" min="0" max="5" field="envPower"/></dd>
+				<dt>Exposure</dt><dd><input type="range" min="-3" max="3" field="exposure"></dd>
+			</dl>
+		');
+	}
+	#end
 }

h3d/shader/pbr/Lighting.hx

@@ -10,25 +10,36 @@ class Indirect extends PropsDefinition {
 		@param var irrSpecularLevels : Float;
 		@param var irrPower : Float;
 
+		@const var showSky : Bool;
+		@param var skyMap : SamplerCube;
+		@param var cameraInvViewProj : Mat4;
+		var calculatedUV : Vec2;
+
 		function fragment() {
-			if( normal.dot(normal) <= 0 ) discard;
-
-			var F0 = pbrSpecularColor;
-			var F = F0 + (max(vec3(1 - roughness), F0) - F0) * exp2( ( -5.55473 * NdV - 6.98316) * NdV );
-
-			var diffuse = irrDiffuse.get(normal).rgb * albedo;
-			var envSpec = textureCubeLod(irrSpecular, reflect(-view,normal), roughness * irrSpecularLevels).rgb;
-			var envBRDF = irrLut.get(vec2(roughness, NdV));
-			var specular = envSpec * (F * envBRDF.x + envBRDF.y);
-			/*
-				// diffuse *= occlusion
-				Usually indirect diffuse is multiplied by occlusion, but since our occlusion mosly
-				comes from shadow map, we want to keep the diffuse term for colored shadows here.
-			*/
-			var indirect = (diffuse * (1 - metalness) * (1. - F) + specular) * irrPower;
-			pixelColor.rgb += indirect;
-		}
+			var isSky = normal.dot(normal) <= 0;
+			if( isSky ) {
+				if( showSky ) {
+					normal = (vec3( (calculatedUV - 0.5) * vec2(10,-10) /*?*/ , 1. ) * cameraInvViewProj.mat3x4()).normalize();
+					pixelColor.rgb = skyMap.get(normal).rgb.pow(vec3(2.)) * irrPower;
+				} else
+					discard;
+			} else {
 
+				var F0 = pbrSpecularColor;
+				var F = F0 + (max(vec3(1 - roughness), F0) - F0) * exp2( ( -5.55473 * NdV - 6.98316) * NdV );
+
+				var diffuse = irrDiffuse.get(normal).rgb * albedo;
+				var envSpec = textureCubeLod(irrSpecular, reflect(-view,normal), roughness * irrSpecularLevels).rgb;
+				var envBRDF = irrLut.get(vec2(roughness, NdV));
+				var specular = envSpec * (F * envBRDF.x + envBRDF.y);
+
+				/*
+					diffuse *= ao;
+				*/
+				var indirect = (diffuse * (1 - metalness) * (1 - F) + specular) * irrPower;
+				pixelColor.rgb += indirect;
+			}
+		}
 	};
 
 }
@@ -72,7 +83,7 @@ class Direct extends PropsDefinition {
 				// F = fresnel term
 				// Schlick approx
 				// pow 5 optimized with Spherical Gaussian
-				// var F = F0 + (1 - F0) * pow(1 - v.dot(h).min(1.), 5.);
+				// var F = F0 + (1 - F0) * pow(1 - v.dot(h), 5.);
 				var F = F0 + (1. - F0) * exp2( ( -5.55473 * VdH - 6.98316) * VdH );
 
 				// G = geometric attenuation