Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some updates and additions to the SAO sample #1149

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Some updates and additions to the SAO sample #1149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions samples/SampleApp.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class SampleApp extends hxd.App {
return f;
}

function addSlider( label : String, get : Void -> Float, set : Float -> Void, min : Float = 0., max : Float = 1. ) {
function addSlider( label : String, get : Void -> Float, set : Float -> Void, min : Float = 0., max : Float = 1., intValues = false ) {
var f = new h2d.Flow(fui);

f.horizontalSpacing = 5;
Expand All @@ -47,12 +47,13 @@ class SampleApp extends hxd.App {
tf.text = "" + hxd.Math.fmt(sli.value);
sli.onChange = function() {
set(sli.value);
tf.text = "" + hxd.Math.fmt(sli.value);
tf.text = "" + (intValues ? Std.int(sli.value) : hxd.Math.fmt(sli.value));
f.needReflow = true;
};
tf.onChange = function() {
var v = Std.parseFloat(tf.text);
if( Math.isNaN(v) ) return;
var p = Std.parseFloat(tf.text);
if( Math.isNaN(p) ) return;
var v = intValues ? Std.int(p) : p;
sli.value = v;
set(v);
};
Expand Down
34 changes: 27 additions & 7 deletions samples/Sao.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
import hxd.Math;
import h3d.pass.ScalableAO;

import hxd.Math;
import hxd.Window;
import hxd.Key in K;

class CustomRenderer extends h3d.scene.fwd.Renderer {

public var sao : h3d.pass.ScalableAO;
public var saoBlur : h3d.pass.Blur;
var fxaa : h3d.pass.FXAA;

public var mode = 0;
public var hasMRT : Bool;
public var enableFXAA : Bool;
var out : h3d.mat.Texture;
var mrt : h3d.pass.Output;

Expand All @@ -17,8 +22,12 @@ class CustomRenderer extends h3d.scene.fwd.Renderer {
super();
sao = new h3d.pass.ScalableAO();
saoBlur = new h3d.pass.Blur();
fxaa = new h3d.pass.FXAA();
sao.shader.sampleRadius = 0.2;
sao.shader.numSamples = 30;
shadow.power = 8;
shadow.blur.quality = 1.0;
enableFXAA = true;
hasMRT = h3d.Engine.getCurrent().driver.hasFeature(MultipleRenderTargets);
if( !hasMRT ) throw "This sample requires MRT";
mrt = new h3d.pass.Output("mrt",[Value("output.color"), PackFloat(Value("output.depth")), PackNormal(Value("output.normal"))]);
Expand Down Expand Up @@ -48,10 +57,11 @@ class CustomRenderer extends h3d.scene.fwd.Renderer {
bench.measure("saoBlur");
saoBlur.apply(ctx, saoTarget);
bench.measure("saoBlend");
copy(color, null);
if (enableFXAA) fxaa.apply(color) else copy(color, null);
copy(saoTarget, null, mode == 0 ? Multiply : null);
} else
copy(color, null);
} else {
if (enableFXAA) fxaa.apply(color) else copy(color, null);
}
}

}
Expand Down Expand Up @@ -108,13 +118,25 @@ class Sao extends SampleApp {
new h3d.scene.CameraController(s3d).loadFromCamera();

var c = renderer;
addSlider("Samples", function() return c.sao.shader.numSamples, function(v) c.sao.shader.numSamples = Std.int(v), 1, 101);
addText("SAO:");
addSlider("Samples", function() return c.sao.shader.numSamples, function(v) c.sao.shader.numSamples = Std.int(v), 1, 101, true);
addSlider("Bias", function() return c.sao.shader.bias, function(v) c.sao.shader.bias = v, 0, 0.3);
addSlider("Intensity", function() return c.sao.shader.intensity, function(v) c.sao.shader.intensity = v, 0, 10);
addSlider("Radius", function() return c.sao.shader.sampleRadius, function(v) c.sao.shader.sampleRadius = v);
addSlider("Blur", function() return c.saoBlur.radius, function(v) c.saoBlur.radius = v, 0, 10);
addSlider("BlurQuality", function() return c.saoBlur.quality, function(v) c.saoBlur.quality = v);
addSlider("BlurLineary", function() return c.saoBlur.linear, function(v) c.saoBlur.linear = v);
addText("Shadow:");
// addSlider("ShadowQuality", function() return c.shadow.pcfQuality, function(v) c.shadow.pcfQuality = Std.int(v), 0, 2); // No noticeable effect?
addSlider("Power", function() return c.shadow.power, function(v) c.shadow.power = v, 0, 50);
addSlider("Size", function() return Math.log(c.shadow.size)/Math.log(2), function(v) c.shadow.size = Std.int(Math.pow(2, Std.int(v))), 6, 12, true);
addSlider("BlurQuality", function() return c.shadow.blur.quality, function(v) c.shadow.blur.quality = v, 0, 2);
addSlider("BlurRadius", function() return c.shadow.blur.radius, function(v) c.shadow.blur.radius = v, 0, 10);
addText("Scene:");
addCheck("FXAA", function() return c.enableFXAA, function(v) c.enableFXAA = v);
// addCheck("Fullscreen", function() return Window.getInstance().displayMode == DisplayMode.Fullscreen, function(v) Window.getInstance().displayMode = v ? DisplayMode.Fullscreen : DisplayMode.Windowed);
addCheck("VSync", function() return Window.getInstance().vsync, function(v) Window.getInstance().vsync = v);
addText("Modes: (1) All, (2) Disable SAO, (3) Isolate SAO");

onResize();
}
Expand Down Expand Up @@ -142,8 +164,6 @@ class Sao extends SampleApp {
r.mode = 1;
if(K.isPressed(K.NUMBER_3))
r.mode = 2;
if( K.isPressed("V".code) )
hxd.Window.getInstance().vsync = !hxd.Window.getInstance().vsync;
}

static function main() {
Expand Down