Revision: 18596
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18596
Author: theeth
Date: 2009-01-20 21:44:36 +0100 (Tue, 20 Jan 2009)
Log Message:
-----------
2.5
cleanup image window apsect ratio correction mess (still disabled, this just
cleans fonction call locations and name)
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/transform/transform.c
branches/blender2.5/blender/source/blender/editors/transform/transform.h
branches/blender2.5/blender/source/blender/editors/transform/transform_numinput.c
Modified:
branches/blender2.5/blender/source/blender/editors/transform/transform.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/transform/transform.c
2009-01-20 19:58:05 UTC (rev 18595)
+++ branches/blender2.5/blender/source/blender/editors/transform/transform.c
2009-01-20 20:44:36 UTC (rev 18596)
@@ -273,10 +273,8 @@
}
}
-void convertVecToDisplayNum(float *vec, float *num)
+void applyAspectRatio(TransInfo *t, float *vec)
{
- VECCOPY(num, vec);
-
#if 0 // TRANSFORM_FIX_ME
TransInfo *t = BIF_GetTransInfo();
@@ -287,24 +285,20 @@
int width, height;
transform_width_height_tface_uv(&width, &height);
- num[0] *= width;
- num[1] *= height;
+ vec[0] *= width;
+ vec[1] *= height;
}
transform_aspect_ratio_tface_uv(&aspx, &aspy);
- num[0] /= aspx;
- num[1] /= aspy;
+ vec[0] /= aspx;
+ vec[1] /= aspy;
}
#endif
}
-void convertDisplayNumToVec(float *num, float *vec)
+void removeAspectRatio(TransInfo *t, float *vec)
{
- VECCOPY(vec, num);
-
#if 0 // TRANSFORM_FIX_ME
- TransInfo *t = BIF_GetTransInfo();
-
if ((t->spacetype==SPACE_IMAGE) && (t->mode==TFM_TRANSLATION)) {
float aspx, aspy;
@@ -2828,16 +2822,18 @@
char tvec[60];
char distvec[20];
char autoik[20];
- float dvec[3];
float dist;
- convertVecToDisplayNum(vec, dvec);
-
if (hasNumInput(&t->num)) {
outputNumInput(&(t->num), tvec);
dist = VecLength(t->num.val);
}
else {
+ float dvec[3];
+
+ VECCOPY(dvec, vec);
+ applyAspectRatio(t, dvec);
+
dist = VecLength(vec);
sprintf(&tvec[0], "%.4f", dvec[0]);
sprintf(&tvec[20], "%.4f", dvec[1]);
@@ -2965,6 +2961,11 @@
applyNDofInput(&t->ndof, t->values);
snapGrid(t, t->values);
applyNumInput(&t->num, t->values);
+ if (hasNumInput(&t->num))
+ {
+ removeAspectRatio(t, t->values);
+ }
+
applySnapping(t, t->values);
headerTranslation(t, t->values, str);
}
Modified:
branches/blender2.5/blender/source/blender/editors/transform/transform.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/transform/transform.h
2009-01-20 19:58:05 UTC (rev 18595)
+++ branches/blender2.5/blender/source/blender/editors/transform/transform.h
2009-01-20 20:44:36 UTC (rev 18596)
@@ -352,8 +352,8 @@
void projectIntView(TransInfo *t, float *vec, int *adr);
void projectFloatView(TransInfo *t, float *vec, float *adr);
-void convertVecToDisplayNum(float *vec, float *num);
-void convertDisplayNumToVec(float *num, float *vec);
+void applyAspectRatio(TransInfo *t, float *vec);
+void removeAspectRatio(TransInfo *t, float *vec);
void initWarp(TransInfo *t);
int handleEventWarp(TransInfo *t, struct wmEvent *event);
Modified:
branches/blender2.5/blender/source/blender/editors/transform/transform_numinput.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/transform/transform_numinput.c
2009-01-20 19:58:05 UTC (rev 18595)
+++
branches/blender2.5/blender/source/blender/editors/transform/transform_numinput.c
2009-01-20 20:44:36 UTC (rev 18596)
@@ -132,8 +132,6 @@
float val[3];
if (hasNumInput(n)) {
- convertDisplayNumToVec(n->val, val);
-
for (j=0; j<=n->idx_max; j++) {
/* if AFFECTALL and no number typed and cursor not on
number, use first number */
if (n->flag & NUM_AFFECT_ALL && n->idx != j &&
n->ctrl[j] == 0)
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
