diff options
author | Mitchell Stokes <mogurijin@gmail.com> | 2014-03-25 07:11:11 +0400 |
---|---|---|
committer | Mitchell Stokes <mogurijin@gmail.com> | 2014-03-25 07:11:11 +0400 |
commit | 9d244e0ad7cb523e58ba76758da28655a942ac09 (patch) | |
tree | d0fe0014e23931f2c9d0c33ae0ab33dfb2190e2c /source/gameengine/Rasterizer | |
parent | b66a9543bbcf86646b46af1da7ed0c4d035c7f98 (diff) |
Code cleanup: Removing KX_KetsjiEngine::m_drawingmode
The rasterizer is already handling this, and there is
no need to duplicate the data.
Diffstat (limited to 'source/gameengine/Rasterizer')
3 files changed, 4 insertions, 4 deletions
diff --git a/source/gameengine/Rasterizer/RAS_IRasterizer.h b/source/gameengine/Rasterizer/RAS_IRasterizer.h index 0776a02a79a..887ebc476b0 100644 --- a/source/gameengine/Rasterizer/RAS_IRasterizer.h +++ b/source/gameengine/Rasterizer/RAS_IRasterizer.h @@ -195,7 +195,7 @@ public: /** * BeginFrame is called at the start of each frame. */ - virtual bool BeginFrame(int drawingmode, double time) = 0; + virtual bool BeginFrame(double time) = 0; /** * ClearColorBuffer clears the color buffer. diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp index e03be54e87b..63355696082 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp @@ -100,6 +100,7 @@ RAS_OpenGLRasterizer::RAS_OpenGLRasterizer(RAS_ICanvas* canvas, int storage) m_usingoverrideshader(false), m_clientobject(NULL), m_auxilaryClientInfo(NULL), + m_drawingmode(KX_TEXTURED), m_texco_num(0), m_attrib_num(0), //m_last_alphablend(GPU_BLEND_SOLID), @@ -330,10 +331,9 @@ void RAS_OpenGLRasterizer::Exit() EndFrame(); } -bool RAS_OpenGLRasterizer::BeginFrame(int drawingmode, double time) +bool RAS_OpenGLRasterizer::BeginFrame(double time) { m_time = time; - SetDrawingMode(drawingmode); // Blender camera routine destroys the settings if (m_drawingmode < KX_SOLID) diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h index d03e06c3b31..ae9e89cd8cc 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h @@ -166,7 +166,7 @@ public: virtual bool SetMaterial(const RAS_IPolyMaterial &mat); virtual bool Init(); virtual void Exit(); - virtual bool BeginFrame(int drawingmode, double time); + virtual bool BeginFrame(double time); virtual void ClearColorBuffer(); virtual void ClearDepthBuffer(); virtual void ClearCachingInfo(void); |