diff options
author | Alfredo de Greef <eeshlo@yahoo.com> | 2004-11-08 06:55:44 +0300 |
---|---|---|
committer | Alfredo de Greef <eeshlo@yahoo.com> | 2004-11-08 06:55:44 +0300 |
commit | 459deaf11f3f451b2f30b97b1e23e72343398445 (patch) | |
tree | e88c2e842c843cd8c5bee06a398e6feac0521c85 /source/blender/src/editipo.c | |
parent | 8daff51e0fab7bf06847e4e019d7b0b21ab4bb69 (diff) |
Fixed:
Texture matrix bug in plugin code reported by Mel_Q.
Vertex colors, this was basically the same as the previous uv coord
splitting bug, for xml export, uv coord splitting was actually not quite
complete either (reported by richie).
Added:
Camera Ipo curves for DoF aperture and focal distance.
Aspect ratio set with AspX & AspY are now taken into account as well.
(needs yafray from cvs)
Bokeh parameters for DoF (also needs yafray from cvs).
'Bokeh' controls the shape of out of focus points when rendering
with depth of field enabled.
This is mostly visible on very out of focus highlights in the image.
There are currently seven types to choose from.:
'Disk1' is the default, the same as was used before.
'Disk2' is similar, but allows you to modify the shape further with the 'bias'
parameter, see below.
Triangle/Square/Pentagon/Hexagon, in addition to the bias control, you can
offset the rotation with the 'Rotation' parameter (in degrees).
'Ring', a weird ring shaped lens, no additional controls.
The 'bias' menu controls accentuation of the shape.
Three types available, uniform, center or edge, with uniform the default.
Although based on an actual phenomenon of real camera's, the current
code is bit of a hack and not physically based, and doesn't work all that
well yet (in yafray anyway). Since this is also mostly visible in the very
out of focus parts of the image, it usually also means that you need lots
of samples to get a reasonably smooth result.
Diffstat (limited to 'source/blender/src/editipo.c')
-rw-r--r-- | source/blender/src/editipo.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/source/blender/src/editipo.c b/source/blender/src/editipo.c index 02505a7986d..9d7d02f80db 100644 --- a/source/blender/src/editipo.c +++ b/source/blender/src/editipo.c @@ -180,7 +180,8 @@ char *wo_ic_names[WO_TOTNAM] = { "HorR", "HorG", "HorB", "ZenR", "ZenG", "ZenB", "StarG", "StarDi", "StarSi" }; char *la_ic_names[LA_TOTNAM] = { "Energ", "R", "G", "B", "Dist", "SpoSi", "SpoBl", "Quad1", "Quad2", "HaInt" }; -char *cam_ic_names[CAM_TOTNAM] = { "Lens", "ClSta", "ClEnd" }; +/* yafray: two curve names added, 'Apert' for aperture, and 'FDist' for focal distance */ +char *cam_ic_names[CAM_TOTNAM] = { "Lens", "ClSta", "ClEnd", "Apert", "FDist" }; char *snd_ic_names[SND_TOTNAM] = { "Vol", "Pitch", "Pan", "Atten" }; char *ac_ic_names[AC_TOTNAM] = {"LocX", "LocY", "LocZ", "SizeX", "SizeY", "SizeZ", "QuatW", "QuatX", "QuatY", "QuatZ"}; @@ -286,7 +287,9 @@ char *getname_la_ei(int nr) char *getname_cam_ei(int nr) { - if(nr>=CAM_LENS && nr<=CAM_END) return cam_ic_names[nr-1]; + /* yafray: curves extended to CAM_YF_FDIST */ + //if(nr>=CAM_LENS && nr<=CAM_END) return cam_ic_names[nr-1]; + if(nr>=CAM_LENS && nr<=CAM_YF_FDIST) return cam_ic_names[nr-1]; return ic_name_empty[0]; } @@ -3781,16 +3784,26 @@ void common_insertkey() if(ob && ob->type==OB_CAMERA) { id= G.buts->lockpoin; if(id) { - event= pupmenu("Insert Key %t|Lens%x0|Clipping%x1"); + /* yafray: insert key extended with aperture and focal distance */ + if (G.scene->r.renderer==R_INTERN) + event= pupmenu("Insert Key %t|Lens%x0|Clipping%x1"); + else + event= pupmenu("Insert Key %t|Lens%x0|Clipping%x1|Aperture%x2|FocalDistance%x3"); if(event== -1) return; if(event==0) { insertkey(id, CAM_LENS); } - if(event==1) { + else if(event==1) { insertkey(id, CAM_STA); insertkey(id, CAM_END); } + else if(event==2) { + insertkey(id, CAM_YF_APERT); + } + else if(event==3) { + insertkey(id, CAM_YF_FDIST); + } } } } |