Update SSAO

hrt/prefab/rfx/Sao.hx

@@ -3,12 +3,15 @@ package hrt.prefab.rfx;
 typedef SaoProps = {
 	var size : Float;
 	var blur : Float;
+	var blurQuality : Float;
+	var noiseScale : Float;
 	var samples : Int;
 	var radius : Float;
 	var intensity : Float;
 	var bias : Float;
 	var microIntensity : Float;
 	var useWorldUV : Bool;
+	var noiseTexturePath: String;
 }
 
 class Sao extends RendererFX {
@@ -22,22 +25,35 @@ class Sao extends RendererFX {
 		props = ({
 			size : 1,
 			blur : 5,
+			blurQuality : 1.0,
+			noiseScale : 1.0,
 			samples : 30,
 			radius : 1,
 			intensity : 1,
 			bias : 0.1,
 			microIntensity : 1.0,
 			useWorldUV : false,
+			noiseTexturePath : null,
 		} : SaoProps);
 	}
 
+	function loadNoiseTexture(path : String, ?wrap : h3d.mat.Data.Wrap){
+		if( path != null ) {
+			var texture = hxd.res.Loader.currentInstance.load(path).toTexture();
+			if( texture == null ) return null;
+			if( wrap != null ) texture.wrap = wrap;
+			// Need mipmap for later
+			return texture;
+		}
+		return null;
+	}
+
 	override function apply( r : h3d.scene.Renderer, step : h3d.impl.RendererFX.Step ) {
 		if( step == BeforeLighting ) {
 			if( sao == null ) sao = new h3d.pass.ScalableAO();
 			var props : SaoProps = props;
 			var ctx = r.ctx;
 			var saoTex = r.allocTarget("sao",false, props.size);
-			var microOcclusion = r.allocTarget("sao",false, props.size);
 			var normal : hxsl.ChannelTexture = ctx.getGlobal("normalMap");
 			var depth : hxsl.ChannelTexture = ctx.getGlobal("depthMap");
 			var occlu : hxsl.ChannelTexture = ctx.getGlobal("occlusionMap");
@@ -52,11 +68,16 @@ class Sao extends RendererFX {
 			sao.shader.microOcclusion = occlu.texture;
 			sao.shader.microOcclusionChannel = occlu.channel;
 			sao.shader.microOcclusionIntensity = props.microIntensity;
+			sao.shader.noiseScale.set(props.noiseScale, props.noiseScale);
+			if( props.noiseTexturePath != null ) 
+				sao.shader.noiseTexture = loadNoiseTexture(props.noiseTexturePath, Repeat);
+			else
+				sao.shader.noiseTexture = h3d.mat.Texture.genNoise(128);
 			sao.apply(depth.texture,normal.texture,ctx.camera);
 			ctx.engine.popTarget();
 
 			saoBlur.radius = props.blur;
-			saoBlur.quality = 0.5;
+			saoBlur.quality = props.blurQuality;
 			saoBlur.apply(ctx, saoTex);
 
 			saoCopy.pass.setColorChannel(occlu.channel);
@@ -67,16 +88,30 @@ class Sao extends RendererFX {
 	#if editor
 	override function edit( ctx : hide.prefab.EditContext ) {
 		ctx.properties.add(new hide.Element('
+		<div class="group" name="SSAO">
+			<dl>
+				<dt>Intensity</dt><dd><input type="range" min="0" max="10" field="intensity"/></dd>
+				<dt>Radius</dt><dd><input type="range" min="0" max="10" field="radius"/></dd>
+				<dt>Bias</dt><dd><input type="range" min="0" max="0.5" field="bias"/></dd>
+				<dt>Texture Size</dt><dd><input type="range" min="0" max="1" field="size"/></dd>
+				<dt>Samples</dt><dd><input type="range" min="3" max="256" field="samples" step="1"/></dd>
+				<dt>Micro Intensity</dt><dd><input type="range" min="0" max="1" field="microIntensity"/></dd>
+			</dl>
+		</div>
+		<div class="group" name="Noise">
+			<dl>
+				<dt>Scale</dt><dd><input type="range" min="0" max="1" field="noiseScale"/></dd>
+				<dt>Use World UV</dt><dd><input type="checkbox" field="useWorldUV"/></dd>
+				<dt>Texture</dt><input type="texturepath" field="noiseTexturePath"/>
+			</dl>
+		</div>
+		<div class="group" name="Blur">
 			<dl>
-			<dt>Intensity</dt><dd><input type="range" min="0" max="10" field="intensity"/></dd>
-			<dt>Radius</dt><dd><input type="range" min="0" max="10" field="radius"/></dd>
-			<dt>Bias</dt><dd><input type="range" min="0" max="0.5" field="bias"/></dd>
-			<dt>Size</dt><dd><input type="range" min="0" max="1" field="size"/></dd>
-			<dt>Blur</dt><dd><input type="range" min="0" max="20" field="blur"/></dd>
-			<dt>Samples</dt><dd><input type="range" min="3" max="256" field="samples" step="1"/></dd>
-			<dt>Micro Intensity</dt><dd><input type="range" min="0" max="1" field="microIntensity"/></dd>
-			<dt>Use World UV</dt><dd><input type="checkbox" field="useWorldUV"/></dd>
+				<dt>Size</dt><dd><input type="range" min="0" max="10" field="blur"/></dd>
+				<dt>Quality</dt><dd><input type="range" min="0" max="1" field="blurQuality"/></dd>
+			</dl>
 			</dl>
+		</div>
 		'),props);
 	}
 	#end