[Gnash-commit] gnash ChangeLog server/character.h server/gener...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/12 21:47:52

Modified files:
        .              : ChangeLog 
        server         : character.h generic_character.h 
                         sprite_instance.cpp 

Log message:
                * server/character.h: clarified semantic of get_width() and
                  get_height().
                * server/generic_character.h: fixed get_width() and get_height()
                  to return "local untransformed" size.
                * server/sprite_instance.cpp (get_member): fixed M_WIDTH and
                  M_HEIGHT members fetch using a plain call to get_width() and
                  get_height() [ only additionally adding twips_to_pixel 
transform]

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1177&r2=1.1178
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/server/generic_character.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.63&r2=1.64

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1177
retrieving revision 1.1178
diff -u -b -r1.1177 -r1.1178
--- ChangeLog   12 Oct 2006 21:22:33 -0000      1.1177
+++ ChangeLog   12 Oct 2006 21:47:52 -0000      1.1178
@@ -1,5 +1,12 @@
 2006-10-13 Sandro Santilli <address@hidden>
 
+       * server/character.h: clarified semantic of get_width() and
+         get_height().
+       * server/generic_character.h: fixed get_width() and get_height()
+         to return "local untransformed" size.
+       * server/sprite_instance.cpp (get_member): fixed M_WIDTH and
+         M_HEIGHT members fetch using a plain call to get_width() and
+         get_height() [ only additionally adding twips_to_pixel transform]
        * gui/gui.cpp: added IF_DEBUG_REGION_UPDATES and
          ENABLE_REGION_UPDATES_DEBUGGIN macros, for future
          compiletime + runtime conditional support.

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/character.h  12 Oct 2006 16:37:25 -0000      1.20
+++ server/character.h  12 Oct 2006 21:47:52 -0000      1.21
@@ -36,7 +36,7 @@
 //
 //
 
-/* $Id: character.h,v 1.20 2006/10/12 16:37:25 udog Exp $ */
+/* $Id: character.h,v 1.21 2006/10/12 21:47:52 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -203,14 +203,14 @@
     // Movie interfaces.  By default do nothing.  sprite_instance and some 
others override these.
     virtual void       display() {}
 
-       /// Returns height of this character in TWIPS
+       /// Returns local, untransformed height of this character in TWIPS
        virtual float   get_height() const
        {
                log_error("a character class didn't override get_height: %s", 
typeid(*this).name());
                return 0;
        }
 
-       /// Returns width of this character in TWIPS
+       /// Returns local, untransformed width of this character in TWIPS
        virtual float   get_width() const
        {
                log_error("a character class didn't override get_width: %s", 
typeid(*this).name());

Index: server/generic_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/generic_character.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/generic_character.h  12 Oct 2006 16:37:25 -0000      1.10
+++ server/generic_character.h  12 Oct 2006 21:47:52 -0000      1.11
@@ -89,16 +89,14 @@
 
     virtual float      get_height() const
        {
-           matrix      m = get_world_matrix();
-           float       h = m_def->get_height_local() * m.m_[1][1];
-           return h;
+               // Verified using samples/test_rotation.swf
+               return m_def->get_height_local();
        }
 
     virtual float      get_width() const
        {
-           matrix      m = get_world_matrix();
-           float       w = m_def->get_width_local() * m.m_[0][0];
-           return w;
+               // Verified using samples/test_rotation.swf
+               return m_def->get_width_local();
        }
 
     // new, from Vitaly.

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- server/sprite_instance.cpp  12 Oct 2006 16:37:25 -0000      1.63
+++ server/sprite_instance.cpp  12 Oct 2006 21:47:52 -0000      1.64
@@ -767,37 +767,16 @@
            val->set_bool(get_visible());
            return true;
        }
-       case M_WIDTH:
-           //else if (name == "_width")
+       case M_WIDTH: // _width
        {
-           matrix      m = get_world_matrix();
-           rect        transformed_rect;
-
-           // @@ not sure about this...
-           rect        source_rect;
-           source_rect.m_x_min = 0;
-           source_rect.m_y_min = 0;
-           source_rect.m_x_max = (float) get_width();
-           source_rect.m_y_max = (float) get_height();
-
-           transformed_rect.enclose_transformed_rect(get_world_matrix(), 
source_rect);
-           val->set_double(TWIPS_TO_PIXELS(transformed_rect.width()));
+           // Verified using samples/test_rotation.swf
+           val->set_double(TWIPS_TO_PIXELS(get_width()));
            return true;
        }
-       case M_HEIGHT:
-           //else if (name == "_height")
+       case M_HEIGHT: // _height
        {
-           rect        transformed_rect;
-
-           // @@ not sure about this...
-           rect        source_rect;
-           source_rect.m_x_min = 0;
-           source_rect.m_y_min = 0;
-           source_rect.m_x_max = (float) get_width();
-           source_rect.m_y_max = (float) get_height();
-
-           transformed_rect.enclose_transformed_rect(get_world_matrix(), 
source_rect);
-           val->set_double(TWIPS_TO_PIXELS(transformed_rect.height()));
+           // Verified using samples/test_rotation.swf
+           val->set_double(TWIPS_TO_PIXELS(get_height()));
            return true;
        }
        case M_ROTATION: