[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57203] trunk/blender/intern/cycles: Cycles / Math functions:
Thomas Dinges
blender at dingto.org
Sun Jun 2 22:39:32 CEST 2013
Revision: 57203
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57203
Author: dingto
Date: 2013-06-02 20:39:32 +0000 (Sun, 02 Jun 2013)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/blender_curves.cpp
trunk/blender/intern/cycles/blender/blender_mesh.cpp
trunk/blender/intern/cycles/bvh/bvh.cpp
trunk/blender/intern/cycles/kernel/kernel_bvh.h
trunk/blender/intern/cycles/kernel/kernel_camera.h
trunk/blender/intern/cycles/kernel/kernel_curve.h
trunk/blender/intern/cycles/kernel/kernel_emission.h
trunk/blender/intern/cycles/kernel/kernel_light.h
trunk/blender/intern/cycles/kernel/kernel_path.h
trunk/blender/intern/cycles/kernel/kernel_subsurface.h
trunk/blender/intern/cycles/kernel/svm/svm_camera.h
trunk/blender/intern/cycles/kernel/svm/svm_math.h
trunk/blender/intern/cycles/kernel/svm/svm_texture.h
trunk/blender/intern/cycles/kernel/svm/svm_wave.h
trunk/blender/intern/cycles/kernel/svm/svm_wireframe.h
trunk/blender/intern/cycles/render/light.cpp
trunk/blender/intern/cycles/render/mesh.cpp
trunk/blender/intern/cycles/render/object.cpp
trunk/blender/intern/cycles/subd/subd_dice.cpp
trunk/blender/intern/cycles/subd/subd_split.cpp
trunk/blender/intern/cycles/util/util_math.h
trunk/blender/intern/cycles/util/util_transform.h
Modified: trunk/blender/intern/cycles/blender/blender_curves.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_curves.cpp 2013-06-02 19:55:57 UTC (rev 57202)
+++ trunk/blender/intern/cycles/blender/blender_curves.cpp 2013-06-02 20:39:32 UTC (rev 57203)
@@ -224,7 +224,7 @@
float3 cKey = make_float3(nco[0],nco[1],nco[2]);
cKey = transform_point(&itfm, cKey);
if(step_no > 0)
- curve_length += len(cKey - pcKey);
+ curve_length += length(cKey - pcKey);
CData->curvekey_co.push_back(cKey);
CData->curvekey_time.push_back(curve_length);
pcKey = cKey;
@@ -473,7 +473,7 @@
for( int curve = CData->psys_firstcurve[sys]; curve < CData->psys_firstcurve[sys] + CData->psys_curvenum[sys] ; curve++) {
float3 firstxbasis = cross(make_float3(1.0f,0.0f,0.0f),CData->curvekey_co[CData->curve_firstkey[curve]+1] - CData->curvekey_co[CData->curve_firstkey[curve]]);
- if(len_squared(firstxbasis)!= 0.0f)
+ if(length_squared(firstxbasis)!= 0.0f)
firstxbasis = normalize(firstxbasis);
else
firstxbasis = normalize(cross(make_float3(0.0f,1.0f,0.0f),CData->curvekey_co[CData->curve_firstkey[curve]+1] - CData->curvekey_co[CData->curve_firstkey[curve]]));
@@ -499,7 +499,7 @@
xbasis = cross(v1,v2);
- if(len_squared(xbasis) >= 0.05f * len_squared(v1) * len_squared(v2)) {
+ if(length_squared(xbasis) >= 0.05f * length_squared(v1) * length_squared(v2)) {
firstxbasis = normalize(xbasis);
break;
}
@@ -528,7 +528,7 @@
xbasis = cross(v1,v2);
- if(len_squared(xbasis) >= 0.05f * len_squared(v1) * len_squared(v2)) {
+ if(length_squared(xbasis) >= 0.05f * length_squared(v1) * length_squared(v2)) {
xbasis = normalize(xbasis);
firstxbasis = xbasis;
}
@@ -586,7 +586,7 @@
for( int curve = CData->psys_firstcurve[sys]; curve < CData->psys_firstcurve[sys] + CData->psys_curvenum[sys] ; curve++) {
float3 firstxbasis = cross(make_float3(1.0f,0.0f,0.0f),CData->curvekey_co[CData->curve_firstkey[curve]+1] - CData->curvekey_co[CData->curve_firstkey[curve]]);
- if(len_squared(firstxbasis)!= 0.0f)
+ if(length_squared(firstxbasis)!= 0.0f)
firstxbasis = normalize(firstxbasis);
else
firstxbasis = normalize(cross(make_float3(0.0f,1.0f,0.0f),CData->curvekey_co[CData->curve_firstkey[curve]+1] - CData->curvekey_co[CData->curve_firstkey[curve]]));
@@ -613,7 +613,7 @@
xbasis = cross(v1,v2);
- if(len_squared(xbasis) >= 0.05f * len_squared(v1) * len_squared(v2)) {
+ if(length_squared(xbasis) >= 0.05f * length_squared(v1) * length_squared(v2)) {
firstxbasis = normalize(xbasis);
break;
}
@@ -643,7 +643,7 @@
xbasis = cross(v1,v2);
- if(len_squared(xbasis) >= 0.05f * len_squared(v1) * len_squared(v2)) {
+ if(length_squared(xbasis) >= 0.05f * length_squared(v1) * length_squared(v2)) {
xbasis = normalize(xbasis);
firstxbasis = xbasis;
}
Modified: trunk/blender/intern/cycles/blender/blender_mesh.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_mesh.cpp 2013-06-02 19:55:57 UTC (rev 57202)
+++ trunk/blender/intern/cycles/blender/blender_mesh.cpp 2013-06-02 20:39:32 UTC (rev 57203)
@@ -237,8 +237,8 @@
bool smooth = f->use_smooth();
if(n == 4) {
- if(len_squared(cross(mesh->verts[vi[1]] - mesh->verts[vi[0]], mesh->verts[vi[2]] - mesh->verts[vi[0]])) == 0.0f ||
- len_squared(cross(mesh->verts[vi[2]] - mesh->verts[vi[0]], mesh->verts[vi[3]] - mesh->verts[vi[0]])) == 0.0f) {
+ if(length_squared(cross(mesh->verts[vi[1]] - mesh->verts[vi[0]], mesh->verts[vi[2]] - mesh->verts[vi[0]])) == 0.0f ||
+ length_squared(cross(mesh->verts[vi[2]] - mesh->verts[vi[0]], mesh->verts[vi[3]] - mesh->verts[vi[0]])) == 0.0f) {
mesh->add_triangle(vi[0], vi[1], vi[3], shader, smooth);
mesh->add_triangle(vi[2], vi[3], vi[1], shader, smooth);
}
Modified: trunk/blender/intern/cycles/bvh/bvh.cpp
===================================================================
--- trunk/blender/intern/cycles/bvh/bvh.cpp 2013-06-02 19:55:57 UTC (rev 57202)
+++ trunk/blender/intern/cycles/bvh/bvh.cpp 2013-06-02 20:39:32 UTC (rev 57203)
@@ -287,7 +287,7 @@
float3 v1 = mesh->curve_keys[k1].co;
float3 d0 = v1 - v0;
- float l = len(d0);
+ float l = length(d0);
/*Plan
*Transform tfm = make_transform(
Modified: trunk/blender/intern/cycles/kernel/kernel_bvh.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_bvh.h 2013-06-02 19:55:57 UTC (rev 57202)
+++ trunk/blender/intern/cycles/kernel/kernel_bvh.h 2013-06-02 20:39:32 UTC (rev 57203)
@@ -64,7 +64,7 @@
float3 dir = transform_direction(&tfm, ray->D);
float len;
- dir = normalize_len(dir, &len);
+ dir = normalize_length(dir, &len);
*idir = bvh_inverse_direction(dir);
@@ -76,7 +76,7 @@
{
if(*t != FLT_MAX) {
Transform tfm = object_fetch_transform(kg, object, OBJECT_TRANSFORM);
- *t *= len(transform_direction(&tfm, 1.0f/(*idir)));
+ *t *= length(transform_direction(&tfm, 1.0f/(*idir)));
}
*P = ray->P;
@@ -94,7 +94,7 @@
float3 dir = transform_direction(&itfm, ray->D);
float len;
- dir = normalize_len(dir, &len);
+ dir = normalize_length(dir, &len);
*idir = bvh_inverse_direction(dir);
@@ -105,7 +105,7 @@
__device_inline void bvh_instance_motion_pop(KernelGlobals *kg, int object, const Ray *ray, float3 *P, float3 *idir, float *t, Transform *tfm, const float tmax)
{
if(*t != FLT_MAX)
- *t *= len(transform_direction(tfm, 1.0f/(*idir)));
+ *t *= length(transform_direction(tfm, 1.0f/(*idir)));
*P = ray->P;
*idir = bvh_inverse_direction(ray->D);
@@ -489,14 +489,14 @@
t = p_curr.z;
}
else {
- float l = len(p_en - p_st);
+ float l = length(p_en - p_st);
/*minimum width extension*/
float or1 = r1;
float or2 = r2;
if(difl != 0.0f) {
- mw_extension = min(len(p_st - P) * difl, extmax);
+ mw_extension = min(length(p_st - P) * difl, extmax);
or1 = r1 < mw_extension ? mw_extension : r1;
- mw_extension = min(len(p_en - P) * difl, extmax);
+ mw_extension = min(length(p_en - P) * difl, extmax);
or2 = r2 < mw_extension ? mw_extension : r2;
}
/* --- */
@@ -611,9 +611,9 @@
float r1 = or1;
float r2 = or2;
if(difl != 0.0f) {
- float pixelsize = min(len(p1 - P) * difl, extmax);
+ float pixelsize = min(length(p1 - P) * difl, extmax);
r1 = or1 < pixelsize ? pixelsize : or1;
- pixelsize = min(len(p2 - P) * difl, extmax);
+ pixelsize = min(length(p2 - P) * difl, extmax);
r2 = or2 < pixelsize ? pixelsize : or2;
}
/* --- */
@@ -621,14 +621,14 @@
float mr = max(r1,r2);
float3 dif = P - p1;
float3 dir = 1.0f/idir;
- float l = len(p2 - p1);
+ float l = length(p2 - p1);
float sp_r = mr + 0.5f * l;
float3 sphere_dif = P - ((p1 + p2) * 0.5f);
float sphere_b = dot(dir,sphere_dif);
sphere_dif = sphere_dif - sphere_b * dir;
sphere_b = dot(dir,sphere_dif);
- float sdisc = sphere_b * sphere_b - len_squared(sphere_dif) + sp_r * sp_r;
+ float sdisc = sphere_b * sphere_b - length_squared(sphere_dif) + sp_r * sp_r;
if(sdisc < 0.0f)
return;
@@ -652,8 +652,8 @@
/* test minimum separation*/
float3 cprod = cross(tg, dir);
float3 cprod2 = cross(tg, dif);
- float cprodsq = len_squared(cprod);
- float cprod2sq = len_squared(cprod2);
+ float cprodsq = length_squared(cprod);
+ float cprod2sq = length_squared(cprod2);
float distscaled = dot(cprod,dif);
if(cprodsq == 0)
@@ -1010,7 +1010,7 @@
P = transform_point(&tfm, P);
D = transform_direction(&tfm, D*t);
- D = normalize_len(D, &t);
+ D = normalize_length(D, &t);
}
P = P + D*t;
@@ -1080,7 +1080,7 @@
P = transform_point(&tfm, P);
D = transform_direction(&tfm, D*t);
- D = normalize_len(D, &t);
+ D = normalize_length(D, &t);
}
int prim = kernel_tex_fetch(__prim_index, isect->prim);
@@ -1092,7 +1092,7 @@
float4 P1 = kernel_tex_fetch(__curve_keys, k0);
float4 P2 = kernel_tex_fetch(__curve_keys, k1);
float l = 1.0f;
- float3 tg = normalize_len(float4_to_float3(P2 - P1),&l);
+ float3 tg = normalize_length(float4_to_float3(P2 - P1),&l);
float r1 = P1.w;
float r2 = P2.w;
float gd = ((r2 - r1)/l);
Modified: trunk/blender/intern/cycles/kernel/kernel_camera.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_camera.h 2013-06-02 19:55:57 UTC (rev 57202)
+++ trunk/blender/intern/cycles/kernel/kernel_camera.h 2013-06-02 20:39:32 UTC (rev 57203)
@@ -255,7 +255,7 @@
return fabsf(dot((P - camP), camD));
}
else
- return len(P - camP);
+ return length(P - camP);
}
CCL_NAMESPACE_END
Modified: trunk/blender/intern/cycles/kernel/kernel_curve.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_curve.h 2013-06-02 19:55:57 UTC (rev 57202)
+++ trunk/blender/intern/cycles/kernel/kernel_curve.h 2013-06-02 20:39:32 UTC (rev 57203)
@@ -122,7 +122,7 @@
if(sd->segment != ~0) {
float normalmix = kernel_data.curve_kernel_data.normalmix;
- tgN = -(-sd->I - sd->dPdu * (dot(sd->dPdu,-sd->I) * normalmix / len_squared(sd->dPdu)));
+ tgN = -(-sd->I - sd->dPdu * (dot(sd->dPdu,-sd->I) * normalmix / length_squared(sd->dPdu)));
tgN = normalize(tgN);
/* need to find suitable scaled gd for corrected normal */
Modified: trunk/blender/intern/cycles/kernel/kernel_emission.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_emission.h 2013-06-02 19:55:57 UTC (rev 57202)
+++ trunk/blender/intern/cycles/kernel/kernel_emission.h 2013-06-02 20:39:32 UTC (rev 57203)
@@ -133,7 +133,7 @@
else {
/* other lights, avoid self-intersection */
ray->D = ray_offset(ls.P, ls.Ng) - ray->P;
- ray->D = normalize_len(ray->D, &ray->t);
+ ray->D = normalize_length(ray->D, &ray->t);
}
ray->dP = sd->dP;
Modified: trunk/blender/intern/cycles/kernel/kernel_light.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_light.h 2013-06-02 19:55:57 UTC (rev 57202)
+++ trunk/blender/intern/cycles/kernel/kernel_light.h 2013-06-02 20:39:32 UTC (rev 57203)
@@ -263,7 +263,7 @@
/* sphere light */
ls->P += sphere_light_sample(P, ls->P, radius, randu, randv);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list