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

Various Transform bugfixes.

Browse Source 
- Trackball rotate was missing the NoConstraints flag
- Zooming didn't recalculate the 2D center correctly
- Zooming in transform was sending event to the 3D window even when working on UVs. (disabled when working on UVs for now, will need to send events to a 2D window handler eventually)
- In camera mode, when the selection was exactly on the camera, initgrabz was barfing, fallback to 1.0 now, which gives ok results.
This commit is contained in:
Martin Poirier
2005-09-24 18:00:32 +00:00
parent 8b7c690a0b
commit 6e94b02616
4 changed files with 46 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
source/blender/src/transform_generics.c
View File

@@ -555,25 +555,14 @@ void restoreTransObjects(TransInfo *t)
restoreElement(td);
}
recalcData(t);
}
}
void calculateCenterCursor(TransInfo *t)
void calculateCenter2D(TransInfo *t)
{
float *cursor;
cursor = give_cursor();
VECCOPY(t->center, cursor);
if(t->flag & (T_EDIT|T_POSE)) {
if (t->flag & (T_EDIT|T_POSE)) {
Object *ob= G.obedit?G.obedit:t->poseobj;
float mat[3][3], imat[3][3];
float vec[3];
VecSubf(t->center, t->center, ob->obmat[3]);
Mat3CpyMat4(mat, ob->obmat);
Mat3Inv(imat, mat);
Mat3MulVecfl(imat, t->center);
VECCOPY(vec, t->center);
Mat4MulVecfl(ob->obmat, vec);
projectIntView(t, vec, t->center2d);
@@ -583,6 +572,27 @@ void calculateCenterCursor(TransInfo *t)
}
}
void calculateCenterCursor(TransInfo *t)
{
float *cursor;
cursor = give_cursor();
VECCOPY(t->center, cursor);
/* If edit or pose mode, move cursor in local space */
if(t->flag & (T_EDIT|T_POSE)) {
Object *ob= G.obedit?G.obedit:t->poseobj;
float mat[3][3], imat[3][3];
VecSubf(t->center, t->center, ob->obmat[3]);
Mat3CpyMat4(mat, ob->obmat);
Mat3Inv(imat, mat);
Mat3MulVecfl(imat, t->center);
}
calculateCenter2D(t);
}
void calculateCenterMedian(TransInfo *t)
{
float partial[3] = {0.0f, 0.0f, 0.0f};
@@ -602,17 +612,7 @@ void calculateCenterMedian(TransInfo *t)
VecMulf(partial, 1.0f / i);
VECCOPY(t->center, partial);
if (t->flag & (T_EDIT|T_POSE)) {
Object *ob= G.obedit?G.obedit:t->poseobj;
float vec[3];
VECCOPY(vec, t->center);
Mat4MulVecfl(ob->obmat, vec);
projectIntView(t, vec, t->center2d);
}
else {
projectIntView(t, t->center, t->center2d);
}
calculateCenter2D(t);
}
void calculateCenterBound(TransInfo *t)
@@ -641,17 +641,7 @@ void calculateCenterBound(TransInfo *t)
VecAddf(t->center, min, max);
VecMulf(t->center, 0.5);
if (t->flag & (T_EDIT|T_POSE)) {
Object *ob= G.obedit?G.obedit:t->poseobj;
float vec[3];
VECCOPY(vec, t->center);
Mat4MulVecfl(ob->obmat, vec);
projectIntView(t, vec, t->center2d);
}
else {
projectIntView(t, t->center, t->center2d);
}
calculateCenter2D(t);
}
void calculateCenter(TransInfo *t)