Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #1251 Code simplification and default values if not using config.h

Browse source
This commit is contained in:
kervala 2011-02-24 18:55:14 +01:00
parent 43decbd157
commit 93c382f02c
3 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/nel/src/3d/driver_user.cpp
View file

@ -36,10 +36,6 @@
#include "nel/misc/hierarchical_timer.h" #include "nel/misc/hierarchical_timer.h"
#include "nel/misc/event_emitter.h" #include "nel/misc/event_emitter.h"
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif // HAVE_CONFIG_H
using namespace NLMISC; using namespace NLMISC;
namespace NL3D namespace NL3D
@ -137,15 +133,13 @@ CDriverUser::CDriverUser (uint windowIcon, bool direct3d, emptyProc exitFunc)
_Driver = NULL; _Driver = NULL;
// Create/Init Driver. // Create/Init Driver.
#if defined(NL_OS_WINDOWS) && defined(NL_DIRECT3D_AVAILABLE) #if defined(NL_OS_WINDOWS)
if (direct3d) if (direct3d)
_Driver= CDRU::createD3DDriver(); _Driver= CDRU::createD3DDriver();
#endif #endif
#ifdef NL_OPENGL_AVAILABLE
if (!_Driver) if (!_Driver)
_Driver= CDRU::createGlDriver(); _Driver= CDRU::createGlDriver();
#endif
nlassert(_Driver); nlassert(_Driver);
_Driver->init (windowIcon, exitFunc); _Driver->init (windowIcon, exitFunc);

5
code/nel/src/3d/dru.cpp
View file

@ -27,6 +27,11 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
#else
# define NL_OPENGL_AVAILABLE
# ifdef NL_OS_WINDOWS
# define NL_DIRECT3D_AVAILABLE
# endif
#endif // HAVE_CONFIG_H #endif // HAVE_CONFIG_H
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS

8
code/nel/src/3d/nelu.cpp
View file

@ -27,10 +27,6 @@
#include "nel/3d/vertex_stream_manager.h" #include "nel/3d/vertex_stream_manager.h"
#include "nel/misc/debug.h" #include "nel/misc/debug.h"
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif // HAVE_CONFIG_H
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;
@ -62,19 +58,17 @@ bool CNELU::initDriver (uint w, uint h, uint bpp, bool windowed, nlWindow syst
CNELU::Driver = NULL; CNELU::Driver = NULL;
// Init driver. // Init driver.
#if defined(NL_OS_WINDOWS) && defined(NL_DIRECT3D_AVAILABLE) #if defined(NL_OS_WINDOWS)
if (direct3d) if (direct3d)
{ {
CNELU::Driver= CDRU::createD3DDriver(); CNELU::Driver= CDRU::createD3DDriver();
} }
#endif #endif
#ifdef NL_OPENGL_AVAILABLE
if (!CNELU::Driver) if (!CNELU::Driver)
{ {
CNELU::Driver= CDRU::createGlDriver(); CNELU::Driver= CDRU::createGlDriver();
} }
#endif
if (!CNELU::Driver) if (!CNELU::Driver)
{ {