removed gl tags

This commit is contained in:
James Turk 2003-01-19 05:43:40 +00:00
parent 44b434b257
commit 751d8a1b65
3 changed files with 4 additions and 12 deletions

View File

@ -13,7 +13,7 @@
File: ZE_Defines.h <br> File: ZE_Defines.h <br>
Description: Defines header file for ZEngine class, where all #define statements to control compilation options are placed. <br> Description: Defines header file for ZEngine class, where all #define statements to control compilation options are placed. <br>
Author(s): James Turk <br> Author(s): James Turk <br>
$Id: ZE_Defines.h,v 1.6 2003/01/13 05:48:47 cozman Exp $<br> $Id: ZE_Defines.h,v 1.7 2003/01/19 05:43:40 cozman Exp $<br>
\file ZE_Defines.h \file ZE_Defines.h
\brief Define file for ZEngine. \brief Define file for ZEngine.
@ -25,8 +25,6 @@ $Id: ZE_Defines.h,v 1.6 2003/01/13 05:48:47 cozman Exp $<br>
#define __ze_defines_h__ #define __ze_defines_h__
//defines- undefine any of these if you dont have the indicated SDL extension// //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 to include font support.
#define USE_SDL_TTF #define USE_SDL_TTF
//! Define to include non-bmp image file support. //! Define to include non-bmp image file support.

View File

@ -13,7 +13,7 @@
File: ZE_ZEngine.h <br> File: ZE_ZEngine.h <br>
Description: Header file for ZEngine class, the core of the ZEngine. <br> Description: Header file for ZEngine class, the core of the ZEngine. <br>
Author(s): James Turk <br> Author(s): James Turk <br>
$Id: ZE_ZEngine.h,v 1.13 2003/01/19 02:05:13 cozman Exp $<br> $Id: ZE_ZEngine.h,v 1.14 2003/01/19 05:43:40 cozman Exp $<br>
\file ZE_ZEngine.h \file ZE_ZEngine.h
\brief Definition file for core ZEngine class. \brief Definition file for core ZEngine class.
@ -117,7 +117,7 @@ class ZEngine
\param width Desired width of screen or window. \param width Desired width of screen or window.
\param height Desired height 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. \param fullscreen A bool for fullscreen setting.
**/ **/
void SetupDisplay(int width, int height, int bpp, bool fullscreen); void SetupDisplay(int width, int height, int bpp, bool fullscreen);

View File

@ -13,7 +13,7 @@
File: ZE_ZEngine.cpp <br> File: ZE_ZEngine.cpp <br>
Description: Implementation source file for ZEngine library main singleton class. <br> Description: Implementation source file for ZEngine library main singleton class. <br>
Author(s): James Turk <br> Author(s): James Turk <br>
$Id: ZE_ZEngine.cpp,v 1.18 2003/01/19 04:55:18 cozman Exp $<br> $Id: ZE_ZEngine.cpp,v 1.19 2003/01/19 05:43:40 cozman Exp $<br>
\file ZE_ZEngine.cpp \file ZE_ZEngine.cpp
\brief Central source file for ZEngine. \brief Central source file for ZEngine.
@ -105,9 +105,7 @@ bool ZEngine::CreateDisplay(string title, string icon)
SDL_Surface *iconImg; SDL_Surface *iconImg;
bool status=true; //status of setup bool status=true; //status of setup
int bpp; int bpp;
#ifdef USE_OPENGL
int rgb_size[3]; int rgb_size[3];
#endif //USE_OPENGL
if(SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_AUDIO) < 0) 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; mBPP = 24;
#endif #endif
#ifdef USE_OPENGL
switch (mBPP) switch (mBPP)
{ {
case 8: case 8:
@ -184,7 +181,6 @@ bool ZEngine::CreateDisplay(string title, string icon)
SDL_GL_SetAttribute(SDL_GL_ACCUM_ALPHA_SIZE, 0); SDL_GL_SetAttribute(SDL_GL_ACCUM_ALPHA_SIZE, 0);
flags |= SDL_OPENGL; flags |= SDL_OPENGL;
#endif //USE_OPENGL
//Window Manager settings// //Window Manager settings//
SDL_EnableKeyRepeat(30,30); SDL_EnableKeyRepeat(30,30);
@ -217,9 +213,7 @@ bool ZEngine::CreateDisplay(string title, string icon)
mHeight = mScreen->h; mHeight = mScreen->h;
mBPP = mScreen->format->BitsPerPixel; mBPP = mScreen->format->BitsPerPixel;
#ifdef USE_OPENGL
SetGL2D(); SetGL2D();
#endif //USE_OPENGL
mKeyIsPressed = SDL_GetKeyState(NULL); mKeyIsPressed = SDL_GetKeyState(NULL);