[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/shape.cpp server/shape.h...
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog server/shape.cpp server/shape.h... |
|
Date: |
Wed, 14 Feb 2007 12:48:19 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/02/14 12:48:18
Modified files:
. : ChangeLog
server : shape.cpp shape.h
server/parser : BitmapMovieDefinition.cpp
Log message:
* server/shape.{cpp,h}: added primitives for
drawing API: drawLineTo, drawCurveTo.
Method names track Ming interface.
* server/parser/BitmapMovieDefinition.cpp:
Use the path drawing api, draw a thicker outline
(outline works, fill not).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2358&r2=1.2359
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shape.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shape.h?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/BitmapMovieDefinition.cpp?cvsroot=gnash&r1=1.2&r2=1.3
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2358
retrieving revision 1.2359
diff -u -b -r1.2358 -r1.2359
--- ChangeLog 14 Feb 2007 12:15:10 -0000 1.2358
+++ ChangeLog 14 Feb 2007 12:48:18 -0000 1.2359
@@ -1,10 +1,11 @@
2007-02-14 Sandro Santilli <address@hidden>
* server/shape.{cpp,h}: added primitives for
- drawing API: draw{Line,Curve}{To,}.
+ drawing API: drawLineTo, drawCurveTo.
Method names track Ming interface.
* server/parser/BitmapMovieDefinition.cpp:
- Use the path drawing api. (still doesn't work).
+ Use the path drawing api, draw a thicker outline
+ (outline works, fill not).
2007-02-14 Sandro Santilli <address@hidden>
Index: server/shape.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shape.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/shape.cpp 14 Feb 2007 12:15:11 -0000 1.27
+++ server/shape.cpp 14 Feb 2007 12:48:18 -0000 1.28
@@ -5,7 +5,7 @@
// Quadratic bezier outline shapes, the basis for most SWF rendering.
-/* $Id: shape.cpp,v 1.27 2007/02/14 12:15:11 strk Exp $ */
+/* $Id: shape.cpp,v 1.28 2007/02/14 12:48:18 strk Exp $ */
#include "shape.h"
@@ -284,38 +284,17 @@
}
void
-path::drawLine(float dx, float dy)
+path::drawLineTo(float dx, float dy)
{
m_edges.push_back(edge(dx, dy, dx, dy));
}
void
-path::drawLineTo(float x, float y)
-{
- float dx = x-m_ax;
- float dy = x-m_ay;
- // TODO: return if dx + dy == 0 ?
- drawLine(dx, dy);
-}
-
-void
-path::drawCurve(float cdx, float cdy, float adx, float ady)
+path::drawCurveTo(float cdx, float cdy, float adx, float ady)
{
m_edges.push_back(edge(cdx, cdy, adx, ady));
}
-void
-path::drawCurveTo(float cx, float cy, float ax, float ay)
-{
- float cdx = cx-m_ax;
- float cdy = cx-m_ay;
- float adx = ax-m_ax;
- float ady = ax-m_ay;
- // TODO: any check for skipping here ?
- drawCurve(cdx, cdy, adx, ady);
-}
-
-
// Utility.
Index: server/shape.h
===================================================================
RCS file: /sources/gnash/gnash/server/shape.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/shape.h 14 Feb 2007 12:15:11 -0000 1.15
+++ server/shape.h 14 Feb 2007 12:48:18 -0000 1.16
@@ -5,7 +5,7 @@
// Quadratic bezier outline shapes, the basis for most SWF rendering.
-/* $Id: shape.h,v 1.15 2007/02/14 12:15:11 strk Exp $ */
+/* $Id: shape.h,v 1.16 2007/02/14 12:48:18 strk Exp $ */
#ifndef GNASH_SHAPE_H
#define GNASH_SHAPE_H
@@ -100,20 +100,7 @@
/// Name of these functions track Ming interface
///
- /// Draw a straight line using offsets.
- //
- /// Offset values are relative to last point in path
- /// and expressed in TWIPS.
- ///
- /// @param dx
- /// X offset (delta).
- ///
- /// @param dy
- /// Y offset (delta).
- ///
- void drawLine(float dx, float dy);
-
- /// Draw a straight line using coordinates (slower).
+ /// Draw a straight line.
//
/// Point coordinates are relative to path origin
/// and expressed in TWIPS.
@@ -126,26 +113,7 @@
///
void drawLineTo(float x, float y);
- /// Draw a curve using offsets.
- //
- /// Offset values are relative to last point in path and
- /// expressed in TWIPS.
- ///
- /// @param cdx
- /// Control point's X offset (delta).
- ///
- /// @param cdy
- /// Control point's Y offset (delta).
- ///
- /// @param adx
- /// Anchor point's X offset (delta).
- ///
- /// @param ady
- /// Anchor point's Y offset (delta).
- ///
- void drawCurve(float cdx, float cdy, float adx, float ady);
-
- /// Draw a curve using coordinates (slower)
+ /// Draw a curve.
//
/// Offset values are relative to path origin and
/// expressed in TWIPS.
Index: server/parser/BitmapMovieDefinition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/BitmapMovieDefinition.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/parser/BitmapMovieDefinition.cpp 14 Feb 2007 12:15:11 -0000
1.2
+++ server/parser/BitmapMovieDefinition.cpp 14 Feb 2007 12:48:18 -0000
1.3
@@ -51,7 +51,7 @@
// Add the bitmap fill style (fill style 0)
fill_style bmFill(_bitmap.get());
- line_style line(2, rgba(255, 0, 0, 255));
+ line_style line(40, rgba(255, 0, 0, 255));
_shapedef->add_fill_style(bmFill);
_shapedef->add_line_style(line);
@@ -62,7 +62,7 @@
log_msg("Creating a shape_definition wrapping a %f x %f bitmap", w, h);
- path bmPath(w, h, 0, -1, 0);
+ path bmPath(w, h, 1, 0, 1);
bmPath.drawLineTo(w, 0);
bmPath.drawLineTo(0, 0);
bmPath.drawLineTo(0, h);