Revision: 41594
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41594
Author: campbellbarton
Date: 2011-11-06 16:23:28 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
replace macros with bli math functions for nodes
Modified Paths:
--------------
trunk/blender/source/blender/nodes/composite/node_composite_util.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_blur.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_curves.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_filter.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_invert.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_normal.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_normalize.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_rgb.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_texture.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_zcombine.c
trunk/blender/source/blender/nodes/shader/node_shader_util.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_camera.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_geom.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_invert.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_material.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_normal.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_output.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_rgb.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_texture.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_bricks.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_image.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_invert.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_proc.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_texture.c
Modified: trunk/blender/source/blender/nodes/composite/node_composite_util.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/node_composite_util.c
2011-11-06 15:42:12 UTC (rev 41593)
+++ trunk/blender/source/blender/nodes/composite/node_composite_util.c
2011-11-06 16:23:28 UTC (rev 41594)
@@ -317,8 +317,8 @@
if(inbuf->rect_procedural) {
outbuf->rect_procedural= inbuf->rect_procedural;
- VECCOPY(outbuf->procedural_size,
inbuf->procedural_size);
- VECCOPY(outbuf->procedural_offset,
inbuf->procedural_offset);
+ copy_v3_v3(outbuf->procedural_size,
inbuf->procedural_size);
+ copy_v3_v3(outbuf->procedural_offset,
inbuf->procedural_offset);
outbuf->procedural_type= inbuf->procedural_type;
outbuf->node= inbuf->node;
return outbuf;
@@ -707,12 +707,12 @@
void do_copy_rgba(bNode *UNUSED(node), float *out, float *in)
{
- QUATCOPY(out, in);
+ copy_v4_v4(out, in);
}
void do_copy_rgb(bNode *UNUSED(node), float *out, float *in)
{
- VECCOPY(out, in);
+ copy_v3_v3(out, in);
out[3]= 1.0f;
}
@@ -723,7 +723,7 @@
void do_copy_a_rgba(bNode *UNUSED(node), float *out, float *in, float *fac)
{
- VECCOPY(out, in);
+ copy_v3_v3(out, in);
out[3]= *fac;
}
Modified:
trunk/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
===================================================================
---
trunk/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
2011-11-06 15:42:12 UTC (rev 41593)
+++
trunk/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
2011-11-06 16:23:28 UTC (rev 41594)
@@ -48,10 +48,10 @@
{
if(over[3]<=0.0f) {
- QUATCOPY(out, src);
+ copy_v4_v4(out, src);
}
else if(fac[0]==1.0f && over[3]>=1.0f) {
- QUATCOPY(out, over);
+ copy_v4_v4(out, over);
}
else {
float mul= 1.0f - fac[0]*over[3];
@@ -68,10 +68,10 @@
{
if(over[3]<=0.0f) {
- QUATCOPY(out, src);
+ copy_v4_v4(out, src);
}
else if(fac[0]==1.0f && over[3]>=1.0f) {
- QUATCOPY(out, over);
+ copy_v4_v4(out, over);
}
else {
float premul= fac[0]*over[3];
@@ -89,10 +89,10 @@
{
if(over[3]<=0.0f) {
- QUATCOPY(out, src);
+ copy_v4_v4(out, src);
}
else if(fac[0]==1.0f && over[3]>=1.0f) {
- QUATCOPY(out, over);
+ copy_v4_v4(out, over);
}
else {
NodeTwoFloats *ntf= node->storage;
Modified:
trunk/blender/source/blender/nodes/composite/nodes/node_composite_blur.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_blur.c
2011-11-06 15:42:12 UTC (rev 41593)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_blur.c
2011-11-06 16:23:28 UTC (rev 41594)
@@ -512,7 +512,7 @@
if(pix==1)
dest[0]= src[0];
else
- QUATCOPY(dest, src);
+ copy_v4_v4(dest, src);
}
else {
int minxr= x-refradx<0?-x:-refradx;
Modified:
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
===================================================================
---
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
2011-11-06 15:42:12 UTC (rev 41593)
+++
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
2011-11-06 16:23:28 UTC (rev 41594)
@@ -52,7 +52,7 @@
c=node->storage;
- VECCOPY(out, in);
+ copy_v3_v3(out, in);
if(
/* do hue last because it needs to wrap, and does some more checks */
Modified:
trunk/blender/source/blender/nodes/composite/nodes/node_composite_curves.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_curves.c
2011-11-06 15:42:12 UTC (rev 41593)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_curves.c
2011-11-06 16:23:28 UTC (rev 41594)
@@ -144,7 +144,7 @@
if(*fac>=1.0)
curvemapping_evaluate_premulRGBF(node->storage, out, in);
else if(*fac<=0.0) {
- VECCOPY(out, in);
+ copy_v3_v3(out, in);
}
else {
float col[4], mfac= 1.0f-*fac;
Modified:
trunk/blender/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
===================================================================
---
trunk/blender/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
2011-11-06 15:42:12 UTC (rev 41593)
+++
trunk/blender/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
2011-11-06 16:23:28 UTC (rev 41594)
@@ -60,7 +60,7 @@
/*average together the distances*/
difference=difference/3.0;
- VECCOPY(outColor, inColor1);
+ copy_v3_v3(outColor, inColor1);
/*make 100% transparent*/
if(difference < tolerence) {
Modified:
trunk/blender/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
===================================================================
---
trunk/blender/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
2011-11-06 15:42:12 UTC (rev 41593)
+++
trunk/blender/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
2011-11-06 16:23:28 UTC (rev 41594)
@@ -59,7 +59,7 @@
(c->key[1]-in[1])*(c->key[1]-in[1]) +
(c->key[2]-in[2])*(c->key[2]-in[2]));
- VECCOPY(out, in);
+ copy_v3_v3(out, in);
/*make 100% transparent */
if(distance < tolerence) {
Modified:
trunk/blender/source/blender/nodes/composite/nodes/node_composite_filter.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_filter.c
2011-11-06 15:42:12 UTC (rev 41593)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_filter.c
2011-11-06 16:23:28 UTC (rev 41594)
@@ -64,7 +64,7 @@
fp= out->rect + pix*y*rowlen;
if(pix==CB_RGBA) {
- QUATCOPY(fp, row2);
+ copy_v4_v4(fp, row2);
fp+= pix;
for(x=2; x<rowlen; x++) {
@@ -78,7 +78,7 @@
/* no alpha... will clear it completely */
fp++; row1++; row2++; row3++;
}
- QUATCOPY(fp, row2+4);
+ copy_v4_v4(fp, row2+4);
}
else if(pix==CB_VAL) {
fp+= pix;
@@ -138,7 +138,7 @@
fp[1]= row2[3];
}
else if(pixlen==3) {
- VECCOPY(fp, row2);
+ copy_v3_v3(fp, row2);
fp+= 3;
for(x=2; x<rowlen; x++) {
@@ -147,10 +147,10 @@
fp++; row1++; row2++; row3++;
}
}
- VECCOPY(fp, row2+3);
+ copy_v3_v3(fp, row2+3);
}
else {
- QUATCOPY(fp, row2);
+ copy_v4_v4(fp, row2);
fp+= 4;
for(x=2; x<rowlen; x++) {
@@ -159,7 +159,7 @@
fp++; row1++; row2++; row3++;
}
}
- QUATCOPY(fp, row2+4);
+ copy_v4_v4(fp, row2+4);
}
}
}
Modified:
trunk/blender/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
===================================================================
---
trunk/blender/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
2011-11-06 15:42:12 UTC (rev 41593)
+++
trunk/blender/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
2011-11-06 16:23:28 UTC (rev 41594)
@@ -64,7 +64,7 @@
out[3]= in[3];
}
else {
- QUATCOPY(out, in);
+ copy_v4_v4(out, in);
}
}
Modified:
trunk/blender/source/blender/nodes/composite/nodes/node_composite_invert.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_invert.c
2011-11-06 15:42:12 UTC (rev 41593)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_invert.c
2011-11-06 16:23:28 UTC (rev 41594)
@@ -50,7 +50,7 @@
out[1] = 1.0f - in[1];
out[2] = 1.0f - in[2];
} else
- VECCOPY(out, in);
+ copy_v3_v3(out, in);
if(node->custom1 & CMP_CHAN_A)
out[3] = 1.0f - in[3];
@@ -75,7 +75,7 @@
if(node->custom1 & CMP_CHAN_A)
col[3] = fac[0]*col[3] + (facm*in[3]);
- QUATCOPY(out, col);
+ copy_v4_v4(out, col);
}
static void node_composit_exec_invert(void *UNUSED(data), bNode *node,
bNodeStack **in, bNodeStack **out)
Modified:
trunk/blender/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
2011-11-06 15:42:12 UTC (rev 41593)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
2011-11-06 16:23:28 UTC (rev 41594)
@@ -47,12 +47,12 @@
{
float col[3];
- VECCOPY(col, in1);
+ copy_v3_v3(col, in1);
if(node->custom2)
ramp_blend(node->custom1, col, col+1, col+2, in2[3]*fac[0],
in2);
else
ramp_blend(node->custom1, col, col+1, col+2, fac[0], in2);
- VECCOPY(out, col);
+ copy_v3_v3(out, col);
out[3]= in1[3];
}
Modified:
trunk/blender/source/blender/nodes/composite/nodes/node_composite_normal.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_normal.c
2011-11-06 15:42:12 UTC (rev 41593)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_normal.c
2011-11-06 16:23:28 UTC (rev 41594)
@@ -64,7 +64,7 @@
/* input no image? then only vector op */
if(in[0]->data==NULL) {
- VECCOPY(out[0]->vec, nor);
+ copy_v3_v3(out[0]->vec, nor);
/* render normals point inside... the widget points outside */
out[1]->vec[0]= -dot_v3v3(out[0]->vec, in[0]->vec);
}
Modified:
trunk/blender/source/blender/nodes/composite/nodes/node_composite_normalize.c
===================================================================
---
trunk/blender/source/blender/nodes/composite/nodes/node_composite_normalize.c
2011-11-06 15:42:12 UTC (rev 41593)
+++
trunk/blender/source/blender/nodes/composite/nodes/node_composite_normalize.c
2011-11-06 16:23:28 UTC (rev 41594)
@@ -69,7 +69,7 @@
/* Input has no image buffer? Then pass the value */
if(in[0]->data==NULL) {
- QUATCOPY(out[0]->vec, in[0]->vec);
+ copy_v4_v4(out[0]->vec, in[0]->vec);
}
else {
float min = 1.0f+BLENDER_ZMAX;
Modified:
trunk/blender/source/blender/nodes/composite/nodes/node_composite_rgb.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_rgb.c
2011-11-06 15:42:12 UTC (rev 41593)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_rgb.c
2011-11-06 16:23:28 UTC (rev 41594)
@@ -55,7 +55,7 @@
bNodeSocket *sock= node->outputs.first;
float *col= ((bNodeSocketValueRGBA*)sock->default_value)->value;
- QUATCOPY(out[0]->vec, col);
+ copy_v4_v4(out[0]->vec, col);
}
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
