[Gnash-commit] gnash ChangeLog server/parser/morph2_character_...

[Zou Lunkai]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Zou Lunkai <zoulunkai>  07/06/14 08:23:15

Modified files:
        .              : ChangeLog 
        server/parser  : morph2_character_def.h 

Log message:
        implement get_bound() for morphs

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3536&r2=1.3537
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/morph2_character_def.h?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3536
retrieving revision 1.3537
diff -u -b -r1.3536 -r1.3537
--- ChangeLog   14 Jun 2007 07:17:10 -0000      1.3536
+++ ChangeLog   14 Jun 2007 08:23:14 -0000      1.3537
@@ -1,3 +1,8 @@
+2007-06-14 Zou Lunkai <address@hidden>
+
+       * server/parser/morph2_character_def.h: implement a get_bound() for
+         morphs, should fix an old displaying problem of morphs.
+         
 2007-06-14 Hubert Figuiere <address@hidden>
 
        * Makefile.am, configure.ac: look for freetype2, not freetype

Index: server/parser/morph2_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/morph2_character_def.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/parser/morph2_character_def.h        26 Aug 2006 10:14:51 -0000      
1.1
+++ server/parser/morph2_character_def.h        14 Jun 2007 08:23:14 -0000      
1.2
@@ -23,6 +23,16 @@
                virtual void    display(character* inst);
                void lerp_matrix(matrix& t, const matrix& m1, const matrix& m2, 
const float ratio);
 
+               // Question: What is the bound of a morph? Is this conceptually 
correct?
+               /// TODO: optimize this by take ratio into consideration, to 
decrease some
+               /// invalidated area when rendering morphs
+               virtual const rect&     get_bound() const 
+               { 
+                       m_bound.expand_to_rect(m_shape1->m_bound);
+                       m_bound.expand_to_rect(m_shape2->m_bound);
+                       return m_bound;
+               }
+
        private:
                shape_character_def* m_shape1;
                shape_character_def* m_shape2;
@@ -31,6 +41,7 @@
                int line_style_count;
                float m_last_ratio;
                mesh_set*       m_mesh;
+               mutable rect m_bound;
        };
 }