lili/opennurbs
1
0
Fork 0
mirror of https://github.com/mcneel/opennurbs.git synced 2026-03-01 03:26:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update source to v6.14.19098.19271

Browse Source
This commit is contained in:
Will Pearson
2019-04-09 10:17:14 -07:00
parent 98797aac6e
commit f2dc7fba67
97 changed files with 10406 additions and 7766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
opennurbs_textobject.cpp
View File

@@ -315,7 +315,16 @@ bool ON_Text::GetTextXform(
ON_Xform tp2sxf; // Text point to view plane rotation
ON_3dVector view_z = ON_CrossProduct(view_x, view_y);
ON_3dPoint text_point_3d = Plane().origin;
rotation_xf.Rotation(text_point_3d, textobjectplane.xaxis, textobjectplane.yaxis, textobjectplane.zaxis, text_point_3d, view_x, view_y, view_z);
ON_3dVector text_xdir = textobjectplane.xaxis;
ON_3dVector text_ydir = textobjectplane.yaxis;
ON_3dVector text_zdir = textobjectplane.zaxis;
if (nullptr != model_xform)
{
text_xdir.Transform(*model_xform);
text_ydir.Transform(*model_xform);
text_zdir.Transform(*model_xform);
}
rotation_xf.Rotation(text_point_3d, text_xdir, text_ydir, text_zdir, text_point_3d, view_x, view_y, view_z);
text_xform_out = wcs2obj_xf * textscale_xf;
text_xform_out = rotation_xf * text_xform_out;
return true;
@@ -325,8 +334,8 @@ bool ON_Text::GetTextXform(
double textrotation = TextRotationRadians();
if (fabs(textrotation) > ON_SQRT_EPSILON)
rotation_xf.Rotation(textrotation, ON_3dVector::ZAxis, ON_3dPoint::Origin); // Text rotation
ON_Xform textcenter_xf(ON_Xform::IdentityTransformation);
//ON_Xform textcenter_xf(ON_Xform::IdentityTransformation);
if (dimstyle->DrawForward())
{
// Check if the text is right-reading by comparing
@@ -367,7 +376,7 @@ bool ON_Text::GetTextXform(
}
text_xform_out = textscale_xf;
text_xform_out = rotation_xf * text_xform_out;
text_xform_out = textcenter_xf * text_xform_out;
//text_xform_out = textcenter_xf * text_xform_out;
text_xform_out = wcs2obj_xf * text_xform_out;
return true;