libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SWORD25: Further fixes to vector images. Still not finished.

Browse Source 
svn-id: r53322
This commit is contained in:
Eugene Sandulenko 2010-09-05 21:15:35 +00:00
parent a773c7a842
commit 7ad20e3337
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/sword25/gfx/image/vectorimage.cpp
View File

@ -446,8 +446,8 @@ bool VectorImage::parseDefineShape(uint shapeType, SWFBitStream &bs) {
double newX = curX + controlDeltaX; double newX = curX + controlDeltaX;
double newY = curY + controlDeltaY; double newY = curY + controlDeltaY;
double anchorX = curX + anchorDeltaX; double anchorX = newX + anchorDeltaX;
double anchorY = curY + anchorDeltaY; double anchorY = newY + anchorDeltaY;
#define WEIGHT (2.0/3.0) #define WEIGHT (2.0/3.0)

17
engines/sword25/gfx/image/vectorimagerenderer.cpp
View File

@ -341,9 +341,16 @@ void drawBez(ArtBpath *bez1, ArtBpath *bez2, art_u8 *buffer, int width, int heig
#endif #endif
vec1 = art_bez_path_to_vec(bez1, 0.5); vec1 = art_bez_path_to_vec(bez1, 0.5);
vec2 = art_bez_path_to_vec(bez2, 0.5); if (bez2 != 0) {
vec2 = art_vpath_reverse_free(vec2); vec2 = art_bez_path_to_vec(bez2, 0.5);
vec = art_vpath_cat(vec1, vec2); vec2 = art_vpath_reverse_free(vec2);
vec = art_vpath_cat(vec1, vec2);
art_free(vec1);
art_free(vec2);
} else {
vec = vec1;
}
if (scaleX != 1.0 || scaleY != 1.0) { if (scaleX != 1.0 || scaleY != 1.0) {
ArtVpath *vect; ArtVpath *vect;
@ -363,7 +370,7 @@ void drawBez(ArtBpath *bez1, ArtBpath *bez2, art_u8 *buffer, int width, int heig
vec = vect; vec = vect;
} }
if (penWidth != -1) { if (bez2 == 0) { // Line drawing
svp = art_svp_vpath_stroke(vec, ART_PATH_STROKE_JOIN_ROUND, ART_PATH_STROKE_CAP_ROUND, penWidth, 1.0, 0.5); svp = art_svp_vpath_stroke(vec, ART_PATH_STROKE_JOIN_ROUND, ART_PATH_STROKE_CAP_ROUND, penWidth, 1.0, 0.5);
} else { } else {
svp = art_svp_from_vpath(vec); svp = art_svp_from_vpath(vec);
@ -427,7 +434,7 @@ void VectorImage::render(int width, int height) {
(*fill0pos).code = ART_END; (*fill0pos).code = ART_END;
(*fill1pos).code = ART_END; (*fill1pos).code = ART_END;
drawBez(fill0, fill1, _pixelData, width, height, scaleX, scaleY, -1, _elements[e].getFillStyleColor(s)); drawBez(fill1, fill0, _pixelData, width, height, scaleX, scaleY, -1, _elements[e].getFillStyleColor(s));
art_free(fill0); art_free(fill0);
art_free(fill1); art_free(fill1);