[paragui-cvs] CVS: paragui/include pggldraw.h,1.1.2.8,1.1.2.9

[Teunis Peters <address@hidden>]

Update of /cvsroot/paragui/paragui/include
In directory subversions:/tmp/cvs-serv20544/include

Modified Files:
      Tag: devel-opengl
        pggldraw.h 
Log Message:
Working OpenGL
still needs additional repairs to get textures looking right, but so far so 
good :)


Index: pggldraw.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/Attic/pggldraw.h,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -C2 -r1.1.2.8 -r1.1.2.9
*** pggldraw.h  8 Nov 2002 11:22:01 -0000       1.1.2.8
--- pggldraw.h  9 Nov 2002 12:00:35 -0000       1.1.2.9
***************
*** 162,165 ****
--- 162,166 ----
     PG_GLDraw* host;
     int scale;
+    int texi;
     bool isgrey;
  };
***************
*** 268,277 ****
    
    /* new functions */
!   glSDL_TexInfo *GetTexInfo(SDL_Surface *surface);
!   glSDL_TexInfo *AllocTexInfo(SDL_Surface *surface);
!   void FreeTexInfo(SDL_Surface *surface);
!   int AddTexInfo(SDL_Surface *surface);
!   int  DownloadSurface(SDL_Surface *surface);
!   void UnloadSurface(SDL_Surface *surface);
  
   private:
--- 269,278 ----
    
    /* new functions */
!   glSDL_TexInfo *GetTexInfo(PG_GLDrawableSurface* surface);
!   glSDL_TexInfo *AllocTexInfo(PG_GLDrawableSurface* surface);
!   void FreeTexInfo(PG_GLDrawableSurface* surface);
!   int AddTexInfo(PG_GLDrawableSurface* surface);
!   int  DownloadSurface(PG_GLDrawableSurface* surface);
!   void UnloadSurface(PG_GLDrawableSurface* surface);
  
   private:
***************
*** 281,285 ****
    SDL_Surface *_CreateRGBSurface(int w, int h);
    SDL_Surface *_CreateRGBASurface(int w, int h);
!   void PG_GLDraw::_FreeSurface(SDL_Surface *);
    void _init_formats(void);
    int _FormatIsOk(SDL_Surface *surface);
--- 282,286 ----
    SDL_Surface *_CreateRGBSurface(int w, int h);
    SDL_Surface *_CreateRGBASurface(int w, int h);
!   /* void _FreeSurface(SDL_Surface *); */
    void _init_formats(void);
    int _FormatIsOk(SDL_Surface *surface);
***************
*** 301,307 ****
                     int dx1, int dy1, int dx2, int dy2,
                     unsigned char alpha, float texscale);
!   int _BlitGL(SDL_Surface *src, SDL_Rect *srcrect,
!             SDL_Surface *dst, SDL_Rect *dstrect);
!   int  _DownloadTexture(SDL_Surface *datasurf, glSDL_TexInfo *txi, int tex);
    void _UnloadTexture(glSDL_TexInfo *txi);
    
--- 302,308 ----
                     int dx1, int dy1, int dx2, int dy2,
                     unsigned char alpha, float texscale);
!   int _BlitGL(PG_GLDrawableSurface* src, SDL_Rect *srcrect,
!             PG_DrawableSurface*   dst, SDL_Rect *dstrect);
!   int  _DownloadTexture(PG_GLDrawableSurface* datasurf, glSDL_TexInfo *txi, 
int tex);
    void _UnloadTexture(glSDL_TexInfo *txi);