Skip to content

Commit 1987419

Browse files
committed
Added optical vignetting highlights and general exposure control
1 parent d855f60 commit 1987419

17 files changed

+60
-31
lines changed

ae/aiZoicTemplate.py

100755100644
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,12 @@ def setup(self):
3737
self.addControl("aiFocalDistance", label="Focus distance (cm)")
3838
self.addSeparator()
3939
self.addControl("aiOpticalVignetting", label="Optical Vignetting")
40+
self.addControl("aiHighlightWidth", label="Highlight Width")
41+
self.addControl("aiHighlightStrength", label="Highlight Strength")
4042
self.addSeparator()
4143
self.addControl("aiUseImage", label="Enable Image based bokeh")
4244
self.addCustom('aiBokehPath', self.filenameNew, self.filenameReplace)
45+
self.addSeparator()
46+
self.addControl("aiExposureControl", label="Exposure")
4347

4448
templates.registerTranslatorUI(aiZoicTemplate, "camera", "zoic")

ae/aiZoicTemplate.pyc

550 Bytes
Binary file not shown.

bin/.nfs00000000015c2b8c0000160e

100755100644
File mode changed.

bin/zoic.mtd

100755100644
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,22 @@
6060
default FLOAT 0
6161
desc STRING "Sometimes referred to as the cat-eye effect, this is a lens imperfection that is not caused by the glass but by the outer edge of the lens, also known as the exit aperture. When the main aperture is fully open, light coming into the camera from steep angles will be blocked partially by the edge of the lens. This creates cat-eye like bokeh shapes near the edges of an image. It should be noted that this lens effect is purely mechanical and can not be confused with lens distortion."
6262

63+
[attr highlightWidth]
64+
maya.name STRING "aiHighlightWidth"
65+
min FLOAT 0.0
66+
softmax FLOAT 0.2
67+
max FLOAT 1.0
68+
default FLOAT 0.0
69+
desc STRING "Width of the highlight on the inner side of the bokeh in relationship to the origin in image space. This is a percentage of the lens radius."
70+
71+
[attr highlightStrength]
72+
maya.name STRING "aiHighlightStrength"
73+
min FLOAT 0.0
74+
softmax FLOAT 20.0
75+
max FLOAT 100.0
76+
default FLOAT 0.0
77+
desc STRING "Strength of the highlight on the inner side of the bokeh in relationship to the origin in image space. This is a multiplier on the weight of the rays."
78+
6379
[attr useImage]
6480
maya.name STRING "aiUseImage"
6581
default BOOL false
@@ -69,3 +85,14 @@
6985
maya.name STRING "aiBokehPath"
7086
default STRING ""
7187
desc STRING "Path to bokeh image. No need to convert to .tx"
88+
89+
90+
[attr exposureControl]
91+
maya.name STRING "aiExposureControl"
92+
min FLOAT -100.0
93+
softmin FLOAT -5.0
94+
softmax FLOAT 5.0
95+
max FLOAT 100.0
96+
default FLOAT 0.0
97+
desc STRING "Multiplier on the ray weight."
98+

bin/zoic.so

100755100644
0 Bytes
Binary file not shown.

src/arnoldCamera.pro

100755100644
File mode changed.

src/arnoldCamera.pro.user

100755100644
File mode changed.

src/imageReader.cpp

100755100644
File mode changed.

src/imgs/wip/testScene_lights.ass

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
### exported: Sun Feb 21 14:14:25 2016
1+
### exported: Mon Feb 22 13:20:38 2016
22
### from: Arnold 4.2.11.0 linux clang-3.6.0 glibc-2.12 oiio-1.5.20 rlm-11.3.1 2015/10/27 15:51:25
33
### host app: MtoA 1.2.4.3 Maya 2016
44

55

66

77
options
88
{
9-
AA_samples 20
9+
AA_samples 10
1010
outputs "RGBA RGBA defaultArnoldFilter@gaussian_filter defaultArnoldDriver@driver_exr.RGBA"
1111
xres 960
1212
yres 350
@@ -33,7 +33,7 @@ options
3333
fps 24
3434
}
3535

36-
zenoCamera
36+
zoic
3737
{
3838
name perspShape
3939
sensorWidth 3.5999999
@@ -42,9 +42,9 @@ zenoCamera
4242
useDof on
4343
fStop 1.39999998
4444
focalDistance 115
45-
opticalVignetting 3.80952382
46-
useImage on
47-
bokehPath "/home/i7210038/qt_arnoldCamera/arnoldCamera/imgs/collected_real/bokeh_31.jpg"
45+
opticalVignetting 8
46+
useImage off
47+
bokehPath "/home/i7210038/qt_arnoldCamera/arnoldCamera/imgs/collected_real/bokeh_18.jpg"
4848
matrix
4949
0.312334925 0 -0.949972034 0
5050
0.153605282 -0.986840844 0.0505028479 0

src/imgs/wip/testScene_lights.exr

4.87 MB
Binary file not shown.

0 commit comments

Comments
 (0)