CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/10/16 09:24:49
Modified files:
. : ChangeLog
server : character.h
Log message:
* server/character.h: indentation cleanups and
get_visible/set_visible
made non-virtual.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4617&r2=1.4618
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.99&r2=1.100
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4617
retrieving revision 1.4618
diff -u -b -r1.4617 -r1.4618
--- ChangeLog 16 Oct 2007 07:50:10 -0000 1.4617
+++ ChangeLog 16 Oct 2007 09:24:48 -0000 1.4618
@@ -1,3 +1,8 @@
+2007-10-16 Sandro Santilli <[EMAIL PROTECTED]>
+
+ * server/character.h: indentation cleanups and get_visible/set_visible
+ made non-virtual.
+
2007-10-15 Sandro Santilli <[EMAIL PROTECTED]>
* server/as_value.cpp (to_debug_string): tell apart dangling from
Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- server/character.h 9 Oct 2007 01:34:41 -0000 1.99
+++ server/character.h 16 Oct 2007 09:24:49 -0000 1.100
@@ -19,7 +19,7 @@
//
//
-/* $Id: character.h,v 1.99 2007/10/09 01:34:41 zoulunkai Exp $ */
+/* $Id: character.h,v 1.100 2007/10/16 09:24:49 strk Exp $ */
#ifndef GNASH_CHARACTER_H
#define GNASH_CHARACTER_H
@@ -231,13 +231,11 @@
///
bool m_invalidated;
-
/// Just like m_invalidated but set when a child is invalidated instead
/// of this character instance. m_invalidated and m_child_invalidated
/// can be set at the same time.
bool m_child_invalidated;
-
/// \brief
/// Bounds of this character instance before first invalidation
/// since last call to clear_invalidated().
@@ -354,7 +352,8 @@
///
/// Example: a character at depth 60 gets moved to
/// depth -32829 (-32769-60) when unloaded and
- /// an onUnload event handler is defined for it.
+ /// an onUnload event handler is defined for it
+ /// or any of its childs.
///
/// So, to recap:
/// 1: -32769 to -16385 are removed
@@ -363,7 +362,7 @@
/// (all of the above correct?)
///
///
- static const int removedDepthOffset = -32769; // -32769;
+ static const int removedDepthOffset = -32769;
/// Return true if the given depth is in the removed zone
static bool depthInRemovedZone(int depth)
@@ -435,9 +434,13 @@
// for extern movie
void set_parent(character* parent) { m_parent = parent; }
+
int get_depth() const { return m_depth; }
+
void set_depth(int d) { m_depth = d; }
+
const matrix& get_matrix() const { return m_matrix; }
+
void set_matrix(const matrix& m)
{
assert(m.is_valid());
@@ -463,6 +466,7 @@
void set_y_scale(float factor);
const cxform& get_cxform() const { return m_color_transform; }
+
void set_cxform(const cxform& cx)
{
if (!(cx == m_color_transform)) {
@@ -470,10 +474,15 @@
m_color_transform = cx;
}
}
+
void concatenate_cxform(const cxform& cx) {
m_color_transform.concatenate(cx); }
+
void concatenate_matrix(const matrix& m) { m_matrix.concatenate(m); }
+
int get_ratio() const { return m_ratio; }
- void set_ratio(int r) {
+
+ void set_ratio(int r)
+ {
if (r!=m_ratio) set_invalidated(__FILE__, __LINE__);
m_ratio = r;
}
@@ -486,6 +495,8 @@
/// returns true!
///
int get_clip_depth() const { return m_clip_depth; }
+
+ /// See get_clip_depth()
void set_clip_depth(int d) { m_clip_depth = d; }
/// Returns true when the character (and it's childs) are used as a mask
@@ -812,15 +823,15 @@
_scriptTransformed = true;
}
-
- // TODO: why is this virtual ??
- virtual void set_visible(bool visible) {
+ // Set whether this character should be rendered
+ void set_visible(bool visible)
+ {
if (m_visible!=visible) set_invalidated(__FILE__, __LINE__);
m_visible = visible;
}
- // TODO: why is this virtual ??
- virtual bool get_visible() const { return m_visible; }
+ // Return true if this character should be rendered
+ bool get_visible() const { return m_visible; }
virtual void set_display_callback(void (*callback)(void*), void*
user_ptr)
{
@@ -1032,6 +1043,7 @@
///
virtual bool unload();
+ /// Return true if this character was unloaded from the stage
bool isUnloaded() { return _unloaded; }
/// Mark this character as destroyed
@@ -1106,9 +1118,6 @@
///
TimelineInfo* getTimelineInfo() { return _timelineInfo.get(); }
- // override from as_object
- //virtual std::string get_text_value() const;
-
#ifdef NEW_KEY_LISTENER_LIST_DESIGN
boost::intrusive_ptr<as_function> getUserDefinedEventHandler(const
std::string& name) const;
#endif
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
