[Gnash-commit] /srv/bzr/gnash/trunk r9791: Add info about corrispondence between gnash::matrix and flash.geom.Matrix

[Sandro Santilli]

------------------------------------------------------------
revno: 9791
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Fri 2008-09-19 16:56:45 +0200
message:
  Add info about corrispondence between gnash::matrix and flash.geom.Matrix
modified:
  libcore/matrix.h
  testsuite/actionscript.all/MovieClip.as
    ------------------------------------------------------------
    revno: 9789.1.2
    committer: Sandro Santilli <address@hidden>
    branch nick: mybranch
    timestamp: Fri 2008-09-19 16:55:40 +0200
    message:
      Add info about which flash.geom.Matrix field correspond to which 
gnash::matrix member
    modified:
      libcore/matrix.h
    ------------------------------------------------------------
    revno: 9789.1.3
    committer: Sandro Santilli <address@hidden>
    branch nick: mybranch
    timestamp: Fri 2008-09-19 16:56:17 +0200
    message:
      fix expected result
    modified:
      testsuite/actionscript.all/MovieClip.as

=== modified file 'libcore/matrix.h'
--- a/libcore/matrix.h  2008-08-26 12:26:38 +0000
+++ b/libcore/matrix.h  2008-09-19 14:55:40 +0000
@@ -53,12 +53,23 @@
 {
 public:
 
-    int sx;  // Xscale, 16.16 fixed point. xx in swfdec.
-    int shx; // Xshear, 16.16 fixed point. yx in swfdec.
-    int tx;  // Xtranslation, TWIPS. x0 in swfdec.
-    int sy;  // Yscale, 16.16 fixed point. yy in swfdec.
-    int shy; // Yshear, 16.16 fixed point. xy in swfdec.
-    int ty;  // Ytranslation, TWIPS. y0 in swfdec.
+    /// Xscale, 16.16 fixed point. xx in swfdec. 'a' in AS Matrix.
+    int sx; 
+
+    /// Xshear, 16.16 fixed point. yx in swfdec. 'b' in AS Matrix.
+    int shx;
+
+    /// Xtranslation, TWIPS. x0 in swfdec. 'tx' in AS Matrix.
+    int tx; 
+
+    /// Yscale, 16.16 fixed point. yy in swfdec. 'd' in AS Matrix.
+    int sy; 
+
+    /// Yshear, 16.16 fixed point. xy in swfdec. 'c' in AS Matrix.
+    int shy;
+
+    /// Ytranslation, TWIPS. y0 in swfdec. 'ty' in AS Matrix.
+    int ty; 
              
     friend bool operator== (const matrix&, const matrix&);
     friend std::ostream& operator<< (std::ostream&, const matrix&);

=== modified file 'testsuite/actionscript.all/MovieClip.as'
--- a/testsuite/actionscript.all/MovieClip.as   2008-09-19 11:40:44 +0000
+++ b/testsuite/actionscript.all/MovieClip.as   2008-09-19 14:56:17 +0000
@@ -1347,7 +1347,7 @@
 
 oldTransform = _root.transform;
 check(oldTransform === oldTransform); 
-check(oldTransform != _root.transform); // everytime transform is accessed, 
it's a new object!
+xcheck(oldTransform != _root.transform); // everytime transform is accessed, 
it's a new object!
 
 Matrix = flash.geom.Matrix;
 xcheck(_root.transform instanceOf Object);