[Gnash-commit] gnash ./ChangeLog server/Makefile.am server/Obj...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Sandro Santilli <address@hidden>        06/05/07 19:40:43

Modified files:
        .              : ChangeLog 
        server         : Makefile.am Object.h button.h gnash.h impl.cpp 
                         impl.h morph2.cpp movie_def_impl.cpp 
                         movie_def_impl.h shape.cpp shape.h styles.h 
Added files:
        server         : bitmap_character_def.h character_def.h 
                         generic_character.h ref_counted.h resource.h 

Log message:
        new class files for bitmap_character_def, character_def,
        generic_character, ref_counted and resource

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.268&tr2=1.269&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Makefile.am.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Object.h.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/bitmap_character_def.h?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/button.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/character_def.h?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/generic_character.h?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/gnash.h.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/impl.cpp.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/impl.h.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/morph2.cpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/movie_def_impl.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/movie_def_impl.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/ref_counted.h?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/resource.h?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/shape.cpp.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/shape.h.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/styles.h.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.268 gnash/ChangeLog:1.269
--- gnash/ChangeLog:1.268       Sun May  7 15:33:08 2006
+++ gnash/ChangeLog     Sun May  7 19:40:43 2006
@@ -12,6 +12,15 @@
 
 2006-05-07 Sandro Santilli <address@hidden>
 
+        * server/Makefile.am, server/Object.h,
+        server/bitmap_character_def.h, server/button.h,
+        server/character_def.h, server/generic_character.h,
+        server/gnash.h, server/impl.cpp, server/impl.h, server/morph2.cpp,
+        server/movie_def_impl.cpp, server/movie_def_impl.h,
+        server/ref_counted.h, server/resource.h, server/shape.cpp,
+        server/shape.h, server/styles.h: new class files for
+       bitmap_character_def, character_def, generic_character,
+       ref_counted and resource
        * renamed Movie.{h,cpp} to MovieClip.{h,cpp}
        * server/Makefile.am, server/Movie.cpp, server/Movie.h,
        server/Sprite.cpp, server/Sprite.h,
Index: gnash/server/Makefile.am
diff -u gnash/server/Makefile.am:1.32 gnash/server/Makefile.am:1.33
--- gnash/server/Makefile.am:1.32       Sun May  7 12:19:06 2006
+++ gnash/server/Makefile.am    Sun May  7 19:40:43 2006
@@ -159,6 +159,9 @@
        array.h         \
        button.h        \
        dlist.h         \
+       character_def.h \
+       generic_character.h     \
+       bitmap_character_def.h  \
        font.h          \
        fontlib.h       \
        Global.h        \
@@ -176,6 +179,8 @@
        movie_root.h    \
        network.h       \
        Object.h        \
+       resource.h      \
+       ref_counted.h   \
        render.h        \
        shape.h         \
        shm.h           \
Index: gnash/server/Object.h
diff -u gnash/server/Object.h:1.9 gnash/server/Object.h:1.10
--- gnash/server/Object.h:1.9   Thu Apr 27 16:31:56 2006
+++ gnash/server/Object.h       Sun May  7 19:40:43 2006
@@ -43,6 +43,7 @@
 #endif
 
 #include "container.h"
+#include "resource.h" // for inheritance of as_object
 #include "smart_ptr.h"
 
 namespace gnash {
@@ -439,34 +440,6 @@
        void set_member_flags(const as_prop_flags &flags)  { m_flags = flags; }
 };
 
-/// For stuff that's tricky to keep track of w/r/t ownership & cleanup.
-class ref_counted
-{
-       mutable int     m_ref_count;
-       mutable weak_proxy*     m_weak_proxy;
-public:
-       ref_counted();
-       virtual ~ref_counted();
-       void    add_ref() const;
-       void    drop_ref() const;
-       int     get_ref_count() const { return m_ref_count; }
-       weak_proxy*     get_weak_proxy() const;
-};
-
-
-/// An interface for casting to different types of resources.
-struct resource : public ref_counted
-{
-       virtual ~resource() {}
-       
-       // Override in derived classes that implement corresponding interfaces.
-       virtual font*   cast_to_font() { return 0; }
-       virtual character_def*  cast_to_character_def() { return 0; }
-       virtual sound_sample*   cast_to_sound_sample() { return 0; }
-};
-
-
-
 /// \brief
 /// A generic bag of attributes. Base class for all ActionScript-able objects.
 //
Index: gnash/server/button.h
diff -u gnash/server/button.h:1.3 gnash/server/button.h:1.4
--- gnash/server/button.h:1.3   Sun Feb 26 21:44:53 2006
+++ gnash/server/button.h       Sun May  7 19:40:43 2006
@@ -11,6 +11,7 @@
 
 
 #include "impl.h"
+#include "character_def.h"
 #include "sound.h"
 
 namespace gnash {
Index: gnash/server/gnash.h
diff -u gnash/server/gnash.h:1.18 gnash/server/gnash.h:1.19
--- gnash/server/gnash.h:1.18   Sun May  7 12:02:39 2006
+++ gnash/server/gnash.h        Sun May  7 19:40:43 2006
@@ -186,46 +186,6 @@
 };
 
 
-/// Immutable data representing the template of a movie element.
-//
-/// This is not really a public interface.  It's here so it
-/// can be mixed into movie_definition and sprite_definition,
-/// without using multiple inheritance.
-///
-struct character_def : public resource
-{
-private:
-       int     m_id;
-       
-public:
-       character_def()
-               :
-               m_id(-1)
-               {
-               }
-       
-       virtual ~character_def() {}
-       
-       virtual void    display(character* instance_info) {}
-       virtual bool    point_test_local(float x, float y) { return false; }
-       virtual float   get_height_local() { return 0.0f; }
-       virtual float   get_width_local() { return 0.0f; }
-       
-       /// Should stick the result in a smart_ptr immediately.
-       virtual character*      create_character_instance(movie* parent, int 
id);       // default is to make a generic_character
-       
-       // From resource interface.
-       virtual character_def*  cast_to_character_def() { return this; }
-       
-       //
-       // Caching.
-       //
-       
-       virtual void    output_cached_data(tu_file* out, const cache_options& 
options) {}
-       virtual void    input_cached_data(tu_file* in) {}
-};
-
-
 /// Try to grab movie info from the header of the given .swf file.
 //
 /// Sets *version to 0 if info can't be extracted.
Index: gnash/server/impl.cpp
diff -u gnash/server/impl.cpp:1.29 gnash/server/impl.cpp:1.30
--- gnash/server/impl.cpp:1.29  Sun May  7 12:19:06 2006
+++ gnash/server/impl.cpp       Sun May  7 19:40:43 2006
@@ -72,6 +72,7 @@
 #include "Function.h"
 #include "movie_def_impl.h"
 #include "swf.h"
+#include "generic_character.h"
 
 namespace gnash
 {
Index: gnash/server/impl.h
diff -u gnash/server/impl.h:1.21 gnash/server/impl.h:1.22
--- gnash/server/impl.h:1.21    Sun May  7 12:02:39 2006
+++ gnash/server/impl.h Sun May  7 19:40:43 2006
@@ -520,107 +520,6 @@
 };
 
 
-/// For characters that don't store unusual state in their instances.
-struct generic_character : public character
-{
-    character_def*     m_def;
-
-    generic_character(character_def* def, movie* parent, int id)
-       :
-       character(parent, id),
-       m_def(def)
-       {
-           assert(m_def);
-       }
-
-    virtual void       display()
-       {
-//                     GNASH_REPORT_FUNCTION;
-               
-           m_def->display(this);       // pass in transform info
-           do_display_callback();
-       }
-
-    // @@ tulrich: these are used for finding bounds; TODO
-    // need to do this using enclose_transformed_rect(),
-    // not by scaling the local height/width!
-
-    virtual float      get_height()
-       {
-           matrix      m = get_world_matrix();
-           float       h = m_def->get_height_local() * m.m_[1][1];
-           return h;
-       }
-
-    virtual float      get_width()
-       {
-           matrix      m = get_world_matrix();
-           float       w = m_def->get_width_local() * m.m_[0][0];
-           return w;
-       }
-
-    // new, from Vitaly.
-    virtual movie*     get_topmost_mouse_entity(float x, float y)
-       {
-           assert(get_visible());      // caller should check this.
-
-           matrix      m = get_matrix();
-           point       p;
-           m.transform_by_inverse(&p, point(x, y));
-
-           if (m_def->point_test_local(p.m_x, p.m_y))
-               {
-                   // The mouse is inside the shape.
-                   return this;
-               }
-           return NULL;
-       }
-};
-
-
-/// What's this ? An interface ?
-struct bitmap_character_def : public character_def
-{
-    virtual gnash::bitmap_info*        get_bitmap_info() = 0;
-};
-
-#if 1
-/// Bitmap character
-struct bitmap_character : public bitmap_character_def
-{
-    bitmap_character(bitmap_info* bi)
-       :
-       m_bitmap_info(bi)
-       {
-       }
-
-//             bitmap_character(image::rgb* image)
-//             {
-//                     assert(image != 0);
-
-//                     // Create our bitmap info, from our image.
-//                     m_bitmap_info = 
gnash::render::create_bitmap_info_rgb(image);
-//             }
-
-//             bitmap_character(image::rgba* image)
-//             {
-//                     assert(image != 0);
-
-//                     // Create our bitmap info, from our image.
-//                     m_bitmap_info = 
gnash::render::create_bitmap_info_rgba(image);
-//             }
-
-    gnash::bitmap_info*        get_bitmap_info()
-       {
-           return m_bitmap_info.get_ptr();
-       }
-
-private:
-    smart_ptr<gnash::bitmap_info>      m_bitmap_info;
-};
-
-#endif
-
 /// Execute tags include things that control the operation of the movie. 
 //
 /// Essentially, these are the events associated with a frame.
Index: gnash/server/morph2.cpp
diff -u gnash/server/morph2.cpp:1.8 gnash/server/morph2.cpp:1.9
--- gnash/server/morph2.cpp:1.8 Sun May  7 12:19:06 2006
+++ gnash/server/morph2.cpp     Sun May  7 19:40:43 2006
@@ -9,6 +9,7 @@
 #include "morph2.h"
 #include "stream.h"
 #include "movie_definition.h"
+#include "bitmap_character_def.h"
 
 
 namespace gnash {
Index: gnash/server/movie_def_impl.cpp
diff -u gnash/server/movie_def_impl.cpp:1.1 gnash/server/movie_def_impl.cpp:1.2
--- gnash/server/movie_def_impl.cpp:1.1 Sun May  7 12:02:39 2006
+++ gnash/server/movie_def_impl.cpp     Sun May  7 19:40:43 2006
@@ -53,6 +53,8 @@
 //#include "Sprite.h"
 #include "sprite_instance.h"
 #include "render.h"
+#include "bitmap_character_def.h"
+#include "smart_ptr.h"
 
 using namespace std;
 
Index: gnash/server/movie_def_impl.h
diff -u gnash/server/movie_def_impl.h:1.1 gnash/server/movie_def_impl.h:1.2
--- gnash/server/movie_def_impl.h:1.1   Sun May  7 12:02:39 2006
+++ gnash/server/movie_def_impl.h       Sun May  7 19:40:43 2006
@@ -39,6 +39,7 @@
 #define GNASH_MOVIE_DEF_IMPL_H
 
 #include "container.h"
+#include "smart_ptr.h"
 #include "button.h" // for mouse_button_state
 #include "timers.h" // for Timer
 #include "fontlib.h"
@@ -46,6 +47,9 @@
 #include "jpeg.h"
 #include "tu_file.h"
 #include "movie_definition.h" // for inheritance
+#include "character_def.h" // for smart_ptr visibility of dtor
+#include "bitmap_character_def.h" // for smart_ptr visibility of dtor
+#include "resource.h" // for smart_ptr visibility of dtor
 
 namespace gnash
 {
Index: gnash/server/shape.cpp
diff -u gnash/server/shape.cpp:1.15 gnash/server/shape.cpp:1.16
--- gnash/server/shape.cpp:1.15 Sun May  7 12:19:06 2006
+++ gnash/server/shape.cpp      Sun May  7 19:40:43 2006
@@ -14,6 +14,7 @@
 #include "stream.h"
 #include "tesselate.h"
 #include "movie_definition.h" // TODO: check if really needed
+#include "bitmap_character_def.h"
 
 #include "tu_file.h"
 
Index: gnash/server/shape.h
diff -u gnash/server/shape.h:1.6 gnash/server/shape.h:1.7
--- gnash/server/shape.h:1.6    Sun Apr 23 14:40:10 2006
+++ gnash/server/shape.h        Sun May  7 19:40:43 2006
@@ -11,6 +11,7 @@
 
 
 #include "styles.h"
+#include "character_def.h" // for inheritance of shape_character_def
 
 
 namespace gnash {
Index: gnash/server/styles.h
diff -u gnash/server/styles.h:1.6 gnash/server/styles.h:1.7
--- gnash/server/styles.h:1.6   Sun Apr 23 14:40:10 2006
+++ gnash/server/styles.h       Sun May  7 19:40:43 2006
@@ -11,6 +11,7 @@
 
 #include "impl.h"
 #include "types.h"
+#include "bitmap_character_def.h"
 
 namespace gnash {
 struct stream;