Blender Git Loki
Git Commits -> Revision f137022
Revision f137022 by Sriharsha Kotcharlakot (master) September 15, 2020, 17:43 (GMT) |
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 |
Commit Details:
Full Hash: f137022f9919f4dd315ec6b325a08e1bf5aec6fb
Parent Commit: bedbd86
Lines Changed: +1410, -220
1 Added Path:
/source/blender/draw/engines/overlay/shaders/volume_gridlines_vert.glsl (+121, -0) (View)
33 Modified Paths:
/intern/mantaflow/extern/manta_fluid_API.h (+2, -0) (Diff)
/intern/mantaflow/intern/manta_fluid_API.cpp (+8, -0) (Diff)
/intern/mantaflow/intern/MANTA_main.cpp (+2, -0) (Diff)
/intern/mantaflow/intern/MANTA_main.h (+5, -0) (Diff)
/intern/opencolorio/ocio_impl_glsl.cc (+3, -2) (Diff)
/release/scripts/modules/rna_manual_reference.py (+13, -2) (Diff)
/release/scripts/startup/bl_operators/object_quick_effects.py (+11, -0) (Diff)
/release/scripts/startup/bl_ui/properties_data_volume.py (+11, -1) (Diff)
/release/scripts/startup/bl_ui/properties_physics_fluid.py (+66, -18) (Diff)
/source/blender/blenkernel/BKE_fluid.h (+1, -0) (Diff)
/source/blender/blenkernel/intern/fluid.c (+49, -3) (Diff)
/source/blender/draw/CMakeLists.txt (+1, -0) (Diff)
/source/blender/draw/engines/overlay/overlay_extra.c (+76, -12) (Diff)
/source/blender/draw/engines/overlay/overlay_private.h (+2, -1) (Diff)
/source/blender/draw/engines/overlay/overlay_shader.c (+63, -2) (Diff)
/source/blender/draw/engines/overlay/shaders/volume_velocity_vert.glsl (+108, -10) (Diff)
/source/blender/draw/engines/workbench/shaders/workbench_volume_frag.glsl (+80, -3) (Diff)
/source/blender/draw/engines/workbench/workbench_engine.c (+4, -2) (Diff)
/source/blender/draw/engines/workbench/workbench_private.h (+11, -1) (Diff)
/source/blender/draw/engines/workbench/workbench_shader.c (+16, -5) (Diff)
/source/blender/draw/engines/workbench/workbench_volume.c (+111, -37) (Diff)
/source/blender/draw/intern/draw_cache_impl_volume.c (+1, -1) (Diff)
/source/blender/draw/intern/draw_common.h (+2, -0) (Diff)
/source/blender/draw/intern/draw_fluid.c (+138, -21) (Diff)
/source/blender/draw/intern/draw_manager_texture.c (+2, -1) (Diff)
/source/blender/draw/tests/shaders_test.cc (+47, -16) (Diff)
/source/blender/gpu/GPU_texture.h (+8, -2) (Diff)
/source/blender/gpu/intern/gpu_texture.cc (+24, -13) (Diff)
/source/blender/makesdna/DNA_fluid_types.h (+61, -16) (Diff)
/source/blender/makesdna/DNA_volume_defaults.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_volume_types.h (+25, -0) (Diff)
/source/blender/makesrna/intern/rna_fluid.c (+283, -51) (Diff)
/source/blender/makesrna/intern/rna_volume.c (+54, -0) (Diff)
/intern/mantaflow/intern/manta_fluid_API.cpp (+8, -0) (Diff)
/intern/mantaflow/intern/MANTA_main.cpp (+2, -0) (Diff)
/intern/mantaflow/intern/MANTA_main.h (+5, -0) (Diff)
/intern/opencolorio/ocio_impl_glsl.cc (+3, -2) (Diff)
/release/scripts/modules/rna_manual_reference.py (+13, -2) (Diff)
/release/scripts/startup/bl_operators/object_quick_effects.py (+11, -0) (Diff)
/release/scripts/startup/bl_ui/properties_data_volume.py (+11, -1) (Diff)
/release/scripts/startup/bl_ui/properties_physics_fluid.py (+66, -18) (Diff)
/source/blender/blenkernel/BKE_fluid.h (+1, -0) (Diff)
/source/blender/blenkernel/intern/fluid.c (+49, -3) (Diff)
/source/blender/draw/CMakeLists.txt (+1, -0) (Diff)
/source/blender/draw/engines/overlay/overlay_extra.c (+76, -12) (Diff)
/source/blender/draw/engines/overlay/overlay_private.h (+2, -1) (Diff)
/source/blender/draw/engines/overlay/overlay_shader.c (+63, -2) (Diff)
/source/blender/draw/engines/overlay/shaders/volume_velocity_vert.glsl (+108, -10) (Diff)
/source/blender/draw/engines/workbench/shaders/workbench_volume_frag.glsl (+80, -3) (Diff)
/source/blender/draw/engines/workbench/workbench_engine.c (+4, -2) (Diff)
/source/blender/draw/engines/workbench/workbench_private.h (+11, -1) (Diff)
/source/blender/draw/engines/workbench/workbench_shader.c (+16, -5) (Diff)
/source/blender/draw/engines/workbench/workbench_volume.c (+111, -37) (Diff)
/source/blender/draw/intern/draw_cache_impl_volume.c (+1, -1) (Diff)
/source/blender/draw/intern/draw_common.h (+2, -0) (Diff)
/source/blender/draw/intern/draw_fluid.c (+138, -21) (Diff)
/source/blender/draw/intern/draw_manager_texture.c (+2, -1) (Diff)
/source/blender/draw/tests/shaders_test.cc (+47, -16) (Diff)
/source/blender/gpu/GPU_texture.h (+8, -2) (Diff)
/source/blender/gpu/intern/gpu_texture.cc (+24, -13) (Diff)
/source/blender/makesdna/DNA_fluid_types.h (+61, -16) (Diff)
/source/blender/makesdna/DNA_volume_defaults.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_volume_types.h (+25, -0) (Diff)
/source/blender/makesrna/intern/rna_fluid.c (+283, -51) (Diff)
/source/blender/makesrna/intern/rna_volume.c (+54, -0) (Diff)