diff options
Diffstat (limited to 'source/blender/nodes/composite')
6 files changed, 16 insertions, 15 deletions
diff --git a/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c b/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c index 9aadfdf363b..0005d9d2cc9 100644 --- a/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c +++ b/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c @@ -102,7 +102,7 @@ static void do_chroma_key(bNode *node, float *out, float *in) z=in[2]*cosf(theta)-in[1]*sinf(theta); /*if within the acceptance angle */ - angle=c->t1*(float)M_PI/180.0f; /* convert to radians */ + angle=c->t1; /* t1 is radians. */ /* if kfg is <0 then the pixel is outside of the key color */ kfg= x-(fabsf(z)/tanf(angle/2.0f)); @@ -115,7 +115,7 @@ static void do_chroma_key(bNode *node, float *out, float *in) alpha=(1.0f-kfg)*(c->fstrength); beta=atan2(z,x); - angle2=c->t2*(float)(M_PI/180.0); + angle2=c->t2; /* t2 is radians. */ /* if beta is within the cutoff angle */ if(fabsf(beta) < (angle2/2.0f)) { @@ -180,8 +180,8 @@ static void node_composit_init_chroma_matte(bNodeTree *UNUSED(ntree), bNode* nod { NodeChroma *c= MEM_callocN(sizeof(NodeChroma), "node chroma"); node->storage= c; - c->t1= 30.0f; - c->t2= 10.0f; + c->t1= DEG2RADF(30.0f); + c->t2= DEG2RADF(10.0f); c->t3= 0.0f; c->fsize= 0.0f; c->fstrength= 1.0f; diff --git a/source/blender/nodes/composite/nodes/node_composite_defocus.c b/source/blender/nodes/composite/nodes/node_composite_defocus.c index 9b32e0f6f3f..515d24dcc51 100644 --- a/source/blender/nodes/composite/nodes/node_composite_defocus.c +++ b/source/blender/nodes/composite/nodes/node_composite_defocus.c @@ -58,8 +58,9 @@ typedef struct BokehCoeffs { static void makeBokeh(char bktype, char ro, int* len_bkh, float* inradsq, BokehCoeffs BKH[8], float bkh_b[4]) { float x0, x1, y0, y1, dx, dy, iDxy; - float w = MAX2(1e-5f, ro)*(float)(M_PI/180); // never reported stangely enough, but a zero offset causes missing center line... - float wi = (360.f/bktype)*(float)(M_PI/180); + /* ro now is in radians. */ + float w = MAX2(1e-6f, ro); // never reported stangely enough, but a zero offset causes missing center line... + float wi = DEG2RADF(360.f/bktype); int i, ov, nv; // bktype must be at least 3 & <= 8 @@ -862,7 +863,7 @@ static void node_composit_init_defocus(bNodeTree *UNUSED(ntree), bNode* node, bN /* qdn: defocus node */ NodeDefocus *nbd = MEM_callocN(sizeof(NodeDefocus), "node defocus data"); nbd->bktype = 0; - nbd->rotation = 0.f; + nbd->rotation = 0.0f; nbd->preview = 1; nbd->gamco = 0; nbd->samples = 16; diff --git a/source/blender/nodes/composite/nodes/node_composite_directionalblur.c b/source/blender/nodes/composite/nodes/node_composite_directionalblur.c index 802ef2d8e12..04610150356 100644 --- a/source/blender/nodes/composite/nodes/node_composite_directionalblur.c +++ b/source/blender/nodes/composite/nodes/node_composite_directionalblur.c @@ -47,7 +47,7 @@ static CompBuf *dblur(bNode *node, CompBuf *img, int iterations, int wrap, { if ((dist != 0.f) || (spin != 0.f) || (zoom != 0.f)) { void (*getpix)(CompBuf*, float, float, float*) = wrap ? qd_getPixelLerpWrap : qd_getPixelLerp; - const float a= angle * (float)M_PI / 180.f; + const float a= angle; const float itsc= 1.f / powf(2.f, (float)iterations); float D; float center_x_pix, center_y_pix; @@ -65,7 +65,7 @@ static CompBuf *dblur(bNode *node, CompBuf *img, int iterations, int wrap, tx= itsc * D * cosf(a); ty= -itsc * D * sinf(a); sc= itsc * zoom; - rot= itsc * spin * (float)M_PI / 180.f; + rot= itsc * spin; /* blur the image */ for(i= 0; i < iterations; ++i) { diff --git a/source/blender/nodes/composite/nodes/node_composite_glare.c b/source/blender/nodes/composite/nodes/node_composite_glare.c index b7cc1d3c92d..296ad2e3a5b 100644 --- a/source/blender/nodes/composite/nodes/node_composite_glare.c +++ b/source/blender/nodes/composite/nodes/node_composite_glare.c @@ -238,7 +238,7 @@ static void streaks(NodeGlare* ndg, CompBuf* dst, CompBuf* src) int x, y, n; unsigned int nump=0; fRGB c1, c2, c3, c4; - float a, ang = 360.f/(float)ndg->angle; + float a, ang = DEG2RADF(360.0f)/(float)ndg->angle; bsrc = BTP(src, ndg->threshold, 1 << ndg->quality); tsrc = dupalloc_compbuf(bsrc); // sample from buffer @@ -246,8 +246,8 @@ static void streaks(NodeGlare* ndg, CompBuf* dst, CompBuf* src) sbuf = alloc_compbuf(tsrc->x, tsrc->y, tsrc->type, 1); // streak sum buffer - for (a=0.f; a<360.f; a+=ang) { - const float an = (a + (float)ndg->angle_ofs)*(float)M_PI/180.f; + for (a=0.f; a<DEG2RADF(360.0f); a+=ang) { + const float an = a + ndg->angle_ofs; const float vx = cos((double)an), vy = sin((double)an); for (n=0; n<ndg->iter; ++n) { const float p4 = pow(4.0, (double)n); @@ -483,7 +483,7 @@ static void node_composit_init_glare(bNodeTree *UNUSED(ntree), bNode* node, bNod ndg->mix = 0; ndg->threshold = 1; ndg->angle = 4; - ndg->angle_ofs = 0; + ndg->angle_ofs = 0.0f; ndg->fade = 0.9; ndg->size = 8; node->storage = ndg; diff --git a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c index 8411de39353..05d13f346f3 100644 --- a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c +++ b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c @@ -118,7 +118,7 @@ static void storage_free(bNode *node) node->storage= NULL; } -void storage_copy(bNode *orig_node, bNode *new_node) +static void storage_copy(bNode *orig_node, bNode *new_node) { if(orig_node->storage) new_node->storage= BKE_tracking_distortion_copy(orig_node->storage); diff --git a/source/blender/nodes/composite/nodes/node_composite_rotate.c b/source/blender/nodes/composite/nodes/node_composite_rotate.c index 730c53a1a29..d02602c7d04 100644 --- a/source/blender/nodes/composite/nodes/node_composite_rotate.c +++ b/source/blender/nodes/composite/nodes/node_composite_rotate.c @@ -58,7 +58,7 @@ static void node_composit_exec_rotate(void *UNUSED(data), bNode *node, bNodeStac int x, y, yo, xo; ImBuf *ibuf, *obuf; - rad= ((float)M_PI*in[1]->vec[0])/180.0f; + rad= in[1]->vec[0]; s= sin(rad); |