Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

SImplify the overlay PLumber

Browse source
This commit is contained in:
sam 2017-02-24 01:11:59 -08:00
parent e1aad8bd63
commit 5257194c48
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/render-utils/src/RenderPipelines.cpp
View file

@ -114,9 +114,10 @@ void initOverlay3DPipelines(ShapePlumber& plumber) {
auto simpleProgram = isOpaque ? opaqueProgram : translucentProgram;
auto unlitProgram = isOpaque ? unlitOpaqueProgram : unlitTranslucentProgram;
plumber.addPipeline(builder.withoutUnlit().withMaterial().build(), opaqueMaterialProgram, state, &lightBatchSetter);
plumber.addPipeline(builder.withoutUnlit().build(), simpleProgram, state, &lightBatchSetter);
plumber.addPipeline(builder.withUnlit().build(), unlitProgram, state, &batchSetter);
plumber.addPipeline(builder.withoutUnlit().withMaterial().build().key(), opaqueMaterialProgram, state, &lightBatchSetter);
plumber.addPipeline(builder.withoutUnlit().withoutMaterial().build().key(), simpleProgram, state, &lightBatchSetter);
plumber.addPipeline(builder.withUnlit().withoutMaterial().build().key(), unlitProgram, state, &batchSetter);
}
}

4
libraries/render-utils/src/overlay3D_model.slf
View file

@ -112,9 +112,9 @@ void main(void) {
opacity);
color.rgb += emissive;
color.rgb = vec3(0.5, 0.5, 1.0);
// color.rgb = vec3(0.5, 0.5, 1.0);
// Apply standard tone mapping
_fragColor = vec4(pow(color.xyz, vec3(1.0 / 2.2)), 0.9);
_fragColor = vec4(pow(color.xyz, vec3(1.0 / 2.2)), 1.0);
//_fragColor = vec4(pow(color.xyz, vec3(1.0 / 2.2)), color.w);
/*_fragColor = vec4(evalGlobalLightingAlphaBlended(

3
libraries/render-utils/src/overlay3D_translucent.slf
View file

@ -82,7 +82,8 @@ void main(void) {
fragRoughness,
fragOpacity);
color.xyz += vec3(1.0, 0.0, 0.0) * fragOpacity;
color.xyz += vec3(0.0, 1.0, 0.0) * fragOpacity;
color.w = 1.0;
// Apply standard tone mapping
_fragColor = vec4(pow(color.xyz, vec3(1.0 / 2.2)), color.w);

1
libraries/render/src/render/ShapePipeline.h
View file

@ -128,6 +128,7 @@ public:
Flags _mask{0};
};
Filter(const Filter::Builder& builder) : Filter(builder._flags, builder._mask) {}
ShapeKey key() const { return ShapeKey(_flags); }
protected:
friend class ShapePlumber;
Flags _flags{0};