[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paragui-cvs] CVS: paragui/src/draw draw.cpp,1.1.2.14,1.1.2.15 drawable.
From: |
Teunis Peters <address@hidden> |
Subject: |
[paragui-cvs] CVS: paragui/src/draw draw.cpp,1.1.2.14,1.1.2.15 drawable.cpp,1.1.2.9,1.1.2.10 drawline.cpp,1.3.2.2,1.3.2.3 drawtile.cpp,1.3.2.5,1.3.2.6 rotozoom.cpp,1.3.2.4,1.3.2.5 setpixel.cpp,1.3.2.2,1.3.2.3 stretch.cpp,1.3.2.4,1.3.2.5 surface.cpp,1.3.2.2,1.3.2.3 |
Date: |
Mon, 03 Feb 2003 11:40:02 -0500 |
Update of /cvsroot/paragui/paragui/src/draw
In directory subversions:/tmp/cvs-serv7702/src/draw
Modified Files:
Tag: devel-opengl
draw.cpp drawable.cpp drawline.cpp drawtile.cpp rotozoom.cpp
setpixel.cpp stretch.cpp surface.cpp
Log Message:
updates to handle multiframe pictures - specifically for building font
accelerations.
Index: draw.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/Attic/draw.cpp,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -C2 -r1.1.2.14 -r1.1.2.15
*** draw.cpp 9 Nov 2002 12:00:35 -0000 1.1.2.14
--- draw.cpp 3 Feb 2003 16:39:59 -0000 1.1.2.15
***************
*** 263,267 ****
PG_Draw::PG_Draw::CreateDrawableSurface(Uint32 flags,
int width, int height, int depth,
! Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32
Amask) {
// depth = Rmask = Gmask = Bmask = Amask = 0;
if (depth == 0) depth = screen->ref->format->BitsPerPixel;
--- 263,267 ----
PG_Draw::PG_Draw::CreateDrawableSurface(Uint32 flags,
int width, int height, int depth,
! Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32
Amask, Uint32 frames) {
// depth = Rmask = Gmask = Bmask = Amask = 0;
if (depth == 0) depth = screen->ref->format->BitsPerPixel;
***************
*** 282,286 ****
PG_DrawableSurface* surf;
SDL_Surface* t;
! t = SDL_CreateRGBSurface(flags,width,height,depth,Rmask,Gmask,Bmask,Amask);
if (t == NULL) { PG_LogERR("[%s] SDL: %s", __FUNCTION__, SDL_GetError());
exit(-1); }
// fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
--- 282,291 ----
PG_DrawableSurface* surf;
SDL_Surface* t;
! if (frames <= 1) {
! t =
SDL_CreateRGBSurface(flags,width,height,depth,Rmask,Gmask,Bmask,Amask);
! } else {
! Uint32 fh = height * frames;
! t = SDL_CreateRGBSurface(flags,width,fh,
depth,Rmask,Gmask,Bmask,Amask);
! };
if (t == NULL) { PG_LogERR("[%s] SDL: %s", __FUNCTION__, SDL_GetError());
exit(-1); }
// fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
***************
*** 288,296 ****
attach(surf);
if (surf == NULL) { PG_LogERR("failed to create window"); exit(-1); }
// fprintf(stderr, "%s:%s:%i %i,%i\n", __FILE__, __FUNCTION__, __LINE__,
width, height);
return surf;
};
! PG_Draw::PG_DrawableSurface* PG_Draw::PG_Draw::CreateDrawableSurface(int
width, int height) {
// fprintf(stderr, "%s:%s:%i %i,%i\n", __FILE__, __FUNCTION__, __LINE__,
width, height);
// PG_LogMSG("%s[%s:%i]", __FUNCTION__, __FILE__, __LINE__);
--- 293,303 ----
attach(surf);
if (surf == NULL) { PG_LogERR("failed to create window"); exit(-1); }
+ surf->rframe = surf->wframe = 0;
+ if (frames <= 1) surf->nframes = 1; else surf->nframes = frames;
// fprintf(stderr, "%s:%s:%i %i,%i\n", __FILE__, __FUNCTION__, __LINE__,
width, height);
return surf;
};
! PG_Draw::PG_DrawableSurface* PG_Draw::PG_Draw::CreateDrawableSurface(int
width, int height, Uint32 frames) {
// fprintf(stderr, "%s:%s:%i %i,%i\n", __FILE__, __FUNCTION__, __LINE__,
width, height);
// PG_LogMSG("%s[%s:%i]", __FUNCTION__, __FILE__, __LINE__);
***************
*** 299,303 ****
SDL_Surface* t;
SDL_Surface* q;
! q = SDL_CreateRGBSurface(SDL_SWSURFACE,width,height,24,0,0,0,0);
t = SDL_DisplayFormat(q);
if (t == NULL) { PG_LogERR("[%s] SDL: %s", __FUNCTION__, SDL_GetError());
exit(-1); }
--- 306,316 ----
SDL_Surface* t;
SDL_Surface* q;
! if (frames <= 1) {
! q = SDL_CreateRGBSurface(SDL_SWSURFACE,width,height,24,0,0,0,0);
! } else {
! Uint32 fh = height * frames;
! q = SDL_CreateRGBSurface(SDL_SWSURFACE,width,fh, 24,0,0,0,0);
! };
! if (q == NULL) { PG_LogERR("[%s] SDL: %s", __FUNCTION__, SDL_GetError());
exit(-1); }
t = SDL_DisplayFormat(q);
if (t == NULL) { PG_LogERR("[%s] SDL: %s", __FUNCTION__, SDL_GetError());
exit(-1); }
***************
*** 307,310 ****
--- 320,325 ----
attach(surf);
if (surf == NULL) { PG_LogERR("failed to create window"); exit(-1); }
+ surf->rframe = surf->wframe = 0;
+ if (frames <= 1) surf->nframes = 1; else surf->nframes = frames;
// fprintf(stderr, "%s:%s:%i %i,%i %p:%p\n", __FILE__, __FUNCTION__,
__LINE__, width, height, surf, q);
return surf;
***************
*** 315,319 ****
};
! PG_Draw::PG_DrawableSurface* PG_Draw::PG_Draw::CreateDrawableSurfaceAlpha(int
width, int height) {
#if 0
PG_DrawableSurface* surf;
--- 330,334 ----
};
! PG_Draw::PG_DrawableSurface* PG_Draw::PG_Draw::CreateDrawableSurfaceAlpha(int
width, int height, Uint32 frames) {
#if 0
PG_DrawableSurface* surf;
***************
*** 333,337 ****
#endif
/* SDL_SRCALPHA? */
! t =
SDL_CreateRGBSurface(SDL_SWSURFACE,width,height,bits,rmask,gmask,bmask,amask);
if (t == NULL) { PG_LogERR("[%s] SDL: %s", __FUNCTION__, SDL_GetError());
exit(-1); }
// fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
--- 348,357 ----
#endif
/* SDL_SRCALPHA? */
! if (frames <= 1) {
! t =
SDL_CreateRGBSurface(SDL_SWSURFACE,width,height,bits,rmask,gmask,bmask,amask);
! } else {
! Uint32 fh = height * frames;
! t = SDL_CreateRGBSurface(SDL_SWSURFACE,width,fh,
bits,rmask,gmask,bmask,amask);
! };
if (t == NULL) { PG_LogERR("[%s] SDL: %s", __FUNCTION__, SDL_GetError());
exit(-1); }
// fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
***************
*** 339,342 ****
--- 359,364 ----
attach(surf);
if (surf == NULL) { PG_LogERR("failed to create window"); exit(-1); }
+ surf->rframe = surf->wframe = 0;
+ if (frames <= 1) surf->nframes = 1; else surf->nframes = frames;
// fprintf(stderr, "%s:%s:%i %i,%i %p:%p\n", __FILE__, __FUNCTION__,
__LINE__, width, height, surf, t);
return surf;
***************
*** 346,350 ****
};
! PG_Draw::PG_DrawableSurface* PG_Draw::PG_Draw::CreateBitmap(int width, int
height) {
PG_DrawableSurface* surf;
SDL_Surface* t;
--- 368,372 ----
};
! PG_Draw::PG_DrawableSurface* PG_Draw::PG_Draw::CreateBitmap(int width, int
height, Uint32 frames) {
PG_DrawableSurface* surf;
SDL_Surface* t;
***************
*** 363,378 ****
#endif
/* SDL_SRCALPHA? */
! t =
SDL_CreateRGBSurface(SDL_SWSURFACE,width,height,bits,rmask,gmask,bmask,amask);
if (t == NULL) { PG_LogERR("[%s] SDL: %s", __FUNCTION__, SDL_GetError());
exit(-1); }
surf = new PG_DrawableSurface(t);
attach(surf);
if (surf == NULL) { PG_LogERR("failed to create window"); exit(-1); }
return surf;
};
! PG_Draw::PG_DrawableSurface* PG_Draw::PG_Draw::CreateGrey(int width, int
height) {
PG_DrawableSurface* surf;
// PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
! surf = CreateDrawableSurface(SDL_SWSURFACE,width,height,8,0,0,0,0);
if (surf == NULL) return NULL;
SDL_Color tmp_pal[256];
--- 385,407 ----
#endif
/* SDL_SRCALPHA? */
! if (frames <= 1) {
! t =
SDL_CreateRGBSurface(SDL_SWSURFACE,width,height,bits,rmask,gmask,bmask,amask);
! } else {
! Uint32 fh = height * frames;
! t = SDL_CreateRGBSurface(SDL_SWSURFACE,width,fh,
bits,rmask,gmask,bmask,amask);
! };
if (t == NULL) { PG_LogERR("[%s] SDL: %s", __FUNCTION__, SDL_GetError());
exit(-1); }
surf = new PG_DrawableSurface(t);
attach(surf);
if (surf == NULL) { PG_LogERR("failed to create window"); exit(-1); }
+ surf->rframe = surf->wframe = 0;
+ if (frames <= 1) surf->nframes = 1; else surf->nframes = frames;
return surf;
};
! PG_Draw::PG_DrawableSurface* PG_Draw::PG_Draw::CreateGrey(int width, int
height, Uint32 frames) {
PG_DrawableSurface* surf;
// PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
! surf = CreateDrawableSurface(SDL_SWSURFACE,width,height,8,0,0,0,0,frames);
if (surf == NULL) return NULL;
SDL_Color tmp_pal[256];
***************
*** 386,394 ****
};
! PG_Draw::PG_DrawableSurface* PG_Draw::PG_Draw::CreateGreyAlpha(int width, int
height) {
PG_DrawableSurface* surf;
/* checking SDL - this looks like it will work... */
// PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
! surf =
CreateDrawableSurface(SDL_SWSURFACE,width,height,16,0xff,0x00,0x00,0xff00);
if (surf == NULL) return NULL;
return surf;
--- 415,423 ----
};
! PG_Draw::PG_DrawableSurface* PG_Draw::PG_Draw::CreateGreyAlpha(int width, int
height, Uint32 frames) {
PG_DrawableSurface* surf;
/* checking SDL - this looks like it will work... */
// PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
! surf =
CreateDrawableSurface(SDL_SWSURFACE,width,height,16,0xff,0x00,0x00,0xff00,frames);
if (surf == NULL) return NULL;
return surf;
***************
*** 398,402 ****
PG_Draw::PG_Draw::CreateDrawableSurfaceFrom(void* pixels,
int width, int height, int depth,
int pitch,
! Uint32 Rmask, Uint32 Gmask, Uint32
Bmask, Uint32 Amask) {
// depth = Rmask = Gmask = Bmask = Amask = 0;
#if 0
--- 427,431 ----
PG_Draw::PG_Draw::CreateDrawableSurfaceFrom(void* pixels,
int width, int height, int depth,
int pitch,
! Uint32 Rmask, Uint32 Gmask, Uint32
Bmask, Uint32 Amask, Uint32 frames) {
// depth = Rmask = Gmask = Bmask = Amask = 0;
#if 0
***************
*** 426,430 ****
PG_DrawableSurface* surf;
SDL_Surface* t;
! t =
SDL_CreateRGBSurfaceFrom(pixels,width,height,depth,pitch,Rmask,Gmask,Bmask,Amask);
if (t == NULL) { PG_LogERR("[%s] SDL: %s", __FUNCTION__, SDL_GetError());
exit(-1); }
// fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
--- 455,464 ----
PG_DrawableSurface* surf;
SDL_Surface* t;
! if (frames <= 1) {
! t =
SDL_CreateRGBSurfaceFrom(pixels,width,height,depth,pitch,Rmask,Gmask,Bmask,Amask);
! } else {
! Uint32 fh = height * frames;
! t = SDL_CreateRGBSurfaceFrom(pixels,width,fh,
depth,pitch,Rmask,Gmask,Bmask,Amask);
! };
if (t == NULL) { PG_LogERR("[%s] SDL: %s", __FUNCTION__, SDL_GetError());
exit(-1); }
// fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
***************
*** 432,435 ****
--- 466,471 ----
attach(surf);
if (surf == NULL) { PG_LogERR("failed to create window"); exit(-1); }
+ surf->rframe = surf->wframe = 0;
+ if (frames <= 1) surf->nframes = 1; else surf->nframes = frames;
// fprintf(stderr, "%s:%s:%i %i,%i\n", __FILE__, __FUNCTION__, __LINE__,
width, height);
return surf;
Index: drawable.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/Attic/drawable.cpp,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -C2 -r1.1.2.9 -r1.1.2.10
*** drawable.cpp 31 Oct 2002 10:38:04 -0000 1.1.2.9
--- drawable.cpp 3 Feb 2003 16:39:59 -0000 1.1.2.10
***************
*** 60,63 ****
--- 60,66 ----
PG_Draw::PG_DrawableSurface::PG_DrawableSurface() {
+ nframes = 1;
+ rframe = 0;
+ wframe = 0;
ref = NULL;
};
***************
*** 78,92 ****
ref = s; // memcpy(this, s, sizeof(SDL_Surface));
// fprintf(stderr, "%s:%s:%i %p:%p\n", __FILE__, __FUNCTION__, __LINE__,
this, ref);
};
void PG_Draw::PG_DrawableSurface::UpdateRects(int numrects, PG_Rect *rects) {
// fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
! if (numrects == 0)
! {
! PG_Rect emptyrect;
! SDL_UpdateRects(ref, 1, &emptyrect);
! }
! else
! SDL_UpdateRects(ref, numrects, rects);
};
--- 81,122 ----
ref = s; // memcpy(this, s, sizeof(SDL_Surface));
// fprintf(stderr, "%s:%s:%i %p:%p\n", __FILE__, __FUNCTION__, __LINE__,
this, ref);
+ nframes = 1;
+ rframe = 0;
+ wframe = 0;
};
void PG_Draw::PG_DrawableSurface::UpdateRects(int numrects, PG_Rect *rects) {
// fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
! /* FIXME FRAMES */
! if (GetFrames() > 1) {
! if (numrects == 0) {
! PG_Rect nrd;
! nrd = PG_Rect(*this);
! nrd.my_height /= GetFrames();
! SDL_UpdateRects(ref, 1, &nrd);
! } else {
! Uint32 wf = GetWriteFrame();
! if (wf > 0) {
! PG_Rect* nrds;
! nrds = new PG_Rect[numrects];
! wf++;
! for (int i=0; i<numrects; i++) {
! nrds[i] = rects[i];
! nrds[i].my_ypos *= wf;
! };
! SDL_UpdateRects(ref, numrects, nrds);
! } else {
! SDL_UpdateRects(ref, numrects, rects);
! };
! };
! } else {
! if (numrects == 0)
! {
! PG_Rect emptyrect;
! SDL_UpdateRects(ref, 1, &emptyrect);
! }
! else
! SDL_UpdateRects(ref, numrects, rects);
! };
};
***************
*** 101,108 ****
bool PG_Draw::PG_DrawableSurface::SetClipRect(const PG_Rect& rect) {
! if (rect.IsNull())
! return (SDL_SetClipRect(ref, NULL) == SDL_TRUE);
! else
! return (SDL_SetClipRect(ref, (SDL_Rect*)&rect) == SDL_TRUE);
};
--- 131,152 ----
bool PG_Draw::PG_DrawableSurface::SetClipRect(const PG_Rect& rect) {
! if (GetFrames() > 1) {
! PG_Rect nrd;
! if (rect.IsNull()) {
! nrd = PG_Rect(*this);
! nrd.my_height /= GetFrames();
! } else {
! nrd = rect;
! };
! if (GetWriteFrame() > 0) {
! rect.my_ypos *= (GetWriteFrame() + 1);
! };
! return (SDL_SetClipRect(ref, (SDL_Rect*)&nrd) == SDL_TRUE);
! } else {
! if (rect.IsNull())
! return (SDL_SetClipRect(ref, NULL) == SDL_TRUE);
! else
! return (SDL_SetClipRect(ref, (SDL_Rect*)&rect) == SDL_TRUE);
! };
};
***************
*** 114,117 ****
--- 158,166 ----
void PG_Draw::PG_DrawableSurface::GetClipRect(PG_Rect& rect) {
SDL_GetClipRect(ref, &rect);
+
+ if (GetWriteFrame() > 0) {
+ /* rect.my_height /= GetFrames(); */
+ rect.my_ypos /= (GetWriteFrame() + 1);
+ };
};
***************
*** 130,134 ****
return;
};
! BlitSurface(srf_src->ref, rect_src, rect_dst);
};
--- 179,198 ----
return;
};
! PG_Rect nrs, nrd;
! bool rf, wf;
! rf = (srf_src->GetReadFrame() > 0);
! wf = (GetWriteFrame() > 0);
! if (rf) {
! nrs = rect_src;
! nrs.my_ypos *= (srf_src->GetReadFrame() + 1);
! }
! if (wf) {
! nrd = rect_dst;
! nrd.my_ypos *= (GetWriteFrame() + 1);
! }
! if (rf && wf) BlitSurface(srf_src->ref, nrs, nrd);
! else if (rf) BlitSurface(srf_src->ref, nrs, rect_dst);
! else if (wf) BlitSurface(srf_src->ref, rect_src, nrd);
! else BlitSurface(srf_src->ref, rect_src, rect_dst);
};
***************
*** 177,184 ****
int PG_Draw::PG_DrawableSurface::FillRect(const PG_Rect& dstrect, Uint32
color) {
! if (dstrect.IsNull())
! return SDL_FillRect(ref, NULL, color);
! else
! return SDL_FillRect(ref, (SDL_Rect*)&dstrect, color);
};
--- 241,260 ----
int PG_Draw::PG_DrawableSurface::FillRect(const PG_Rect& dstrect, Uint32
color) {
! if (GetWriteFrame() > 0) {
! PG_Rect nrd;
! if (dstrect.IsNull()) {
! nrd = PG_Rect(*this);
! nrd.my_height /= GetFrames();
! } else {
! nrd = dstrect;
! };
! nrd.my_ypos *= (GetWriteFrame() + 1);
! return SDL_FillRect(ref, (SDL_Rect*)&nrd, color);
! } else {
! if (dstrect.IsNull())
! return SDL_FillRect(ref, NULL, color);
! else
! return SDL_FillRect(ref, (SDL_Rect*)&dstrect, color);
! }
};
***************
*** 298,300 ****
--- 374,407 ----
};
return PG_AttribList::setAttribute(offset, data);
+ };
+
+ Uint32 PG_Draw::PG_DrawableSurface::GetFrames() const {
+ if (nframes > 1) {
+ PG_LogDBG("ParaGUI[%s]: %s:%i nframes %i", __FILE__, __FUNCTION__,
__LINE__, nframes);
+ };
+ return nframes;
+ };
+
+ Uint32 PG_Draw::PG_DrawableSurface::GetReadFrame() const {
+ if (rframe > 0) {
+ PG_LogDBG("ParaGUI[%s]: %s:%i rframe %i", __FILE__, __FUNCTION__,
__LINE__, rframe);
+ };
+ return rframe;
+ };
+
+ Uint32 PG_Draw::PG_DrawableSurface::GetWriteFrame() const {
+ if (wframe > 0) {
+ PG_LogDBG("ParaGUI[%s]: %s:%i wframe %i", __FILE__, __FUNCTION__,
__LINE__, wframe);
+ };
+ return wframe;
+ };
+
+ void PG_Draw::PG_DrawableSurface::SetReadFrame(Uint32 frame) {
+ if (frame > nframes) return;
+ rframe = frame;
+ };
+
+ void PG_Draw::PG_DrawableSurface::SetWriteFrame(Uint32 frame) {
+ if (frame > nframes) return;
+ wframe = frame;
};
Index: drawline.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/drawline.cpp,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** drawline.cpp 30 Oct 2002 20:15:17 -0000 1.3.2.2
--- drawline.cpp 3 Feb 2003 16:39:59 -0000 1.3.2.3
***************
*** 35,38 ****
--- 35,39 ----
void plotpixel(PG_DrawableSurface* surface, Uint32 x, Uint32 y, const
SDL_Color& c, Uint8 width, int *pixelflag) {
+ /* FIXME FRAMES */
Uint32 xp, yp, xf, yf;
static Uint32 oldx, oldy;
Index: drawtile.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/drawtile.cpp,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -C2 -r1.3.2.5 -r1.3.2.6
*** drawtile.cpp 24 Oct 2002 16:08:13 -0000 1.3.2.5
--- drawtile.cpp 3 Feb 2003 16:39:59 -0000 1.3.2.6
***************
*** 36,39 ****
--- 36,40 ----
const PG_Rect& drawrect,
PG_DrawableSurface* tilemap) {
+ /* FIXME FRAMES */
// fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
PG_Point index1;
Index: rotozoom.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/rotozoom.cpp,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -C2 -r1.3.2.4 -r1.3.2.5
*** rotozoom.cpp 31 Oct 2002 10:38:04 -0000 1.3.2.4
--- rotozoom.cpp 3 Feb 2003 16:39:59 -0000 1.3.2.5
***************
*** 29,32 ****
--- 29,34 ----
*/
+ /* FIXME FRAMES */
+
#include "paragui.h"
#include "pgdraw.h"
Index: setpixel.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/setpixel.cpp,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** setpixel.cpp 30 Oct 2002 09:16:29 -0000 1.3.2.2
--- setpixel.cpp 3 Feb 2003 16:39:59 -0000 1.3.2.3
***************
*** 35,38 ****
--- 35,39 ----
static void __SetPixel(int x, int y, Uint8 r, Uint8 g, Uint8 b,
PG_DrawableSurface* surface) {
+ /* FIXME FRAMES */
static Uint8 old_r = 0;
static Uint8 old_g = 0;
Index: stretch.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/stretch.cpp,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -C2 -r1.3.2.4 -r1.3.2.5
*** stretch.cpp 31 Oct 2002 10:38:04 -0000 1.3.2.4
--- stretch.cpp 3 Feb 2003 16:39:59 -0000 1.3.2.5
***************
*** 36,39 ****
--- 36,41 ----
#include "drawpriv.hh"
+ /* FIXME FRAMES */
+
namespace PG_Draw {
DECLSPEC void RectStretch(SDL_Surface* src_surface, int xs1, int ys1, int
xs2, int ys2, SDL_Surface* dst_surface, int xd1, int yd1, int xd2, int yd2,
Uint32* voiLUT);
Index: surface.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/surface.cpp,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** surface.cpp 30 Oct 2002 09:16:29 -0000 1.3.2.2
--- surface.cpp 3 Feb 2003 16:40:00 -0000 1.3.2.3
***************
*** 31,34 ****
--- 31,35 ----
#include "pgdraw.h"
#include "drawpriv.hh"
+ /* FIXME FRAMES */
namespace PG_Draw {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paragui-cvs] CVS: paragui/src/draw draw.cpp,1.1.2.14,1.1.2.15 drawable.cpp,1.1.2.9,1.1.2.10 drawline.cpp,1.3.2.2,1.3.2.3 drawtile.cpp,1.3.2.5,1.3.2.6 rotozoom.cpp,1.3.2.4,1.3.2.5 setpixel.cpp,1.3.2.2,1.3.2.3 stretch.cpp,1.3.2.4,1.3.2.5 surface.cpp,1.3.2.2,1.3.2.3,
Teunis Peters <address@hidden> <=
- Prev by Date:
[paragui-cvs] CVS: paragui/test gltest.cpp,1.1.2.8,1.1.2.9
- Next by Date:
[paragui-cvs] CVS: paragui/include pgdraw.h,1.4.2.10,1.4.2.11 pggldraw.h,1.1.2.9,1.1.2.10
- Previous by thread:
[paragui-cvs] CVS: paragui/test gltest.cpp,1.1.2.8,1.1.2.9
- Next by thread:
[paragui-cvs] CVS: paragui/include pgdraw.h,1.4.2.10,1.4.2.11 pggldraw.h,1.1.2.9,1.1.2.10
- Index(es):