Fix text transform

.travis.yml

@@ -14,3 +14,9 @@ matrix:
       script:
         - cargo build --no-default-features
         - cargo test --verbose --all
+    - os: osx
+      script:
+        - cargo test --verbose --all
+    - os: windows
+      script:
+        - cargo test --verbose --all

Cargo.toml

@@ -18,7 +18,7 @@ lyon_geom = "0.15"
 pathfinder_geometry = { version = "0.5", optional = true }
 png = "0.16"
 typed-arena = "2.0"
-sw-composite = "0.7.10"
+sw-composite = "0.7.12"
 
 [features]
 default = ["text"]

src/draw_target.rs

@@ -775,8 +775,8 @@ impl DrawTarget {
             let bounds = font.raster_bounds(
                 *id,
                 point_size,
-                fk::Transform2F::row_major(self.transform.m11, self.transform.m12, self.transform.m21, self.transform.m22, 0., 0.)
-                    .translate(fk::vec2f(position.x, position.y)),
+                fk::Transform2F::row_major(self.transform.m11, self.transform.m21, self.transform.m12, self.transform.m22, self.transform.m31, self.transform.m32)
+                    * fk::Transform2F::from_translation(fk::vec2f(position.x, position.y)),
                 fk::HintingOptions::None,
                 fk::RasterizationOptions::GrayscaleAa,
             );
@@ -790,23 +790,21 @@ impl DrawTarget {
                 _ => panic!(),
             }
         }
+        //let combined_bounds: euclid::Rect<i32, euclid::UnknownUnit> = euclid::Rect::new(euclid::Point2D::new(0, 0),euclid::Size2D::new( self.width, self.height));
 
-        /*let mut canvas = Canvas::new(&euclid::Size2D::new(combined_bounds.size.width as u32,
-        combined_bounds.size.height as u32), Format::A8);*/
         let mut canvas = fk::Canvas::new(
             fk::vec2i(combined_bounds.size.width, combined_bounds.size.height),
             fk::Format::A8,
         );
         for (id, position) in ids.iter().zip(positions.iter()) {
-            let mut position = self.transform.transform_point(*position);
-            position.x -= combined_bounds.origin.x as f32;
-            position.y -= combined_bounds.origin.y as f32;
+            let adjust = fk::Transform2F::from_translation(fk::vec2f(-combined_bounds.origin.x as f32, -combined_bounds.origin.y as f32));
+            dbg!(fk::Transform2F::row_major(self.transform.m11, self.transform.m21, self.transform.m12, self.transform.m22, self.transform.m31, self.transform.m32));
             font.rasterize_glyph(
                 &mut canvas,
                 *id,
                 point_size,
-                fk::Transform2F::row_major(self.transform.m11, self.transform.m12, self.transform.m21, self.transform.m22, 0., 0.)
-                    .translate(fk::vec2f(position.x, position.y)),
+                adjust * fk::Transform2F::row_major(self.transform.m11, self.transform.m21, self.transform.m12, self.transform.m22, self.transform.m31, self.transform.m32)
+                    * fk::Transform2F::from_translation(fk::vec2f(position.x, position.y)),
                 fk::HintingOptions::None,
                 fk::RasterizationOptions::GrayscaleAa,
             ).unwrap();

src/tests.rs

@@ -956,4 +956,34 @@ mod tests {
             &checkerboard[..]
         );
     }
+
+    #[test]
+    fn text() {
+        let mut dt = DrawTarget::new(64, 1);
+        dt.fill_rect(0., 0., 800., 800., &WHITE_SOURCE, &DrawOptions::new());
+
+        dt.set_transform(&Transform::create_rotation(euclid::Angle::degrees(15.0)));
+        let font = font_kit::loader::Loader::from_file(&mut std::fs::File::open("res/Box3.ttf").unwrap(), 0).unwrap();
+        let black = Source::Solid(SolidSource {
+            r: 0,
+            g: 0,
+            b: 0,
+            a: 0xff,
+        });
+        dt.draw_text(
+            &font,
+            30.,
+            "3333",
+            Point::new(-20., 30.),
+            &black,
+            &DrawOptions::new(),
+        );
+
+        let white = 0xffffffff;
+        let black = 0xff000000;
+        let d = dt.get_data();
+        assert_eq!(d[0], white);
+        assert_eq!(d[42], black);
+        assert_eq!(d[62], white);
+    }
 }