From a37ea917bec9deeb52880d574e16b93a800f221d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Tue, 30 Aug 2005 09:57:37 +0000 Subject: [PATCH] RotationBy now accepts radians, to be consistent among methods git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14087 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/drawing/Painter/Transformable.cpp | 6 +++--- src/servers/app/drawing/Painter/Transformable.h | 2 +- .../app/drawing/Painter/font_support/AGGTextRenderer.cpp | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/servers/app/drawing/Painter/Transformable.cpp b/src/servers/app/drawing/Painter/Transformable.cpp index 7dd178d572..308fad512a 100644 --- a/src/servers/app/drawing/Painter/Transformable.cpp +++ b/src/servers/app/drawing/Painter/Transformable.cpp @@ -280,11 +280,11 @@ Transformable::TranslateBy(BPoint offset) // RotateBy void -Transformable::RotateBy(BPoint origin, double degrees) +Transformable::RotateBy(BPoint origin, double radians) { - if (degrees != 0.0) { + if (radians != 0.0) { multiply(agg::trans_affine_translation(-origin.x, -origin.y)); - multiply(agg::trans_affine_rotation(degrees * (PI / 180.0))); + multiply(agg::trans_affine_rotation(radians)); multiply(agg::trans_affine_translation(origin.x, origin.y)); TransformationChanged(); } diff --git a/src/servers/app/drawing/Painter/Transformable.h b/src/servers/app/drawing/Painter/Transformable.h index e5afe95a3d..b4c8a45385 100644 --- a/src/servers/app/drawing/Painter/Transformable.h +++ b/src/servers/app/drawing/Painter/Transformable.h @@ -55,7 +55,7 @@ class Transformable : public BArchivable, // some convenience functions virtual void TranslateBy(BPoint offset); - virtual void RotateBy(BPoint origin, double degrees); + virtual void RotateBy(BPoint origin, double radians); virtual void ScaleBy(BPoint origin, double xScale, double yScale); virtual void ShearBy(BPoint origin, double xShear, double yShear); diff --git a/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp b/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp index a118eb8552..80a0e0214a 100644 --- a/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp +++ b/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp @@ -82,9 +82,8 @@ AGGTextRenderer::SetFont(const ServerFont &font) bool success = true; // construct an embedded transformation (rotate & shear) Transformable transform; -// TODO: check if Transformable::ShearBy should accept degrees instead of radians transform.ShearBy(B_ORIGIN, (90.0 - font.Shear()) * PI / 180.0, 0.0); - transform.RotateBy(B_ORIGIN, -font.Rotation()); + transform.RotateBy(B_ORIGIN, -font.Rotation() * PI / 180.0); bool load = font.GetFamilyAndStyle() != fLastFamilyAndStyle || transform != fEmbeddedTransformation;