[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paragui-cvs] CVS: paragui/include pgdraw.h,1.4.2.10,1.4.2.11 pggldraw.
From: |
Teunis Peters <address@hidden> |
Subject: |
[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 |
Date: |
Mon, 03 Feb 2003 11:40:02 -0500 |
Update of /cvsroot/paragui/paragui/include
In directory subversions:/tmp/cvs-serv7702/include
Modified Files:
Tag: devel-opengl
pgdraw.h pggldraw.h
Log Message:
updates to handle multiframe pictures - specifically for building font
accelerations.
Index: pgdraw.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgdraw.h,v
retrieving revision 1.4.2.10
retrieving revision 1.4.2.11
diff -C2 -r1.4.2.10 -r1.4.2.11
*** pgdraw.h 8 Nov 2002 11:22:01 -0000 1.4.2.10
--- pgdraw.h 3 Feb 2003 16:39:59 -0000 1.4.2.11
***************
*** 77,81 ****
class PG_DrawableSurface;
! class PG_DrawableSurface : public PG_AttribList {
friend class PG_Draw;
protected:
--- 77,81 ----
class PG_DrawableSurface;
! class PG_DrawableSurface : public PG_AttribList, public PG_Rect {
friend class PG_Draw;
protected:
***************
*** 86,95 ****
virtual ~PG_DrawableSurface();
! virtual Uint32 GetWidth();
! virtual Uint32 GetHeight();
! virtual Uint32 GetDepth(); /* BitsPerPixel */
virtual SDL_PixelFormat* GetFormat();
virtual void* GetPixels(); /* may return NULL - as a warning! */
! virtual Uint32 GetPitch(); /* may return 0 - as a warning! */
/**
--- 86,108 ----
virtual ~PG_DrawableSurface();
! virtual Uint32 GetWidth() const;
! virtual Uint32 GetHeight() const;
! virtual Uint32 GetDepth() const; /* BitsPerPixel */
virtual SDL_PixelFormat* GetFormat();
virtual void* GetPixels(); /* may return NULL - as a warning! */
! virtual Uint32 GetPitch() const; /* may return 0 - as a warning! */
! virtual Uint32 GetFrames() const; /* # of frames; usually 1 */
! virtual Uint32 GetReadFrame() const;
! virtual Uint32 GetWriteFrame() const;
!
! /**
! Set the rendering frame (to read from)
! */
! virtual void SetReadFrame(Uint32 frame);
!
! /**
! Set the frame to render onto
! */
! virtual void SetWriteFrame(Uint32 frame);
/**
***************
*** 273,277 ****
* ------------------
*/
! Uint32 GetSDLFlags();
virtual SDL_Surface* SDL();
void BlitSurface(const SDL_Surface* srf_src, const PG_Rect& rect_src,
const PG_Rect& rect_dst);
--- 286,290 ----
* ------------------
*/
! Uint32 GetSDLFlags() const;
virtual SDL_Surface* SDL();
void BlitSurface(const SDL_Surface* srf_src, const PG_Rect& rect_src,
const PG_Rect& rect_dst);
***************
*** 279,282 ****
--- 292,298 ----
protected:
SDL_Surface* ref;
+ Uint32 rframe;
+ Uint32 wframe;
+ Uint32 nframes; /* SDL doesn't maintain this... but see offset */
};
***************
*** 411,418 ****
virtual PG_DrawableSurface*
CreateDrawableSurface(Uint32 flags,int width, int height, int depth=0,
! Uint32 Rmask=0, Uint32 Gmask=0, Uint32 Bmask=0,
Uint32 Amask=0);
! virtual PG_DrawableSurface* CreateDrawableSurface(int width, int
height);
! virtual PG_DrawableSurface* CreateDrawableSurfaceAlpha(int width, int
height);
/**
--- 427,434 ----
virtual PG_DrawableSurface*
CreateDrawableSurface(Uint32 flags,int width, int height, int depth=0,
! Uint32 Rmask=0, Uint32 Gmask=0, Uint32 Bmask=0,
Uint32 Amask=0, Uint32 frames=0);
! virtual PG_DrawableSurface* CreateDrawableSurface(int width, int
height, Uint32 frames=0);
! virtual PG_DrawableSurface* CreateDrawableSurfaceAlpha(int width, int
height, Uint32 frames=0);
/**
***************
*** 420,424 ****
This is mostly used in fonts...
*/
! virtual PG_DrawableSurface* CreateBitmap(int width, int height);
/**
--- 436,440 ----
This is mostly used in fonts...
*/
! virtual PG_DrawableSurface* CreateBitmap(int width, int height, Uint32
frames=0);
/**
***************
*** 432,436 ****
== CreateDrawableSurface(SDL_SWSURFACE,width,height,8,0,0,0,0);
*/
! virtual PG_DrawableSurface* CreateGrey(int width, int height);
/**
--- 448,452 ----
== CreateDrawableSurface(SDL_SWSURFACE,width,height,8,0,0,0,0);
*/
! virtual PG_DrawableSurface* CreateGrey(int width, int height, Uint32
frames=0);
/**
***************
*** 447,451 ****
== CreateDrawableSurface(SDL_SWSURFACE,width,height,16,0xff,0,0,0xff00);
*/
! virtual PG_DrawableSurface* CreateGreyAlpha(int width, int height);
/**
--- 463,467 ----
== CreateDrawableSurface(SDL_SWSURFACE,width,height,16,0xff,0,0,0xff00);
*/
! virtual PG_DrawableSurface* CreateGreyAlpha(int width, int height,
Uint32 frames=0);
/**
***************
*** 456,460 ****
CreateDrawableSurfaceFrom(void* pixels,
int width, int height, int depth=0, int
pitch=0,
! Uint32 Rmask=0, Uint32 Gmask=0, Uint32
Bmask=0, Uint32 Amask=0);
/**
--- 472,476 ----
CreateDrawableSurfaceFrom(void* pixels,
int width, int height, int depth=0, int
pitch=0,
! Uint32 Rmask=0, Uint32 Gmask=0, Uint32
Bmask=0, Uint32 Amask=0, Uint32 frames=0);
/**
***************
*** 534,544 ****
};
! inline Uint32 PG_DrawableSurface::GetWidth() { return ref->w; };
! inline Uint32 PG_DrawableSurface::GetHeight() { return ref->h; };
! inline Uint32 PG_DrawableSurface::GetDepth() { return
ref->format->BitsPerPixel; };
inline SDL_PixelFormat* PG_DrawableSurface::GetFormat() { return
ref->format; };
inline void* PG_DrawableSurface::GetPixels() { return ref->pixels; };
! inline Uint32 PG_DrawableSurface::GetPitch() { return ref->pitch; };
! inline Uint32 PG_DrawableSurface::GetSDLFlags() { return ref->flags; };
inline SDL_Surface* PG_DrawableSurface::SDL() { return ref; };
--- 550,560 ----
};
! inline Uint32 PG_DrawableSurface::GetWidth() const { return ref->w; };
! inline Uint32 PG_DrawableSurface::GetHeight() const { return ref->h; };
! inline Uint32 PG_DrawableSurface::GetDepth() const { return
ref->format->BitsPerPixel; };
inline SDL_PixelFormat* PG_DrawableSurface::GetFormat() { return
ref->format; };
inline void* PG_DrawableSurface::GetPixels() { return ref->pixels; };
! inline Uint32 PG_DrawableSurface::GetPitch() const { return ref->pitch; };
! inline Uint32 PG_DrawableSurface::GetSDLFlags() const { return ref->flags;
};
inline SDL_Surface* PG_DrawableSurface::SDL() { return ref; };
Index: pggldraw.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/Attic/pggldraw.h,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -C2 -r1.1.2.9 -r1.1.2.10
*** pggldraw.h 9 Nov 2002 12:00:35 -0000 1.1.2.9
--- pggldraw.h 3 Feb 2003 16:39:59 -0000 1.1.2.10
***************
*** 164,167 ****
--- 164,169 ----
int texi;
bool isgrey;
+ bool alpha; /* true if alpha or colourkey present */
+ bool colourkey; /* true if colourkey specifically present */
};
[Prev in Thread] |
Current Thread |
[Next in 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,
Teunis Peters <address@hidden> <=
- Prev by Date:
[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
- Next by Date:
[paragui-cvs] CVS: paragui/src/draw/opengl pgglcore.cpp,1.1.2.8,1.1.2.9 pgglmem.cpp,1.1.2.4,1.1.2.5 pgglroot.cpp,1.1.2.8,1.1.2.9 pgglsurf.cpp,1.1.2.10,1.1.2.11
- Previous by 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
- Next by thread:
[paragui-cvs] CVS: paragui/src/draw/opengl pgglcore.cpp,1.1.2.8,1.1.2.9 pgglmem.cpp,1.1.2.4,1.1.2.5 pgglroot.cpp,1.1.2.8,1.1.2.9 pgglsurf.cpp,1.1.2.10,1.1.2.11
- Index(es):