From 751d8a1b65a6c7a25fb042e9212e9f5ee0bc7a3f Mon Sep 17 00:00:00 2001 From: James Turk Date: Sun, 19 Jan 2003 05:43:40 +0000 Subject: [PATCH] removed gl tags --- include/ZE_Defines.h | 4 +--- include/ZE_ZEngine.h | 4 ++-- src/ZE_ZEngine.cpp | 8 +------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/include/ZE_Defines.h b/include/ZE_Defines.h index bfa192b..bc16755 100644 --- a/include/ZE_Defines.h +++ b/include/ZE_Defines.h @@ -13,7 +13,7 @@ File: ZE_Defines.h
Description: Defines header file for ZEngine class, where all #define statements to control compilation options are placed.
Author(s): James Turk
-$Id: ZE_Defines.h,v 1.6 2003/01/13 05:48:47 cozman Exp $
+$Id: ZE_Defines.h,v 1.7 2003/01/19 05:43:40 cozman Exp $
\file ZE_Defines.h \brief Define file for ZEngine. @@ -25,8 +25,6 @@ $Id: ZE_Defines.h,v 1.6 2003/01/13 05:48:47 cozman Exp $
#define __ze_defines_h__ //defines- undefine any of these if you dont have the indicated SDL extension// -//! Define to include OpenGL support (MUST be defined, may become optional in future) -#define USE_OPENGL //! Define to include font support. #define USE_SDL_TTF //! Define to include non-bmp image file support. diff --git a/include/ZE_ZEngine.h b/include/ZE_ZEngine.h index ee2d617..a238953 100644 --- a/include/ZE_ZEngine.h +++ b/include/ZE_ZEngine.h @@ -13,7 +13,7 @@ File: ZE_ZEngine.h
Description: Header file for ZEngine class, the core of the ZEngine.
Author(s): James Turk
-$Id: ZE_ZEngine.h,v 1.13 2003/01/19 02:05:13 cozman Exp $
+$Id: ZE_ZEngine.h,v 1.14 2003/01/19 05:43:40 cozman Exp $
\file ZE_ZEngine.h \brief Definition file for core ZEngine class. @@ -117,7 +117,7 @@ class ZEngine \param width Desired width of screen or window. \param height Desired height of screen or window. - \param bpp Desired BPP for screen (only works in fullscreen). + \param bpp Desired BPP for screen (generally use 32). \param fullscreen A bool for fullscreen setting. **/ void SetupDisplay(int width, int height, int bpp, bool fullscreen); diff --git a/src/ZE_ZEngine.cpp b/src/ZE_ZEngine.cpp index 0c4848e..632c0ff 100644 --- a/src/ZE_ZEngine.cpp +++ b/src/ZE_ZEngine.cpp @@ -13,7 +13,7 @@ File: ZE_ZEngine.cpp
Description: Implementation source file for ZEngine library main singleton class.
Author(s): James Turk
-$Id: ZE_ZEngine.cpp,v 1.18 2003/01/19 04:55:18 cozman Exp $
+$Id: ZE_ZEngine.cpp,v 1.19 2003/01/19 05:43:40 cozman Exp $
\file ZE_ZEngine.cpp \brief Central source file for ZEngine. @@ -105,9 +105,7 @@ bool ZEngine::CreateDisplay(string title, string icon) SDL_Surface *iconImg; bool status=true; //status of setup int bpp; -#ifdef USE_OPENGL int rgb_size[3]; -#endif //USE_OPENGL if(SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_AUDIO) < 0) { @@ -151,7 +149,6 @@ bool ZEngine::CreateDisplay(string title, string icon) mBPP = 24; #endif -#ifdef USE_OPENGL switch (mBPP) { case 8: @@ -184,7 +181,6 @@ bool ZEngine::CreateDisplay(string title, string icon) SDL_GL_SetAttribute(SDL_GL_ACCUM_ALPHA_SIZE, 0); flags |= SDL_OPENGL; -#endif //USE_OPENGL //Window Manager settings// SDL_EnableKeyRepeat(30,30); @@ -217,9 +213,7 @@ bool ZEngine::CreateDisplay(string title, string icon) mHeight = mScreen->h; mBPP = mScreen->format->BitsPerPixel; -#ifdef USE_OPENGL SetGL2D(); -#endif //USE_OPENGL mKeyIsPressed = SDL_GetKeyState(NULL);