archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

style cleanup: issues missed last commit

Browse Source
This commit is contained in:
Campbell Barton
2012-03-25 15:56:17 +00:00
parent fffe342d87
commit 3f56ee3da7
7 changed files with 70 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source/blender/blenlib/intern/math_color.c
View File

@@ -17,7 +17,7 @@
* *
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
* All rights reserved. * All rights reserved.
*
* The Original Code is: some of this file. * The Original Code is: some of this file.
* *
* ***** END GPL LICENSE BLOCK ***** * ***** END GPL LICENSE BLOCK *****
@@ -129,18 +129,18 @@ void rgb_to_ycc(float r, float g, float b, float *ly, float *lcb, float *lcr, in
switch (colorspace) { switch (colorspace) {
case BLI_YCC_ITU_BT601: case BLI_YCC_ITU_BT601:
y = (0.257f * sr) + (0.504f * sg) + (0.098f * sb) + 16.0f; y = (0.257f * sr) + (0.504f * sg) + (0.098f * sb) + 16.0f;
cb = (-0.148f * sr)-(0.291f * sg) + (0.439f * sb) + 128.0f; cb = (-0.148f * sr) - (0.291f * sg) + (0.439f * sb) + 128.0f;
cr = (0.439f * sr)-(0.368f * sg)-(0.071f * sb) + 128.0f; cr = (0.439f * sr) - (0.368f * sg) - (0.071f * sb) + 128.0f;
break; break;
case BLI_YCC_ITU_BT709: case BLI_YCC_ITU_BT709:
y = (0.183f * sr) + (0.614f * sg) + (0.062f * sb) + 16.0f; y = (0.183f * sr) + (0.614f * sg) + (0.062f * sb) + 16.0f;
cb = (-0.101f * sr)-(0.338f * sg) + (0.439f * sb) + 128.0f; cb = (-0.101f * sr) - (0.338f * sg) + (0.439f * sb) + 128.0f;
cr = (0.439f * sr)-(0.399f * sg)-(0.040f * sb) + 128.0f; cr = (0.439f * sr) - (0.399f * sg) - (0.040f * sb) + 128.0f;
break; break;
case BLI_YCC_JFIF_0_255: case BLI_YCC_JFIF_0_255:
y = (0.299f * sr) + (0.587f * sg) + (0.114f * sb); y = (0.299f * sr) + (0.587f * sg) + (0.114f * sb);
cb = (-0.16874f * sr)-(0.33126f * sg) + (0.5f * sb) + 128.0f; cb = (-0.16874f * sr) - (0.33126f * sg) + (0.5f * sb) + 128.0f;
cr = (0.5f * sr)-(0.41869f * sg)-(0.08131f * sb) + 128.0f; cr = (0.5f * sr) - (0.41869f * sg) - (0.08131f * sb) + 128.0f;
break; break;
default: default:
assert(!"invalid colorspace"); assert(!"invalid colorspace");
@@ -230,13 +230,17 @@ void rgb_to_hsv(float r, float g, float b, float *lh, float *ls, float *lv)
rc = (cmax - r) / cdelta; rc = (cmax - r) / cdelta;
gc = (cmax - g) / cdelta; gc = (cmax - g) / cdelta;
bc = (cmax - b) / cdelta; bc = (cmax - b) / cdelta;
if (r == cmax)
if (r == cmax) {
h = bc - gc; h = bc - gc;
else }
if (g == cmax) else if (g == cmax) {
h = 2.0f + rc - bc; h = 2.0f + rc - bc;
else }
else {
h = 4.0f + gc - rc; h = 4.0f + gc - rc;
}
h = h * 60.0f; h = h * 60.0f;
if (h < 0.0f) if (h < 0.0f)
h += 360.0f; h += 360.0f;
@@ -331,13 +335,13 @@ unsigned int rgb_to_cpack(float r, float g, float b)
void cpack_to_rgb(unsigned int col, float *r, float *g, float *b) void cpack_to_rgb(unsigned int col, float *r, float *g, float *b)
{ {
*r = (float)((col)&0xFF); *r = (float)((col) & 0xFF);
*r /= 255.0f; *r /= 255.0f;
*g = (float)(((col) >> 8)&0xFF); *g = (float)(((col) >> 8) & 0xFF);
*g /= 255.0f; *g /= 255.0f;
*b = (float)(((col) >> 16)&0xFF); *b = (float)(((col) >> 16) & 0xFF);
*b /= 255.0f; *b /= 255.0f;
} }

36
source/blender/blenlib/intern/math_geom.c
View File

@@ -17,7 +17,7 @@
* *
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
* All rights reserved. * All rights reserved.
*
* The Original Code is: some of this file. * The Original Code is: some of this file.
* *
* ***** END GPL LICENSE BLOCK ***** * ***** END GPL LICENSE BLOCK *****
@@ -173,7 +173,7 @@ float dist_to_line_v2(const float v1[2], const float v2[2], const float v3[2])
deler = (float)sqrt(a[0] * a[0] + a[1] * a[1]); deler = (float)sqrt(a[0] * a[0] + a[1] * a[1]);
if (deler == 0.0f) return 0; if (deler == 0.0f) return 0;
return fabsf((v1[0] - v2[0]) * a[0]+(v1[1] - v2[1]) * a[1]) / deler; return fabsf((v1[0] - v2[0]) * a[0] + (v1[1] - v2[1]) * a[1]) / deler;
} }
@@ -298,12 +298,12 @@ int isect_line_line_v2_int(const int v1[2], const int v2[2], const int v3[2], co
{ {
float div, labda, mu; float div, labda, mu;
div = (float)((v2[0] - v1[0]) * (v4[1] - v3[1])-(v2[1] - v1[1]) * (v4[0] - v3[0])); div = (float)((v2[0] - v1[0]) * (v4[1] - v3[1]) - (v2[1] - v1[1]) * (v4[0] - v3[0]));
if (div == 0.0f) return ISECT_LINE_LINE_COLINEAR; if (div == 0.0f) return ISECT_LINE_LINE_COLINEAR;
labda = ((float)(v1[1] - v3[1]) * (v4[0] - v3[0])-(v1[0] - v3[0]) * (v4[1] - v3[1])) / div; labda = ((float)(v1[1] - v3[1]) * (v4[0] - v3[0]) - (v1[0] - v3[0]) * (v4[1] - v3[1])) / div;
mu = ((float)(v1[1] - v3[1]) * (v2[0] - v1[0])-(v1[0] - v3[0]) * (v2[1] - v1[1])) / div; mu = ((float)(v1[1] - v3[1]) * (v2[0] - v1[0]) - (v1[0] - v3[0]) * (v2[1] - v1[1])) / div;
if (labda >= 0.0f && labda <= 1.0f && mu >= 0.0f && mu <= 1.0f) { if (labda >= 0.0f && labda <= 1.0f && mu >= 0.0f && mu <= 1.0f) {
if (labda == 0.0f || labda == 1.0f || mu == 0.0f || mu == 1.0f) return ISECT_LINE_LINE_EXACT; if (labda == 0.0f || labda == 1.0f || mu == 0.0f || mu == 1.0f) return ISECT_LINE_LINE_EXACT;
@@ -317,12 +317,12 @@ int isect_line_line_v2(const float v1[2], const float v2[2], const float v3[2],
{ {
float div, labda, mu; float div, labda, mu;
div = (v2[0] - v1[0]) * (v4[1] - v3[1])-(v2[1] - v1[1]) * (v4[0] - v3[0]); div = (v2[0] - v1[0]) * (v4[1] - v3[1]) - (v2[1] - v1[1]) * (v4[0] - v3[0]);
if (div == 0.0f) return ISECT_LINE_LINE_COLINEAR; if (div == 0.0f) return ISECT_LINE_LINE_COLINEAR;
labda = ((float)(v1[1] - v3[1]) * (v4[0] - v3[0])-(v1[0] - v3[0]) * (v4[1] - v3[1])) / div; labda = ((float)(v1[1] - v3[1]) * (v4[0] - v3[0]) - (v1[0] - v3[0]) * (v4[1] - v3[1])) / div;
mu = ((float)(v1[1] - v3[1]) * (v2[0] - v1[0])-(v1[0] - v3[0]) * (v2[1] - v1[1])) / div; mu = ((float)(v1[1] - v3[1]) * (v2[0] - v1[0]) - (v1[0] - v3[0]) * (v2[1] - v1[1])) / div;
if (labda >= 0.0f && labda <= 1.0f && mu >= 0.0f && mu <= 1.0f) { if (labda >= 0.0f && labda <= 1.0f && mu >= 0.0f && mu <= 1.0f) {
if (labda == 0.0f || labda == 1.0f || mu == 0.0f || mu == 1.0f) return ISECT_LINE_LINE_EXACT; if (labda == 0.0f || labda == 1.0f || mu == 0.0f || mu == 1.0f) return ISECT_LINE_LINE_EXACT;
@@ -383,7 +383,7 @@ int isect_seg_seg_v2_point(const float v1[2], const float v2[2], const float v3[
if (u > u2) SWAP(float, u, u2); if (u > u2) SWAP(float, u, u2);
if (u > 1.0f + eps || u2<-eps) return -1; /* non-ovlerlapping segments */ if (u > 1.0f + eps || u2 < -eps) return -1; /* non-ovlerlapping segments */
else if (maxf(0.0f, u) == minf(1.0f, u2)) { /* one common point: can return result */ else if (maxf(0.0f, u) == minf(1.0f, u2)) { /* one common point: can return result */
interp_v2_v2v2(vi, v1, v2, maxf(0, u)); interp_v2_v2v2(vi, v1, v2, maxf(0, u));
return 1; return 1;
@@ -1918,11 +1918,11 @@ int interp_sparse_array(float *array, int const list_size, const float skipval)
float valid_last = skipval; float valid_last = skipval;
int valid_ofs = 0; int valid_ofs = 0;
float *array_up = MEM_callocN(sizeof(float)* list_size, "interp_sparse_array up"); float *array_up = MEM_callocN(sizeof(float) * list_size, "interp_sparse_array up");
float *array_down = MEM_callocN(sizeof(float)* list_size, "interp_sparse_array up"); float *array_down = MEM_callocN(sizeof(float) * list_size, "interp_sparse_array up");
int *ofs_tot_up = MEM_callocN(sizeof(int)* list_size, "interp_sparse_array tup"); int *ofs_tot_up = MEM_callocN(sizeof(int) * list_size, "interp_sparse_array tup");
int *ofs_tot_down = MEM_callocN(sizeof(int)* list_size, "interp_sparse_array tdown"); int *ofs_tot_down = MEM_callocN(sizeof(int) * list_size, "interp_sparse_array tdown");
for (i = 0; i < list_size; i++) { for (i = 0; i < list_size; i++) {
if (array[i] == skipval) { if (array[i] == skipval) {
@@ -2046,7 +2046,7 @@ void interp_cubic_v3(float x[3], float v[3], const float x1[3], const float v1[3
/* unfortunately internal calculations have to be done at double precision to achieve correct/stable results. */ /* unfortunately internal calculations have to be done at double precision to achieve correct/stable results. */
#define IS_ZERO(x) ((x>(-DBL_EPSILON) && x<DBL_EPSILON) ? 1 : 0) #define IS_ZERO(x) ((x > (-DBL_EPSILON) && x < DBL_EPSILON) ? 1 : 0)
/* Barycentric reverse */ /* Barycentric reverse */
void resolve_tri_uv(float r_uv[2], const float st[2], const float st0[2], const float st1[2], const float st2[2]) void resolve_tri_uv(float r_uv[2], const float st[2], const float st0[2], const float st1[2], const float st2[2])
@@ -2915,14 +2915,14 @@ static vFloat vec_splat_float(float val)
static float ff_quad_form_factor(float *p, float *n, float *q0, float *q1, float *q2, float *q3) static float ff_quad_form_factor(float *p, float *n, float *q0, float *q1, float *q2, float *q3)
{ {
vFloat vcos, rlen, vrx, vry, vrz, vsrx, vsry, vsrz, gx, gy, gz, vangle; vFloat vcos, rlen, vrx, vry, vrz, vsrx, vsry, vsrz, gx, gy, gz, vangle;
vUInt8 rotate = (vUInt8){4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3}; vUInt8 rotate = (vUInt8) {4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3};
vFloatResult vresult; vFloatResult vresult;
float result; float result;
/* compute r* */ /* compute r* */
vrx = (vFloat) {q0[0], q1[0], q2[0], q3[0]} - vec_splat_float(p[0]); vrx = (vFloat) {q0[0], q1[0], q2[0], q3[0]} -vec_splat_float(p[0]);
vry = (vFloat) {q0[1], q1[1], q2[1], q3[1]} - vec_splat_float(p[1]); vry = (vFloat) {q0[1], q1[1], q2[1], q3[1]} -vec_splat_float(p[1]);
vrz = (vFloat) {q0[2], q1[2], q2[2], q3[2]} - vec_splat_float(p[2]); vrz = (vFloat) {q0[2], q1[2], q2[2], q3[2]} -vec_splat_float(p[2]);
/* normalize r* */ /* normalize r* */
rlen = vec_rsqrte(vrx * vrx + vry * vry + vrz * vrz + vec_splat_float(1e-16f)); rlen = vec_rsqrte(vrx * vrx + vry * vry + vrz * vrz + vec_splat_float(1e-16f));

12
source/blender/blenlib/intern/math_matrix.c
View File

@@ -245,9 +245,9 @@ void mul_m4_m3m4(float (*m1)[4], float (*m3)[3], float (*m2)[4])
} }
void mul_serie_m3(float answ[][3], void mul_serie_m3(float answ[][3],
float m1[][3], float m2[][3], float m3[][3], float m1[][3], float m2[][3], float m3[][3],
float m4[][3], float m5[][3], float m6[][3], float m4[][3], float m5[][3], float m6[][3],
float m7[][3], float m8[][3]) float m7[][3], float m8[][3])
{ {
float temp[3][3]; float temp[3][3];
@@ -278,9 +278,9 @@ float m7[][3], float m8[][3])
} }
void mul_serie_m4(float answ[][4], float m1[][4], void mul_serie_m4(float answ[][4], float m1[][4],
float m2[][4], float m3[][4], float m4[][4], float m2[][4], float m3[][4], float m4[][4],
float m5[][4], float m6[][4], float m7[][4], float m5[][4], float m6[][4], float m7[][4],
float m8[][4]) float m8[][4])
{ {
float temp[4][4]; float temp[4][4];

4
source/blender/blenlib/intern/math_rotation.c
View File

@@ -1178,7 +1178,7 @@ typedef struct RotOrderInfo {
/* Array of info for Rotation Order calculations /* Array of info for Rotation Order calculations
* WARNING: must be kept in same order as eEulerRotationOrders * WARNING: must be kept in same order as eEulerRotationOrders
*/ */
static RotOrderInfo rotOrders[]= { static RotOrderInfo rotOrders[] = {
/* i, j, k, n */ /* i, j, k, n */
{{0, 1, 2}, 0}, // XYZ {{0, 1, 2}, 0}, // XYZ
{{0, 2, 1}, 1}, // XZY {{0, 2, 1}, 1}, // XZY
@@ -1192,7 +1192,7 @@ static RotOrderInfo rotOrders[]= {
* NOTE: since we start at 1 for the values, but arrays index from 0, * NOTE: since we start at 1 for the values, but arrays index from 0,
* there is -1 factor involved in this process... * there is -1 factor involved in this process...
*/ */
#define GET_ROTATIONORDER_INFO(order) (assert(order>=0 && order<=6), (order < 1) ? &rotOrders[0] : &rotOrders[(order)-1]) #define GET_ROTATIONORDER_INFO(order) (assert(order >= 0 && order <= 6), (order < 1) ? &rotOrders[0] : &rotOrders[(order) - 1])
/* Construct quaternion from Euler angles (in radians). */ /* Construct quaternion from Euler angles (in radians). */
void eulO_to_quat(float q[4], const float e[3], const short order) void eulO_to_quat(float q[4], const float e[3], const short order)

4
source/blender/blenlib/intern/math_vector.c
View File

@@ -17,7 +17,7 @@
* *
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
* All rights reserved. * All rights reserved.
*
* The Original Code is: some of this file. * The Original Code is: some of this file.
* *
* ***** END GPL LICENSE BLOCK ***** * ***** END GPL LICENSE BLOCK *****
@@ -467,7 +467,7 @@ void negate_vn_vn(float *array_tar, const float *array_src, const int size)
const float *src = array_src + (size - 1); const float *src = array_src + (size - 1);
int i = size; int i = size;
while (i--) { while (i--) {
*(tar--) = - *(src--); *(tar--) = -*(src--);
} }
} }

2
source/blender/blenlib/intern/math_vector_inline.c
View File

@@ -17,7 +17,7 @@
* *
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
* All rights reserved. * All rights reserved.
*
* The Original Code is: some of this file. * The Original Code is: some of this file.
* *
* ***** END GPL LICENSE BLOCK ***** * ***** END GPL LICENSE BLOCK *****