Revision: 14828
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14828
Author: theeth
Date: 2008-05-13 15:20:47 +0200 (Tue, 13 May 2008)
Log Message:
-----------
Todo [#5743] Rotate dosnt work at high zoom
Fixed by only conditionally resetting the start of the triangle used to
calculate the angle to when an angle is actually measured (so really small
angle don't result in continuous deltas of 0 degree).
However, the smallest rotation angle is still limited by the precision of the
acos function (here: 0.02 degrees, 0.02 / 30 with Shift pressed).
Modified Paths:
--------------
trunk/blender/source/blender/src/transform.c
Modified: trunk/blender/source/blender/src/transform.c
===================================================================
--- trunk/blender/source/blender/src/transform.c 2008-05-13 10:19:28 UTC
(rev 14827)
+++ trunk/blender/source/blender/src/transform.c 2008-05-13 13:20:47 UTC
(rev 14828)
@@ -243,6 +243,41 @@
return Inpf(t->viewinv[1], vec) * 2.0f;
}
+float InputDeltaAngle(TransInfo *t, short mval[2])
+{
+ double dx2 = t->center2d[0] - mval[0];
+ double dy2 = t->center2d[1] - mval[1];
+ double B = sqrt(dx2*dx2+dy2*dy2);
+
+ double dx1 = t->center2d[0] - t->imval[0];
+ double dy1 = t->center2d[1] - t->imval[1];
+ double A = sqrt(dx1*dx1+dy1*dy1);
+
+ double dx3 = mval[0] - t->imval[0];
+ double dy3 = mval[1] - t->imval[1];
+
+ /* use doubles here, to make sure a "1.0" (no rotation) doesnt become
9.999999e-01, which gives 0.02 for acos */
+ double deler = ((dx1*dx1+dy1*dy1)+(dx2*dx2+dy2*dy2)-(dx3*dx3+dy3*dy3))
+ / (2.0 * (A*B?A*B:1.0));
+ /* (A*B?A*B:1.0f) this takes care of potential divide by zero errors */
+
+ float dphi;
+
+ dphi = saacos((float)deler);
+ if( (dx1*dy2-dx2*dy1)>0.0 ) dphi= -dphi;
+
+ if(t->flag & T_SHIFT_MOD) dphi = dphi/30.0f;
+
+ /* if no delta angle, don't update initial position */
+ if (dphi != 0)
+ {
+ t->imval[0] = mval[0];
+ t->imval[1] = mval[1];
+ }
+
+ return dphi;
+}
+
/* ************************** SPACE DEPENDANT CODE
**************************** */
void setTransformViewMatrices(TransInfo *t)
@@ -2584,23 +2619,6 @@
float final;
- double dx2 = t->center2d[0] - mval[0];
- double dy2 = t->center2d[1] - mval[1];
- double B = sqrt(dx2*dx2+dy2*dy2);
-
- double dx1 = t->center2d[0] - t->imval[0];
- double dy1 = t->center2d[1] - t->imval[1];
- double A = sqrt(dx1*dx1+dy1*dy1);
-
- double dx3 = mval[0] - t->imval[0];
- double dy3 = mval[1] - t->imval[1];
- /* use doubles here, to make sure a "1.0" (no rotation) doesnt
become 9.999999e-01, which gives 0.02 for acos */
- double deler=
((double)((dx1*dx1+dy1*dy1)+(dx2*dx2+dy2*dy2)-(dx3*dx3+dy3*dy3) ))
- / (2.0 * (A*B?A*B:1.0));
- /* (A*B?A*B:1.0f) this takes care of potential divide by zero errors */
-
- float dphi;
-
float axis[3];
float mat[3][3];
@@ -2608,29 +2626,14 @@
VecMulf(axis, -1.0f);
Normalize(axis);
- dphi = saacos((float)deler);
- if( (dx1*dy2-dx2*dy1)>0.0 ) dphi= -dphi;
+ t->fac += InputDeltaAngle(t, mval);
- if(t->flag & T_SHIFT_MOD) t->fac += dphi/30.0f;
- else t->fac += dphi;
-
- /*
- clamping angle between -2 PI and 2 PI (not sure if useful so commented
out - theeth)
- if (t->fac >= 2 * M_PI)
- t->fac -= 2 * M_PI;
- else if (t->fac <= -2 * M_PI)
- t->fac -= -2 * M_PI;
- */
-
final = t->fac;
applyNDofInput(&t->ndof, &final);
snapGrid(t, &final);
- t->imval[0] = mval[0];
- t->imval[1] = mval[1];
-
if (t->con.applyRot) {
t->con.applyRot(t, NULL, axis);
}
@@ -3097,37 +3100,14 @@
float final;
- double dx2 = t->center2d[0] - mval[0];
- double dy2 = t->center2d[1] - mval[1];
- double B = (float)sqrt(dx2*dx2+dy2*dy2);
+ t->fac += InputDeltaAngle(t, mval);
- double dx1 = t->center2d[0] - t->imval[0];
- double dy1 = t->center2d[1] - t->imval[1];
- double A = (float)sqrt(dx1*dx1+dy1*dy1);
-
- double dx3 = mval[0] - t->imval[0];
- double dy3 = mval[1] - t->imval[1];
-
- double deler= ((dx1*dx1+dy1*dy1)+(dx2*dx2+dy2*dy2)-(dx3*dx3+dy3*dy3))
- / (2 * A * B);
-
- float dphi;
-
- dphi = saacos((float)deler);
- if( (dx1*dy2-dx2*dy1)>0.0 ) dphi= -dphi;
-
- if(G.qual & LR_SHIFTKEY) t->fac += dphi/30.0f;
- else t->fac += dphi;
-
final = t->fac;
applyNDofInput(&t->ndof, &final);
snapGrid(t, &final);
- t->imval[0] = mval[0];
- t->imval[1] = mval[1];
-
if (hasNumInput(&t->num)) {
char c[20];
@@ -3899,36 +3879,12 @@
float final;
- double dx2 = t->center2d[0] - mval[0];
- double dy2 = t->center2d[1] - mval[1];
- double B = sqrt(dx2*dx2+dy2*dy2);
+ t->fac += InputDeltaAngle(t, mval);
- double dx1 = t->center2d[0] - t->imval[0];
- double dy1 = t->center2d[1] - t->imval[1];
- double A = sqrt(dx1*dx1+dy1*dy1);
-
- double dx3 = mval[0] - t->imval[0];
- double dy3 = mval[1] - t->imval[1];
- /* use doubles here, to make sure a "1.0" (no rotation) doesnt
become 9.999999e-01, which gives 0.02 for acos */
- double deler=
((double)((dx1*dx1+dy1*dy1)+(dx2*dx2+dy2*dy2)-(dx3*dx3+dy3*dy3) ))
- / (2.0 * (A*B?A*B:1.0));
- /* (A*B?A*B:1.0f) this takes care of potential divide by zero errors */
-
- float dphi;
-
- dphi = saacos((float)deler);
- if( (dx1*dy2-dx2*dy1)>0.0 ) dphi= -dphi;
-
- if(G.qual & LR_SHIFTKEY) t->fac += dphi/30.0f;
- else t->fac += dphi;
-
final = t->fac;
snapGrid(t, &final);
- t->imval[0] = mval[0];
- t->imval[1] = mval[1];
-
if (hasNumInput(&t->num)) {
char c[20];
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
