Skip to content

Image based lighting local probe system - first commit. #3660

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

Open
scratchyrice wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Image based lighting local probe system - first commit. #3660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d747bd9
Updated D3D11 Auto mip generation
scratchyrice Jan 16, 2026
c6475a0
Updated IBL with Dual textures
scratchyrice Jan 18, 2026
c423bb3
Added texture AO to PBR pipeline
scratchyrice Jan 19, 2026
dcc1894
Fixed whitespace
scratchyrice Jan 19, 2026
a4db1a0
Updated AO calc to match filament.
scratchyrice Jan 19, 2026
27ee68d
Image based lighting local probe system - first commit.
scratchyrice Jul 1, 2026
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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ cmake-build-*/
/mingw/
/.cache/
/_skbuild/

/buildrelease/
# Meta data of macOS's Finder.app
.DS_Store

Expand Down
5 changes: 4 additions & 1 deletion Components/RTShaderSystem/src/OgreShaderCookTorranceLighting.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ bool CookTorranceLighting::createCpuSubPrograms(ProgramSet* programSet)

// add the lighting computation
auto mrparams = psMain->resolveLocalParameter(GCT_FLOAT2, "metalRoughness");
auto ao = psMain->resolveLocalParameter(GCT_FLOAT1, "ao");
fstage.assign(1.0f, ao); //Default to no AO.
if(!mMetalRoughnessMapName.empty())
{
auto metalRoughnessSampler =
Expand All @@ -106,6 +108,7 @@ bool CookTorranceLighting::createCpuSubPrograms(ProgramSet* programSet)
// This layout intentionally reserves the 'r' channel for (optional) occlusion map data
fstage.sampleTexture(metalRoughnessSampler, psInTexcoord, mrSample);
fstage.assign(In(mrSample).mask(Operand::OPM_YZ), mrparams);
fstage.assign(In(mrSample).x(), ao);
}
else
{
Expand All @@ -124,7 +127,7 @@ bool CookTorranceLighting::createCpuSubPrograms(ProgramSet* programSet)
fstage.assign(Vector3(0), Out(outDiffuse).xyz());
fstage.mul(In(diffuse).w(), In(outDiffuse).w(), Out(outDiffuse).w()); // forward alpha

fstage.callFunction("PBR_MakeParams", {In(baseColor), In(mrparams), InOut(pixelParams)});
fstage.callFunction("PBR_MakeParams", {In(baseColor), In(mrparams), In(ao), InOut(pixelParams)});

fstage = psMain->getStage(FFP_PS_PBR_LIGHTING_END);
if(mLightCount > 0)
Expand Down
Loading