Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
glow-extras
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Glow
glow-extras
Merge requests
!24
Visually neutral viewer
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Visually neutral viewer
feature/visually-neutral-viewer
into
master
Overview
0
Commits
4
Pipelines
0
Changes
21
Merged
Jonathan Kunstwald
requested to merge
feature/visually-neutral-viewer
into
master
5 years ago
Overview
0
Commits
4
Pipelines
0
Changes
21
Expand
Restructure pipeline internals to use a single UBO with render scene information
Restructure render scene parameters
Add render scene option to toggle tonemapping
Disable tonemapping in Viewer, neutralize all postprocessing options
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
96264c7a
4 commits,
5 years ago
21 files
+
217
−
141
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
21
Search (e.g. *.vue) (Ctrl+P)
pipeline/glow-extras/pipeline/stages/implementations/LightingCombinationStage.cc
+
0
−
13
Options
@@ -45,19 +45,6 @@ void glow::pipeline::LightingCombinationStage::onExecuteStage(RenderContext cons
shader
.
setTexture
(
"uDepth"
,
mStageDepthPre
->
getTargetDepth
());
shader
.
setUniform
(
"uCamPos"
,
ctx
.
camData
.
camPos
);
shader
.
setUniform
(
"uSunDirection"
,
ctx
.
scene
.
sunDirection
);
shader
.
setUniform
(
"uSunColor"
,
ctx
.
scene
.
sunColor
);
shader
.
setUniform
(
"uSunIntensity"
,
ctx
.
scene
.
sunIntensity
);
shader
.
setUniform
(
"uEnableAtmoScatter"
,
ctx
.
scene
.
enableAtmoScatter
);
shader
.
setUniform
(
"uAtmoScatterIntensity"
,
ctx
.
scene
.
atmoScatterIntensity
);
shader
.
setUniform
(
"uFogDensity"
,
ctx
.
scene
.
atmoScatterDensity
);
shader
.
setUniform
(
"uAtmoScatterColor"
,
ctx
.
scene
.
atmoScatterFogColor
);
shader
.
setUniform
(
"uHeightFalloffStart"
,
ctx
.
scene
.
atmoScatterHeightFalloffStart
);
shader
.
setUniform
(
"uHeightFalloffEnd"
,
ctx
.
scene
.
atmoScatterHeightFalloffEnd
);
shader
.
setUniform
(
"uHeightFalloffExponent"
,
ctx
.
scene
.
atmoScatterHeightFalloffExponent
);
geometry
::
FullscreenTriangle
::
draw
();
}
}
Loading