summaryrefslogtreecommitdiff
path: root/host/simu/inter
diff options
context:
space:
mode:
authorNicolas Schodet2011-04-29 20:35:20 +0200
committerNicolas Schodet2011-04-29 20:35:20 +0200
commit9c9f35753489cba5a61816104ac294857be20941 (patch)
treeba36dbe8fda70ca491fc499128c6f317c532cbc7 /host/simu/inter
parentde2a1e81eef5054725ae218afaf51dc8e06dedd0 (diff)
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.
Diffstat (limited to 'host/simu/inter')
-rw-r--r--host/simu/inter/inter.py2
-rw-r--r--host/simu/inter/test/test_drawable.py4
2 files changed, 3 insertions, 3 deletions
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 ()