diff options
author | Thomas Dinges <blender@dingto.org> | 2013-06-03 00:39:32 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-06-03 00:39:32 +0400 |
commit | c5ed6765b9c46630579be5e43cab74965f0be9da (patch) | |
tree | 0ca3bee53bec86f5bb63a005aa4cbfb04e6735a6 /intern/cycles/render | |
parent | 834492489ab9cea37ff32166895b6a298d7225e9 (diff) |
Cycles / Math functions:
* Rename some math functions:
len -> length
len_squared -> length_squared
normalize_len -> normalize_length
* This way OpenCL uses its inbuilt length() function, rather than our own. The other two functions have been renamed for consistency.
* Tested CPU, CUDA and OpenCL compile, should be no functional changes.
Diffstat (limited to 'intern/cycles/render')
-rw-r--r-- | intern/cycles/render/light.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/render/mesh.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/render/object.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp index 1d2acf79b6c..f29061299b5 100644 --- a/intern/cycles/render/light.cpp +++ b/intern/cycles/render/light.cpp @@ -276,7 +276,7 @@ void LightManager::device_update_distribution(Device *device, DeviceScene *dscen p2 = transform_point(&tfm, p2); } - totarea += M_PI_F * (r1 + r2) * len(p1 - p2); + totarea += M_PI_F * (r1 + r2) * length(p1 - p2); } } @@ -547,7 +547,7 @@ void LightManager::device_update_points(Device *device, DeviceScene *dscene, Sce else if(light->type == LIGHT_AREA) { float3 axisu = light->axisu*(light->sizeu*light->size); float3 axisv = light->axisv*(light->sizev*light->size); - float area = len(axisu)*len(axisv); + float area = length(axisu)*length(axisv); float invarea = (area > 0.0f)? 1.0f/area: 1.0f; if(light->use_mis && area > 0.0f) diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp index 4a2a64bb0f3..8ec2514bbfe 100644 --- a/intern/cycles/render/mesh.cpp +++ b/intern/cycles/render/mesh.cpp @@ -187,7 +187,7 @@ void Mesh::add_face_normals() float3 v2 = verts_ptr[t.v[2]]; float3 norm = cross(v1 - v0, v2 - v0); - float normlen = len(norm); + float normlen = length(norm); if(normlen == 0.0f) fN[i] = make_float3(0.0f, 0.0f, 0.0f); else diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp index 1a2780995e3..cd266367b6f 100644 --- a/intern/cycles/render/object.cpp +++ b/intern/cycles/render/object.cpp @@ -200,7 +200,7 @@ void ObjectManager::device_update_transforms(Device *device, DeviceScene *dscene float r2 = mesh->curve_keys[first_key + i + 1].radius; /* currently ignores segment overlaps*/ - surface_area += M_PI_F *(r1 + r2) * len(p1 - p2); + surface_area += M_PI_F *(r1 + r2) * length(p1 - p2); } } @@ -233,7 +233,7 @@ void ObjectManager::device_update_transforms(Device *device, DeviceScene *dscene p2 = transform_point(&tfm, p2); /* currently ignores segment overlaps*/ - surface_area += M_PI_F *(r1 + r2) * len(p1 - p2); + surface_area += M_PI_F *(r1 + r2) * length(p1 - p2); } } } |