[Bf-blender-cvs] [11f3852] testbuild: Revert "Cycles Anamorphic Lens again, now with a CUDA fix"
Dalai Felinto
noreply at git.blender.org
Thu Aug 21 11:11:49 CEST 2014
Commit: 11f3852c2463542cc907373558119c2b0d2e87bc
Author: Dalai Felinto
Date: Thu Aug 21 11:11:40 2014 +0200
Branches: testbuild
https://developer.blender.org/rB11f3852c2463542cc907373558119c2b0d2e87bc
Revert "Cycles Anamorphic Lens again, now with a CUDA fix"
This reverts commit d1e9854dbc484e4bdbba2014c76cf8928253a4d5.
===================================================================
M intern/cycles/blender/addon/properties.py
M intern/cycles/blender/addon/ui.py
M intern/cycles/blender/blender_camera.cpp
M intern/cycles/kernel/kernel_camera.h
M intern/cycles/kernel/kernel_types.h
M intern/cycles/render/camera.cpp
M intern/cycles/render/camera.h
===================================================================
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 4a5a6c0..b4a1b10 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -544,13 +544,6 @@ class CyclesCameraSettings(bpy.types.PropertyGroup):
subtype='ANGLE',
default=0,
)
- cls.anamorphic_bokeh = FloatProperty(
- name="Anamorphic Bokeh",
- description="Distortion to simulate anamorphic bokeh distortion",
- min=0.01, soft_min=1.0, soft_max=2.0,
- default=1.0,
- precision=4,
- )
cls.panorama_type = EnumProperty(
name="Panorama Type",
description="Distortion to use for the calculation",
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index c548944..057b592 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -469,9 +469,6 @@ class CyclesCamera_PT_dof(CyclesButtonsPanel, Panel):
sub.prop(ccam, "aperture_blades", text="Blades")
sub.prop(ccam, "aperture_rotation", text="Rotation")
- col.separator()
- col.prop(ccam, "anamorphic_bokeh")
-
class Cycles_PT_context_material(CyclesButtonsPanel, Panel):
bl_label = ""
diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp
index a7adfe1..1a85561 100644
--- a/intern/cycles/blender/blender_camera.cpp
+++ b/intern/cycles/blender/blender_camera.cpp
@@ -46,8 +46,6 @@ struct BlenderCamera {
float2 pixelaspect;
- float anamorphic_bokeh;
-
PanoramaType panorama_type;
float fisheye_fov;
float fisheye_lens;
@@ -169,7 +167,6 @@ static void blender_camera_from_object(BlenderCamera *bcam, BL::Object b_ob, boo
bcam->apertureblades = RNA_int_get(&ccamera, "aperture_blades");
bcam->aperturerotation = RNA_float_get(&ccamera, "aperture_rotation");
bcam->focaldistance = blender_camera_focal_distance(b_ob, b_camera);
- bcam->anamorphic_bokeh = RNA_float_get(&ccamera, "anamorphic_bokeh");
bcam->shift.x = b_camera.shift_x();
bcam->shift.y = b_camera.shift_y();
@@ -331,9 +328,6 @@ static void blender_camera_sync(Camera *cam, BlenderCamera *bcam, int width, int
cam->fisheye_fov = bcam->fisheye_fov;
cam->fisheye_lens = bcam->fisheye_lens;
- /* anamorphic lens */
- cam->anamorphic_bokeh = bcam->anamorphic_bokeh;
-
/* perspective */
cam->fov = 2.0f * atanf((0.5f * sensor_size) / bcam->lens / aspectratio);
cam->focaldistance = bcam->focaldistance;
diff --git a/intern/cycles/kernel/kernel_camera.h b/intern/cycles/kernel/kernel_camera.h
index 9ba968d..6b03abe 100644
--- a/intern/cycles/kernel/kernel_camera.h
+++ b/intern/cycles/kernel/kernel_camera.h
@@ -21,24 +21,16 @@ CCL_NAMESPACE_BEGIN
ccl_device float2 camera_sample_aperture(KernelGlobals *kg, float u, float v)
{
float blades = kernel_data.cam.blades;
- float anamorphic_bokeh = kernel_data.cam.anamorphic_bokeh;
- float2 bokeh;
if(blades == 0.0f) {
/* sample disk */
- bokeh = concentric_sample_disk(u, v);
+ return concentric_sample_disk(u, v);
}
else {
/* sample polygon */
float rotation = kernel_data.cam.bladesrotation;
- bokeh = regular_polygon_sample(blades, rotation, u, v);
+ return regular_polygon_sample(blades, rotation, u, v);
}
-
- if(anamorphic_bokeh != 1.0f) {
- bokeh.x *= 1.0f / anamorphic_bokeh;
- }
-
- return bokeh;
}
ccl_device void camera_sample_perspective(KernelGlobals *kg, float raster_x, float raster_y, float lens_u, float lens_v, Ray *ray)
@@ -191,8 +183,7 @@ ccl_device void camera_sample_panorama(KernelGlobals *kg, float raster_x, float
/* calculate orthonormal coordinates perpendicular to D */
float3 U, V;
- U = normalize(make_float3(1.0f, 0.0f, 0.0f) - D.x * D);
- V = normalize(cross(D, U));
+ make_orthonormals(D, &U, &V);
/* update ray for effect of lens */
ray->P = U * lensuv.x + V * lensuv.y;
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index b8cbada..3a54c68 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -757,11 +757,9 @@ typedef struct KernelCamera {
/* render size */
float width, height;
int resolution;
-
- /* anamorphic lens */
- float anamorphic_bokeh;
int pad1;
int pad2;
+ int pad3;
/* more matrices */
Transform screentoworld;
diff --git a/intern/cycles/render/camera.cpp b/intern/cycles/render/camera.cpp
index 12c1ef2..8659fe4 100644
--- a/intern/cycles/render/camera.cpp
+++ b/intern/cycles/render/camera.cpp
@@ -38,8 +38,6 @@ Camera::Camera()
motion.post = transform_identity();
use_motion = false;
- anamorphic_bokeh = 1.0f;
-
type = CAMERA_PERSPECTIVE;
panorama_type = PANORAMA_EQUIRECTANGULAR;
fisheye_fov = M_PI_F;
@@ -243,9 +241,6 @@ void Camera::device_update(Device *device, DeviceScene *dscene, Scene *scene)
/* type */
kcam->type = type;
- /* anamorphic lens */
- kcam->anamorphic_bokeh = anamorphic_bokeh;
-
/* panorama */
kcam->panorama_type = panorama_type;
kcam->fisheye_fov = fisheye_fov;
@@ -296,7 +291,6 @@ bool Camera::modified(const Camera& cam)
(viewplane == cam.viewplane) &&
(border == cam.border) &&
(matrix == cam.matrix) &&
- (anamorphic_bokeh == cam.anamorphic_bokeh) &&
(panorama_type == cam.panorama_type) &&
(fisheye_fov == cam.fisheye_fov) &&
(fisheye_lens == cam.fisheye_lens));
diff --git a/intern/cycles/render/camera.h b/intern/cycles/render/camera.h
index ff38870..c28670b 100644
--- a/intern/cycles/render/camera.h
+++ b/intern/cycles/render/camera.h
@@ -54,9 +54,6 @@ public:
float fisheye_fov;
float fisheye_lens;
- /* anamorphic lens */
- float anamorphic_bokeh;
-
/* sensor */
float sensorwidth;
float sensorheight;
More information about the Bf-blender-cvs
mailing list