From b8a71efeba70d6c3ebc579f5043daa4162da86e8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 24 Mar 2012 07:52:14 +0000 Subject: style cleanup: follow style guide for/with/if spacing --- source/gameengine/Ketsji/KX_BlenderMaterial.cpp | 170 ++++++++++++------------ 1 file changed, 85 insertions(+), 85 deletions(-) (limited to 'source/gameengine/Ketsji/KX_BlenderMaterial.cpp') diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp index 66cbcdb914c..13727be8b98 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp @@ -101,7 +101,7 @@ void KX_BlenderMaterial::Initialize( // so we can ether accept or reject this material // as being equal, this is rather important to // prevent material bleeding - for(int i=0; inum_enabled; i++) { + for (int i=0; inum_enabled; i++) { m_multimode += (mMaterial->flag[i] + mMaterial->blend_mode[i]); } m_multimode += mMaterial->IdMode+ (mMaterial->ras_mode & ~(USE_LIGHT)); @@ -161,25 +161,25 @@ void KX_BlenderMaterial::OnConstruction(int layer) // when material are reused between objects return; - if(mMaterial->glslmat) + if (mMaterial->glslmat) SetBlenderGLSLShader(layer); // for each unique material... int i; - for(i=0; inum_enabled; i++) { - if( mMaterial->mapping[i].mapping & USEENV ) { - if(!GLEW_ARB_texture_cube_map) { + for (i=0; inum_enabled; i++) { + if ( mMaterial->mapping[i].mapping & USEENV ) { + if (!GLEW_ARB_texture_cube_map) { spit("CubeMap textures not supported"); continue; } - if(!mTextures[i].InitCubeMap(i, mMaterial->cubemap[i] ) ) + if (!mTextures[i].InitCubeMap(i, mMaterial->cubemap[i] ) ) spit("unable to initialize image("<matname<< ", image will not be available"); } else { - if( mMaterial->img[i] ) { - if( ! mTextures[i].InitFromImage(i, mMaterial->img[i], (mMaterial->flag[i] &MIPMAP)!=0 )) + if ( mMaterial->img[i] ) { + if ( ! mTextures[i].InitFromImage(i, mMaterial->img[i], (mMaterial->flag[i] &MIPMAP)!=0 )) spit("unable to initialize image("<matname<< ", image will not be available"); } @@ -193,12 +193,12 @@ void KX_BlenderMaterial::OnConstruction(int layer) void KX_BlenderMaterial::EndFrame() { - if(mLastBlenderShader) { + if (mLastBlenderShader) { mLastBlenderShader->SetProg(false); mLastBlenderShader = NULL; } - if(mLastShader) { + if (mLastShader) { mLastShader->SetProg(false); mLastShader = NULL; } @@ -206,10 +206,10 @@ void KX_BlenderMaterial::EndFrame() void KX_BlenderMaterial::OnExit() { - if( mShader ) { + if ( mShader ) { //note, the shader here is allocated, per unique material //and this function is called per face - if(mShader == mLastShader) { + if (mShader == mLastShader) { mShader->SetProg(false); mLastShader = NULL; } @@ -218,8 +218,8 @@ void KX_BlenderMaterial::OnExit() mShader = 0; } - if( mBlenderShader ) { - if(mBlenderShader == mLastBlenderShader) { + if ( mBlenderShader ) { + if (mBlenderShader == mLastBlenderShader) { mBlenderShader->SetProg(false); mLastBlenderShader = NULL; } @@ -229,7 +229,7 @@ void KX_BlenderMaterial::OnExit() } BL_Texture::ActivateFirst(); - for(int i=0; inum_enabled; i++) { + for (int i=0; inum_enabled; i++) { BL_Texture::ActivateUnit(i); mTextures[i].DeleteTex(); mTextures[i].DisableUnit(); @@ -249,9 +249,9 @@ void KX_BlenderMaterial::setShaderData( bool enable, RAS_IRasterizer *ras) MT_assert(GLEW_ARB_shader_objects && mShader); int i; - if( !enable || !mShader->Ok() ) { + if ( !enable || !mShader->Ok() ) { // frame cleanup. - if(mShader == mLastShader) { + if (mShader == mLastShader) { mShader->SetProg(false); mLastShader = NULL; } @@ -270,13 +270,13 @@ void KX_BlenderMaterial::setShaderData( bool enable, RAS_IRasterizer *ras) mShader->ApplyShader(); // for each enabled unit - for(i=0; inum_enabled; i++) { - if(!mTextures[i].Ok()) continue; + for (i=0; inum_enabled; i++) { + if (!mTextures[i].Ok()) continue; mTextures[i].ActivateTexture(); mTextures[0].SetMapping(mMaterial->mapping[i].mapping); } - if(!mUserDefBlend) { + if (!mUserDefBlend) { ras->SetAlphaBlend(mMaterial->alphablend); } else { @@ -291,11 +291,11 @@ void KX_BlenderMaterial::setShaderData( bool enable, RAS_IRasterizer *ras) void KX_BlenderMaterial::setBlenderShaderData( bool enable, RAS_IRasterizer *ras) { - if( !enable || !mBlenderShader->Ok() ) { + if ( !enable || !mBlenderShader->Ok() ) { ras->SetAlphaBlend(TF_SOLID); // frame cleanup. - if(mLastBlenderShader) { + if (mLastBlenderShader) { mLastBlenderShader->SetProg(false); mLastBlenderShader= NULL; } @@ -305,10 +305,10 @@ void KX_BlenderMaterial::setBlenderShaderData( bool enable, RAS_IRasterizer *ras return; } - if(!mBlenderShader->Equals(mLastBlenderShader)) { + if (!mBlenderShader->Equals(mLastBlenderShader)) { ras->SetAlphaBlend(mMaterial->alphablend); - if(mLastBlenderShader) + if (mLastBlenderShader) mLastBlenderShader->SetProg(false); else BL_Texture::DisableAllTextures(); @@ -322,21 +322,21 @@ void KX_BlenderMaterial::setTexData( bool enable, RAS_IRasterizer *ras) { BL_Texture::DisableAllTextures(); - if( !enable ) { + if ( !enable ) { ras->SetAlphaBlend(TF_SOLID); return; } BL_Texture::ActivateFirst(); - if( mMaterial->IdMode == DEFAULT_BLENDER ) { + if ( mMaterial->IdMode == DEFAULT_BLENDER ) { ras->SetAlphaBlend(mMaterial->alphablend); return; } - if( mMaterial->IdMode == TEXFACE ) { + if ( mMaterial->IdMode == TEXFACE ) { // no material connected to the object - if( mTextures[0].Ok() ) { + if ( mTextures[0].Ok() ) { mTextures[0].ActivateTexture(); mTextures[0].setTexEnv(0, true); mTextures[0].SetMapping(mMaterial->mapping[0].mapping); @@ -346,23 +346,23 @@ void KX_BlenderMaterial::setTexData( bool enable, RAS_IRasterizer *ras) } int mode = 0,i=0; - for(i=0; (inum_enabled && inum_enabled && imapping[i].mapping; - if(mode &USEOBJ) + if (mode &USEOBJ) setObjectMatrixData(i, ras); else mTextures[i].SetMapping(mode); - if(!(mode &USEOBJ)) + if (!(mode &USEOBJ)) setTexMatrixData( i ); } - if(!mUserDefBlend) { + if (!mUserDefBlend) { ras->SetAlphaBlend(mMaterial->alphablend); } else { @@ -382,10 +382,10 @@ KX_BlenderMaterial::ActivatShaders( KX_BlenderMaterial *tmp = const_cast(this); // reset... - if(tmp->mMaterial->IsShared()) + if (tmp->mMaterial->IsShared()) cachingInfo =0; - if(mLastBlenderShader) { + if (mLastBlenderShader) { mLastBlenderShader->SetProg(false); mLastBlenderShader= NULL; } @@ -397,7 +397,7 @@ KX_BlenderMaterial::ActivatShaders( cachingInfo = GetCachingInfo(); - if(rasty->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED) + if (rasty->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED) tmp->setShaderData(true, rasty); else tmp->setShaderData(false, rasty); @@ -431,7 +431,7 @@ KX_BlenderMaterial::ActivateBlenderShaders( { KX_BlenderMaterial *tmp = const_cast(this); - if(mLastShader) { + if (mLastShader) { mLastShader->SetProg(false); mLastShader= NULL; } @@ -442,7 +442,7 @@ KX_BlenderMaterial::ActivateBlenderShaders( cachingInfo = GetCachingInfo(); - if(rasty->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED) + if (rasty->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED) tmp->setBlenderShaderData(true, rasty); else tmp->setBlenderShaderData(false, rasty); @@ -475,12 +475,12 @@ KX_BlenderMaterial::ActivateMat( { KX_BlenderMaterial *tmp = const_cast(this); - if(mLastShader) { + if (mLastShader) { mLastShader->SetProg(false); mLastShader= NULL; } - if(mLastBlenderShader) { + if (mLastBlenderShader) { mLastBlenderShader->SetProg(false); mLastBlenderShader= NULL; } @@ -524,13 +524,13 @@ KX_BlenderMaterial::Activate( TCachingInfo& cachingInfo )const { - if(GLEW_ARB_shader_objects && (mShader && mShader->Ok())) { - if((mPass++) < mShader->getNumPass() ) { + if (GLEW_ARB_shader_objects && (mShader && mShader->Ok())) { + if ((mPass++) < mShader->getNumPass() ) { ActivatShaders(rasty, cachingInfo); return true; } else { - if(mShader == mLastShader) { + if (mShader == mLastShader) { mShader->SetProg(false); mLastShader = NULL; } @@ -538,8 +538,8 @@ KX_BlenderMaterial::Activate( return false; } } - else if( GLEW_ARB_shader_objects && (mBlenderShader && mBlenderShader->Ok() ) ) { - if(mPass++ == 0) { + else if ( GLEW_ARB_shader_objects && (mBlenderShader && mBlenderShader->Ok() ) ) { + if (mPass++ == 0) { ActivateBlenderShaders(rasty, cachingInfo); return true; } @@ -549,7 +549,7 @@ KX_BlenderMaterial::Activate( } } else { - if(mPass++ == 0) { + if (mPass++ == 0) { ActivateMat(rasty, cachingInfo); return true; } @@ -562,12 +562,12 @@ KX_BlenderMaterial::Activate( bool KX_BlenderMaterial::UsesLighting(RAS_IRasterizer *rasty) const { - if(!RAS_IPolyMaterial::UsesLighting(rasty)) + if (!RAS_IPolyMaterial::UsesLighting(rasty)) return false; - if(mShader && mShader->Ok()) + if (mShader && mShader->Ok()) return true; - else if(mBlenderShader && mBlenderShader->Ok()) + else if (mBlenderShader && mBlenderShader->Ok()) return false; else return true; @@ -575,10 +575,10 @@ bool KX_BlenderMaterial::UsesLighting(RAS_IRasterizer *rasty) const void KX_BlenderMaterial::ActivateMeshSlot(const RAS_MeshSlot & ms, RAS_IRasterizer* rasty) const { - if(mShader && GLEW_ARB_shader_objects) { + if (mShader && GLEW_ARB_shader_objects) { mShader->Update(ms, rasty); } - else if(mBlenderShader && GLEW_ARB_shader_objects) { + else if (mBlenderShader && GLEW_ARB_shader_objects) { int alphablend; mBlenderShader->Update(ms, rasty); @@ -586,7 +586,7 @@ void KX_BlenderMaterial::ActivateMeshSlot(const RAS_MeshSlot & ms, RAS_IRasteriz /* we do blend modes here, because they can change per object * with the same material due to obcolor/obalpha */ alphablend = mBlenderShader->GetAlphaBlend(); - if(ELEM3(alphablend, GEMAT_SOLID, GEMAT_ALPHA, GEMAT_ALPHA_SORT) && mMaterial->alphablend != GEMAT_SOLID) + if (ELEM3(alphablend, GEMAT_SOLID, GEMAT_ALPHA, GEMAT_ALPHA_SORT) && mMaterial->alphablend != GEMAT_SOLID) alphablend = mMaterial->alphablend; rasty->SetAlphaBlend(alphablend); @@ -595,7 +595,7 @@ void KX_BlenderMaterial::ActivateMeshSlot(const RAS_MeshSlot & ms, RAS_IRasteriz void KX_BlenderMaterial::ActivatGLMaterials( RAS_IRasterizer* rasty )const { - if(mShader || !mBlenderShader) { + if (mShader || !mBlenderShader) { rasty->SetSpecularity( mMaterial->speccolor[0]*mMaterial->spec_f, mMaterial->speccolor[1]*mMaterial->spec_f, @@ -627,10 +627,10 @@ void KX_BlenderMaterial::ActivatGLMaterials( RAS_IRasterizer* rasty )const void KX_BlenderMaterial::ActivateTexGen(RAS_IRasterizer *ras) const { - if(ras->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED) { + if (ras->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED) { ras->SetAttribNum(0); - if(mShader && GLEW_ARB_shader_objects) { - if(mShader->GetAttribute() == BL_Shader::SHD_TANGENT) { + if (mShader && GLEW_ARB_shader_objects) { + if (mShader->GetAttribute() == BL_Shader::SHD_TANGENT) { ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_DISABLE, 0); ras->SetAttrib(RAS_IRasterizer::RAS_TEXTANGENT, 1); ras->SetAttribNum(2); @@ -639,7 +639,7 @@ void KX_BlenderMaterial::ActivateTexGen(RAS_IRasterizer *ras) const ras->SetTexCoordNum(mMaterial->num_enabled); - for(int i=0; inum_enabled; i++) { + for (int i=0; inum_enabled; i++) { int mode = mMaterial->mapping[i].mapping; if (mode &USECUSTOMUV) @@ -649,15 +649,15 @@ void KX_BlenderMaterial::ActivateTexGen(RAS_IRasterizer *ras) const continue; } - if( mode &(USEREFL|USEOBJ)) + if ( mode &(USEREFL|USEOBJ)) ras->SetTexCoord(RAS_IRasterizer::RAS_TEXCO_GEN, i); - else if(mode &USEORCO) + else if (mode &USEORCO) ras->SetTexCoord(RAS_IRasterizer::RAS_TEXCO_ORCO, i); - else if(mode &USENORM) + else if (mode &USENORM) ras->SetTexCoord(RAS_IRasterizer::RAS_TEXCO_NORM, i); - else if(mode &USEUV) + else if (mode &USEUV) ras->SetTexCoord(RAS_IRasterizer::RAS_TEXCO_UV1, i); - else if(mode &USETANG) + else if (mode &USETANG) ras->SetTexCoord(RAS_IRasterizer::RAS_TEXTANGENT, i); else ras->SetTexCoord(RAS_IRasterizer::RAS_TEXCO_DISABLE, i); @@ -670,7 +670,7 @@ void KX_BlenderMaterial::setTexMatrixData(int i) glMatrixMode(GL_TEXTURE); glLoadIdentity(); - if( GLEW_ARB_texture_cube_map && + if ( GLEW_ARB_texture_cube_map && mTextures[i].GetTextureType() == GL_TEXTURE_CUBE_MAP_ARB && mMaterial->mapping[i].mapping & USEREFL) { glScalef( @@ -700,11 +700,11 @@ void KX_BlenderMaterial::setTexMatrixData(int i) static void GetProjPlane(BL_Material *mat, int index,int num, float*param) { param[0]=param[1]=param[2]=param[3]=0.f; - if( mat->mapping[index].projplane[num] == PROJX ) + if ( mat->mapping[index].projplane[num] == PROJX ) param[0] = 1.f; - else if( mat->mapping[index].projplane[num] == PROJY ) + else if ( mat->mapping[index].projplane[num] == PROJY ) param[1] = 1.f; - else if( mat->mapping[index].projplane[num] == PROJZ) + else if ( mat->mapping[index].projplane[num] == PROJZ) param[2] = 1.f; } @@ -714,7 +714,7 @@ void KX_BlenderMaterial::setObjectMatrixData(int i, RAS_IRasterizer *ras) (KX_GameObject*) mScene->GetObjectList()->FindValue(mMaterial->mapping[i].objconame); - if(!obj) return; + if (!obj) return; glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR ); glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR ); @@ -784,10 +784,10 @@ void KX_BlenderMaterial::UpdateIPO( void KX_BlenderMaterial::SetBlenderGLSLShader(int layer) { - if(!mBlenderShader) + if (!mBlenderShader) mBlenderShader = new BL_BlenderShader(mScene, mMaterial->material, layer); - if(!mBlenderShader->Ok()) { + if (!mBlenderShader->Ok()) { delete mBlenderShader; mBlenderShader = 0; } @@ -855,7 +855,7 @@ int KX_BlenderMaterial::pyattr_set_blending(void *self_v, const KX_PYATTRIBUTE_D { KX_BlenderMaterial* self= static_cast(self_v); PyObject* obj = self->PysetBlending(value, NULL); - if(obj) + if (obj) { Py_DECREF(obj); return 0; @@ -865,24 +865,24 @@ int KX_BlenderMaterial::pyattr_set_blending(void *self_v, const KX_PYATTRIBUTE_D KX_PYMETHODDEF_DOC( KX_BlenderMaterial, getShader , "getShader()") { - if( !GLEW_ARB_fragment_shader) { - if(!mModified) + if ( !GLEW_ARB_fragment_shader) { + if (!mModified) spit("Fragment shaders not supported"); mModified = true; Py_RETURN_NONE; } - if( !GLEW_ARB_vertex_shader) { - if(!mModified) + if ( !GLEW_ARB_vertex_shader) { + if (!mModified) spit("Vertex shaders not supported"); mModified = true; Py_RETURN_NONE; } - if(!GLEW_ARB_shader_objects) { - if(!mModified) + if (!GLEW_ARB_shader_objects) { + if (!mModified) spit("GLSL not supported"); mModified = true; Py_RETURN_NONE; @@ -891,12 +891,12 @@ KX_PYMETHODDEF_DOC( KX_BlenderMaterial, getShader , "getShader()") // returns Py_None on error // the calling script will need to check - if(!mShader && !mModified) { + if (!mShader && !mModified) { mShader = new BL_Shader(); mModified = true; } - if(mShader && !mShader->GetError()) { + if (mShader && !mShader->GetError()) { m_flag &= ~RAS_BLENDERGLSL; mMaterial->SetSharedMaterial(true); mScene->GetBucketManager()->ReleaseDisplayLists(this); @@ -907,7 +907,7 @@ KX_PYMETHODDEF_DOC( KX_BlenderMaterial, getShader , "getShader()") // then delete it! // We will then go back to fixed functionality // for this material - if(mShader) { + if (mShader) { delete mShader; /* will handle python de-referencing */ mShader=0; } @@ -952,22 +952,22 @@ static unsigned int GL_array[11] = { KX_PYMETHODDEF_DOC( KX_BlenderMaterial, setBlending , "setBlending( bge.logic.src, bge.logic.dest)") { unsigned int b[2]; - if(PyArg_ParseTuple(args, "ii:setBlending", &b[0], &b[1])) + if (PyArg_ParseTuple(args, "ii:setBlending", &b[0], &b[1])) { bool value_found[2] = {false, false}; - for(int i=0; i<11; i++) + for (int i=0; i<11; i++) { - if(b[0] == GL_array[i]) { + if (b[0] == GL_array[i]) { value_found[0] = true; mBlendFunc[0] = b[0]; } - if(b[1] == GL_array[i]) { + if (b[1] == GL_array[i]) { value_found[1] = true; mBlendFunc[1] = b[1]; } - if(value_found[0] && value_found[1]) break; + if (value_found[0] && value_found[1]) break; } - if(!value_found[0] || !value_found[1]) { + if (!value_found[0] || !value_found[1]) { PyErr_SetString(PyExc_ValueError, "material.setBlending(int, int): KX_BlenderMaterial, invalid enum."); return NULL; } -- cgit v1.2.3