zaki
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Push the params also for OSX. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1379 dfc29bdd-3216-0410-991c-e03cc46cb475
master
hybrid 2008-06-13 15:52:54 +00:00
parent 97577f9bc2
commit d6c32fd9f0
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/Irrlicht/COpenGLDriver.cpp
View File

@ -163,18 +163,17 @@ bool COpenGLDriver::initDriver(const core::dimension2d<s32>& screenSize,
// -----------------------------------------------------------------------
#ifdef _IRR_USE_OSX_DEVICE_
//! Windows constructor and init code
COpenGLDriver::COpenGLDriver(const core::dimension2d<s32>& screenSize,
bool fullscreen, bool stencilBuffer, CIrrDeviceMacOSX *device,
io::IFileSystem* io, bool vsync, bool antiAlias)
: CNullDriver(io, screenSize), COpenGLExtensionHandler(),
COpenGLDriver::COpenGLDriver(const SIrrlichtCreationParameters& params,
io::IFileSystem* io, CIrrDeviceMacOSX *device)
: CNullDriver(io, params.WindowSize), COpenGLExtensionHandler(),
CurrentRenderMode(ERM_NONE), ResetRenderStates(true), Transformation3DChanged(true),
AntiAlias(antiAlias), RenderTargetTexture(0), LastSetLight(-1),
AntiAlias(params.AntiAlias), RenderTargetTexture(0), LastSetLight(-1),
CurrentRendertargetSize(0,0), _device(device)
{
#ifdef _DEBUG
setDebugName("COpenGLDriver");
#endif
genericDriverInit(screenSize, stencilBuffer);
genericDriverInit(params.WindowSize, params.Stencilbuffer);
}
#endif
@ -2726,13 +2725,11 @@ IVideoDriver* createOpenGLDriver(const core::dimension2d<s32>& screenSize,
// MACOSX VERSION
// -----------------------------------
#if defined(_IRR_USE_OSX_DEVICE_)
IVideoDriver* createOpenGLDriver(const core::dimension2d<s32>& screenSize,
CIrrDeviceMacOSX *device, bool fullscreen, bool stencilBuffer,
io::IFileSystem* io, bool vsync, bool antiAlias)
IVideoDriver* createOpenGLDriver(const SIrrlichtCreationParameters& params,
io::IFileSystem* io, CIrrDeviceMacOSX *device)
{
#ifdef _IRR_COMPILE_WITH_OPENGL_
return new COpenGLDriver(screenSize, fullscreen, stencilBuffer,
device, io, vsync, antiAlias);
return new COpenGLDriver(params, io, device);
#else
return 0;
#endif // _IRR_COMPILE_WITH_OPENGL_

4
source/Irrlicht/COpenGLDriver.h
View File

@ -86,8 +86,8 @@ namespace video
#endif
#ifdef _IRR_USE_OSX_DEVICE_
COpenGLDriver(const core::dimension2d<s32>& screenSize, bool fullscreen,
bool stencilBuffer, CIrrDeviceMacOSX *device,io::IFileSystem* io, bool vsync, bool antiAlias);
COpenGLDriver(const SIrrlichtCreationParameters& params,
io::IFileSystem* io, CIrrDeviceMacOSX *device);
#endif
//! destructor

4
source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
View File

@ -61,7 +61,7 @@ namespace irr
{
namespace video
{
IVideoDriver* createOpenGLDriver(const core::dimension2d<s32>& screenSize, CIrrDeviceMacOSX *device, bool fullscreen, bool stencilBuffer, io::IFileSystem* io, bool vsync, bool antiAlias);
IVideoDriver* createOpenGLDriver(const SIrrlichtCreationParameters& param, io::IFileSystem* io, CIrrDeviceMacOSX *device);
}
} // end namespace irr
@ -332,7 +332,7 @@ void CIrrDeviceMacOSX::createDriver()
case video::EDT_OPENGL:
#ifdef _IRR_COMPILE_WITH_OPENGL_
VideoDriver = video::createOpenGLDriver(CreationParams.WindowSize, this, CreationParams.Fullscreen, CreationParams.Stencilbuffer, FileSystem, CreationParams.Vsync, creationParams.AntiAlias);
VideoDriver = video::createOpenGLDriver(CreationParams, FileSystem, this);
#else
os::Printer::log("No OpenGL support compiled in.", ELL_ERROR);
#endif