From 9c9f35753489cba5a61816104ac294857be20941 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Fri, 29 Apr 2011 20:35:20 +0200 Subject: host/simu: transpose transformation matrix, reverse transformation order This is better because transformations can be built incrementally from the container to the contained. This use the same semantic as OpenGL. --- host/simu/inter/inter.py | 2 +- host/simu/inter/test/test_drawable.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'host/simu/inter') diff --git a/host/simu/inter/inter.py b/host/simu/inter/inter.py index b8a889e5..8623885f 100644 --- a/host/simu/inter/inter.py +++ b/host/simu/inter/inter.py @@ -58,8 +58,8 @@ class ActuatorView (DrawableCanvas): self.resize (1, self.size, 0, self.size / 2) self.configure (width = self.UNIT, height = self.UNIT * self.size) d = Drawable (self) - d.trans_scale (1.0 / width) d.trans_translate ((0, - self.size + ratio / 2)) + d.trans_scale (1.0 / width) return d class Inter (Frame): diff --git a/host/simu/inter/test/test_drawable.py b/host/simu/inter/test/test_drawable.py index b977d36e..a9c1bfef 100644 --- a/host/simu/inter/test/test_drawable.py +++ b/host/simu/inter/test/test_drawable.py @@ -49,9 +49,9 @@ class App (DrawableCanvas): # Real user should reset at each redraw. self.after (500, self.animate) self.test.draw () - self.test.trans_rotate (-pi/12) - self.test.trans_translate ((10, 10)) self.test.trans_scale (1.05) + self.test.trans_translate ((10, 10)) + self.test.trans_rotate (-pi/12) self.i += 1 if self.i == 10: self.test.reset () -- cgit v1.2.3