diff options
author | Sriharsha Kotcharlakot <k.venkatsriharsha@gmail.com> | 2020-09-15 18:51:14 +0300 |
---|---|---|
committer | Sriharsha Kotcharlakot <k.venkatsriharsha@gmail.com> | 2020-09-15 20:43:01 +0300 |
commit | f137022f9919f4dd315ec6b325a08e1bf5aec6fb (patch) | |
tree | 4b15aa230eb100e77b41dfffb8ef5e7501c55db5 /source/blender/draw/tests | |
parent | bedbd8655ed1d331aeaf756874c46dbed93168a1 (diff) |
Liquid Simulation Display Options (GSoC 2020)
All the changes made in the branch `soc-2020-fluid-tools` are included in this patch.
**Major changes:**
=== Viewport Display ===
- //Raw voxel display// or //closest (nearest-neighbor)// interpolation for displaying the underlying voxel data of the simulation grids more clearly.
- An option to display //gridlines// when the slicing method is //single//.
==== Grid Display ====
- Visualization for flags, pressure and level-set representation grids with a fixed color coding based on Manta GUI.
==== Vector Display ====
- //**M**arker **A**nd **C**ell// grid visualization options for vector grids like velocity or external forces.
- Made vector display options available for external forces.
==== Coloring options for //gridlines// ====
- Range highlighting and cell filtering options for displaying the simulation grid data more precisely.
- Color gridlines with flags.
- Also, made slicing and interpolation options available for Volume Object.
Reviewed By: JacquesLucke, sebbas
Differential Revision: https://developer.blender.org/D8705
Diffstat (limited to 'source/blender/draw/tests')
-rw-r--r-- | source/blender/draw/tests/shaders_test.cc | 63 |
1 files changed, 47 insertions, 16 deletions
diff --git a/source/blender/draw/tests/shaders_test.cc b/source/blender/draw/tests/shaders_test.cc index f99fa04ce75..cb9a572eadf 100644 --- a/source/blender/draw/tests/shaders_test.cc +++ b/source/blender/draw/tests/shaders_test.cc @@ -97,22 +97,53 @@ TEST_F(DrawTest, workbench_glsl_shaders) EXPECT_NE(workbench_shader_antialiasing_get(1), nullptr); EXPECT_NE(workbench_shader_antialiasing_get(2), nullptr); - EXPECT_NE(workbench_shader_volume_get(false, false, false, false), nullptr); - EXPECT_NE(workbench_shader_volume_get(false, false, false, true), nullptr); - EXPECT_NE(workbench_shader_volume_get(false, false, true, false), nullptr); - EXPECT_NE(workbench_shader_volume_get(false, false, true, true), nullptr); - EXPECT_NE(workbench_shader_volume_get(false, true, false, false), nullptr); - EXPECT_NE(workbench_shader_volume_get(false, true, false, true), nullptr); - EXPECT_NE(workbench_shader_volume_get(false, true, true, false), nullptr); - EXPECT_NE(workbench_shader_volume_get(false, true, true, true), nullptr); - EXPECT_NE(workbench_shader_volume_get(true, false, false, false), nullptr); - EXPECT_NE(workbench_shader_volume_get(true, false, false, true), nullptr); - EXPECT_NE(workbench_shader_volume_get(true, false, true, false), nullptr); - EXPECT_NE(workbench_shader_volume_get(true, false, true, true), nullptr); - EXPECT_NE(workbench_shader_volume_get(true, true, false, false), nullptr); - EXPECT_NE(workbench_shader_volume_get(true, true, false, true), nullptr); - EXPECT_NE(workbench_shader_volume_get(true, true, true, false), nullptr); - EXPECT_NE(workbench_shader_volume_get(true, true, true, true), nullptr); + EXPECT_NE(workbench_shader_volume_get(false, false, WORKBENCH_VOLUME_INTERP_LINEAR, false), + nullptr); + EXPECT_NE(workbench_shader_volume_get(false, false, WORKBENCH_VOLUME_INTERP_LINEAR, true), + nullptr); + EXPECT_NE(workbench_shader_volume_get(false, false, WORKBENCH_VOLUME_INTERP_CUBIC, false), + nullptr); + EXPECT_NE(workbench_shader_volume_get(false, false, WORKBENCH_VOLUME_INTERP_CUBIC, true), + nullptr); + EXPECT_NE(workbench_shader_volume_get(false, false, WORKBENCH_VOLUME_INTERP_CLOSEST, false), + nullptr); + EXPECT_NE(workbench_shader_volume_get(false, false, WORKBENCH_VOLUME_INTERP_CLOSEST, true), + nullptr); + EXPECT_NE(workbench_shader_volume_get(false, true, WORKBENCH_VOLUME_INTERP_LINEAR, false), + nullptr); + EXPECT_NE(workbench_shader_volume_get(false, true, WORKBENCH_VOLUME_INTERP_LINEAR, true), + nullptr); + EXPECT_NE(workbench_shader_volume_get(false, true, WORKBENCH_VOLUME_INTERP_CUBIC, false), + nullptr); + EXPECT_NE(workbench_shader_volume_get(false, true, WORKBENCH_VOLUME_INTERP_CUBIC, true), + nullptr); + EXPECT_NE(workbench_shader_volume_get(false, true, WORKBENCH_VOLUME_INTERP_CLOSEST, false), + nullptr); + EXPECT_NE(workbench_shader_volume_get(false, true, WORKBENCH_VOLUME_INTERP_CLOSEST, true), + nullptr); + EXPECT_NE(workbench_shader_volume_get(true, false, WORKBENCH_VOLUME_INTERP_LINEAR, false), + nullptr); + EXPECT_NE(workbench_shader_volume_get(true, false, WORKBENCH_VOLUME_INTERP_LINEAR, true), + nullptr); + EXPECT_NE(workbench_shader_volume_get(true, false, WORKBENCH_VOLUME_INTERP_CUBIC, false), + nullptr); + EXPECT_NE(workbench_shader_volume_get(true, false, WORKBENCH_VOLUME_INTERP_CUBIC, true), + nullptr); + EXPECT_NE(workbench_shader_volume_get(true, false, WORKBENCH_VOLUME_INTERP_CLOSEST, false), + nullptr); + EXPECT_NE(workbench_shader_volume_get(true, false, WORKBENCH_VOLUME_INTERP_CLOSEST, true), + nullptr); + EXPECT_NE(workbench_shader_volume_get(true, true, WORKBENCH_VOLUME_INTERP_LINEAR, false), + nullptr); + EXPECT_NE(workbench_shader_volume_get(true, true, WORKBENCH_VOLUME_INTERP_LINEAR, true), + nullptr); + EXPECT_NE(workbench_shader_volume_get(true, true, WORKBENCH_VOLUME_INTERP_CUBIC, false), + nullptr); + EXPECT_NE(workbench_shader_volume_get(true, true, WORKBENCH_VOLUME_INTERP_CUBIC, true), nullptr); + EXPECT_NE(workbench_shader_volume_get(true, true, WORKBENCH_VOLUME_INTERP_CLOSEST, false), + nullptr); + EXPECT_NE(workbench_shader_volume_get(true, true, WORKBENCH_VOLUME_INTERP_CLOSEST, true), + nullptr); GPUShader *dof_prepare_sh; GPUShader *dof_downsample_sh; |