Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

BGE Rasterizer Cleanup: Moving the RAS_OpenGLRasterizer::ApplyLights() code into RAS_OpenGLRasterizer::ProcessLighting().

Browse Source
This commit is contained in:
Mitchell Stokes
2013-11-04 19:21:37 +00:00
parent c1e617d26b
commit a35e9daaef
2 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
View File

@@ -1159,8 +1159,33 @@ void RAS_OpenGLRasterizer::ProcessLighting(bool uselights, const MT_Transform& v
m_lastauxinfo = m_auxilaryClientInfo; m_lastauxinfo = m_auxilaryClientInfo;
/* enable/disable lights as needed */ /* enable/disable lights as needed */
if (layer >= 0) if (layer >= 0) {
enable = ApplyLights(layer, viewmat); //enable = ApplyLights(layer, viewmat);
// taken from blender source, incompatibility between Blender Object / GameObject
KX_Scene* kxscene = (KX_Scene*)m_auxilaryClientInfo;
float glviewmat[16];
unsigned int count;
std::vector<struct RAS_LightObject*>::iterator lit = m_lights.begin();
for (count=0; count<m_numgllights; count++)
glDisable((GLenum)(GL_LIGHT0+count));
viewmat.getValue(glviewmat);
glPushMatrix();
glLoadMatrixf(glviewmat);
for (lit = m_lights.begin(), count = 0; !(lit==m_lights.end()) && count < m_numgllights; ++lit)
{
RAS_LightObject* lightdata = (*lit);
KX_LightObject *kxlight = (KX_LightObject*)lightdata->m_light;
if (kxlight->ApplyLight(kxscene, layer, count))
count++;
}
glPopMatrix();
enable = count > 0;
}
if (enable) if (enable)
EnableOpenGLLights(); EnableOpenGLLights();
@@ -1508,35 +1533,6 @@ void RAS_OpenGLRasterizer::PopMatrix()
glPopMatrix(); glPopMatrix();
} }
int RAS_OpenGLRasterizer::ApplyLights(int objectlayer, const MT_Transform& viewmat)
{
// taken from blender source, incompatibility between Blender Object / GameObject
KX_Scene* kxscene = (KX_Scene*)m_auxilaryClientInfo;
float glviewmat[16];
unsigned int count;
std::vector<struct RAS_LightObject*>::iterator lit = m_lights.begin();
for (count=0; count<m_numgllights; count++)
glDisable((GLenum)(GL_LIGHT0+count));
viewmat.getValue(glviewmat);
glPushMatrix();
glLoadMatrixf(glviewmat);
for (lit = m_lights.begin(), count = 0; !(lit==m_lights.end()) && count < m_numgllights; ++lit)
{
RAS_LightObject* lightdata = (*lit);
KX_LightObject *kxlight = (KX_LightObject*)lightdata->m_light;
if (kxlight->ApplyLight(kxscene, objectlayer, count))
count++;
}
glPopMatrix();
return count;
}
void RAS_OpenGLRasterizer::MotionBlur() void RAS_OpenGLRasterizer::MotionBlur()
{ {
int state = GetMotionBlurState(); int state = GetMotionBlurState();

1
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
View File

@@ -367,7 +367,6 @@ public:
int height); int height);
void applyTransform(double* oglmatrix, int objectdrawmode); void applyTransform(double* oglmatrix, int objectdrawmode);
int applyLights(int objectlayer, const MT_Transform& viewmat);
void PushMatrix(); void PushMatrix();
void PopMatrix(); void PopMatrix();