[aedGUI-cvs] aedGUI/include aedApp.h,1.18,1.19 drawlibs.h,1.6,1.7

[Rodrigo H. <kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6822/include

Modified Files:
	aedApp.h drawlibs.h 
Log Message:
OpenGL Patch

Index: drawlibs.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/drawlibs.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** drawlibs.h	6 Nov 2003 18:46:34 -0000	1.6
--- drawlibs.h	16 Apr 2004 01:29:56 -0000	1.7
***************
*** 24,27 ****
--- 24,28 ----
  
  #include "SDL.h"
+ #include "aedColor.h"
  
  #define sgn(x) ((x<0)?-1:((x>0)?1:0))   /* macro to return the sign of a
***************
*** 32,40 ****
  DLLEXPORT void ConvertSurface(SDL_Surface ** surface);
  
! DLLEXPORT void DrawPixel(SDL_Surface * screen, int x, int y, Uint32 color);
! DLLEXPORT void DrawLine(SDL_Surface * screen, int x1, int y1, int x2, int y2,
!                         Uint32 color);
! DLLEXPORT void DrawRect(SDL_Surface * screen, int x1, int y1, int x2, int y2,
!                         Uint32 color);
  DLLEXPORT void DrawRound(SDL_Surface * screen, int x0, int y0, int w, int h,
                           int corner, Uint32 color);
--- 33,41 ----
  DLLEXPORT void ConvertSurface(SDL_Surface ** surface);
  
! DLLEXPORT void DrawPixel(void* screenORrect, int x, int y, aedColor &aedColor);
! DLLEXPORT void DrawLine(void* screenORrect, int x1, int y1, int x2, int y2,
!                         aedColor &aedColor);
! DLLEXPORT void DrawRect(void* screenORrect, int x1, int y1, int x2, int y2,
!                         aedColor &aedColor);
  DLLEXPORT void DrawRound(SDL_Surface * screen, int x0, int y0, int w, int h,
                           int corner, Uint32 color);
***************
*** 49,53 ****
  DLLEXPORT Uint32 GetPixel(SDL_Surface * surface, int x, int y);
  DLLEXPORT void FloodFill(SDL_Surface * screen, int x, int y, Uint32 c);
! DLLEXPORT void DrawTriangle(SDL_Surface * s, int x[3], int y[3], Uint32 c);
  
  enum
--- 50,54 ----
  DLLEXPORT Uint32 GetPixel(SDL_Surface * surface, int x, int y);
  DLLEXPORT void FloodFill(SDL_Surface * screen, int x, int y, Uint32 c);
! DLLEXPORT void DrawTriangle(void* s, int x[3], int y[3], Uint32 c);
  
  enum
***************
*** 58,63 ****
      ARROW_RIGHT
  };
! DLLEXPORT void DrawArrow(SDL_Surface * s, int type, int x, int y, int a,
!                          Uint32 color, bool fill = false, Uint32 fillcolor = 0);
  
  #define SLOCK(surface) \
--- 59,64 ----
      ARROW_RIGHT
  };
! DLLEXPORT void DrawArrow(void* s, int type, int x, int y, int a,
!                          aedColor &aedColor, bool fill, aedColor &fillcolor);
  
  #define SLOCK(surface) \

Index: aedApp.h
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/include/aedApp.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** aedApp.h	6 Nov 2003 18:46:32 -0000	1.18
--- aedApp.h	16 Apr 2004 01:29:56 -0000	1.19
***************
*** 170,173 ****
--- 170,181 ----
          return m_UTF8;
      }
+     bool usesOpenGL()
+     {
+       return m_use_OpenGL;
+     };
+     void setOpenGL(bool use_OpenGL)
+     {
+       m_use_OpenGL = use_OpenGL;
+     };
  
    private:
***************
*** 184,188 ****
      aedButton *m_okayButton;
      aedButton *m_cancelButton;
! 
      bool m_UTF8;
  };
--- 192,196 ----
      aedButton *m_okayButton;
      aedButton *m_cancelButton;
!     bool m_use_OpenGL;
      bool m_UTF8;
  };