diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2015-02-12 20:54:41 +0300 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2015-02-12 20:54:41 +0300 |
commit | 5e613198e59124986ab3e4bdb8829f77e2284450 (patch) | |
tree | 6659b06236acf73a8c687ea15867a83f1c63983c /source/blender/makesdna/DNA_view3d_types.h | |
parent | d40ac45610edef50885ce73034f7c035f48cc9c1 (diff) |
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
Diffstat (limited to 'source/blender/makesdna/DNA_view3d_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 543a95cc120..210deddc854 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -46,6 +46,7 @@ struct bGPdata; struct SmoothView3DStore; struct wmTimer; struct Material; +struct GPUFX; /* This is needed to not let VC choke on near and far... old * proprietary MS extensions... */ @@ -60,6 +61,7 @@ struct Material; #include "DNA_listBase.h" #include "DNA_image_types.h" #include "DNA_movieclip_types.h" +#include "DNA_gpu_types.h" /* ******************************** */ @@ -146,6 +148,7 @@ typedef struct RegionView3D { float rot_angle; float rot_axis[3]; + struct GPUFX *compositor; } RegionView3D; /* 3D ViewPort Struct */ @@ -210,11 +213,17 @@ typedef struct View3D { struct ListBase afterdraw_transp; struct ListBase afterdraw_xray; struct ListBase afterdraw_xraytransp; - + /* drawflags, denoting state */ char zbuf, transp, xray; + + /* built-in shader effects (eGPUFXFlags) */ char pad3[5]; + /* note, 'fx_settings.dof' is currently _not_ allocated, + * instead set (temporarily) from camera */ + struct GPUFXSettings fx_settings; + void *properties_storage; /* Nkey panel stores stuff here (runtime only!) */ struct Material *defmaterial; /* used by matcap now */ |