From 172737370633a30aec51f6abb938b0ea0478ff0a Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Mon, 18 Jun 2012 22:07:13 +0200 Subject: [PATCH] fix geometry tutorial about scalings. --- doc/C08_TutorialGeometry.dox | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/C08_TutorialGeometry.dox b/doc/C08_TutorialGeometry.dox index 5657dee85..b9e9eba12 100644 --- a/doc/C08_TutorialGeometry.dox +++ b/doc/C08_TutorialGeometry.dox @@ -52,10 +52,10 @@ AngleAxis aa(angle_in_radian, Vector3f(ax,ay,az));\endcode Quaternion q; q = AngleAxis(angle_in_radian, axis);\endcode N-D Scaling\code -Scaling(sx, sy) -Scaling(sx, sy, sz) -Scaling(s) -Scaling(vecN)\endcode +Scaling(sx, sy) +Scaling(sx, sy, sz) +Scaling(s) +Scaling(vecN)\endcode N-D Translation\code Translation(tx, ty) @@ -65,13 +65,13 @@ Translation(vecN)\endcode N-D \ref TutorialGeoTransform "Affine transformation"\code Transform t = concatenation_of_any_transformations; -Transform t = Translation3f(p) * AngleAxisf(a,axis) * Scaling3f(s);\endcode +Transform t = Translation3f(p) * AngleAxisf(a,axis) * Scaling(s);\endcode N-D Linear transformations \n (pure rotations, \n scaling, etc.)\code Matrix t = concatenation_of_rotations_and_scalings; -Matrix t = Rotation2Df(a) * Scaling2f(s); -Matrix t = AngleAxisf(a,axis) * Scaling3f(s);\endcode +Matrix t = Rotation2Df(a) * Scaling(s); +Matrix t = AngleAxisf(a,axis) * Scaling(s);\endcode Notes on rotations\n To transform more than a single vector the preferred @@ -93,8 +93,8 @@ Rotation2Df r; r = Matrix2f(..); // assumes a pure rotation matrix AngleAxisf aa; aa = Quaternionf(..); AngleAxisf aa; aa = Matrix3f(..); // assumes a pure rotation matrix Matrix2f m; m = Rotation2Df(..); -Matrix3f m; m = Quaternionf(..); Matrix3f m; m = Scaling3f(..); -Affine3f m; m = AngleAxis3f(..); Affine3f m; m = Scaling3f(..); +Matrix3f m; m = Quaternionf(..); Matrix3f m; m = Scaling(..); +Affine3f m; m = AngleAxis3f(..); Affine3f m; m = Scaling(..); Affine3f m; m = Translation3f(..); Affine3f m; m = Matrix3f(..); \endcode @@ -208,10 +208,10 @@ t.scale(s); t.prescale(Vector_(sx,sy,..)); t.prescale(s); \endcode\code -t *= Scaling_(sx,sy,..); -t *= Scaling_(s); -t = Scaling_(sx,sy,..) * t; -t = Scaling_(s) * t; +t *= Scaling(sx,sy,..); +t *= Scaling(s); +t = Scaling(sx,sy,..) * t; +t = Scaling(s) * t; \endcode Shear transformation \n ( \b 2D \b only ! )\code t.shear(sx,sy); @@ -225,7 +225,7 @@ Note that in both API, any many transformations can be concatenated in a single t.pretranslate(..).rotate(..).translate(..).scale(..); \endcode \code -t = Translation_(..) * t * RotationType(..) * Translation_(..) * Scaling_(..); +t = Translation_(..) * t * RotationType(..) * Translation_(..) * Scaling(..); \endcode