diff options
| author | Comment <tim@gray.(none)> | 2013-12-08 10:55:03 +0000 |
|---|---|---|
| committer | Comment <tim@gray.(none)> | 2013-12-08 10:55:03 +0000 |
| commit | 1d05d2380bb4f1fd265aef55744f432af38b08aa (patch) | |
| tree | 89c1c15497149951d4b99938ad932abde42eae14 /rotord/src/nodes_transform.h | |
| parent | e04516069c71a5a1e32e6a5fbf0eb5b86dcfc5a2 (diff) | |
switched signals to double and random to uint16
Diffstat (limited to 'rotord/src/nodes_transform.h')
| -rw-r--r-- | rotord/src/nodes_transform.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/rotord/src/nodes_transform.h b/rotord/src/nodes_transform.h index ea8f474..c4a29ea 100644 --- a/rotord/src/nodes_transform.h +++ b/rotord/src/nodes_transform.h @@ -17,12 +17,12 @@ namespace Rotor { //aspect: scaled or homogenous public: Transformer(){ - create_parameter("transformX","number","X transformation","Transform X",0.0f); - create_parameter("transformY","number","Y transformation","Transform Y",0.0f); + create_parameter("transformX","number","X transformation","Transform X",0.0); + create_parameter("transformY","number","Y transformation","Transform Y",0.0); create_parameter("originX","number","X transformation origin","Origin X",0.5f); create_parameter("originY","number","Y transformation origin","Origin Y",0.5f); - create_parameter("rotation","number","Rotation about origin","Rotation",0.0f); - create_parameter("scale","number","Scale about origin","Scale",1.0f); + create_parameter("rotation","number","Rotation about origin","Rotation",0.0); + create_parameter("scale","number","Scale about origin","Scale",1.0); create_attribute("filter","Filtering mode","Filter mode","linear",{"nearest","linear","area","cubic","lanczos"}); }; Image *transform(Image *in){ @@ -51,12 +51,12 @@ namespace Rotor { break; } - float tX=parameters["transformX"]->value; - float tY=parameters["transformY"]->value; - float oX=parameters["originX"]->value; - float oY=parameters["originY"]->value; - float r=(parameters["rotation"]->value/180)*3.1415926f; - float s=parameters["scale"]->value; + double tX=parameters["transformX"]->value; + double tY=parameters["transformY"]->value; + double oX=parameters["originX"]->value; + double oY=parameters["originY"]->value; + double r=(parameters["rotation"]->value/180)*3.1415926f; + double s=parameters["scale"]->value; //do opencv transform cv::Point2f srcTri[3], dstTri[3]; @@ -70,18 +70,18 @@ namespace Rotor { //using mipmaps: cv::Mat inter; - //int level=(int)ceil(log(1.0f/(s*((float)in.w/(float)image.w)))/log(2)); + //int level=(int)ceil(log(1.0/(s*((double)in.w/(double)image.w)))/log(2)); //if (s<1){ // if (s<.01) s=.01; - // float scalefac=((float)image.w/in->w)*s; + // double scalefac=((double)image.w/in->w)*s; // cv::resize(in->rgb,inter,cv::Size(in->w*scalefac,in->h*scalefac),s,s); //double fx=0, double fy=0, int interpolation=INTER_LINEAR )ΒΆ - // s=1.0f; + // s=1.0; //} //else { inter=in->rgb; - s=((float)image.w/in->w)*s; + s=((double)image.w/in->w)*s; //} // Compute matrix by creating triangle and transforming @@ -103,8 +103,8 @@ namespace Rotor { dstTri[i].x*=s; dstTri[i].y*=s; - float dx=(dstTri[i].x*cos(r))-(dstTri[i].y*sin(r)); - float dy=(dstTri[i].x*sin(r))+(dstTri[i].y*cos(r)); + double dx=(dstTri[i].x*cos(r))-(dstTri[i].y*sin(r)); + double dy=(dstTri[i].x*sin(r))+(dstTri[i].y*cos(r)); dstTri[i].x=dx; dstTri[i].y=dy; @@ -129,8 +129,8 @@ namespace Rotor { //trans_mat.resize(3); //rot_mat.resize(3); - //trans_mat.data[8]=1.0f; - //rot_mat.data[8]=1.0f; + //trans_mat.data[8]=1.0; + //rot_mat.data[8]=1.0; //out_mat=rot_mat*trans_mat; //out_mat.resize(2); |
