[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/character.h server/dlist...
|
From: |
Zou Lunkai |
|
Subject: |
[Gnash-commit] gnash ChangeLog server/character.h server/dlist... |
|
Date: |
Thu, 14 Jun 2007 02:03:20 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Zou Lunkai <zoulunkai> 07/06/14 02:03:19
Modified files:
. : ChangeLog
server : character.h dlist.h dlist.cpp sprite_instance.h
sprite_instance.cpp
server/parser : morph2_character_def.cpp
server/swf : PlaceObject2Tag.h PlaceObject2Tag.cpp
server/vm : action.cpp
testsuite/server: DisplayListTest.cpp
Log message:
change type of ratio from float to integer, don't re-interpret the
definition
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3534&r2=1.3535
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.h?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.117&r2=1.118
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.285&r2=1.286
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/morph2_character_def.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.h?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/action.cpp?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/DisplayListTest.cpp?cvsroot=gnash&r1=1.4&r2=1.5
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3534
retrieving revision 1.3535
diff -u -b -r1.3534 -r1.3535
--- ChangeLog 13 Jun 2007 19:17:44 -0000 1.3534
+++ ChangeLog 14 Jun 2007 02:03:17 -0000 1.3535
@@ -1,3 +1,17 @@
+2007-06-14 Zou Lunkai <address@hidden>
+
+ * server/character.h,
+ server/dlist.h,
+ server/dlist.cpp,
+ server/sprite_instance.h,
+ server/sprite_instance.cpp,
+ server/parser/morph2_character_def.cpp,
+ server/swf/PlaceObject2Tag.h,
+ server/swf/PlaceObject2Tag.cpp,
+ server/vm/action.cpp,
+ testsuite/server/DisplayListTest.cpp,
+ change type of "ratio" from float to integer, don't re-interpret the
definition.
+
2007-06-13 Petr Pisar <address@hidden>
* gui/gtk.cpp: internationalize menus. (patch #6006).
Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- server/character.h 8 Jun 2007 12:11:50 -0000 1.81
+++ server/character.h 14 Jun 2007 02:03:17 -0000 1.82
@@ -19,7 +19,7 @@
//
//
-/* $Id: character.h,v 1.81 2007/06/08 12:11:50 zoulunkai Exp $ */
+/* $Id: character.h,v 1.82 2007/06/14 02:03:17 zoulunkai Exp $ */
#ifndef GNASH_CHARACTER_H
#define GNASH_CHARACTER_H
@@ -131,7 +131,7 @@
int m_depth;
cxform m_color_transform;
matrix m_matrix;
- float m_ratio;
+ int m_ratio;
int m_clip_depth;
Events _event_handlers;
void (*m_display_callback)(void*);
@@ -325,7 +325,7 @@
:
m_id(id),
m_depth(0),
- m_ratio(0.0f),
+ m_ratio(0),
m_clip_depth(noClipDepthValue),
m_display_callback(NULL),
m_display_callback_user_ptr(NULL),
@@ -405,10 +405,10 @@
}
void concatenate_cxform(const cxform& cx) {
m_color_transform.concatenate(cx); }
void concatenate_matrix(const matrix& m) { m_matrix.concatenate(m); }
- float get_ratio() const { return m_ratio; }
- void set_ratio(float f) {
- if (f!=m_ratio) set_invalidated(__FILE__, __LINE__);
- m_ratio = f;
+ int get_ratio() const { return m_ratio; }
+ void set_ratio(int r) {
+ if (r!=m_ratio) set_invalidated(__FILE__, __LINE__);
+ m_ratio = r;
}
/// Returns the clipping depth (if any) of this character. The parameter
is
Index: server/dlist.h
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- server/dlist.h 24 May 2007 18:09:57 -0000 1.42
+++ server/dlist.h 14 Jun 2007 02:03:18 -0000 1.43
@@ -91,7 +91,7 @@
int depth,
const cxform& color_xform,
const matrix& mat,
- float ratio,
+ int ratio,
int clip_depth);
/// \brief
@@ -115,7 +115,7 @@
int depth,
const cxform* color_xform,
const matrix* mat,
- float ratio,
+ int ratio,
int clip_depth);
/// \brief
@@ -161,7 +161,7 @@
int depth,
const cxform* color_xform,
const matrix* mat,
- float ratio,
+ int ratio,
int clip_depth);
/// Removes the object at the specified depth.
Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- server/dlist.cpp 24 May 2007 18:09:57 -0000 1.69
+++ server/dlist.cpp 14 Jun 2007 02:03:18 -0000 1.70
@@ -171,7 +171,7 @@
int depth,
const cxform& color_xform,
const matrix& mat,
- float ratio,
+ int ratio,
int clip_depth)
{
// GNASH_REPORT_FUNCTION;
@@ -254,7 +254,7 @@
int depth,
const cxform* color_xform,
const matrix* mat,
- float ratio,
+ int ratio,
int clip_depth)
{
//GNASH_REPORT_FUNCTION;
@@ -333,7 +333,7 @@
int depth,
const cxform* color_xform,
const matrix* mat,
- float ratio,
+ int ratio,
int /* clip_depth */)
{
//GNASH_REPORT_FUNCTION;
Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- server/sprite_instance.h 28 May 2007 15:41:07 -0000 1.117
+++ server/sprite_instance.h 14 Jun 2007 02:03:18 -0000 1.118
@@ -371,7 +371,7 @@
bool replace_if_depth_is_occupied,
const cxform& color_transform,
const matrix& matrix,
- float ratio,
+ int ratio,
int clip_depth);
/// Attach the given character instance to current display list
@@ -422,7 +422,7 @@
int depth,
const cxform* color_xform,
const matrix* mat,
- float ratio,
+ int ratio,
int clip_depth)
{
m_display_list.move_display_object(depth, color_xform, mat, ratio,
clip_depth);
@@ -444,7 +444,7 @@
int depth,
const cxform* color_xform,
const matrix* mat,
- float ratio,
+ int ratio,
int clip_depth);
@@ -463,7 +463,7 @@
int depth,
const cxform* color_xform,
const matrix* mat,
- float ratio,
+ int ratio,
int clip_depth);
@@ -934,7 +934,7 @@
void place_character(character* ch, int depth,
const cxform& color_transform, const matrix& mat,
- float ratio, int clip_depth)
+ int ratio, int clip_depth)
{
m_display_list.place_character(ch, depth, color_transform, mat,
ratio, clip_depth);
}
Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -b -r1.285 -r1.286
--- server/sprite_instance.cpp 8 Jun 2007 12:11:50 -0000 1.285
+++ server/sprite_instance.cpp 14 Jun 2007 02:03:18 -0000 1.286
@@ -2022,7 +2022,7 @@
depth,
color_transform,
matrix,
- 0.0f,
+ 0,
character::noClipDepthValue);
return sprite;
@@ -2056,7 +2056,7 @@
depth,
cxform(),
txt_matrix,
- 0.0f,
+ 0,
character::noClipDepthValue);
static bool warned = false;
@@ -3026,7 +3026,7 @@
depth,
cxform(),
matrix(),
- 1.0,
+ 65535,
character::noClipDepthValue);
return true; // FIXME: check return from place_character above ?
@@ -3040,7 +3040,7 @@
int depth,
bool replace_if_depth_is_occupied,
const cxform& color_transform, const matrix& mat,
- float ratio, int clip_depth)
+ int ratio, int clip_depth)
{
// GNASH_REPORT_FUNCTION;
assert(m_def != NULL);
@@ -3189,7 +3189,7 @@
int depth,
const cxform* color_transform,
const matrix* mat,
- float ratio,
+ int ratio,
int clip_depth)
{
assert(m_def != NULL);
@@ -3263,7 +3263,7 @@
int depth,
const cxform* color_transform,
const matrix* mat,
- float ratio,
+ int ratio,
int clip_depth)
{
//printf("%s: character %s, id is %d\n", __FUNCTION__, name,
ch->get_id()); // FIXME:
@@ -3788,7 +3788,7 @@
cxform color_transform = get_cxform();
bool use_matrix = false;
matrix mat = get_matrix();
- float ratio = get_ratio();
+ int ratio = get_ratio();
int clip_depth = get_clip_depth();
//character* new_movie = extern_movie->get_root_movie();
Index: server/parser/morph2_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/morph2_character_def.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/parser/morph2_character_def.cpp 15 May 2007 13:54:59 -0000
1.8
+++ server/parser/morph2_character_def.cpp 14 Jun 2007 02:03:18 -0000
1.9
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: morph2_character_def.cpp,v 1.8 2007/05/15 13:54:59 strk Exp $ */
+/* $Id: morph2_character_def.cpp,v 1.9 2007/06/14 02:03:18 zoulunkai Exp $ */
// Based on the public domain morph2.cpp of:
// Thatcher Ulrich <address@hidden>, Mike Shaver <address@hidden> 2003,
@@ -117,7 +117,7 @@
// GNASH_REPORT_FUNCTION;
unsigned int i;
- float ratio = inst->get_ratio(); //m_ratio;
+ float ratio = inst->get_ratio() / 65535.0;
// bounds
rect new_bound;
Index: server/swf/PlaceObject2Tag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/swf/PlaceObject2Tag.h 28 May 2007 15:41:09 -0000 1.9
+++ server/swf/PlaceObject2Tag.h 14 Jun 2007 02:03:19 -0000 1.10
@@ -19,7 +19,7 @@
//
//
-/* $Id: PlaceObject2Tag.h,v 1.9 2007/05/28 15:41:09 ann Exp $ */
+/* $Id: PlaceObject2Tag.h,v 1.10 2007/06/14 02:03:19 zoulunkai Exp $ */
#ifndef GNASH_SWF_PLACEOBJECT2TAG_H
#define GNASH_SWF_PLACEOBJECT2TAG_H
@@ -103,7 +103,7 @@
int m_tag_type;
char* m_name;
- float m_ratio;
+ int m_ratio;
cxform m_color_transform;
matrix m_matrix;
bool m_has_matrix;
Index: server/swf/PlaceObject2Tag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/swf/PlaceObject2Tag.cpp 24 May 2007 18:09:58 -0000 1.13
+++ server/swf/PlaceObject2Tag.cpp 14 Jun 2007 02:03:19 -0000 1.14
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: PlaceObject2Tag.cpp,v 1.13 2007/05/24 18:09:58 strk Exp $ */
+/* $Id: PlaceObject2Tag.cpp,v 1.14 2007/06/14 02:03:19 zoulunkai Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -239,7 +239,7 @@
m_color_transform.read_rgba(in);
}
- if (has_ratio) m_ratio = (float)in->read_u16() / (float)65535;
+ if (has_ratio) m_ratio = in->read_u16();
if (has_name) m_name = in->read_string();
@@ -283,7 +283,7 @@
log_parse(_(" cxform:"));
m_color_transform.print();
}
- if ( has_ratio ) log_parse(_(" ratio: %f"), m_ratio);
+ if ( has_ratio ) log_parse(_(" ratio: %d"), m_ratio);
if ( has_name ) log_parse(_(" name = %s"), m_name ? m_name :
"<null>");
if ( has_clip_bracket ) log_parse(_(" clip_depth = %d (%d)"),
m_clip_depth, m_clip_depth-character::staticDepthOffset);
log_parse(_(" m_place_type: %d"), m_place_type);
Index: server/vm/action.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/action.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/vm/action.cpp 24 May 2007 18:09:58 -0000 1.20
+++ server/vm/action.cpp 14 Jun 2007 02:03:19 -0000 1.21
@@ -175,7 +175,7 @@
const character* tar = (const character*)target;
const char* name = tar->get_name().c_str();
uint16_t depth = tar->get_depth();
- float ratio = tar->get_ratio();
+ int ratio = tar->get_ratio();
uint16_t clip_depth = tar->get_clip_depth();
character* parent = tar->get_parent();
Index: testsuite/server/DisplayListTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/DisplayListTest.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/server/DisplayListTest.cpp 28 May 2007 15:41:13 -0000
1.4
+++ testsuite/server/DisplayListTest.cpp 14 Jun 2007 02:03:19 -0000
1.5
@@ -65,13 +65,13 @@
boost::intrusive_ptr<character> ch1 ( new DummyCharacter() );
boost::intrusive_ptr<character> ch2 ( new DummyCharacter() );
- dlist1.place_character( ch1.get(), 1, color, mat, 0.0f, 0);
- dlist1.place_character( ch2.get(), 2, color, mat, 0.0f, 0);
+ dlist1.place_character( ch1.get(), 1, color, mat, 0, 0);
+ dlist1.place_character( ch2.get(), 2, color, mat, 0, 0);
check(dlist1 != dlist2);
- dlist2.place_character( ch2.get(), 1, color, mat, 0.0f, 0);
- dlist2.place_character( ch1.get(), 2, color, mat, 0.0f, 0);
+ dlist2.place_character( ch2.get(), 1, color, mat, 0, 0);
+ dlist2.place_character( ch1.get(), 2, color, mat, 0, 0);
// Resort dlist1 as depth of it's chars has been changed
// by place_character calls above :/
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog server/character.h server/dlist...,
Zou Lunkai <=