Reorganize multiframe demos #412
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 30 commits
June 29, 2017 12:13
- Explicitly use transparency and noise kernels for multiple frames - Switch noise texture type from 3D to 2DArray
…loperate into reorganize_multiframe_demos Conflicts: source/examples/demo-stages-plugins/MultiFramePostprocessingStage.cpp source/examples/demo-stages-plugins/MultiFrameSceneRenderingStage.cpp
Conflicts: source/examples/demo-stages-plugins/DemoMultiFrameAggregationPipeline.cpp
+ Remove texture extraction stages as textures are already aviable + Minor changes for readability
- Use correct noise kernel type (fixes solid circles) - Add depth buffer (fixes blue always being on top) - Make circles' alpha value a uniform
Conflicts: source/examples/demo-stages-plugins/DemoMultiFrameAggregationPipeline.cpp source/examples/demo-stages-plugins/MultiFrameRenderingPipeline.cpp source/examples/demo-stages-plugins/MultiFrameRenderingPipeline.h
…emo_base_stages_rewrite
- Use Quad instead of ScreenAlignedQuad
- Set Output value of Geometry importer stage
- Correctly connect stages and their dynamic slots
> Use additional connections to trigger ClearStages
- according to cginternals/cppassist#40
+ Remove viewport input from MultiFrameControlStage
+ Use pseudo-randomness shader code provided by Willy instead of noise
texture
- Remove commented code that has been replaced - Add include guard to random.glsl - Fix DiscDistributionKernel calculation - Add debug statements about multiframe aggregation progress - Fix aggregation halting one frame too early
- Transparency demo is kept on purpose
…ltiframe_demos Conflicts: data/gloperate/shaders/demos/transparency.frag source/examples/demo-stages-plugins/CMakeLists.txt source/examples/demo-stages-plugins/DemoMultiFrameAggregationPipeline.cpp source/examples/demo-stages-plugins/DemoMultiFrameEffectsPipeline.cpp source/examples/demo-stages-plugins/DemoMultiFrameEffectsPipeline.h source/examples/demo-stages-plugins/MultiFramePostprocessingStage.cpp source/examples/demo-stages-plugins/MultiFrameRenderingPipeline.cpp source/examples/demo-stages-plugins/MultiFrameRenderingPipeline.h source/examples/demo-stages-plugins/MultiFrameSceneRenderingStage.cpp source/examples/demo-stages-plugins/TransparencyRenderingPipeline.cpp source/examples/demo-stages-plugins/TransparencyRenderingPipeline.h source/examples/demo-stages-plugins/TransparentCirclesStage.cpp source/gloperate-glkernel/source/stages/MultiFrameAggregationPipeline.cpp source/gloperate-glkernel/source/stages/MultiFrameControlStage.cpp
added 22 commits
September 12, 2017 10:26
(cherry picked from commit e043020)
+ Reimplement MultiFrameEffectDemo based on this (cherry picked from commit 4af1f00)
+ Remove underscores from variable some names (cherry picked from commit ea5c852)
- Add some options to MF effect & aggregation demos' inputs - Fix MF aggregation aggregating one frame less than specified
- Added cppexpose::EnumDefaultStrings<LightType> - Changed LightTestPipeline accordingly
…write Conflicts: source/examples/demo-stages-plugins/LightTestPipeline.cpp source/examples/demo-stages-plugins/LightTestPipeline.h
- Fix illumination from backside
- Make MF effect config slots members instead of creating them dynamically - Add, move & adapt various comments - Work towards naming & formatting consistency
- Re-sort uniforms - Remove uniform default values - Add some comments
- Use operator= instead of setValue in pipelines - Add comments in light and transparency demo shaders
- Randomize sample distances - Increase kernel size even more - Randomize sample order in kernel - Add intensity parameter - Tweak default parameters
Tobias1595
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Includes #406, fixes/answers #370 & #340, hopefully fixes #278
Condensed multi frame demos down to two:
MultiFrameAggregationDemofor aggregation mechanicMultiFrameEffectsDemofor possible visual effects.