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

Remove redundant members which are now in Params. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3730 dfc29bdd-3216-0410-991c-e03cc46cb475
master
hybrid 2011-05-19 20:10:20 +00:00
parent 92f1299cd2
commit 20c0d588a6
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/Irrlicht/COpenGLDriver.cpp
View File

@ -38,7 +38,6 @@ COpenGLDriver::COpenGLDriver(const irr::SIrrlichtCreationParameters& params,
AntiAlias(params.AntiAlias), RenderTargetTexture(0), AntiAlias(params.AntiAlias), RenderTargetTexture(0),
CurrentRendertargetSize(0,0), ColorFormat(ECF_R8G8B8), CurrentRendertargetSize(0,0), ColorFormat(ECF_R8G8B8),
CurrentTarget(ERT_FRAME_BUFFER), Params(params), CurrentTarget(ERT_FRAME_BUFFER), Params(params),
Doublebuffer(params.Doublebuffer), Stereo(params.Stereobuffer),
HDc(0), Window(static_cast<HWND>(params.WindowId)), Win32Device(device), HDc(0), Window(static_cast<HWND>(params.WindowId)), Win32Device(device),
DeviceType(EIDT_WIN32) DeviceType(EIDT_WIN32)
{ {
@ -472,7 +471,6 @@ COpenGLDriver::COpenGLDriver(const SIrrlichtCreationParameters& params,
AntiAlias(params.AntiAlias), RenderTargetTexture(0), AntiAlias(params.AntiAlias), RenderTargetTexture(0),
CurrentRendertargetSize(0,0), ColorFormat(ECF_R8G8B8), CurrentRendertargetSize(0,0), ColorFormat(ECF_R8G8B8),
CurrentTarget(ERT_FRAME_BUFFER), Params(params), CurrentTarget(ERT_FRAME_BUFFER), Params(params),
Doublebuffer(params.Doublebuffer), Stereo(params.Stereobuffer),
OSXDevice(device), DeviceType(EIDT_OSX) OSXDevice(device), DeviceType(EIDT_OSX)
{ {
#ifdef _DEBUG #ifdef _DEBUG
@ -495,7 +493,6 @@ COpenGLDriver::COpenGLDriver(const SIrrlichtCreationParameters& params,
Transformation3DChanged(true), AntiAlias(params.AntiAlias), Transformation3DChanged(true), AntiAlias(params.AntiAlias),
RenderTargetTexture(0), CurrentRendertargetSize(0,0), ColorFormat(ECF_R8G8B8), RenderTargetTexture(0), CurrentRendertargetSize(0,0), ColorFormat(ECF_R8G8B8),
CurrentTarget(ERT_FRAME_BUFFER), Params(params), CurrentTarget(ERT_FRAME_BUFFER), Params(params),
Doublebuffer(params.Doublebuffer), Stereo(params.Stereobuffer),
X11Device(device), DeviceType(EIDT_X11) X11Device(device), DeviceType(EIDT_X11)
{ {
#ifdef _DEBUG #ifdef _DEBUG
@ -568,7 +565,6 @@ COpenGLDriver::COpenGLDriver(const SIrrlichtCreationParameters& params,
Transformation3DChanged(true), AntiAlias(params.AntiAlias), Transformation3DChanged(true), AntiAlias(params.AntiAlias),
RenderTargetTexture(0), CurrentRendertargetSize(0,0), ColorFormat(ECF_R8G8B8), RenderTargetTexture(0), CurrentRendertargetSize(0,0), ColorFormat(ECF_R8G8B8),
CurrentTarget(ERT_FRAME_BUFFER), Params(params), CurrentTarget(ERT_FRAME_BUFFER), Params(params),
Doublebuffer(params.Doublebuffer), Stereo(params.Stereobuffer),
SDLDevice(device), DeviceType(EIDT_SDL) SDLDevice(device), DeviceType(EIDT_SDL)
{ {
#ifdef _DEBUG #ifdef _DEBUG
@ -3942,16 +3938,16 @@ bool COpenGLDriver::setRenderTarget(video::E_RENDER_TARGET target, bool clearTar
return false; return false;
} }
if (Stereo && (ERT_STEREO_RIGHT_BUFFER == target)) if (Params.Stereobuffer && (ERT_STEREO_RIGHT_BUFFER == target))
{ {
if (Doublebuffer) if (Params.Doublebuffer)
glDrawBuffer(GL_BACK_RIGHT); glDrawBuffer(GL_BACK_RIGHT);
else else
glDrawBuffer(GL_FRONT_RIGHT); glDrawBuffer(GL_FRONT_RIGHT);
} }
else if (Stereo && ERT_STEREO_BOTH_BUFFERS == target) else if (Params.Stereobuffer && ERT_STEREO_BOTH_BUFFERS == target)
{ {
if (Doublebuffer) if (Params.Doublebuffer)
glDrawBuffer(GL_BACK); glDrawBuffer(GL_BACK);
else else
glDrawBuffer(GL_FRONT); glDrawBuffer(GL_FRONT);
@ -3962,7 +3958,7 @@ bool COpenGLDriver::setRenderTarget(video::E_RENDER_TARGET target, bool clearTar
} }
else else
{ {
if (Doublebuffer) if (Params.Doublebuffer)
glDrawBuffer(GL_BACK_LEFT); glDrawBuffer(GL_BACK_LEFT);
else else
glDrawBuffer(GL_FRONT_LEFT); glDrawBuffer(GL_FRONT_LEFT);
@ -4029,7 +4025,7 @@ bool COpenGLDriver::setRenderTarget(video::ITexture* texture, bool clearBackBuff
RenderTargetTexture = 0; RenderTargetTexture = 0;
CurrentRendertargetSize = core::dimension2d<u32>(0,0); CurrentRendertargetSize = core::dimension2d<u32>(0,0);
CurrentTarget=ERT_FRAME_BUFFER; CurrentTarget=ERT_FRAME_BUFFER;
glDrawBuffer(Doublebuffer?GL_BACK_LEFT:GL_FRONT_LEFT); glDrawBuffer(Params.Doublebuffer?GL_BACK_LEFT:GL_FRONT_LEFT);
} }
// we need to update the matrices due to the rendersize change. // we need to update the matrices due to the rendersize change.
Transformation3DChanged=true; Transformation3DChanged=true;

2
source/Irrlicht/COpenGLDriver.h
View File

@ -474,8 +474,6 @@ namespace video
E_RENDER_TARGET CurrentTarget; E_RENDER_TARGET CurrentTarget;
SIrrlichtCreationParameters Params; SIrrlichtCreationParameters Params;
bool Doublebuffer;
bool Stereo;
//! All the lights that have been requested; a hardware limited //! All the lights that have been requested; a hardware limited
//! number of them will be used at once. //! number of them will be used at once.