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

[Udo Giacomozzi]

CVSROOT:        /cvsroot/gnash
Module name:    gnash
Changes by:     Udo Giacomozzi <udog>   07/04/20 15:03:24

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

Log message:
        newly placed characters aren't masks

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2957&r2=1.2958
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.249&r2=1.250

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.2957
retrieving revision 1.2958
diff -u -b -r1.2957 -r1.2958
--- ChangeLog   20 Apr 2007 14:35:44 -0000      1.2957
+++ ChangeLog   20 Apr 2007 15:03:24 -0000      1.2958
@@ -2,6 +2,9 @@
 
        * backend/render_handler.h (getAveragePixel):
          fix computation of max x/y values.
+       * server/character.h: character are not masks by default
+       * server/character.h, server/sprite_instance.cpp: when placing
+         new characters, disable clip_depth (zero is a valid depth)    
 
 2007-04-20 Sandro Santilli <address@hidden>
 

Index: server/character.h
===================================================================
RCS file: /cvsroot/gnash/gnash/server/character.h,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- server/character.h  19 Apr 2007 17:41:35 -0000      1.70
+++ server/character.h  20 Apr 2007 15:03:24 -0000      1.71
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.h,v 1.70 2007/04/19 17:41:35 udog Exp $ */
+/* $Id: character.h,v 1.71 2007/04/20 15:03:24 udog Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -259,7 +259,7 @@
        m_id(id),
        m_depth(0),
        m_ratio(0.0f),
-       m_clip_depth(0),
+       m_clip_depth(noClipDepthValue),
        m_display_callback(NULL),
        m_display_callback_user_ptr(NULL),
        _unloaded(false),

Index: server/sprite_instance.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -b -r1.249 -r1.250
--- server/sprite_instance.cpp  20 Apr 2007 13:50:23 -0000      1.249
+++ server/sprite_instance.cpp  20 Apr 2007 15:03:24 -0000      1.250
@@ -1772,7 +1772,7 @@
                color_transform,
                matrix,
                0.0f,
-               0); 
+               character::noClipDepthValue); 
 
        return sprite;
 }
@@ -1806,7 +1806,7 @@
                cxform(),
                txt_matrix,
                0.0f,
-               0);
+               character::noClipDepthValue);
 
        static bool warned = false;
        if ( ! warned )
@@ -2606,7 +2606,7 @@
                cxform(),
                matrix(),
                1.0,
-               0);
+               character::noClipDepthValue);
 
        return true; // FIXME: check return from place_character above ?
 }