Blender Git Loki
Git Commits -> Revision 5e61319
Revision 5e61319 by Antonis Ryakiotakis (master) February 12, 2015, 17:54 (GMT) |
Viewport compositing - first code This commit introduces a few ready made effects for the 3D viewport and OpenGL rendering. Included effects are Depth of Field, accessible from camera view and screen space ambient occlusion. Those effects can be turned on and tweaked from the shading panel in the 3D viewport. Off screen rendering will use the settings of the current camera. WIP documentation can be found here: http://wiki.blender.org/index.php/User:Psy-Fi/Framebuffer_Post-processing |
Commit Details:
Full Hash: 5e613198e59124986ab3e4bdb8829f77e2284450
Parent Commit: d40ac45
Lines Changed: +2102, -72
8 Added Paths:
/source/blender/gpu/GPU_compositing.h (+88, -0) (View)
/source/blender/gpu/intern/gpu_compositing.c (+863, -0) (View)
/source/blender/gpu/shaders/gpu_shader_fx_dof_frag.glsl (+206, -0) (View)
/source/blender/gpu/shaders/gpu_shader_fx_dof_vert.glsl (+68, -0) (View)
/source/blender/gpu/shaders/gpu_shader_fx_lib.glsl (+47, -0) (View)
/source/blender/gpu/shaders/gpu_shader_fx_ssao_frag.glsl (+82, -0) (View)
/source/blender/gpu/shaders/gpu_shader_fx_vert.glsl (+9, -0) (View)
/source/blender/makesdna/DNA_gpu_types.h (+66, -0) (View)
/source/blender/gpu/intern/gpu_compositing.c (+863, -0) (View)
/source/blender/gpu/shaders/gpu_shader_fx_dof_frag.glsl (+206, -0) (View)
/source/blender/gpu/shaders/gpu_shader_fx_dof_vert.glsl (+68, -0) (View)
/source/blender/gpu/shaders/gpu_shader_fx_lib.glsl (+47, -0) (View)
/source/blender/gpu/shaders/gpu_shader_fx_ssao_frag.glsl (+82, -0) (View)
/source/blender/gpu/shaders/gpu_shader_fx_vert.glsl (+9, -0) (View)
/source/blender/makesdna/DNA_gpu_types.h (+66, -0) (View)
28 Modified Paths:
/release/scripts/startup/bl_ui/properties_data_camera.py (+2, -0) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+20, -2) (Diff)
/SConstruct (+5, -0) (Diff)
/source/blender/blenkernel/BKE_camera.h (+3, -0) (Diff)
/source/blender/blenkernel/BKE_screen.h (+2, -0) (Diff)
/source/blender/blenkernel/intern/camera.c (+20, -1) (Diff)
/source/blender/blenkernel/intern/screen.c (+25, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+7, -1) (Diff)
/source/blender/blenloader/intern/versioning_270.c (+11, -0) (Diff)
/source/blender/blenloader/intern/writefile.c (+5, -0) (Diff)
/source/blender/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/include/ED_view3d.h (+9, -2) (Diff)
/source/blender/editors/render/render_opengl.c (+34, -8) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+20, -1) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+72, -17) (Diff)
/source/blender/gpu/CMakeLists.txt (+21, -0) (Diff)
/source/blender/gpu/GPU_extensions.h (+19, -5) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+231, -27) (Diff)
/source/blender/gpu/SConscript (+5, -0) (Diff)
/source/blender/makesdna/DNA_camera_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_view3d_types.h (+10, -1) (Diff)
/source/blender/makesdna/intern/makesdna.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_camera.c (+7, -2) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+133, -1) (Diff)
/source/blender/makesrna/intern/rna_space.c (+5, -1) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+20, -2) (Diff)
/SConstruct (+5, -0) (Diff)
/source/blender/blenkernel/BKE_camera.h (+3, -0) (Diff)
/source/blender/blenkernel/BKE_screen.h (+2, -0) (Diff)
/source/blender/blenkernel/intern/camera.c (+20, -1) (Diff)
/source/blender/blenkernel/intern/screen.c (+25, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+7, -1) (Diff)
/source/blender/blenloader/intern/versioning_270.c (+11, -0) (Diff)
/source/blender/blenloader/intern/writefile.c (+5, -0) (Diff)
/source/blender/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/include/ED_view3d.h (+9, -2) (Diff)
/source/blender/editors/render/render_opengl.c (+34, -8) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+20, -1) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+72, -17) (Diff)
/source/blender/gpu/CMakeLists.txt (+21, -0) (Diff)
/source/blender/gpu/GPU_extensions.h (+19, -5) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+231, -27) (Diff)
/source/blender/gpu/SConscript (+5, -0) (Diff)
/source/blender/makesdna/DNA_camera_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_view3d_types.h (+10, -1) (Diff)
/source/blender/makesdna/intern/makesdna.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_camera.c (+7, -2) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+133, -1) (Diff)
/source/blender/makesrna/intern/rna_space.c (+5, -1) (Diff)