diff options
Diffstat (limited to 'source/gameengine/Ketsji')
32 files changed, 600 insertions, 600 deletions
diff --git a/source/gameengine/Ketsji/BL_BlenderShader.cpp b/source/gameengine/Ketsji/BL_BlenderShader.cpp index 0f97898c73f..122d692b599 100644 --- a/source/gameengine/Ketsji/BL_BlenderShader.cpp +++ b/source/gameengine/Ketsji/BL_BlenderShader.cpp @@ -35,7 +35,7 @@ BL_BlenderShader::BL_BlenderShader(KX_Scene *scene, struct Material *ma, int lig BL_BlenderShader::~BL_BlenderShader() { - if(mGPUMat) + if (mGPUMat) GPU_material_unbind(mGPUMat); } @@ -46,8 +46,8 @@ void BL_BlenderShader::ReloadMaterial() void BL_BlenderShader::SetProg(bool enable, double time) { - if(VerifyShader()) { - if(enable) + if (VerifyShader()) { + if (enable) GPU_material_bind(mGPUMat, mLightLayer, mBlenderScene->lay, time, 1); else GPU_material_unbind(mGPUMat); @@ -59,16 +59,16 @@ int BL_BlenderShader::GetAttribNum() GPUVertexAttribs attribs; int i, enabled = 0; - if(!VerifyShader()) + if (!VerifyShader()) return enabled; GPU_material_vertex_attributes(mGPUMat, &attribs); - for(i = 0; i < attribs.totlayer; i++) - if(attribs.layer[i].glindex+1 > enabled) + for (i = 0; i < attribs.totlayer; i++) + if (attribs.layer[i].glindex+1 > enabled) enabled= attribs.layer[i].glindex+1; - if(enabled > BL_MAX_ATTRIB) + if (enabled > BL_MAX_ATTRIB) enabled = BL_MAX_ATTRIB; return enabled; @@ -82,39 +82,39 @@ void BL_BlenderShader::SetAttribs(RAS_IRasterizer* ras, const BL_Material *mat) ras->SetAttribNum(0); - if(!VerifyShader()) + if (!VerifyShader()) return; gpumat = mGPUMat; - if(ras->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED) { + if (ras->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED) { GPU_material_vertex_attributes(gpumat, &attribs); attrib_num = GetAttribNum(); ras->SetTexCoordNum(0); ras->SetAttribNum(attrib_num); - for(i=0; i<attrib_num; i++) + for (i=0; i<attrib_num; i++) ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_DISABLE, i); - for(i = 0; i < attribs.totlayer; i++) { - if(attribs.layer[i].glindex > attrib_num) + for (i = 0; i < attribs.totlayer; i++) { + if (attribs.layer[i].glindex > attrib_num) continue; - if(attribs.layer[i].type == CD_MTFACE) { - if(!mat->uvName.IsEmpty() && strcmp(mat->uvName.ReadPtr(), attribs.layer[i].name) == 0) + if (attribs.layer[i].type == CD_MTFACE) { + if (!mat->uvName.IsEmpty() && strcmp(mat->uvName.ReadPtr(), attribs.layer[i].name) == 0) ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_UV1, attribs.layer[i].glindex); - else if(!mat->uv2Name.IsEmpty() && strcmp(mat->uv2Name.ReadPtr(), attribs.layer[i].name) == 0) + else if (!mat->uv2Name.IsEmpty() && strcmp(mat->uv2Name.ReadPtr(), attribs.layer[i].name) == 0) ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_UV2, attribs.layer[i].glindex); else ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_UV1, attribs.layer[i].glindex); } - else if(attribs.layer[i].type == CD_TANGENT) + else if (attribs.layer[i].type == CD_TANGENT) ras->SetAttrib(RAS_IRasterizer::RAS_TEXTANGENT, attribs.layer[i].glindex); - else if(attribs.layer[i].type == CD_ORCO) + else if (attribs.layer[i].type == CD_ORCO) ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_ORCO, attribs.layer[i].glindex); - else if(attribs.layer[i].type == CD_NORMAL) + else if (attribs.layer[i].type == CD_NORMAL) ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_NORM, attribs.layer[i].glindex); - else if(attribs.layer[i].type == CD_MCOL) + else if (attribs.layer[i].type == CD_MCOL) ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_VCOL, attribs.layer[i].glindex); else ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_DISABLE, attribs.layer[i].glindex); @@ -129,7 +129,7 @@ void BL_BlenderShader::Update(const RAS_MeshSlot & ms, RAS_IRasterizer* rasty ) gpumat = mGPUMat; - if(!gpumat || !GPU_material_bound(gpumat)) + if (!gpumat || !GPU_material_bound(gpumat)) return; MT_Matrix4x4 model; @@ -142,7 +142,7 @@ void BL_BlenderShader::Update(const RAS_MeshSlot & ms, RAS_IRasterizer* rasty ) view.getValue((float*)viewmat); viewinv.getValue((float*)viewinvmat); - if(ms.m_bObjectColor) + if (ms.m_bObjectColor) ms.m_RGBAcolor.getValue((float*)obcol); else obcol[0]= obcol[1]= obcol[2]= obcol[3]= 1.0f; diff --git a/source/gameengine/Ketsji/BL_Material.cpp b/source/gameengine/Ketsji/BL_Material.cpp index 092f9273a6b..2061a763331 100644 --- a/source/gameengine/Ketsji/BL_Material.cpp +++ b/source/gameengine/Ketsji/BL_Material.cpp @@ -12,9 +12,9 @@ MTex* getImageFromMaterial(Material *mat, int index) { - if(!mat) return 0; + if (!mat) return 0; - if(!(index >=0 && index < MAX_MTEX) ) return 0; + if (!(index >=0 && index < MAX_MTEX) ) return 0; MTex *m = mat->mtex[index]; return m?m:0; @@ -23,9 +23,9 @@ MTex* getImageFromMaterial(Material *mat, int index) int getNumTexChannels( Material *mat ) { int count = -1; - if(!mat) return -1; + if (!mat) return -1; - for(count =0; (count < 10) && mat->mtex[count] != 0; count++) {} + for (count =0; (count < 10) && mat->mtex[count] != 0; count++) {} return count; } @@ -66,13 +66,13 @@ void BL_Material::Initialize() share = false; int i; - for(i=0; i<4; i++) + for (i=0; i<4; i++) { uv[i] = MT_Point2(0.f,1.f); uv2[i] = MT_Point2(0.f, 1.f); } - for(i=0; i<MAXTEX; i++) // :( + for (i=0; i<MAXTEX; i++) // :( { mapping[i].mapping = 0; mapping[i].offsets[0] = 0.f; @@ -150,7 +150,7 @@ void BL_Material::GetConversionUV2(MT_Point2 *nuv) void BL_Material::SetSharedMaterial(bool v) { - if((v && num_users == -1) || num_users > 1 ) + if ((v && num_users == -1) || num_users > 1 ) share = true; else share = false; diff --git a/source/gameengine/Ketsji/BL_Shader.cpp b/source/gameengine/Ketsji/BL_Shader.cpp index b1e3737af07..55045f9f169 100644 --- a/source/gameengine/Ketsji/BL_Shader.cpp +++ b/source/gameengine/Ketsji/BL_Shader.cpp @@ -40,7 +40,7 @@ BL_Uniform::BL_Uniform(int data_size) BL_Uniform::~BL_Uniform() { #ifdef SORT_UNIFORMS - if(mData) { + if (mData) { MEM_freeN(mData); mData=0; } @@ -52,7 +52,7 @@ void BL_Uniform::Apply(class BL_Shader *shader) #ifdef SORT_UNIFORMS MT_assert(mType > UNI_NONE && mType < UNI_MAX && mData); - if(!mDirty) + if (!mDirty) return; switch(mType) @@ -137,14 +137,14 @@ BL_Shader::BL_Shader() BL_Shader::~BL_Shader() { //for (int i=0; i<MAXTEX; i++){ - // if(mSampler[i].mOwn) { - // if(mSampler[i].mTexture) + // if (mSampler[i].mOwn) { + // if (mSampler[i].mTexture) // mSampler[i].mTexture->DeleteTex(); // } //} ClearUniforms(); - if( mShader ) { + if ( mShader ) { glDeleteObjectARB(mShader); mShader = 0; } @@ -179,7 +179,7 @@ BL_Uniform *BL_Shader::FindUniform(const int location) #ifdef SORT_UNIFORMS BL_UniformVec::iterator it = mUniforms.begin(); while(it != mUniforms.end()) { - if((*it)->GetLocation() == location) + if ((*it)->GetLocation() == location) return (*it); it++; } @@ -191,7 +191,7 @@ void BL_Shader::SetUniformfv(int location, int type, float *param,int size, bool { #ifdef SORT_UNIFORMS BL_Uniform *uni= FindUniform(location); - if(uni) { + if (uni) { memcpy(uni->getData(), param, size); uni->SetData(location, type, transpose); } @@ -210,7 +210,7 @@ void BL_Shader::SetUniformiv(int location, int type, int *param,int size, bool t { #ifdef SORT_UNIFORMS BL_Uniform *uni= FindUniform(location); - if(uni) { + if (uni) { memcpy(uni->getData(), param, size); uni->SetData(location, type, transpose); } @@ -228,10 +228,10 @@ void BL_Shader::SetUniformiv(int location, int type, int *param,int size, bool t void BL_Shader::ApplyShader() { #ifdef SORT_UNIFORMS - if(!mDirty) + if (!mDirty) return; - for(unsigned int i=0; i<mUniforms.size(); i++) + for (unsigned int i=0; i<mUniforms.size(); i++) mUniforms[i]->Apply(this); mDirty = false; @@ -252,18 +252,18 @@ bool BL_Shader::LinkProgram() int char_len=0; char *logInf =0; - if(mError) + if (mError) goto programError; - if(!vertProg || !fragProg){ + if (!vertProg || !fragProg){ spit("Invalid GLSL sources"); return false; } - if( !GLEW_ARB_fragment_shader) { + if ( !GLEW_ARB_fragment_shader) { spit("Fragment shaders not supported"); return false; } - if( !GLEW_ARB_vertex_shader) { + if ( !GLEW_ARB_vertex_shader) { spit("Vertex shaders not supported"); return false; } @@ -275,10 +275,10 @@ bool BL_Shader::LinkProgram() glGetObjectParameterivARB(tmpVert, GL_OBJECT_INFO_LOG_LENGTH_ARB,(GLint*) &vertlen); // print info if any - if( vertlen > 0 && vertlen < MAX_LOG_LEN){ + if ( vertlen > 0 && vertlen < MAX_LOG_LEN){ logInf = (char*)MEM_mallocN(vertlen, "vert-log"); glGetInfoLogARB(tmpVert, vertlen, (GLsizei*)&char_len, logInf); - if(char_len >0) { + if (char_len >0) { spit("---- Vertex Shader Error ----"); spit(logInf); } @@ -287,7 +287,7 @@ bool BL_Shader::LinkProgram() } // check for compile errors glGetObjectParameterivARB(tmpVert, GL_OBJECT_COMPILE_STATUS_ARB,(GLint*)&vertstatus); - if(!vertstatus) { + if (!vertstatus) { spit("---- Vertex shader failed to compile ----"); goto programError; } @@ -297,10 +297,10 @@ bool BL_Shader::LinkProgram() glShaderSourceARB(tmpFrag, 1,(const char**)&fragProg, 0); glCompileShaderARB(tmpFrag); glGetObjectParameterivARB(tmpFrag, GL_OBJECT_INFO_LOG_LENGTH_ARB, (GLint*) &fraglen); - if(fraglen >0 && fraglen < MAX_LOG_LEN){ + if (fraglen >0 && fraglen < MAX_LOG_LEN){ logInf = (char*)MEM_mallocN(fraglen, "frag-log"); glGetInfoLogARB(tmpFrag, fraglen,(GLsizei*) &char_len, logInf); - if(char_len >0) { + if (char_len >0) { spit("---- Fragment Shader Error ----"); spit(logInf); } @@ -309,7 +309,7 @@ bool BL_Shader::LinkProgram() } glGetObjectParameterivARB(tmpFrag, GL_OBJECT_COMPILE_STATUS_ARB, (GLint*) &fragstatus); - if(!fragstatus){ + if (!fragstatus){ spit("---- Fragment shader failed to compile ----"); goto programError; } @@ -325,10 +325,10 @@ bool BL_Shader::LinkProgram() glGetObjectParameterivARB(tmpProg, GL_OBJECT_LINK_STATUS_ARB, (GLint*) &progstatus); - if(proglen > 0 && proglen < MAX_LOG_LEN) { + if (proglen > 0 && proglen < MAX_LOG_LEN) { logInf = (char*)MEM_mallocN(proglen, "prog-log"); glGetInfoLogARB(tmpProg, proglen, (GLsizei*)&char_len, logInf); - if(char_len >0) { + if (char_len >0) { spit("---- GLSL Program ----"); spit(logInf); } @@ -336,7 +336,7 @@ bool BL_Shader::LinkProgram() logInf=0; } - if(!progstatus){ + if (!progstatus){ spit("---- GLSL program failed to link ----"); goto programError; } @@ -350,16 +350,16 @@ bool BL_Shader::LinkProgram() return true; programError: - if(tmpVert) { + if (tmpVert) { glDeleteObjectARB(tmpVert); tmpVert=0; } - if(tmpFrag) { + if (tmpFrag) { glDeleteObjectARB(tmpFrag); tmpFrag=0; } - if(tmpProg) { + if (tmpProg) { glDeleteObjectARB(tmpProg); tmpProg=0; } @@ -403,7 +403,7 @@ unsigned int BL_Shader::GetProg() void BL_Shader::SetSampler(int loc, int unit) { - if( GLEW_ARB_fragment_shader && + if ( GLEW_ARB_fragment_shader && GLEW_ARB_vertex_shader && GLEW_ARB_shader_objects ) @@ -422,12 +422,12 @@ void BL_Shader::SetSampler(int loc, int unit) void BL_Shader::SetProg(bool enable) { - if( GLEW_ARB_fragment_shader && + if ( GLEW_ARB_fragment_shader && GLEW_ARB_vertex_shader && GLEW_ARB_shader_objects ) { - if( mShader != 0 && mOk && enable) { + if ( mShader != 0 && mOk && enable) { glUseProgramObjectARB(mShader); } else { @@ -438,10 +438,10 @@ void BL_Shader::SetProg(bool enable) void BL_Shader::Update( const RAS_MeshSlot & ms, RAS_IRasterizer* rasty ) { - if(!Ok() || !mPreDef.size()) + if (!Ok() || !mPreDef.size()) return; - if( GLEW_ARB_fragment_shader && + if ( GLEW_ARB_fragment_shader && GLEW_ARB_vertex_shader && GLEW_ARB_shader_objects ) @@ -450,14 +450,14 @@ void BL_Shader::Update( const RAS_MeshSlot & ms, RAS_IRasterizer* rasty ) model.setValue(ms.m_OpenGLMatrix); const MT_Matrix4x4& view = rasty->GetViewMatrix(); - if(mAttr==SHD_TANGENT) + if (mAttr==SHD_TANGENT) ms.m_mesh->SetMeshModified(true); BL_UniformVecDef::iterator it; - for(it = mPreDef.begin(); it!= mPreDef.end(); it++) + for (it = mPreDef.begin(); it!= mPreDef.end(); it++) { BL_DefUniform *uni = (*it); - if(uni->mLoc == -1) continue; + if (uni->mLoc == -1) continue; switch (uni->mType) { @@ -554,7 +554,7 @@ void BL_Shader::Update( const RAS_MeshSlot & ms, RAS_IRasterizer* rasty ) int BL_Shader::GetAttribLocation(const STR_String& name) { - if( GLEW_ARB_fragment_shader && + if ( GLEW_ARB_fragment_shader && GLEW_ARB_vertex_shader && GLEW_ARB_shader_objects ) @@ -567,7 +567,7 @@ int BL_Shader::GetAttribLocation(const STR_String& name) void BL_Shader::BindAttribute(const STR_String& attr, int loc) { - if( GLEW_ARB_fragment_shader && + if ( GLEW_ARB_fragment_shader && GLEW_ARB_vertex_shader && GLEW_ARB_shader_objects ) @@ -578,14 +578,14 @@ void BL_Shader::BindAttribute(const STR_String& attr, int loc) int BL_Shader::GetUniformLocation(const STR_String& name) { - if( GLEW_ARB_fragment_shader && + if ( GLEW_ARB_fragment_shader && GLEW_ARB_vertex_shader && GLEW_ARB_shader_objects ) { MT_assert(mShader!=0); int location = glGetUniformLocationARB(mShader, name.ReadPtr()); - if(location == -1) + if (location == -1) spit("Invalid uniform value: " << name.ReadPtr() << "."); return location; } @@ -595,7 +595,7 @@ int BL_Shader::GetUniformLocation(const STR_String& name) void BL_Shader::SetUniform(int uniform, const MT_Tuple2& vec) { - if( GLEW_ARB_fragment_shader && + if ( GLEW_ARB_fragment_shader && GLEW_ARB_vertex_shader && GLEW_ARB_shader_objects ) @@ -609,7 +609,7 @@ void BL_Shader::SetUniform(int uniform, const MT_Tuple2& vec) void BL_Shader::SetUniform(int uniform, const MT_Tuple3& vec) { - if( GLEW_ARB_fragment_shader && + if ( GLEW_ARB_fragment_shader && GLEW_ARB_vertex_shader && GLEW_ARB_shader_objects ) @@ -622,7 +622,7 @@ void BL_Shader::SetUniform(int uniform, const MT_Tuple3& vec) void BL_Shader::SetUniform(int uniform, const MT_Tuple4& vec) { - if( GLEW_ARB_fragment_shader && + if ( GLEW_ARB_fragment_shader && GLEW_ARB_vertex_shader && GLEW_ARB_shader_objects ) @@ -635,7 +635,7 @@ void BL_Shader::SetUniform(int uniform, const MT_Tuple4& vec) void BL_Shader::SetUniform(int uniform, const unsigned int& val) { - if( GLEW_ARB_fragment_shader && + if ( GLEW_ARB_fragment_shader && GLEW_ARB_vertex_shader && GLEW_ARB_shader_objects ) @@ -646,7 +646,7 @@ void BL_Shader::SetUniform(int uniform, const unsigned int& val) void BL_Shader::SetUniform(int uniform, const int val) { - if( GLEW_ARB_fragment_shader && + if ( GLEW_ARB_fragment_shader && GLEW_ARB_vertex_shader && GLEW_ARB_shader_objects ) @@ -657,7 +657,7 @@ void BL_Shader::SetUniform(int uniform, const int val) void BL_Shader::SetUniform(int uniform, const float& val) { - if( GLEW_ARB_fragment_shader && + if ( GLEW_ARB_fragment_shader && GLEW_ARB_vertex_shader && GLEW_ARB_shader_objects ) @@ -668,7 +668,7 @@ void BL_Shader::SetUniform(int uniform, const float& val) void BL_Shader::SetUniform(int uniform, const MT_Matrix4x4& vec, bool transpose) { - if( GLEW_ARB_fragment_shader && + if ( GLEW_ARB_fragment_shader && GLEW_ARB_vertex_shader && GLEW_ARB_shader_objects ) @@ -682,7 +682,7 @@ void BL_Shader::SetUniform(int uniform, const MT_Matrix4x4& vec, bool transpose) void BL_Shader::SetUniform(int uniform, const MT_Matrix3x3& vec, bool transpose) { - if( GLEW_ARB_fragment_shader && + if ( GLEW_ARB_fragment_shader && GLEW_ARB_vertex_shader && GLEW_ARB_shader_objects ) @@ -697,12 +697,12 @@ void BL_Shader::SetUniform(int uniform, const MT_Matrix3x3& vec, bool transpose) void BL_Shader::SetUniform(int uniform, const float* val, int len) { - if( GLEW_ARB_fragment_shader && + if ( GLEW_ARB_fragment_shader && GLEW_ARB_vertex_shader && GLEW_ARB_shader_objects ) { - if(len == 2) + if (len == 2) glUniform2fvARB(uniform, 1,(GLfloat*)val); else if (len == 3) glUniform3fvARB(uniform, 1,(GLfloat*)val); @@ -715,12 +715,12 @@ void BL_Shader::SetUniform(int uniform, const float* val, int len) void BL_Shader::SetUniform(int uniform, const int* val, int len) { - if( GLEW_ARB_fragment_shader && + if ( GLEW_ARB_fragment_shader && GLEW_ARB_vertex_shader && GLEW_ARB_shader_objects ) { - if(len == 2) + if (len == 2) glUniform2ivARB(uniform, 1, (GLint*)val); else if (len == 3) glUniform3ivARB(uniform, 1, (GLint*)val); @@ -793,18 +793,18 @@ PyTypeObject BL_Shader::Type = { KX_PYMETHODDEF_DOC( BL_Shader, setSource," setSource(vertexProgram, fragmentProgram)" ) { - if(mShader !=0 && mOk ) + if (mShader !=0 && mOk ) { // already set... Py_RETURN_NONE; } char *v,*f; int apply=0; - if( PyArg_ParseTuple(args, "ssi:setSource", &v, &f, &apply) ) + if ( PyArg_ParseTuple(args, "ssi:setSource", &v, &f, &apply) ) { vertProg = v; fragProg = f; - if( LinkProgram() ) { + if ( LinkProgram() ) { glUseProgramObjectARB( mShader ); mUse = apply!=0; Py_RETURN_NONE; @@ -847,10 +847,10 @@ KX_PYMETHODDEF_DOC( BL_Shader, getFragmentProg ,"getFragmentProg( )" ) KX_PYMETHODDEF_DOC( BL_Shader, validate, "validate()") { - if(mError) { + if (mError) { Py_RETURN_NONE; } - if(mShader==0) { + if (mShader==0) { PyErr_SetString(PyExc_TypeError, "shader.validate(): BL_Shader, invalid shader object"); return NULL; } @@ -859,12 +859,12 @@ KX_PYMETHODDEF_DOC( BL_Shader, validate, "validate()") glGetObjectParameterivARB(mShader, GL_OBJECT_VALIDATE_STATUS_ARB,(GLint*) &stat); - if(stat > 0 && stat < MAX_LOG_LEN) { + if (stat > 0 && stat < MAX_LOG_LEN) { int char_len=0; char *logInf = (char*)MEM_mallocN(stat, "validate-log"); glGetInfoLogARB(mShader, stat,(GLsizei*) &char_len, logInf); - if(char_len >0) { + if (char_len >0) { spit("---- GLSL Validation ----"); spit(logInf); } @@ -877,17 +877,17 @@ KX_PYMETHODDEF_DOC( BL_Shader, validate, "validate()") KX_PYMETHODDEF_DOC( BL_Shader, setSampler, "setSampler(name, index)" ) { - if(mError) { + if (mError) { Py_RETURN_NONE; } const char *uniform=""; int index=-1; - if(PyArg_ParseTuple(args, "si:setSampler", &uniform, &index)) + if (PyArg_ParseTuple(args, "si:setSampler", &uniform, &index)) { int loc = GetUniformLocation(uniform); - if(loc != -1) { - if(index >= MAXTEX || index < 0) + if (loc != -1) { + if (index >= MAXTEX || index < 0) spit("Invalid texture sample index: " << index); #ifdef SORT_UNIFORMS @@ -908,7 +908,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setSampler, "setSampler(name, index)" ) KX_PYMETHODDEF_DOC( BL_Shader, setNumberOfPasses, "setNumberOfPasses( max-pass )" ) { int pass = 1; - if(!PyArg_ParseTuple(args, "i:setNumberOfPasses", &pass)) + if (!PyArg_ParseTuple(args, "i:setNumberOfPasses", &pass)) return NULL; mPass = 1; @@ -918,16 +918,16 @@ KX_PYMETHODDEF_DOC( BL_Shader, setNumberOfPasses, "setNumberOfPasses( max-pass ) /// access functions KX_PYMETHODDEF_DOC( BL_Shader, setUniform1f, "setUniform1f(name, fx)" ) { - if(mError) { + if (mError) { Py_RETURN_NONE; } const char *uniform=""; float value=0; - if(PyArg_ParseTuple(args, "sf:setUniform1f", &uniform, &value )) + if (PyArg_ParseTuple(args, "sf:setUniform1f", &uniform, &value )) { int loc = GetUniformLocation(uniform); - if(loc != -1) + if (loc != -1) { #ifdef SORT_UNIFORMS SetUniformfv(loc, BL_Uniform::UNI_FLOAT, &value, sizeof(float)); @@ -943,15 +943,15 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniform1f, "setUniform1f(name, fx)" ) KX_PYMETHODDEF_DOC( BL_Shader, setUniform2f , "setUniform2f(name, fx, fy)") { - if(mError) { + if (mError) { Py_RETURN_NONE; } const char *uniform=""; float array[2]={ 0,0 }; - if(PyArg_ParseTuple(args, "sff:setUniform2f", &uniform, &array[0],&array[1] )) + if (PyArg_ParseTuple(args, "sff:setUniform2f", &uniform, &array[0],&array[1] )) { int loc = GetUniformLocation(uniform); - if(loc != -1) + if (loc != -1) { #ifdef SORT_UNIFORMS SetUniformfv(loc, BL_Uniform::UNI_FLOAT2, array, (sizeof(float)*2) ); @@ -967,15 +967,15 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniform2f , "setUniform2f(name, fx, fy)") KX_PYMETHODDEF_DOC( BL_Shader, setUniform3f, "setUniform3f(name, fx,fy,fz) ") { - if(mError) { + if (mError) { Py_RETURN_NONE; } const char *uniform=""; float array[3]={0,0,0}; - if(PyArg_ParseTuple(args, "sfff:setUniform3f", &uniform, &array[0],&array[1],&array[2])) + if (PyArg_ParseTuple(args, "sfff:setUniform3f", &uniform, &array[0],&array[1],&array[2])) { int loc = GetUniformLocation(uniform); - if(loc != -1) + if (loc != -1) { #ifdef SORT_UNIFORMS SetUniformfv(loc, BL_Uniform::UNI_FLOAT3, array, (sizeof(float)*3) ); @@ -992,15 +992,15 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniform3f, "setUniform3f(name, fx,fy,fz) ") KX_PYMETHODDEF_DOC( BL_Shader, setUniform4f, "setUniform4f(name, fx,fy,fz, fw) ") { - if(mError) { + if (mError) { Py_RETURN_NONE; } const char *uniform=""; float array[4]={0,0,0,0}; - if(PyArg_ParseTuple(args, "sffff:setUniform4f", &uniform, &array[0],&array[1],&array[2], &array[3])) + if (PyArg_ParseTuple(args, "sffff:setUniform4f", &uniform, &array[0],&array[1],&array[2], &array[3])) { int loc = GetUniformLocation(uniform); - if(loc != -1) + if (loc != -1) { #ifdef SORT_UNIFORMS SetUniformfv(loc, BL_Uniform::UNI_FLOAT4, array, (sizeof(float)*4) ); @@ -1016,15 +1016,15 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniform4f, "setUniform4f(name, fx,fy,fz, fw) " KX_PYMETHODDEF_DOC( BL_Shader, setUniform1i, "setUniform1i(name, ix)" ) { - if(mError) { + if (mError) { Py_RETURN_NONE; } const char *uniform=""; int value=0; - if(PyArg_ParseTuple(args, "si:setUniform1i", &uniform, &value )) + if (PyArg_ParseTuple(args, "si:setUniform1i", &uniform, &value )) { int loc = GetUniformLocation(uniform); - if(loc != -1) + if (loc != -1) { #ifdef SORT_UNIFORMS SetUniformiv(loc, BL_Uniform::UNI_INT, &value, sizeof(int)); @@ -1040,15 +1040,15 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniform1i, "setUniform1i(name, ix)" ) KX_PYMETHODDEF_DOC( BL_Shader, setUniform2i , "setUniform2i(name, ix, iy)") { - if(mError) { + if (mError) { Py_RETURN_NONE; } const char *uniform=""; int array[2]={ 0,0 }; - if(PyArg_ParseTuple(args, "sii:setUniform2i", &uniform, &array[0],&array[1] )) + if (PyArg_ParseTuple(args, "sii:setUniform2i", &uniform, &array[0],&array[1] )) { int loc = GetUniformLocation(uniform); - if(loc != -1) + if (loc != -1) { #ifdef SORT_UNIFORMS SetUniformiv(loc, BL_Uniform::UNI_INT2, array, sizeof(int)*2); @@ -1064,16 +1064,16 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniform2i , "setUniform2i(name, ix, iy)") KX_PYMETHODDEF_DOC( BL_Shader, setUniform3i, "setUniform3i(name, ix,iy,iz) ") { - if(mError) { + if (mError) { Py_RETURN_NONE; } const char *uniform=""; int array[3]={0,0,0}; - if(PyArg_ParseTuple(args, "siii:setUniform3i", &uniform, &array[0],&array[1],&array[2])) + if (PyArg_ParseTuple(args, "siii:setUniform3i", &uniform, &array[0],&array[1],&array[2])) { int loc = GetUniformLocation(uniform); - if(loc != -1) + if (loc != -1) { #ifdef SORT_UNIFORMS SetUniformiv(loc, BL_Uniform::UNI_INT3, array, sizeof(int)*3); @@ -1088,15 +1088,15 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniform3i, "setUniform3i(name, ix,iy,iz) ") KX_PYMETHODDEF_DOC( BL_Shader, setUniform4i, "setUniform4i(name, ix,iy,iz, iw) ") { - if(mError) { + if (mError) { Py_RETURN_NONE; } const char *uniform=""; int array[4]={0,0,0, 0}; - if(PyArg_ParseTuple(args, "siiii:setUniform4i", &uniform, &array[0],&array[1],&array[2], &array[3] )) + if (PyArg_ParseTuple(args, "siiii:setUniform4i", &uniform, &array[0],&array[1],&array[2], &array[3] )) { int loc = GetUniformLocation(uniform); - if(loc != -1) + if (loc != -1) { #ifdef SORT_UNIFORMS SetUniformiv(loc, BL_Uniform::UNI_INT4, array, sizeof(int)*4); @@ -1111,23 +1111,23 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniform4i, "setUniform4i(name, ix,iy,iz, iw) " KX_PYMETHODDEF_DOC( BL_Shader, setUniformfv , "setUniformfv( float (list2 or list3 or list4) )") { - if(mError) { + if (mError) { Py_RETURN_NONE; } const char *uniform = ""; PyObject *listPtr =0; float array_data[4] = {0.f,0.f,0.f,0.f}; - if(PyArg_ParseTuple(args, "sO:setUniformfv", &uniform, &listPtr)) + if (PyArg_ParseTuple(args, "sO:setUniformfv", &uniform, &listPtr)) { int loc = GetUniformLocation(uniform); - if(loc != -1) + if (loc != -1) { - if(PySequence_Check(listPtr)) + if (PySequence_Check(listPtr)) { unsigned int list_size = PySequence_Size(listPtr); - for(unsigned int i=0; (i<list_size && i<4); i++) + for (unsigned int i=0; (i<list_size && i<4); i++) { PyObject *item = PySequence_GetItem(listPtr, i); array_data[i] = (float)PyFloat_AsDouble(item); @@ -1180,38 +1180,38 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformfv , "setUniformfv( float (list2 or lis KX_PYMETHODDEF_DOC( BL_Shader, setUniformiv, "setUniformiv( uniform_name, (list2 or list3 or list4) )") { - if(mError) { + if (mError) { Py_RETURN_NONE; } const char *uniform = ""; PyObject *listPtr =0; int array_data[4] = {0,0,0,0}; - if(!PyArg_ParseTuple(args, "sO:setUniformiv", &uniform, &listPtr)) + if (!PyArg_ParseTuple(args, "sO:setUniformiv", &uniform, &listPtr)) return NULL; int loc = GetUniformLocation(uniform); - if(loc == -1) { + if (loc == -1) { PyErr_SetString(PyExc_TypeError, "shader.setUniformiv(...): BL_Shader, first string argument is not a valid uniform value"); return NULL; } - if(!PySequence_Check(listPtr)) { + if (!PySequence_Check(listPtr)) { PyErr_SetString(PyExc_TypeError, "shader.setUniformiv(...): BL_Shader, second argument is not a sequence"); return NULL; } unsigned int list_size = PySequence_Size(listPtr); - for(unsigned int i=0; (i<list_size && i<4); i++) + for (unsigned int i=0; (i<list_size && i<4); i++) { PyObject *item = PySequence_GetItem(listPtr, i); array_data[i] = PyLong_AsSsize_t(item); Py_DECREF(item); } - if(PyErr_Occurred()) { + if (PyErr_Occurred()) { PyErr_SetString(PyExc_TypeError, "shader.setUniformiv(...): BL_Shader, one or more values in the list is not an int"); return NULL; } @@ -1266,7 +1266,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformiv, "setUniformiv( uniform_name, (list2 KX_PYMETHODDEF_DOC( BL_Shader, setUniformMatrix4, "setUniformMatrix4(uniform_name, mat-4x4, transpose(row-major=true, col-major=false)" ) { - if(mError) { + if (mError) { Py_RETURN_NONE; } @@ -1281,12 +1281,12 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformMatrix4, PyObject *matrix=0; int transp=0; // python use column major by default, so no transpose.... - if(!PyArg_ParseTuple(args, "sO|i:setUniformMatrix4",&uniform, &matrix,&transp)) + if (!PyArg_ParseTuple(args, "sO|i:setUniformMatrix4",&uniform, &matrix,&transp)) return NULL; int loc = GetUniformLocation(uniform); - if(loc == -1) { + if (loc == -1) { PyErr_SetString(PyExc_TypeError, "shader.setUniformMatrix4(...): BL_Shader, first string argument is not a valid uniform value"); return NULL; } @@ -1313,7 +1313,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformMatrix4, KX_PYMETHODDEF_DOC( BL_Shader, setUniformMatrix3, "setUniformMatrix3(uniform_name, list[3x3], transpose(row-major=true, col-major=false)" ) { - if(mError) { + if (mError) { Py_RETURN_NONE; } @@ -1326,12 +1326,12 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformMatrix3, const char *uniform=""; PyObject *matrix=0; int transp=0; // python use column major by default, so no transpose.... - if(!PyArg_ParseTuple(args, "sO|i:setUniformMatrix3",&uniform, &matrix,&transp)) + if (!PyArg_ParseTuple(args, "sO|i:setUniformMatrix3",&uniform, &matrix,&transp)) return NULL; int loc = GetUniformLocation(uniform); - if(loc == -1) { + if (loc == -1) { PyErr_SetString(PyExc_TypeError, "shader.setUniformMatrix3(...): BL_Shader, first string argument is not a valid uniform value"); return NULL; } @@ -1356,18 +1356,18 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformMatrix3, KX_PYMETHODDEF_DOC( BL_Shader, setAttrib, "setAttrib(enum)" ) { - if(mError) { + if (mError) { Py_RETURN_NONE; } int attr=0; - if(!PyArg_ParseTuple(args, "i:setAttrib", &attr)) + if (!PyArg_ParseTuple(args, "i:setAttrib", &attr)) return NULL; attr= SHD_TANGENT; /* user input is ignored for now, there is only 1 attr */ - if(mShader==0) { + if (mShader==0) { PyErr_SetString(PyExc_ValueError, "shader.setAttrib() BL_Shader, invalid shader object"); return NULL; } @@ -1381,27 +1381,27 @@ KX_PYMETHODDEF_DOC( BL_Shader, setAttrib, "setAttrib(enum)" ) KX_PYMETHODDEF_DOC( BL_Shader, setUniformDef, "setUniformDef(name, enum)" ) { - if(mError) { + if (mError) { Py_RETURN_NONE; } const char *uniform=""; int nloc=0; - if(PyArg_ParseTuple(args, "si:setUniformDef",&uniform, &nloc)) + if (PyArg_ParseTuple(args, "si:setUniformDef",&uniform, &nloc)) { int loc = GetUniformLocation(uniform); - if(loc != -1) + if (loc != -1) { bool defined = false; BL_UniformVecDef::iterator it = mPreDef.begin(); while(it != mPreDef.end()) { - if((*it)->mLoc == loc) { + if ((*it)->mLoc == loc) { defined = true; break; } it++; } - if(defined) + if (defined) { Py_RETURN_NONE; } diff --git a/source/gameengine/Ketsji/BL_Texture.cpp b/source/gameengine/Ketsji/BL_Texture.cpp index 2c57004e6c4..4aab091c6a1 100644 --- a/source/gameengine/Ketsji/BL_Texture.cpp +++ b/source/gameengine/Ketsji/BL_Texture.cpp @@ -79,18 +79,18 @@ BL_Texture::~BL_Texture() void BL_Texture::DeleteTex() { - if( mNeedsDeleted ) { + if ( mNeedsDeleted ) { glDeleteTextures(1, (GLuint*)&mTexture); mNeedsDeleted = 0; mOk = 0; } - if(mEnvState) { + if (mEnvState) { glDeleteLists((GLuint)mEnvState, 1); mEnvState =0; } - if(mDisableState) { + if (mDisableState) { glDeleteLists((GLuint)mDisableState, 1); mDisableState =0; } @@ -167,7 +167,7 @@ void BL_Texture::InitGLTex(unsigned int *pix,int x,int y,bool mipmap) } glBindTexture(GL_TEXTURE_2D, mTexture ); - if( mipmap ) { + if ( mipmap ) { glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); gluBuild2DMipmaps( GL_TEXTURE_2D, GL_RGBA, x, y, GL_RGBA, GL_UNSIGNED_BYTE, pix ); @@ -194,7 +194,7 @@ void BL_Texture::InitNonPow2Tex(unsigned int *pix,int x,int y,bool mipmap) gluScaleImage(GL_RGBA, x, y, GL_UNSIGNED_BYTE, pix, nx,ny, GL_UNSIGNED_BYTE, newPixels); glBindTexture(GL_TEXTURE_2D, mTexture ); - if( mipmap ) { + if ( mipmap ) { glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); gluBuild2DMipmaps( GL_TEXTURE_2D, GL_RGBA, nx, ny, GL_RGBA, GL_UNSIGNED_BYTE, newPixels ); @@ -304,7 +304,7 @@ bool BL_Texture::InitCubeMap(int unit, EnvMap *cubemap) glTexParameteri( GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); glTexParameteri( GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); glTexParameteri( GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); - if(GLEW_VERSION_1_2) + if (GLEW_VERSION_1_2) glTexParameteri( GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE ); if (needs_split) @@ -346,7 +346,7 @@ int BL_Texture::GetMaxUnits() { GLint unit=0; - if(GLEW_ARB_multitexture) { + if (GLEW_ARB_multitexture) { glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &unit); return (MAXTEX>=unit?unit:MAXTEX); } @@ -356,28 +356,28 @@ int BL_Texture::GetMaxUnits() void BL_Texture::ActivateFirst() { - if(GLEW_ARB_multitexture) + if (GLEW_ARB_multitexture) glActiveTextureARB(GL_TEXTURE0_ARB); } void BL_Texture::ActivateUnit(int unit) { - if(GLEW_ARB_multitexture) - if(unit <= MAXTEX) + if (GLEW_ARB_multitexture) + if (unit <= MAXTEX) glActiveTextureARB(GL_TEXTURE0_ARB+unit); } void BL_Texture::DisableUnit() { - if(GLEW_ARB_multitexture) + if (GLEW_ARB_multitexture) glActiveTextureARB(GL_TEXTURE0_ARB+mUnit); glMatrixMode(GL_TEXTURE); glLoadIdentity(); glMatrixMode(GL_MODELVIEW); - if(GLEW_ARB_texture_cube_map && glIsEnabled(GL_TEXTURE_CUBE_MAP_ARB)) + if (GLEW_ARB_texture_cube_map && glIsEnabled(GL_TEXTURE_CUBE_MAP_ARB)) glDisable(GL_TEXTURE_CUBE_MAP_ARB); else { @@ -395,8 +395,8 @@ void BL_Texture::DisableUnit() void BL_Texture::DisableAllTextures() { - for(int i=0; i<MAXTEX; i++) { - if(GLEW_ARB_multitexture) + for (int i=0; i<MAXTEX; i++) { + if (GLEW_ARB_multitexture) glActiveTextureARB(GL_TEXTURE0_ARB+i); glMatrixMode(GL_TEXTURE); @@ -410,14 +410,14 @@ void BL_Texture::DisableAllTextures() glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE ); } - if(GLEW_ARB_multitexture) + if (GLEW_ARB_multitexture) glActiveTextureARB(GL_TEXTURE0_ARB); } void BL_Texture::ActivateTexture() { - if(GLEW_ARB_multitexture) + if (GLEW_ARB_multitexture) glActiveTextureARB(GL_TEXTURE0_ARB+mUnit); if (mType == GL_TEXTURE_CUBE_MAP_ARB && GLEW_ARB_texture_cube_map) @@ -426,7 +426,7 @@ void BL_Texture::ActivateTexture() glEnable(GL_TEXTURE_CUBE_MAP_ARB); } else { - if(GLEW_ARB_texture_cube_map ) + if (GLEW_ARB_texture_cube_map ) glDisable(GL_TEXTURE_CUBE_MAP_ARB); glBindTexture( GL_TEXTURE_2D, mTexture ); @@ -437,7 +437,7 @@ void BL_Texture::ActivateTexture() void BL_Texture::SetMapping(int mode) { - if(!(mode &USEREFL)) { + if (!(mode &USEREFL)) { glDisable(GL_TEXTURE_GEN_S); glDisable(GL_TEXTURE_GEN_T); glDisable(GL_TEXTURE_GEN_R); @@ -445,7 +445,7 @@ void BL_Texture::SetMapping(int mode) return; } - if( mType == GL_TEXTURE_CUBE_MAP_ARB && + if ( mType == GL_TEXTURE_CUBE_MAP_ARB && GLEW_ARB_texture_cube_map && mode &USEREFL) { @@ -474,17 +474,17 @@ void BL_Texture::SetMapping(int mode) void BL_Texture::setTexEnv(BL_Material *mat, bool modulate) { - if(modulate || !GLEW_ARB_texture_env_combine){ + if (modulate || !GLEW_ARB_texture_env_combine){ glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE ); return; } - if(glIsList(mEnvState)) + if (glIsList(mEnvState)) { glCallList(mEnvState); return; } - if(!mEnvState) + if (!mEnvState) mEnvState = glGenLists(1); glNewList(mEnvState, GL_COMPILE_AND_EXECUTE); @@ -504,7 +504,7 @@ void BL_Texture::setTexEnv(BL_Material *mat, bool modulate) GLenum op2 = GL_OPERAND2_RGB_ARB; // switch to alpha combiners - if( mat->flag[mUnit] &TEXALPHA ) { + if ( mat->flag[mUnit] &TEXALPHA ) { combiner = GL_COMBINE_ALPHA_ARB; source0 = GL_SOURCE0_ALPHA_ARB; source1 = GL_SOURCE1_ALPHA_ARB; @@ -515,24 +515,24 @@ void BL_Texture::setTexEnv(BL_Material *mat, bool modulate) blend_operand = GL_SRC_ALPHA; blend_operand_prev = GL_SRC_ALPHA; // invert - if(mat->flag[mUnit] &TEXNEG) { + if (mat->flag[mUnit] &TEXNEG) { blend_operand_prev = GL_ONE_MINUS_SRC_ALPHA; blend_operand = GL_ONE_MINUS_SRC_ALPHA; } } else { - if(mat->flag[mUnit] &TEXNEG) { + if (mat->flag[mUnit] &TEXNEG) { blend_operand_prev=GL_ONE_MINUS_SRC_COLOR; blend_operand = GL_ONE_MINUS_SRC_COLOR; } } bool using_alpha = false; - if(mat->flag[mUnit] &USEALPHA){ + if (mat->flag[mUnit] &USEALPHA){ alphaOp = GL_ONE_MINUS_SRC_ALPHA; using_alpha=true; } - else if(mat->flag[mUnit] &USENEGALPHA){ + else if (mat->flag[mUnit] &USENEGALPHA){ alphaOp = GL_SRC_ALPHA; using_alpha = true; } @@ -541,7 +541,7 @@ void BL_Texture::setTexEnv(BL_Material *mat, bool modulate) case BLEND_MIX: { // ------------------------------ - if(!using_alpha) { + if (!using_alpha) { GLfloat base_col[4]; base_col[0] = base_col[1] = base_col[2] = 0.f; base_col[3] = 1.f-mat->color_blend[mUnit]; @@ -552,7 +552,7 @@ void BL_Texture::setTexEnv(BL_Material *mat, bool modulate) glTexEnvf( GL_TEXTURE_ENV, op0, blend_operand_prev ); glTexEnvf( GL_TEXTURE_ENV, source1, GL_TEXTURE ); glTexEnvf( GL_TEXTURE_ENV, op1, blend_operand); - if(!using_alpha) + if (!using_alpha) glTexEnvf( GL_TEXTURE_ENV, source2, GL_CONSTANT_ARB ); else glTexEnvf( GL_TEXTURE_ENV, source2, GL_TEXTURE ); @@ -566,7 +566,7 @@ void BL_Texture::setTexEnv(BL_Material *mat, bool modulate) glTexEnvf( GL_TEXTURE_ENV, source0, GL_PREVIOUS_ARB); glTexEnvf( GL_TEXTURE_ENV, op0, blend_operand_prev); glTexEnvf( GL_TEXTURE_ENV, source1, GL_TEXTURE ); - if(using_alpha) + if (using_alpha) glTexEnvf( GL_TEXTURE_ENV, op1, alphaOp); else glTexEnvf( GL_TEXTURE_ENV, op1, blend_operand); @@ -578,7 +578,7 @@ void BL_Texture::setTexEnv(BL_Material *mat, bool modulate) glTexEnvf( GL_TEXTURE_ENV, source0, GL_PREVIOUS_ARB ); glTexEnvf( GL_TEXTURE_ENV, op0, blend_operand_prev ); glTexEnvf( GL_TEXTURE_ENV, source1, GL_TEXTURE ); - if(using_alpha) + if (using_alpha) glTexEnvf( GL_TEXTURE_ENV, op1, alphaOp); else glTexEnvf( GL_TEXTURE_ENV, op1, blend_operand); @@ -599,7 +599,7 @@ void BL_Texture::setTexEnv(BL_Material *mat, bool modulate) glTexEnvf( GL_TEXTURE_ENV, source0, GL_PREVIOUS_ARB ); glTexEnvf( GL_TEXTURE_ENV, op0, blend_operand_prev ); glTexEnvf( GL_TEXTURE_ENV, source1, GL_TEXTURE ); - if(using_alpha) + if (using_alpha) glTexEnvf( GL_TEXTURE_ENV, op1, alphaOp); else glTexEnvf( GL_TEXTURE_ENV, op1, blend_operand); @@ -612,7 +612,7 @@ void BL_Texture::setTexEnv(BL_Material *mat, bool modulate) int BL_Texture::GetPow2(int n) { - if(!is_power_of_2_i(n)) + if (!is_power_of_2_i(n)) n = power_of_2_min_i(n); return n; @@ -638,13 +638,13 @@ void my_envmap_split_ima(EnvMap *env, ImBuf *ibuf) dx= ibuf->y; dx/= 2; - if(3*dx != ibuf->x) { + if (3*dx != ibuf->x) { printf("Incorrect envmap size\n"); env->ok= 0; env->ima->ok= 0; } else { - for(part=0; part<6; part++) { + for (part=0; part<6; part++) { env->cube[part]= IMB_allocImBuf(dx, dx, 24, IB_rect); } IMB_rectcpy(env->cube[0], ibuf, @@ -669,9 +669,9 @@ void my_free_envmapdata(EnvMap *env) { unsigned int part; - for(part=0; part<6; part++) { + for (part=0; part<6; part++) { ImBuf *ibuf= env->cube[part]; - if(ibuf) { + if (ibuf) { IMB_freeImBuf(ibuf); env->cube[part]= NULL; } 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; i<mMaterial->num_enabled; i++) { + for (int i=0; i<mMaterial->num_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; i<mMaterial->num_enabled; i++) { - if( mMaterial->mapping[i].mapping & USEENV ) { - if(!GLEW_ARB_texture_cube_map) { + for (i=0; i<mMaterial->num_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("<<i<<") in "<< mMaterial->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("<<i<<") in "<< mMaterial->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; i<mMaterial->num_enabled; i++) { + for (int i=0; i<mMaterial->num_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; i<mMaterial->num_enabled; i++) { - if(!mTextures[i].Ok()) continue; + for (i=0; i<mMaterial->num_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; (i<mMaterial->num_enabled && i<MAXTEX); i++) { - if( !mTextures[i].Ok() ) continue; + for (i=0; (i<mMaterial->num_enabled && i<MAXTEX); i++) { + if ( !mTextures[i].Ok() ) continue; mTextures[i].ActivateTexture(); mTextures[i].setTexEnv(mMaterial); mode = mMaterial->mapping[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<KX_BlenderMaterial*>(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<KX_BlenderMaterial*>(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<KX_BlenderMaterial*>(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; i<mMaterial->num_enabled; i++) { + for (int i=0; i<mMaterial->num_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<KX_BlenderMaterial*>(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; } diff --git a/source/gameengine/Ketsji/KX_Camera.cpp b/source/gameengine/Ketsji/KX_Camera.cpp index 7a2d71f56ff..6806698dab2 100644 --- a/source/gameengine/Ketsji/KX_Camera.cpp +++ b/source/gameengine/Ketsji/KX_Camera.cpp @@ -387,7 +387,7 @@ bool KX_Camera::PointInsideFrustum(const MT_Point3& x) { ExtractClipPlanes(); - for( unsigned int i = 0; i < 6 ; i++ ) + for ( unsigned int i = 0; i < 6 ; i++ ) { if (m_planes[i][0]*x[0] + m_planes[i][1]*x[1] + m_planes[i][2]*x[2] + m_planes[i][3] < 0.) return false; @@ -401,7 +401,7 @@ int KX_Camera::BoxInsideFrustum(const MT_Point3 *box) unsigned int insideCount = 0; // 6 view frustum planes - for( unsigned int p = 0; p < 6 ; p++ ) + for ( unsigned int p = 0; p < 6 ; p++ ) { unsigned int behindCount = 0; // 8 box vertices. @@ -944,7 +944,7 @@ KX_PYMETHODDEF_DOC_O(KX_Camera, getScreenPosition, { PyErr_Clear(); - if(ConvertPythonToGameObject(value, &obj, true, "")) + if (ConvertPythonToGameObject(value, &obj, true, "")) { PyErr_Clear(); vect = MT_Vector3(obj->NodeGetWorldPosition()); @@ -977,7 +977,7 @@ KX_PYMETHODDEF_DOC_O(KX_Camera, getScreenPosition, vect[1] = 1.0 - vect[1]; //to follow Blender window coordinate system (Top-Down) PyObject* ret = PyTuple_New(2); - if(ret){ + if (ret){ PyTuple_SET_ITEM(ret, 0, PyFloat_FromDouble(vect[0])); PyTuple_SET_ITEM(ret, 1, PyFloat_FromDouble(vect[1])); return ret; @@ -1044,7 +1044,7 @@ KX_PYMETHODDEF_DOC_VARARGS(KX_Camera, getScreenRay, PyTuple_SET_ITEM(argValue, 0, PyFloat_FromDouble(x)); PyTuple_SET_ITEM(argValue, 1, PyFloat_FromDouble(y)); - if(!PyVecTo(PygetScreenVect(argValue), vect)) + if (!PyVecTo(PygetScreenVect(argValue), vect)) { Py_DECREF(argValue); PyErr_SetString(PyExc_TypeError, diff --git a/source/gameengine/Ketsji/KX_CameraActuator.cpp b/source/gameengine/Ketsji/KX_CameraActuator.cpp index b683fcb8036..dfe45b8cfcd 100644 --- a/source/gameengine/Ketsji/KX_CameraActuator.cpp +++ b/source/gameengine/Ketsji/KX_CameraActuator.cpp @@ -121,7 +121,7 @@ static float Kx_Normalize(float *n) d= n[0]*n[0]+n[1]*n[1]+n[2]*n[2]; /* FLT_EPSILON is too large! A larger value causes normalize errors in a scaled down utah teapot */ - if(d>0.0000000000001) { + if (d>0.0000000000001) { d= sqrt(d); n[0]/=d; @@ -159,25 +159,25 @@ static void Kx_VecUpMat3(float vec[3], float mat[][3], short axis) * see: VecUpMat3old */ - if(axis==0) { + if (axis==0) { cox= 0; coy= 1; coz= 2; /* Y up Z tr */ } - if(axis==1) { + if (axis==1) { cox= 1; coy= 2; coz= 0; /* Z up X tr */ } - if(axis==2) { + if (axis==2) { cox= 2; coy= 0; coz= 1; /* X up Y tr */ } - if(axis==3) { + if (axis==3) { cox= 0; coy= 1; coz= 2; /* Y op -Z tr */ vec[0]= -vec[0]; vec[1]= -vec[1]; vec[2]= -vec[2]; } - if(axis==4) { + if (axis==4) { cox= 1; coy= 0; coz= 2; /* */ } - if(axis==5) { + if (axis==5) { cox= 2; coy= 1; coz= 0; /* Y up X tr */ } @@ -318,8 +318,8 @@ bool KX_CameraActuator::Update(double curtime, bool frame) from[2]+= fac*fp1[2]; /* alleen alstie ervoor ligt: cross testen en loodrechte bijtellen */ - if(inp<0.0) { - if(fp1[0]*fp2[1] - fp1[1]*fp2[0] > 0.0) { + if (inp<0.0) { + if (fp1[0]*fp2[1] - fp1[1]*fp2[0] > 0.0) { from[0]-= fac*fp1[1]; from[1]+= fac*fp1[0]; } @@ -336,14 +336,14 @@ bool KX_CameraActuator::Update(double curtime, bool frame) rc[2]= (lookat[2]-from[2]); distsq= rc[0]*rc[0] + rc[1]*rc[1] + rc[2]*rc[2]; - if(distsq > maxdistsq) { + if (distsq > maxdistsq) { distsq = 0.15*(distsq-maxdistsq)/distsq; from[0] += distsq*rc[0]; from[1] += distsq*rc[1]; from[2] += distsq*rc[2]; } - else if(distsq < mindistsq) { + else if (distsq < mindistsq) { distsq = 0.15*(mindistsq-distsq)/mindistsq; from[0] -= distsq*rc[0]; diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp index 46753dcaffe..e26c5b6a7bf 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp @@ -544,17 +544,17 @@ bool KX_ReInstanceBulletShapeFromMesh(KX_GameObject *gameobj, KX_GameObject *fro /* if this is the child of a compound shape this can happen * don't support compound shapes for now */ - if(spc==NULL) + if (spc==NULL) return false; shapeInfo = spc->GetShapeInfo(); - if(shapeInfo->m_shapeType != PHY_SHAPE_MESH/* || spc->GetSoftBody()*/) + if (shapeInfo->m_shapeType != PHY_SHAPE_MESH/* || spc->GetSoftBody()*/) return false; spc->DeleteControllerShape(); - if(from_gameobj==NULL && from_meshobj==NULL) + if (from_gameobj==NULL && from_meshobj==NULL) from_gameobj= gameobj; /* updates the arrays used for making the new bullet mesh */ diff --git a/source/gameengine/Ketsji/KX_Dome.cpp b/source/gameengine/Ketsji/KX_Dome.cpp index 0f0e4b8c10d..0be5a5609aa 100644 --- a/source/gameengine/Ketsji/KX_Dome.cpp +++ b/source/gameengine/Ketsji/KX_Dome.cpp @@ -158,7 +158,7 @@ KX_Dome::KX_Dome ( CreateGLImages(); - if(warp.usemesh) + if (warp.usemesh) fboSupported = CreateFBO(); dlistSupported = CreateDL(); @@ -169,16 +169,16 @@ KX_Dome::~KX_Dome (void) { ClearGLImages(); - if(fboSupported) + if (fboSupported) glDeleteFramebuffersEXT(1, &warp.fboId); - if(dlistSupported) + if (dlistSupported) glDeleteLists(dlistId, (GLsizei) m_numimages); } void KX_Dome::SetViewPort(GLuint viewport[4]) { - if(canvaswidth != m_viewport.GetWidth() || canvasheight != m_viewport.GetHeight()) + if (canvaswidth != m_viewport.GetWidth() || canvasheight != m_viewport.GetHeight()) { m_viewport.SetLeft(viewport[0]); m_viewport.SetBottom(viewport[1]); @@ -203,7 +203,7 @@ void KX_Dome::CreateGLImages(void) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); } - if(warp.usemesh){ + if (warp.usemesh){ glBindTexture(GL_TEXTURE_2D, domefacesId[m_numfaces]); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, warp.imagesize, warp.imagesize, 0, GL_RGB8, GL_UNSIGNED_BYTE, 0); @@ -220,7 +220,7 @@ void KX_Dome::ClearGLImages(void) glDeleteTextures(m_numimages, (GLuint*)&domefacesId); #if 0 for (int i=0;i<m_numimages;i++) - if(glIsTexture(domefacesId[i])) + if (glIsTexture(domefacesId[i])) glDeleteTextures(1, (GLuint*)&domefacesId[i]); #endif } @@ -259,7 +259,7 @@ bool KX_Dome::CreateDL() { dlistId = glGenLists((GLsizei) m_numimages); if (dlistId != 0) { - if(m_mode == DOME_FISHEYE || m_mode == DOME_TRUNCATED_FRONT || m_mode == DOME_TRUNCATED_REAR){ + if (m_mode == DOME_FISHEYE || m_mode == DOME_TRUNCATED_FRONT || m_mode == DOME_TRUNCATED_REAR){ glNewList(dlistId, GL_COMPILE); GLDrawTriangles(cubetop, nfacestop); glEndList(); @@ -309,7 +309,7 @@ bool KX_Dome::CreateDL() glEndList(); } - if(warp.usemesh){ + if (warp.usemesh){ glNewList((dlistId + m_numfaces), GL_COMPILE); GLDrawWarpQuads(); glEndList(); @@ -340,7 +340,7 @@ bool KX_Dome::CreateFBO(void) } glGenFramebuffersEXT(1, &warp.fboId); - if(warp.fboId==0) + if (warp.fboId==0) { printf("Dome Error: Invalid frame buffer object. Using low resolution warp image."); return false; @@ -353,12 +353,12 @@ bool KX_Dome::CreateFBO(void) GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT); - if(status == GL_FRAMEBUFFER_UNSUPPORTED_EXT) + if (status == GL_FRAMEBUFFER_UNSUPPORTED_EXT) { printf("Dome Error: FrameBuffer settings unsupported. Using low resolution warp image."); return false; } - else if(status != GL_FRAMEBUFFER_COMPLETE_EXT) + else if (status != GL_FRAMEBUFFER_COMPLETE_EXT) { glDeleteFramebuffersEXT(1, &warp.fboId); return false; @@ -391,11 +391,11 @@ void KX_Dome::GLDrawWarpQuads(void) float uv_width = (float)(warp.bufferwidth) / warp.imagesize; float uv_height = (float)(warp.bufferheight) / warp.imagesize; - if(warp.mode ==2 ){ + if (warp.mode ==2 ){ glBegin(GL_QUADS); for (i=0;i<warp.n_height-1;i++) { for (j=0;j<warp.n_width-1;j++) { - if(warp.nodes[i][j].i < 0 || warp.nodes[i+1][j].i < 0 || warp.nodes[i+1][j+1].i < 0 || warp.nodes[i][j+1].i < 0) + if (warp.nodes[i][j].i < 0 || warp.nodes[i+1][j].i < 0 || warp.nodes[i+1][j+1].i < 0 || warp.nodes[i][j+1].i < 0) continue; glColor3f(warp.nodes[i][j].i, warp.nodes[i][j].i, warp.nodes[i][j].i); @@ -481,15 +481,15 @@ bool KX_Dome::ParseWarpMesh(STR_String text) vector<STR_String> columns, lines; lines = text.Explode('\n'); - if(lines.size() < 6){ + if (lines.size() < 6){ printf("Dome Error: Warp Mesh File with insufficient data!\n"); return false; } columns = lines[1].Explode(' '); - if(columns.size() == 1) + if (columns.size() == 1) columns = lines[1].Explode('\t'); - if(columns.size() !=2){ + if (columns.size() !=2){ printf("Dome Error: Warp Mesh File incorrect. The second line should contain: width height.\n"); return false; } @@ -505,9 +505,9 @@ bool KX_Dome::ParseWarpMesh(STR_String text) }else{ warp.nodes = vector<vector<WarpMeshNode> > (warp.n_height, vector<WarpMeshNode>(warp.n_width)); - for(i=2; i-2 < (warp.n_width*warp.n_height); i++){ + for (i=2; i-2 < (warp.n_width*warp.n_height); i++){ columns = lines[i].Explode(' '); - if(columns.size() == 1) + if (columns.size() == 1) columns = lines[i].Explode('\t'); if (columns.size() == 5){ @@ -674,7 +674,7 @@ void KX_Dome::CreateMeshDome180(void) //Refine a triangular mesh by bisecting each edge forms 3 new triangles for each existing triangle on each iteration //Could be made more efficient for drawing if the triangles were ordered in a fan. Not that important since we are using DisplayLists - for(i=0;i<m_resolution;i++){ + for (i=0;i<m_resolution;i++){ cubetop.resize(4*nfacestop); SplitFace(cubetop,&nfacestop); cubebottom.resize(4*nfacesbottom); @@ -686,25 +686,25 @@ void KX_Dome::CreateMeshDome180(void) } // Turn into a hemisphere - for(j=0;j<3;j++){ - for(i=0;i<nfacestop;i++) + for (j=0;j<3;j++){ + for (i=0;i<nfacestop;i++) cubetop[i].verts[j].normalize(); - for(i=0;i<nfacesbottom;i++) + for (i=0;i<nfacesbottom;i++) cubebottom[i].verts[j].normalize(); - for(i=0;i<nfacesleft;i++) + for (i=0;i<nfacesleft;i++) cubeleft[i].verts[j].normalize(); - for(i=0;i<nfacesright;i++) + for (i=0;i<nfacesright;i++) cuberight[i].verts[j].normalize(); } //flatten onto xz plane - for(i=0;i<nfacestop;i++) + for (i=0;i<nfacestop;i++) FlattenDome(cubetop[i].verts); - for(i=0;i<nfacesbottom;i++) + for (i=0;i<nfacesbottom;i++) FlattenDome(cubebottom[i].verts); - for(i=0;i<nfacesleft;i++) + for (i=0;i<nfacesleft;i++) FlattenDome(cubeleft[i].verts); - for(i=0;i<nfacesright;i++) + for (i=0;i<nfacesright;i++) FlattenDome(cuberight[i].verts); } @@ -953,7 +953,7 @@ void KX_Dome::CreateMeshDome250(void) //Refine a triangular mesh by bisecting each edge forms 3 new triangles for each existing triangle on each iteration //It could be made more efficient for drawing if the triangles were ordered in a strip! - for(i=0;i<m_resolution;i++){ + for (i=0;i<m_resolution;i++){ cubefront.resize(4*nfacesfront); SplitFace(cubefront,&nfacesfront); cubetop.resize(4*nfacestop); @@ -967,29 +967,29 @@ void KX_Dome::CreateMeshDome250(void) } // Turn into a hemisphere/sphere - for(j=0;j<3;j++){ - for(i=0;i<nfacesfront;i++) + for (j=0;j<3;j++){ + for (i=0;i<nfacesfront;i++) cubefront[i].verts[j].normalize(); - for(i=0;i<nfacestop;i++) + for (i=0;i<nfacestop;i++) cubetop[i].verts[j].normalize(); - for(i=0;i<nfacesbottom;i++) + for (i=0;i<nfacesbottom;i++) cubebottom[i].verts[j].normalize(); - for(i=0;i<nfacesleft;i++) + for (i=0;i<nfacesleft;i++) cubeleft[i].verts[j].normalize(); - for(i=0;i<nfacesright;i++) + for (i=0;i<nfacesright;i++) cuberight[i].verts[j].normalize(); } //flatten onto xz plane - for(i=0;i<nfacesfront;i++) + for (i=0;i<nfacesfront;i++) FlattenDome(cubefront[i].verts); - for(i=0;i<nfacestop;i++) + for (i=0;i<nfacestop;i++) FlattenDome(cubetop[i].verts); - for(i=0;i<nfacesbottom;i++) + for (i=0;i<nfacesbottom;i++) FlattenDome(cubebottom[i].verts); - for(i=0;i<nfacesleft;i++) + for (i=0;i<nfacesleft;i++) FlattenDome(cubeleft[i].verts); - for(i=0;i<nfacesright;i++) + for (i=0;i<nfacesright;i++) FlattenDome(cuberight[i].verts); } @@ -1252,7 +1252,7 @@ void KX_Dome::CreateMeshPanorama(void) nfacesrightback = 2; // Subdivide the faces - for(i=0;i<m_resolution;i++) + for (i=0;i<m_resolution;i++) { cubetop.resize(4*nfacestop); SplitFace(cubetop,&nfacestop); @@ -1274,44 +1274,44 @@ void KX_Dome::CreateMeshPanorama(void) } // Spherize the cube - for(j=0;j<3;j++) + for (j=0;j<3;j++) { - for(i=0;i<nfacestop;i++) + for (i=0;i<nfacestop;i++) cubetop[i].verts[j].normalize(); - for(i=0;i<nfacesbottom;i++) + for (i=0;i<nfacesbottom;i++) cubebottom[i].verts[j].normalize(); - for(i=0;i<nfacesleftback;i++) + for (i=0;i<nfacesleftback;i++) cubeleftback[i].verts[j].normalize(); - for(i=0;i<nfacesleft;i++) + for (i=0;i<nfacesleft;i++) cubeleft[i].verts[j].normalize(); - for(i=0;i<nfacesright;i++) + for (i=0;i<nfacesright;i++) cuberight[i].verts[j].normalize(); - for(i=0;i<nfacesrightback;i++) + for (i=0;i<nfacesrightback;i++) cuberightback[i].verts[j].normalize(); } //Flatten onto xz plane - for(i=0;i<nfacesleftback;i++) + for (i=0;i<nfacesleftback;i++) FlattenPanorama(cubeleftback[i].verts); - for(i=0;i<nfacesleft;i++) + for (i=0;i<nfacesleft;i++) FlattenPanorama(cubeleft[i].verts); - for(i=0;i<nfacesright;i++) + for (i=0;i<nfacesright;i++) FlattenPanorama(cuberight[i].verts); - for(i=0;i<nfacesrightback;i++) + for (i=0;i<nfacesrightback;i++) FlattenPanorama(cuberightback[i].verts); - for(i=0;i<nfacestop;i++) + for (i=0;i<nfacestop;i++) FlattenPanorama(cubetop[i].verts); - for(i=0;i<nfacesbottom;i++) + for (i=0;i<nfacesbottom;i++) FlattenPanorama(cubebottom[i].verts); } @@ -1358,18 +1358,18 @@ void KX_Dome::FlattenPanorama(MT_Vector3 verts[3]) verts[i][2] = atan2(verts[i][2], 1.0); verts[i][2] /= MT_PI / 2; } - if(edge){ + if (edge){ bool right=false; for (i=0;i<3;i++){ - if(fmod(verts[i][0],1.0) > 0.0){ + if (fmod(verts[i][0],1.0) > 0.0){ right=true; break; } } - if(right){ + if (right){ for (i=0;i<3;i++){ - if(verts[i][0] < 0.0) + if (verts[i][0] < 0.0) verts[i][0] *= -1.0; } } @@ -1383,7 +1383,7 @@ void KX_Dome::SplitFace(vector <DomeFace>& face, int *nfaces) n1 = n2 = *nfaces; - for(i=0;i<n1;i++){ + for (i=0;i<n1;i++){ face[n2].verts[0] = (face[i].verts[0] + face[i].verts[1]) /2; face[n2].verts[1] = face[i].verts[1]; @@ -1635,9 +1635,9 @@ void KX_Dome::Draw(void) break; } - if(warp.usemesh) + if (warp.usemesh) { - if(fboSupported) + if (fboSupported) { m_canvas->SetViewPort(0, 0, m_canvas->GetWidth(), m_canvas->GetHeight()); glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); @@ -1793,7 +1793,7 @@ void KX_Dome::DrawDomeFisheye(void) float ortho_width, ortho_height; - if(m_mode == DOME_FISHEYE) { + if (m_mode == DOME_FISHEYE) { if (warp.usemesh) glOrtho((-1.0), 1.0, (-1.0), 1.0, -20.0, 10.0); //stretch the image to reduce resolution lost @@ -1809,7 +1809,7 @@ void KX_Dome::DrawDomeFisheye(void) glOrtho((-ortho_width), ortho_width, (-ortho_height), ortho_height, -20.0, 10.0); } } - else if(m_mode == DOME_TRUNCATED_FRONT) + else if (m_mode == DOME_TRUNCATED_FRONT) { ortho_width = 1.0; ortho_height = 2 * ((float)can_height / can_width) - 1.0; @@ -1829,7 +1829,7 @@ void KX_Dome::DrawDomeFisheye(void) glLoadIdentity(); gluLookAt(0.0,-1.0,0.0, 0.0,0.0,0.0, 0.0,0.0,1.0); - if(m_drawingmode == RAS_IRasterizer::KX_WIREFRAME) + if (m_drawingmode == RAS_IRasterizer::KX_WIREFRAME) glPolygonMode(GL_FRONT, GL_LINE); else glPolygonMode(GL_FRONT, GL_FILL); @@ -1842,7 +1842,7 @@ void KX_Dome::DrawDomeFisheye(void) glColor3f(1.0,1.0,1.0); if (dlistSupported){ - for(i=0;i<m_numfaces;i++){ + for (i=0;i<m_numfaces;i++){ glBindTexture(GL_TEXTURE_2D, domefacesId[i]); glCallList(dlistId+i); } @@ -1911,7 +1911,7 @@ void KX_Dome::DrawPanorama(void) glLoadIdentity(); gluLookAt(0.0,-1.0,0.0, 0.0,0.0,0.0, 0.0,0.0,1.0); - if(m_drawingmode == RAS_IRasterizer::KX_WIREFRAME) + if (m_drawingmode == RAS_IRasterizer::KX_WIREFRAME) glPolygonMode(GL_FRONT, GL_LINE); else glPolygonMode(GL_FRONT, GL_FILL); @@ -1924,7 +1924,7 @@ void KX_Dome::DrawPanorama(void) glColor3f(1.0,1.0,1.0); if (dlistSupported){ - for(i=0;i<m_numfaces;i++){ + for (i=0;i<m_numfaces;i++){ glBindTexture(GL_TEXTURE_2D, domefacesId[i]); glCallList(dlistId+i); } @@ -1979,7 +1979,7 @@ void KX_Dome::DrawDomeWarped(void) glLoadIdentity(); gluLookAt(0.0, 0.0, 1.0, 0.0,0.0,0.0, 0.0,1.0,0.0); - if(m_drawingmode == RAS_IRasterizer::KX_WIREFRAME) + if (m_drawingmode == RAS_IRasterizer::KX_WIREFRAME) glPolygonMode(GL_FRONT, GL_LINE); else glPolygonMode(GL_FRONT, GL_FILL); diff --git a/source/gameengine/Ketsji/KX_FontObject.cpp b/source/gameengine/Ketsji/KX_FontObject.cpp index 5a67b052a2b..308154d8ebc 100644 --- a/source/gameengine/Ketsji/KX_FontObject.cpp +++ b/source/gameengine/Ketsji/KX_FontObject.cpp @@ -60,7 +60,7 @@ std::vector<STR_String> split_string(STR_String str) int begin=0, end=0; while (end < str.Length()) { - if(str.GetAt(end) == '\n') + if (str.GetAt(end) == '\n') { text.push_back(str.Mid(begin, end-begin)); begin = end+1; @@ -165,11 +165,11 @@ int GetFontId (VFont *font) void KX_FontObject::DrawText() { /* Allow for some logic brick control */ - if(this->GetProperty("Text")) + if (this->GetProperty("Text")) m_text = split_string(this->GetProperty("Text")->GetText()); /* only draws the text if visible */ - if(this->GetVisible() == 0) return; + if (this->GetVisible() == 0) return; /* update the animated color */ this->GetObjectColor().getValue(m_color); @@ -193,7 +193,7 @@ void KX_FontObject::DrawText() spacing = this->NodeGetWorldOrientation() * spacing * this->NodeGetWorldScaling()[1]; /* Draw each line, taking spacing into consideration */ - for(int i=0; i<m_text.size(); ++i) + for (int i=0; i<m_text.size(); ++i) { if (i!=0) { @@ -256,9 +256,9 @@ PyObject* KX_FontObject::pyattr_get_text(void *self_v, const KX_PYATTRIBUTE_DEF { KX_FontObject* self= static_cast<KX_FontObject*>(self_v); STR_String str = STR_String(); - for(int i=0; i<self->m_text.size(); ++i) + for (int i=0; i<self->m_text.size(); ++i) { - if(i!=0) + if (i!=0) str += '\n'; str += self->m_text[i]; } @@ -268,13 +268,13 @@ PyObject* KX_FontObject::pyattr_get_text(void *self_v, const KX_PYATTRIBUTE_DEF int KX_FontObject::pyattr_set_text(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value) { KX_FontObject* self= static_cast<KX_FontObject*>(self_v); - if(!PyUnicode_Check(value)) + if (!PyUnicode_Check(value)) return PY_SET_ATTR_FAIL; char* chars = _PyUnicode_AsString(value); /* Allow for some logic brick control */ CValue* tprop = self->GetProperty("Text"); - if(tprop) { + if (tprop) { CValue *newstringprop = new CStringValue(STR_String(chars), "Text"); self->SetProperty("Text", newstringprop); newstringprop->Release(); diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index 1bc60ebd337..c77d40e8f8c 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -445,7 +445,7 @@ void KX_GameObject::ProcessReplica() } #ifdef WITH_PYTHON - if(m_attr_dict) + if (m_attr_dict) m_attr_dict= PyDict_Copy(m_attr_dict); #endif @@ -588,7 +588,7 @@ void KX_GameObject::AddMeshUser() SG_QList::iterator<RAS_MeshSlot> mit(m_meshSlots); // RAS_MeshSlot* ms; - for(mit.begin(); !mit.end(); ++mit) + for (mit.begin(); !mit.end(); ++mit) { (*mit)->m_OpenGLMatrix = fl; } @@ -621,7 +621,7 @@ void KX_GameObject::UpdateBuckets( bool recursive ) GetOpenGLMatrix(); SG_QList::iterator<RAS_MeshSlot> mit(m_meshSlots); - for(mit.begin(); !mit.end(); ++mit) + for (mit.begin(); !mit.end(); ++mit) { ms = *mit; ms->m_bObjectColor = m_bUseObjectColor; @@ -742,11 +742,11 @@ KX_GameObject::UpdateMaterialData( if (((unsigned int)mesh < m_meshes.size()) && mesh >= 0) { list<RAS_MeshMaterial>::iterator mit = m_meshes[mesh]->GetFirstMaterial(); - for(; mit != m_meshes[mesh]->GetLastMaterial(); ++mit) + for (; mit != m_meshes[mesh]->GetLastMaterial(); ++mit) { RAS_IPolyMaterial* poly = mit->m_bucket->GetPolyMaterial(); - if(poly->GetFlag() & RAS_BLENDERMAT ) + if (poly->GetFlag() & RAS_BLENDERMAT ) { KX_BlenderMaterial *m = static_cast<KX_BlenderMaterial*>(poly); @@ -1282,7 +1282,7 @@ void KX_GameObject::Resume(void) { if (m_suspended) { SCA_IObject::Resume(); - if(GetPhysicsController()) + if (GetPhysicsController()) GetPhysicsController()->RestoreDynamics(); m_suspended = false; @@ -1294,7 +1294,7 @@ void KX_GameObject::Suspend() if ((!m_ignore_activity_culling) && (!m_suspended)) { SCA_IObject::Suspend(); - if(GetPhysicsController()) + if (GetPhysicsController()) GetPhysicsController()->SuspendDynamics(); m_suspended = true; } @@ -1379,7 +1379,7 @@ static unsigned char mathutils_kxgameob_vector_cb_index= -1; /* index for our ca static int mathutils_kxgameob_generic_check(BaseMathObject *bmo) { KX_GameObject* self= static_cast<KX_GameObject*>BGE_PROXY_REF(bmo->cb_user); - if(self==NULL) + if (self==NULL) return -1; return 0; @@ -1388,7 +1388,7 @@ static int mathutils_kxgameob_generic_check(BaseMathObject *bmo) static int mathutils_kxgameob_vector_get(BaseMathObject *bmo, int subtype) { KX_GameObject* self= static_cast<KX_GameObject*>BGE_PROXY_REF(bmo->cb_user); - if(self==NULL) + if (self==NULL) return -1; #define PHYS_ERR(attr) PyErr_SetString(PyExc_AttributeError, "KX_GameObject." attr ", is missing a physics controller") @@ -1407,26 +1407,26 @@ static int mathutils_kxgameob_vector_get(BaseMathObject *bmo, int subtype) self->NodeGetWorldScaling().getValue(bmo->data); break; case MATHUTILS_VEC_CB_INERTIA_LOCAL: - if(!self->GetPhysicsController()) return PHYS_ERR("localInertia"), -1; + if (!self->GetPhysicsController()) return PHYS_ERR("localInertia"), -1; self->GetPhysicsController()->GetLocalInertia().getValue(bmo->data); break; case MATHUTILS_VEC_CB_OBJECT_COLOR: self->GetObjectColor().getValue(bmo->data); break; case MATHUTILS_VEC_CB_LINVEL_LOCAL: - if(!self->GetPhysicsController()) return PHYS_ERR("localLinearVelocity"), -1; + if (!self->GetPhysicsController()) return PHYS_ERR("localLinearVelocity"), -1; self->GetLinearVelocity(true).getValue(bmo->data); break; case MATHUTILS_VEC_CB_LINVEL_GLOBAL: - if(!self->GetPhysicsController()) return PHYS_ERR("worldLinearVelocity"), -1; + if (!self->GetPhysicsController()) return PHYS_ERR("worldLinearVelocity"), -1; self->GetLinearVelocity(false).getValue(bmo->data); break; case MATHUTILS_VEC_CB_ANGVEL_LOCAL: - if(!self->GetPhysicsController()) return PHYS_ERR("localLinearVelocity"), -1; + if (!self->GetPhysicsController()) return PHYS_ERR("localLinearVelocity"), -1; self->GetAngularVelocity(true).getValue(bmo->data); break; case MATHUTILS_VEC_CB_ANGVEL_GLOBAL: - if(!self->GetPhysicsController()) return PHYS_ERR("worldLinearVelocity"), -1; + if (!self->GetPhysicsController()) return PHYS_ERR("worldLinearVelocity"), -1; self->GetAngularVelocity(false).getValue(bmo->data); break; @@ -1440,7 +1440,7 @@ static int mathutils_kxgameob_vector_get(BaseMathObject *bmo, int subtype) static int mathutils_kxgameob_vector_set(BaseMathObject *bmo, int subtype) { KX_GameObject* self= static_cast<KX_GameObject*>BGE_PROXY_REF(bmo->cb_user); - if(self==NULL) + if (self==NULL) return -1; switch(subtype) { @@ -1485,7 +1485,7 @@ static int mathutils_kxgameob_vector_set(BaseMathObject *bmo, int subtype) static int mathutils_kxgameob_vector_get_index(BaseMathObject *bmo, int subtype, int index) { /* lazy, avoid repeteing the case statement */ - if(mathutils_kxgameob_vector_get(bmo, subtype) == -1) + if (mathutils_kxgameob_vector_get(bmo, subtype) == -1) return -1; return 0; } @@ -1495,7 +1495,7 @@ static int mathutils_kxgameob_vector_set_index(BaseMathObject *bmo, int subtype, float f= bmo->data[index]; /* lazy, avoid repeteing the case statement */ - if(mathutils_kxgameob_vector_get(bmo, subtype) == -1) + if (mathutils_kxgameob_vector_get(bmo, subtype) == -1) return -1; bmo->data[index]= f; @@ -1519,7 +1519,7 @@ static unsigned char mathutils_kxgameob_matrix_cb_index= -1; /* index for our ca static int mathutils_kxgameob_matrix_get(BaseMathObject *bmo, int subtype) { KX_GameObject* self= static_cast<KX_GameObject*>BGE_PROXY_REF(bmo->cb_user); - if(self==NULL) + if (self==NULL) return -1; switch(subtype) { @@ -1538,7 +1538,7 @@ static int mathutils_kxgameob_matrix_get(BaseMathObject *bmo, int subtype) static int mathutils_kxgameob_matrix_set(BaseMathObject *bmo, int subtype) { KX_GameObject* self= static_cast<KX_GameObject*>BGE_PROXY_REF(bmo->cb_user); - if(self==NULL) + if (self==NULL) return -1; MT_Matrix3x3 mat3x3; @@ -1713,7 +1713,7 @@ PyObject* KX_GameObject::PyReinstancePhysicsMesh(PyObject* args) } #ifdef USE_BULLET /* gameobj and mesh can be NULL */ - if(KX_ReInstanceBulletShapeFromMesh(this, gameobj, mesh)) + if (KX_ReInstanceBulletShapeFromMesh(this, gameobj, mesh)) Py_RETURN_TRUE; #endif Py_RETURN_FALSE; @@ -1732,7 +1732,7 @@ static PyObject *Map_GetItem(PyObject *self_v, PyObject *item) } /* first see if the attributes a string and try get the cvalue attribute */ - if(attr_str && (resultattr=self->GetProperty(attr_str))) { + if (attr_str && (resultattr=self->GetProperty(attr_str))) { pyconvert = resultattr->ConvertValueToPython(); return pyconvert ? pyconvert:resultattr->GetProxy(); } @@ -1745,7 +1745,7 @@ static PyObject *Map_GetItem(PyObject *self_v, PyObject *item) return pyconvert; } else { - if(attr_str) PyErr_Format(PyExc_KeyError, "value = gameOb[key]: KX_GameObject, key \"%s\" does not exist", attr_str); + if (attr_str) PyErr_Format(PyExc_KeyError, "value = gameOb[key]: KX_GameObject, key \"%s\" does not exist", attr_str); else PyErr_SetString(PyExc_KeyError, "value = gameOb[key]: KX_GameObject, key does not exist"); return NULL; } @@ -1757,7 +1757,7 @@ static int Map_SetItem(PyObject *self_v, PyObject *key, PyObject *val) { KX_GameObject* self= static_cast<KX_GameObject*>BGE_PROXY_REF(self_v); const char *attr_str= _PyUnicode_AsString(key); - if(attr_str==NULL) + if (attr_str==NULL) PyErr_Clear(); if (self==NULL) { @@ -1769,14 +1769,14 @@ static int Map_SetItem(PyObject *self_v, PyObject *key, PyObject *val) int del= 0; /* try remove both just in case */ - if(attr_str) + if (attr_str) del |= (self->RemoveProperty(attr_str)==true) ? 1:0; - if(self->m_attr_dict) + if (self->m_attr_dict) del |= (PyDict_DelItem(self->m_attr_dict, key)==0) ? 1:0; if (del==0) { - if(attr_str) PyErr_Format(PyExc_KeyError, "gameOb[key] = value: KX_GameObject, key \"%s\" could not be set", attr_str); + if (attr_str) PyErr_Format(PyExc_KeyError, "gameOb[key] = value: KX_GameObject, key \"%s\" could not be set", attr_str); else PyErr_SetString(PyExc_KeyError, "del gameOb[key]: KX_GameObject, key could not be deleted"); return -1; } @@ -1788,11 +1788,11 @@ static int Map_SetItem(PyObject *self_v, PyObject *key, PyObject *val) int set= 0; /* as CValue */ - if(attr_str && PyObject_TypeCheck(val, &PyObjectPlus::Type)==0) /* don't allow GameObjects for eg to be assigned to CValue props */ + if (attr_str && PyObject_TypeCheck(val, &PyObjectPlus::Type)==0) /* don't allow GameObjects for eg to be assigned to CValue props */ { CValue* vallie = self->ConvertPythonToValue(val, ""); /* error unused */ - if(vallie) + if (vallie) { CValue* oldprop = self->GetProperty(attr_str); @@ -1815,25 +1815,25 @@ static int Map_SetItem(PyObject *self_v, PyObject *key, PyObject *val) } } - if(set==0) + if (set==0) { if (self->m_attr_dict==NULL) /* lazy init */ self->m_attr_dict= PyDict_New(); - if(PyDict_SetItem(self->m_attr_dict, key, val)==0) + if (PyDict_SetItem(self->m_attr_dict, key, val)==0) { - if(attr_str) + if (attr_str) self->RemoveProperty(attr_str); /* overwrite the CValue if it exists */ set= 1; } else { - if(attr_str) PyErr_Format(PyExc_KeyError, "gameOb[key] = value: KX_GameObject, key \"%s\" not be added to internal dictionary", attr_str); + if (attr_str) PyErr_Format(PyExc_KeyError, "gameOb[key] = value: KX_GameObject, key \"%s\" not be added to internal dictionary", attr_str); else PyErr_SetString(PyExc_KeyError, "gameOb[key] = value: KX_GameObject, key not be added to internal dictionary"); } } - if(set==0) + if (set==0) return -1; /* pythons error value */ } @@ -1850,7 +1850,7 @@ static int Seq_Contains(PyObject *self_v, PyObject *value) return -1; } - if(PyUnicode_Check(value) && self->GetProperty(_PyUnicode_AsString(value))) + if (PyUnicode_Check(value) && self->GetProperty(_PyUnicode_AsString(value))) return 1; if (self->m_attr_dict && PyDict_GetItem(self->m_attr_dict, value)) @@ -2406,7 +2406,7 @@ PyObject* KX_GameObject::pyattr_get_meshes(void *self_v, const KX_PYATTRIBUTE_DE PyObject *meshes= PyList_New(self->m_meshes.size()); int i; - for(i=0; i < (int)self->m_meshes.size(); i++) + for (i=0; i < (int)self->m_meshes.size(); i++) { KX_MeshProxy* meshproxy = new KX_MeshProxy(self->m_meshes[i]); PyList_SET_ITEM(meshes, i, meshproxy->NewProxy(true)); @@ -2469,7 +2469,7 @@ PyObject* KX_GameObject::pyattr_get_attrDict(void *self_v, const KX_PYATTRIBUTE_ { KX_GameObject* self= static_cast<KX_GameObject*>(self_v); - if(self->m_attr_dict==NULL) + if (self->m_attr_dict==NULL) self->m_attr_dict= PyDict_New(); Py_INCREF(self->m_attr_dict); @@ -2653,7 +2653,7 @@ PyObject* KX_GameObject::PyGetReactionForce() PyObject* KX_GameObject::PyEnableRigidBody() { - if(GetPhysicsController()) + if (GetPhysicsController()) GetPhysicsController()->setRigidBody(true); Py_RETURN_NONE; @@ -2663,7 +2663,7 @@ PyObject* KX_GameObject::PyEnableRigidBody() PyObject* KX_GameObject::PyDisableRigidBody() { - if(GetPhysicsController()) + if (GetPhysicsController()) GetPhysicsController()->setRigidBody(false); Py_RETURN_NONE; @@ -2806,7 +2806,7 @@ PyObject* KX_GameObject::PyGetPropertyNames() { PyObject *list= ConvertKeysToPython(); - if(m_attr_dict) { + if (m_attr_dict) { PyObject *key, *value; Py_ssize_t pos = 0; @@ -3311,11 +3311,11 @@ PyObject* KX_GameObject::Pyget(PyObject *args) return NULL; - if(PyUnicode_Check(key)) { + if (PyUnicode_Check(key)) { CValue *item = GetProperty(_PyUnicode_AsString(key)); if (item) { ret = item->ConvertValueToPython(); - if(ret) + if (ret) return ret; else return item->GetProxy(); diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp index facac230e05..f088d548089 100644 --- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp +++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp @@ -194,7 +194,7 @@ KX_KetsjiEngine::KX_KetsjiEngine(KX_ISystem* system) KX_KetsjiEngine::~KX_KetsjiEngine() { delete m_logger; - if(m_usedome) + if (m_usedome) delete m_dome; } @@ -317,7 +317,7 @@ void KX_KetsjiEngine::RenderDome() RenderShadowBuffers(scene); } // Avoid drawing the scene with the active camera twice when it's viewport is enabled - if(cam && !cam->GetViewport()) + if (cam && !cam->GetViewport()) { if (scene->IsClearingZBuffer()) m_rasterizer->ClearDepthBuffer(); @@ -336,7 +336,7 @@ void KX_KetsjiEngine::RenderDome() list<KX_Camera*>::iterator it = cameras->begin(); while(it != cameras->end()) { - if((*it)->GetViewport()) + if ((*it)->GetViewport()) { if (scene->IsClearingZBuffer()) m_rasterizer->ClearDepthBuffer(); @@ -431,7 +431,7 @@ void KX_KetsjiEngine::StartEngine(bool clearIpo) void KX_KetsjiEngine::ClearFrame() { // clear unless we're drawing overlapping stereo - if(m_rasterizer->InterlacedStereo() && + if (m_rasterizer->InterlacedStereo() && m_rasterizer->GetEye() == RAS_IRasterizer::RAS_STEREO_RIGHTEYE) return; @@ -447,29 +447,29 @@ void KX_KetsjiEngine::ClearFrame() list<class KX_Camera*>* cameras = scene->GetCameras(); list<KX_Camera*>::iterator it; - for(it = cameras->begin(); it != cameras->end(); it++) + for (it = cameras->begin(); it != cameras->end(); it++) { GetSceneViewport(scene, (*it), area, viewport); - if(!doclear) { + if (!doclear) { clearvp = viewport; doclear = true; } else { - if(viewport.GetLeft() < clearvp.GetLeft()) + if (viewport.GetLeft() < clearvp.GetLeft()) clearvp.SetLeft(viewport.GetLeft()); - if(viewport.GetBottom() < clearvp.GetBottom()) + if (viewport.GetBottom() < clearvp.GetBottom()) clearvp.SetBottom(viewport.GetBottom()); - if(viewport.GetRight() > clearvp.GetRight()) + if (viewport.GetRight() > clearvp.GetRight()) clearvp.SetRight(viewport.GetRight()); - if(viewport.GetTop() > clearvp.GetTop()) + if (viewport.GetTop() > clearvp.GetTop()) clearvp.SetTop(viewport.GetTop()); } } } - if(doclear) { + if (doclear) { KX_Scene* firstscene = *m_scenes.begin(); SetBackGround(firstscene->GetWorldInfo()); @@ -694,7 +694,7 @@ else scene->setSuspendedTime(0.0); } // suspended else - if(scene->getSuspendedTime()==0.0) + if (scene->getSuspendedTime()==0.0) scene->setSuspendedTime(m_clockTime); m_logger->StartLog(tc_services, m_kxsystem->GetTimeInSeconds(), true); @@ -768,7 +768,7 @@ else scene->setSuspendedTime(0.0); } // suspended else - if(scene->getSuspendedTime()==0.0) + if (scene->getSuspendedTime()==0.0) scene->setSuspendedTime(m_clockTime); m_logger->StartLog(tc_services, m_kxsystem->GetTimeInSeconds(), true); @@ -806,7 +806,7 @@ else void KX_KetsjiEngine::Render() { - if(m_usedome){ + if (m_usedome){ RenderDome(); return; } @@ -872,7 +872,7 @@ void KX_KetsjiEngine::Render() RenderShadowBuffers(scene); // Avoid drawing the scene with the active camera twice when it's viewport is enabled - if(cam && !cam->GetViewport()) + if (cam && !cam->GetViewport()) { if (scene->IsClearingZBuffer()) m_rasterizer->ClearDepthBuffer(); @@ -889,7 +889,7 @@ void KX_KetsjiEngine::Render() list<KX_Camera*>::iterator it = cameras->begin(); while(it != cameras->end()) { - if((*it)->GetViewport()) + if ((*it)->GetViewport()) { if (scene->IsClearingZBuffer()) m_rasterizer->ClearDepthBuffer(); @@ -906,7 +906,7 @@ void KX_KetsjiEngine::Render() } // only one place that checks for stereo - if(m_rasterizer->Stereo()) + if (m_rasterizer->Stereo()) { m_rasterizer->SetEye(RAS_IRasterizer::RAS_STEREO_RIGHTEYE); @@ -939,7 +939,7 @@ void KX_KetsjiEngine::Render() list<KX_Camera*>::iterator it = cameras->begin(); while(it != cameras->end()) { - if((*it)->GetViewport()) + if ((*it)->GetViewport()) { if (scene->IsClearingZBuffer()) m_rasterizer->ClearDepthBuffer(); @@ -954,7 +954,7 @@ void KX_KetsjiEngine::Render() } PostRenderScene(scene); } - } // if(m_rasterizer->Stereo()) + } // if (m_rasterizer->Stereo()) EndFrame(); } @@ -985,7 +985,7 @@ int KX_KetsjiEngine::GetExitCode() } // check if the window has been closed. - if(!m_exitcode) + if (!m_exitcode) { //if(!m_canvas->Check()) { // m_exitcode = KX_EXIT_REQUEST_OUTSIDE; @@ -1119,7 +1119,7 @@ void KX_KetsjiEngine::GetSceneViewport(KX_Scene *scene, KX_Camera* cam, RAS_Rect // Don't do bars on user specified viewport RAS_FrameSettings settings = scene->GetFramingType(); - if(settings.FrameType() == RAS_FrameSettings::e_frame_bars) + if (settings.FrameType() == RAS_FrameSettings::e_frame_bars) settings.SetFrameType(RAS_FrameSettings::e_frame_extend); RAS_FramingManager::ComputeViewport( @@ -1155,14 +1155,14 @@ void KX_KetsjiEngine::RenderShadowBuffers(KX_Scene *scene) m_rendertools->SetAuxilaryClientInfo(scene); - for(i=0; i<lightlist->GetCount(); i++) { + for (i=0; i<lightlist->GetCount(); i++) { KX_GameObject *gameobj = (KX_GameObject*)lightlist->GetValue(i); KX_LightObject *light = (KX_LightObject*)gameobj; light->Update(); - if(m_drawingmode == RAS_IRasterizer::KX_TEXTURED && light->HasShadowBuffer()) { + if (m_drawingmode == RAS_IRasterizer::KX_TEXTURED && light->HasShadowBuffer()) { /* make temporary camera */ RAS_CameraData camdata = RAS_CameraData(); KX_Camera *cam = new KX_Camera(scene, scene->m_callbacks, camdata, true, true); @@ -1238,7 +1238,7 @@ void KX_KetsjiEngine::RenderFrame(KX_Scene* scene, KX_Camera* cam) focallength = cam->GetFocalLength(); MT_Matrix4x4 projmat; - if(override_camera) { + if (override_camera) { nearfrust = m_overrideCamNear; farfrust = m_overrideCamFar; } diff --git a/source/gameengine/Ketsji/KX_Light.cpp b/source/gameengine/Ketsji/KX_Light.cpp index b174b4f701e..7e9d95b37a2 100644 --- a/source/gameengine/Ketsji/KX_Light.cpp +++ b/source/gameengine/Ketsji/KX_Light.cpp @@ -67,7 +67,7 @@ KX_LightObject::~KX_LightObject() { GPULamp *lamp; - if((lamp = GetGPULamp())) { + if ((lamp = GetGPULamp())) { float obmat[4][4] = {{0}}; GPU_lamp_update(lamp, 0, 0, obmat); } @@ -95,18 +95,18 @@ bool KX_LightObject::ApplyLight(KX_Scene *kxscene, int oblayer, int slot) float vec[4]; int scenelayer = ~0; - if(kxscene && kxscene->GetBlenderScene()) + if (kxscene && kxscene->GetBlenderScene()) scenelayer = kxscene->GetBlenderScene()->lay; /* only use lights in the same layer as the object */ - if(!(m_lightobj.m_layer & oblayer)) + if (!(m_lightobj.m_layer & oblayer)) return false; /* only use lights in the same scene, and in a visible layer */ - if(kxscene != lightscene || !(m_lightobj.m_layer & scenelayer)) + if (kxscene != lightscene || !(m_lightobj.m_layer & scenelayer)) return false; // lights don't get their openGL matrix updated, do it now - if(GetSGNode()->IsDirty()) + if (GetSGNode()->IsDirty()) GetOpenGLMatrix(); MT_CmMatrix4x4& worldmatrix= *GetOpenGLMatrixPtr(); @@ -116,7 +116,7 @@ bool KX_LightObject::ApplyLight(KX_Scene *kxscene, int oblayer, int slot) vec[2] = worldmatrix(2,3); vec[3] = 1.0f; - if(m_lightobj.m_type==RAS_LightObject::LIGHT_SUN) { + if (m_lightobj.m_type==RAS_LightObject::LIGHT_SUN) { vec[0] = worldmatrix(0,2); vec[1] = worldmatrix(1,2); @@ -136,7 +136,7 @@ bool KX_LightObject::ApplyLight(KX_Scene *kxscene, int oblayer, int slot) //attennuation still is acceptable glLightf((GLenum)(GL_LIGHT0+slot), GL_QUADRATIC_ATTENUATION, m_lightobj.m_att2/(m_lightobj.m_distance*m_lightobj.m_distance)); - if(m_lightobj.m_type==RAS_LightObject::LIGHT_SPOT) { + if (m_lightobj.m_type==RAS_LightObject::LIGHT_SPOT) { vec[0] = -worldmatrix(0,2); vec[1] = -worldmatrix(1,2); vec[2] = -worldmatrix(2,2); @@ -162,7 +162,7 @@ bool KX_LightObject::ApplyLight(KX_Scene *kxscene, int oblayer, int slot) } glLightfv((GLenum)(GL_LIGHT0+slot), GL_DIFFUSE, vec); - if(m_lightobj.m_nospecular) + if (m_lightobj.m_nospecular) { vec[0] = vec[1] = vec[2] = vec[3] = 0.0; } @@ -181,7 +181,7 @@ bool KX_LightObject::ApplyLight(KX_Scene *kxscene, int oblayer, int slot) GPULamp *KX_LightObject::GetGPULamp() { - if(m_glsl) + if (m_glsl) return GPU_lamp_from_blender(m_blenderscene, GetBlenderObject(), GetBlenderGroupObject()); else return NULL; @@ -191,15 +191,15 @@ void KX_LightObject::Update() { GPULamp *lamp; - if((lamp = GetGPULamp()) != NULL && GetSGNode()) { + if ((lamp = GetGPULamp()) != NULL && GetSGNode()) { float obmat[4][4]; // lights don't get their openGL matrix updated, do it now if (GetSGNode()->IsDirty()) GetOpenGLMatrix(); double *dobmat = GetOpenGLMatrixPtr()->getPointer(); - for(int i=0; i<4; i++) - for(int j=0; j<4; j++, dobmat++) + for (int i=0; i<4; i++) + for (int j=0; j<4; j++, dobmat++) obmat[i][j] = (float)*dobmat; GPU_lamp_update(lamp, m_lightobj.m_layer, 0, obmat); @@ -212,7 +212,7 @@ bool KX_LightObject::HasShadowBuffer() { GPULamp *lamp; - if((lamp = GetGPULamp())) + if ((lamp = GetGPULamp())) return GPU_lamp_has_shadow_buffer(lamp); else return false; @@ -222,7 +222,7 @@ int KX_LightObject::GetShadowLayer() { GPULamp *lamp; - if((lamp = GetGPULamp())) + if ((lamp = GetGPULamp())) return GPU_lamp_shadow_layer(lamp); else return 0; @@ -347,7 +347,7 @@ PyObject* KX_LightObject::pyattr_get_typeconst(void *self_v, const KX_PYATTRIBUT const char* type = attrdef->m_name; - if(!strcmp(type, "SPOT")) { + if (!strcmp(type, "SPOT")) { retvalue = PyLong_FromSsize_t(RAS_LightObject::LIGHT_SPOT); } else if (!strcmp(type, "SUN")) { retvalue = PyLong_FromSsize_t(RAS_LightObject::LIGHT_SUN); @@ -373,7 +373,7 @@ int KX_LightObject::pyattr_set_type(void* self_v, const KX_PYATTRIBUTE_DEF *attr { KX_LightObject* self = static_cast<KX_LightObject*>(self_v); int val = PyLong_AsSsize_t(value); - if((val==-1 && PyErr_Occurred()) || val<0 || val>2) { + if ((val==-1 && PyErr_Occurred()) || val<0 || val>2) { PyErr_SetString(PyExc_ValueError, "light.type= val: KX_LightObject, expected an int between 0 and 2"); return PY_SET_ATTR_FAIL; } diff --git a/source/gameengine/Ketsji/KX_MeshProxy.cpp b/source/gameengine/Ketsji/KX_MeshProxy.cpp index fa1366874a3..f1a9a93c2db 100644 --- a/source/gameengine/Ketsji/KX_MeshProxy.cpp +++ b/source/gameengine/Ketsji/KX_MeshProxy.cpp @@ -184,7 +184,7 @@ PyObject* KX_MeshProxy::PyGetVertex(PyObject* args, PyObject* kwds) RAS_TexVert* vertex = m_meshobj->GetVertex(matindex,vertexindex); - if(vertex==NULL) { + if (vertex==NULL) { PyErr_SetString(PyExc_ValueError, "mesh.getVertex(mat_idx, vert_idx): KX_MeshProxy, could not get a vertex at the given indices"); return NULL; } @@ -230,11 +230,11 @@ PyObject* KX_MeshProxy::pyattr_get_materials(void *self_v, const KX_PYATTRIBUTE_ list<RAS_MeshMaterial>::iterator mit= self->m_meshobj->GetFirstMaterial(); - for(i=0; i<tot; mit++, i++) { + for (i=0; i<tot; mit++, i++) { RAS_IPolyMaterial *polymat = mit->m_bucket->GetPolyMaterial(); /* Why do we need to check for RAS_BLENDERMAT if both are cast to a (PyObject*)? - Campbell */ - if(polymat->GetFlag() & RAS_BLENDERMAT) + if (polymat->GetFlag() & RAS_BLENDERMAT) { KX_BlenderMaterial *mat = static_cast<KX_BlenderMaterial*>(polymat); PyList_SET_ITEM(materials, i, mat->GetProxy()); diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp index 0d81883104b..bfee124d443 100644 --- a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp +++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp @@ -114,7 +114,7 @@ bool KX_MouseFocusSensor::Evaluate() if (!m_mouse_over_in_previous_frame) { result = true; } - else if(m_bTouchPulse && (m_hitObject != m_hitObject_Last)) { + else if (m_bTouchPulse && (m_hitObject != m_hitObject_Last)) { result = true; } } @@ -303,7 +303,7 @@ bool KX_MouseFocusSensor::ParentObjectHasFocus() KX_Camera *cam= m_kxscene->GetActiveCamera(); - if(ParentObjectHasFocusCamera(cam)) + if (ParentObjectHasFocusCamera(cam)) return true; list<class KX_Camera*>* cameras = m_kxscene->GetCameras(); @@ -311,7 +311,7 @@ bool KX_MouseFocusSensor::ParentObjectHasFocus() while(it != cameras->end()) { - if(((*it) != cam) && (*it)->GetViewport()) + if (((*it) != cam) && (*it)->GetViewport()) if (ParentObjectHasFocusCamera(*it)) return true; @@ -408,7 +408,7 @@ PyObject* KX_MouseFocusSensor::pyattr_get_ray_direction(void *self_v, const KX_P { KX_MouseFocusSensor* self= static_cast<KX_MouseFocusSensor*>(self_v); MT_Vector3 dir = self->RayTarget() - self->RaySource(); - if(MT_fuzzyZero(dir)) dir.setValue(0,0,0); + if (MT_fuzzyZero(dir)) dir.setValue(0,0,0); else dir.normalize(); return PyObjectFrom(dir); } @@ -417,7 +417,7 @@ PyObject* KX_MouseFocusSensor::pyattr_get_hit_object(void *self_v, const KX_PYAT { KX_MouseFocusSensor* self= static_cast<KX_MouseFocusSensor*>(self_v); - if(self->m_hitObject) + if (self->m_hitObject) return self->m_hitObject->GetProxy(); Py_RETURN_NONE; diff --git a/source/gameengine/Ketsji/KX_NavMeshObject.cpp b/source/gameengine/Ketsji/KX_NavMeshObject.cpp index 79e9c28a81c..2368ff97a14 100644 --- a/source/gameengine/Ketsji/KX_NavMeshObject.cpp +++ b/source/gameengine/Ketsji/KX_NavMeshObject.cpp @@ -420,7 +420,7 @@ bool KX_NavMeshObject::BuildNavMesh() } // setup triangles. unsigned char* tri = navDTris; - for(size_t i=0; i<ndtris; i++) + for (size_t i=0; i<ndtris; i++) { for (size_t j=0; j<3; j++) tri[4*i+j] = j; @@ -432,7 +432,7 @@ bool KX_NavMeshObject::BuildNavMesh() memcpy(navDVerts, dvertices, ndvertsuniq*3*sizeof(float)); //tris unsigned char* tri = navDTris; - for(size_t i=0; i<ndtris; i++) + for (size_t i=0; i<ndtris; i++) { for (size_t j=0; j<3; j++) tri[4*i+j] = dtris[6*i+j]; diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.cpp b/source/gameengine/Ketsji/KX_ObjectActuator.cpp index acd9cc53428..a3f098c3b1f 100644 --- a/source/gameengine/Ketsji/KX_ObjectActuator.cpp +++ b/source/gameengine/Ketsji/KX_ObjectActuator.cpp @@ -390,7 +390,7 @@ static unsigned char mathutils_kxobactu_vector_cb_index = -1; /* index for our c static int mathutils_obactu_generic_check(BaseMathObject *bmo) { KX_ObjectActuator* self= static_cast<KX_ObjectActuator*>BGE_PROXY_REF(bmo->cb_user); - if(self==NULL) + if (self==NULL) return -1; return 0; @@ -399,7 +399,7 @@ static int mathutils_obactu_generic_check(BaseMathObject *bmo) static int mathutils_obactu_vector_get(BaseMathObject *bmo, int subtype) { KX_ObjectActuator* self= static_cast<KX_ObjectActuator*>BGE_PROXY_REF(bmo->cb_user); - if(self==NULL) + if (self==NULL) return -1; switch(subtype) { @@ -417,7 +417,7 @@ static int mathutils_obactu_vector_get(BaseMathObject *bmo, int subtype) static int mathutils_obactu_vector_set(BaseMathObject *bmo, int subtype) { KX_ObjectActuator* self= static_cast<KX_ObjectActuator*>BGE_PROXY_REF(bmo->cb_user); - if(self==NULL) + if (self==NULL) return -1; switch(subtype) { @@ -435,7 +435,7 @@ static int mathutils_obactu_vector_set(BaseMathObject *bmo, int subtype) static int mathutils_obactu_vector_get_index(BaseMathObject *bmo, int subtype, int index) { /* lazy, avoid repeteing the case statement */ - if(mathutils_obactu_vector_get(bmo, subtype) == -1) + if (mathutils_obactu_vector_get(bmo, subtype) == -1) return -1; return 0; } @@ -445,7 +445,7 @@ static int mathutils_obactu_vector_set_index(BaseMathObject *bmo, int subtype, i float f= bmo->data[index]; /* lazy, avoid repeteing the case statement */ - if(mathutils_obactu_vector_get(bmo, subtype) == -1) + if (mathutils_obactu_vector_get(bmo, subtype) == -1) return -1; bmo->data[index]= f; @@ -629,7 +629,7 @@ int KX_ObjectActuator::pyattr_set_reference(void *self, const struct KX_PYATTRIB if (actuator->m_reference) actuator->m_reference->UnregisterActuator(actuator); - if(refOb==NULL) { + if (refOb==NULL) { actuator->m_reference= NULL; } else { diff --git a/source/gameengine/Ketsji/KX_PolyProxy.cpp b/source/gameengine/Ketsji/KX_PolyProxy.cpp index caef8ba5e2e..85c88337d60 100644 --- a/source/gameengine/Ketsji/KX_PolyProxy.cpp +++ b/source/gameengine/Ketsji/KX_PolyProxy.cpp @@ -259,7 +259,7 @@ KX_PYMETHODDEF_DOC_NOARGS(KX_PolyProxy, getMaterial, "getMaterial() : returns a material\n") { RAS_IPolyMaterial *polymat = m_polygon->GetMaterial()->GetPolyMaterial(); - if(polymat->GetFlag() & RAS_BLENDERMAT) + if (polymat->GetFlag() & RAS_BLENDERMAT) { KX_BlenderMaterial* mat = static_cast<KX_BlenderMaterial*>(polymat); return mat->GetProxy(); diff --git a/source/gameengine/Ketsji/KX_PolygonMaterial.cpp b/source/gameengine/Ketsji/KX_PolygonMaterial.cpp index 29127ec11a0..a85ba488fbc 100644 --- a/source/gameengine/Ketsji/KX_PolygonMaterial.cpp +++ b/source/gameengine/Ketsji/KX_PolygonMaterial.cpp @@ -182,7 +182,7 @@ void KX_PolygonMaterial::DefaultActivate(RAS_IRasterizer* rasty, TCachingInfo& c else GPU_set_tpage(NULL, 0, 0); - if(m_drawingmode & RAS_IRasterizer::KX_BACKCULL) + if (m_drawingmode & RAS_IRasterizer::KX_BACKCULL) rasty->SetCullFace(true); else rasty->SetCullFace(false); diff --git a/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp b/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp index deb69fe494b..556d451cf66 100644 --- a/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp +++ b/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp @@ -666,7 +666,7 @@ PyObject* initPythonConstraintBinding() /* Use existing module where possible * be careful not to init any runtime vars after this */ m = PyImport_ImportModule( "PhysicsConstraints" ); - if(m) { + if (m) { Py_DECREF(m); return m; } diff --git a/source/gameengine/Ketsji/KX_PyMath.cpp b/source/gameengine/Ketsji/KX_PyMath.cpp index dd32284a807..9c5e043477c 100644 --- a/source/gameengine/Ketsji/KX_PyMath.cpp +++ b/source/gameengine/Ketsji/KX_PyMath.cpp @@ -82,7 +82,7 @@ bool PyOrientationTo(PyObject* pyval, MT_Matrix3x3 &rot, const char *error_prefi bool PyQuatTo(PyObject* pyval, MT_Quaternion &qrot) { - if(!PyVecTo(pyval, qrot)) + if (!PyVecTo(pyval, qrot)) return false; /* annoying!, Blender/Mathutils have the W axis first! */ @@ -106,7 +106,7 @@ PyObject* PyObjectFrom(const MT_Matrix4x4 &mat) PyObject *col; int i; - for(i=0; i < 4; i++) { + for (i=0; i < 4; i++) { col = PyList_New(4); PyList_SET_ITEM(col, 0, PyFloat_FromDouble(mat[0][i])); PyList_SET_ITEM(col, 1, PyFloat_FromDouble(mat[1][i])); @@ -130,7 +130,7 @@ PyObject* PyObjectFrom(const MT_Matrix3x3 &mat) PyObject *col; int i; - for(i=0; i < 3; i++) { + for (i=0; i < 3; i++) { col = PyList_New(3); PyList_SET_ITEM(col, 0, PyFloat_FromDouble(mat[0][i])); PyList_SET_ITEM(col, 1, PyFloat_FromDouble(mat[1][i])); diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index b804bacf79e..0ca84870944 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -523,7 +523,7 @@ static PyObject* gPyGetBlendFileList(PyObject*, PyObject* args) BLI_split_dir_part(gp_GamePythonPath, cpath, sizeof(cpath)); } - if((dp = opendir(cpath)) == NULL) { + if ((dp = opendir(cpath)) == NULL) { /* todo, show the errno, this shouldnt happen anyway if the blendfile is readable */ fprintf(stderr, "Could not read directoty (%s) failed, code %d (%s)\n", cpath, errno, strerror(errno)); return list; @@ -607,7 +607,7 @@ static PyObject *pyPrintExt(PyObject *,PyObject *,PyObject *) support= GLEW_ARB_vertex_shader; pprint(" GL_ARB_vertex_shader supported? "<< (support?"yes.":"no.")); count = 1; - if(support){ + if (support){ pprint(" ----------Details----------"); int max=0; glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB, (GLint*)&max); @@ -627,7 +627,7 @@ static PyObject *pyPrintExt(PyObject *,PyObject *,PyObject *) support=GLEW_ARB_fragment_shader; pprint(" GL_ARB_fragment_shader supported? "<< (support?"yes.":"no.")); count = 1; - if(support){ + if (support){ pprint(" ----------Details----------"); int max=0; glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB, (GLint*)&max); @@ -638,7 +638,7 @@ static PyObject *pyPrintExt(PyObject *,PyObject *,PyObject *) support = GLEW_ARB_texture_cube_map; pprint(" GL_ARB_texture_cube_map supported? "<< (support?"yes.":"no.")); count = 1; - if(support){ + if (support){ pprint(" ----------Details----------"); int size=0; glGetIntegerv(GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB, (GLint*)&size); @@ -649,7 +649,7 @@ static PyObject *pyPrintExt(PyObject *,PyObject *,PyObject *) support = GLEW_ARB_multitexture; count = 1; pprint(" GL_ARB_multitexture supported? "<< (support?"yes.":"no.")); - if(support){ + if (support){ pprint(" ----------Details----------"); int units=0; glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, (GLint*)&units); @@ -660,7 +660,7 @@ static PyObject *pyPrintExt(PyObject *,PyObject *,PyObject *) pprint(" GL_ARB_texture_env_combine supported? "<< (GLEW_ARB_texture_env_combine?"yes.":"no.")); count = 1; - if(!count) + if (!count) pprint("No extenstions are used in this build"); Py_RETURN_NONE; @@ -697,14 +697,14 @@ static PyObject *gLibLoad(PyObject*, PyObject* args, PyObject* kwds) BLI_strncpy(abs_path, path, sizeof(abs_path)); BLI_path_abs(abs_path, gp_GamePythonPath); - if(kx_scene->GetSceneConverter()->LinkBlendFilePath(abs_path, group, kx_scene, &err_str, options)) { + if (kx_scene->GetSceneConverter()->LinkBlendFilePath(abs_path, group, kx_scene, &err_str, options)) { Py_RETURN_TRUE; } } else { - if(kx_scene->GetSceneConverter()->LinkBlendFileMemory(py_buffer.buf, py_buffer.len, path, group, kx_scene, &err_str, options)) { + if (kx_scene->GetSceneConverter()->LinkBlendFileMemory(py_buffer.buf, py_buffer.len, path, group, kx_scene, &err_str, options)) { PyBuffer_Release(&py_buffer); Py_RETURN_TRUE; } @@ -712,7 +712,7 @@ static PyObject *gLibLoad(PyObject*, PyObject* args, PyObject* kwds) PyBuffer_Release(&py_buffer); } - if(err_str) { + if (err_str) { PyErr_SetString(PyExc_ValueError, err_str); return NULL; } @@ -732,14 +732,14 @@ static PyObject *gLibNew(PyObject*, PyObject* args) if (!PyArg_ParseTuple(args,"ssO!:LibNew",&path, &group, &PyList_Type, &names)) return NULL; - if(kx_scene->GetSceneConverter()->GetMainDynamicPath(path)) + if (kx_scene->GetSceneConverter()->GetMainDynamicPath(path)) { PyErr_SetString(PyExc_KeyError, "the name of the path given exists"); return NULL; } idcode= BKE_idcode_from_name(group); - if(idcode==0) { + if (idcode==0) { PyErr_Format(PyExc_ValueError, "invalid group given \"%s\"", group); return NULL; } @@ -749,14 +749,14 @@ static PyObject *gLibNew(PyObject*, PyObject* args) strncpy(maggie->name, path, sizeof(maggie->name)-1); /* Copy the object into main */ - if(idcode==ID_ME) { + if (idcode==ID_ME) { PyObject *ret= PyList_New(0); PyObject *item; - for(Py_ssize_t i= 0; i < PyList_GET_SIZE(names); i++) { + for (Py_ssize_t i= 0; i < PyList_GET_SIZE(names); i++) { name= _PyUnicode_AsString(PyList_GET_ITEM(names, i)); - if(name) { + if (name) { RAS_MeshObject *meshobj= kx_scene->GetSceneConverter()->ConvertMeshSpecial(kx_scene, maggie, name); - if(meshobj) { + if (meshobj) { KX_MeshProxy* meshproxy = new KX_MeshProxy(meshobj); item= meshproxy->NewProxy(true); PyList_Append(ret, item); @@ -1113,17 +1113,17 @@ static PyObject* gPyDisableMotionBlur(PyObject*) static int getGLSLSettingFlag(const char *setting) { - if(strcmp(setting, "lights") == 0) + if (strcmp(setting, "lights") == 0) return GAME_GLSL_NO_LIGHTS; - else if(strcmp(setting, "shaders") == 0) + else if (strcmp(setting, "shaders") == 0) return GAME_GLSL_NO_SHADERS; - else if(strcmp(setting, "shadows") == 0) + else if (strcmp(setting, "shadows") == 0) return GAME_GLSL_NO_SHADOWS; - else if(strcmp(setting, "ramps") == 0) + else if (strcmp(setting, "ramps") == 0) return GAME_GLSL_NO_RAMPS; - else if(strcmp(setting, "nodes") == 0) + else if (strcmp(setting, "nodes") == 0) return GAME_GLSL_NO_NODES; - else if(strcmp(setting, "extra_textures") == 0) + else if (strcmp(setting, "extra_textures") == 0) return GAME_GLSL_NO_EXTRA_TEX; else return -1; @@ -1155,14 +1155,14 @@ static PyObject* gPySetGLSLMaterialSetting(PyObject*, gs->glslflag |= flag; /* display lists and GLSL materials need to be remade */ - if(sceneflag != gs->glslflag) { + if (sceneflag != gs->glslflag) { GPU_materials_free(); - if(gp_KetsjiEngine) { + if (gp_KetsjiEngine) { KX_SceneList *scenes = gp_KetsjiEngine->CurrentScenes(); KX_SceneList::iterator it; - for(it=scenes->begin(); it!=scenes->end(); it++) - if((*it)->GetBucketManager()) { + for (it=scenes->begin(); it!=scenes->end(); it++) + if ((*it)->GetBucketManager()) { (*it)->GetBucketManager()->ReleaseDisplayLists(); (*it)->GetBucketManager()->ReleaseMaterials(); } @@ -1208,11 +1208,11 @@ static PyObject* gPySetMaterialType(PyObject*, if (!PyArg_ParseTuple(args,"i:setMaterialType",&type)) return NULL; - if(type == KX_BLENDER_GLSL_MATERIAL) + if (type == KX_BLENDER_GLSL_MATERIAL) gs->matmode= GAME_MAT_GLSL; - else if(type == KX_BLENDER_MULTITEX_MATERIAL) + else if (type == KX_BLENDER_MULTITEX_MATERIAL) gs->matmode= GAME_MAT_MULTITEX; - else if(type == KX_TEXFACE_MATERIAL) + else if (type == KX_TEXFACE_MATERIAL) gs->matmode= GAME_MAT_TEXFACE; else { PyErr_SetString(PyExc_ValueError, "Rasterizer.setMaterialType(int): material type is not known"); @@ -1227,9 +1227,9 @@ static PyObject* gPyGetMaterialType(PyObject*) GlobalSettings *gs= gp_KetsjiEngine->GetGlobalSettings(); int flag; - if(gs->matmode == GAME_MAT_GLSL) + if (gs->matmode == GAME_MAT_GLSL) flag = KX_BLENDER_GLSL_MATERIAL; - else if(gs->matmode == GAME_MAT_MULTITEX) + else if (gs->matmode == GAME_MAT_MULTITEX) flag = KX_BLENDER_MULTITEX_MATERIAL; else flag = KX_TEXFACE_MATERIAL; @@ -1381,7 +1381,7 @@ PyObject* initGameLogic(KX_KetsjiEngine *engine, KX_Scene* scene) // quick hack /* Use existing module where possible * be careful not to init any runtime vars after this */ m = PyImport_ImportModule( "GameLogic" ); - if(m) { + if (m) { Py_DECREF(m); return m; } @@ -1762,7 +1762,7 @@ static void initPySysObjects__append(PyObject *sys_path, const char *filename) // printf("SysPath - '%s', '%s', '%s'\n", expanded, filename, gp_GamePythonPath); - if(PySequence_Index(sys_path, item) == -1) { + if (PySequence_Index(sys_path, item) == -1) { PyErr_Clear(); /* PySequence_Index sets a ValueError */ PyList_Insert(sys_path, 0, item); } @@ -1859,7 +1859,7 @@ PyObject* initGamePlayerPythonScripting(const STR_String& progname, TPythonSecur Py_Initialize(); - if(argv && first_time) { /* browser plugins don't currently set this */ + if (argv && first_time) { /* browser plugins don't currently set this */ // Until python support ascii again, we use our own. // PySys_SetArgv(argc, argv); int i; @@ -1971,7 +1971,7 @@ void setupGamePython(KX_KetsjiEngine* ketsjiengine, KX_Scene* startscene, Main * { PyObject* dictionaryobject; - if(argv) /* player only */ + if (argv) /* player only */ dictionaryobject= initGamePlayerPythonScripting("Ketsji", psl_Lowest, blenderdata, argc, argv); else dictionaryobject= initGamePythonScripting("Ketsji", psl_Lowest, blenderdata); @@ -1981,7 +1981,7 @@ void setupGamePython(KX_KetsjiEngine* ketsjiengine, KX_Scene* startscene, Main * *gameLogic = initGameLogic(ketsjiengine, startscene); /* is set in initGameLogic so only set here if we want it to persist between scenes */ - if(pyGlobalDict) + if (pyGlobalDict) PyDict_SetItemString(PyModule_GetDict(*gameLogic), "globalDict", pyGlobalDict); // Same as importing the module. *gameLogic_keys = PyDict_Keys(PyModule_GetDict(*gameLogic)); @@ -2027,7 +2027,7 @@ PyObject* initRasterizer(RAS_IRasterizer* rasty,RAS_ICanvas* canvas) /* Use existing module where possible * be careful not to init any runtime vars after this */ m = PyImport_ImportModule( "Rasterizer" ); - if(m) { + if (m) { Py_DECREF(m); return m; } @@ -2111,7 +2111,7 @@ static PyObject* gPyEventToCharacter(PyObject*, PyObject* args) if (!PyArg_ParseTuple(args,"ii:EventToCharacter", &event, &shift)) return NULL; - if(IsPrintable(event)) { + if (IsPrintable(event)) { char ch[2] = {'\0', '\0'}; ch[0] = ToCharacter(event, (bool)shift); return PyUnicode_FromString(ch); @@ -2148,7 +2148,7 @@ PyObject* initGameKeys() /* Use existing module where possible */ m = PyImport_ImportModule( "GameKeys" ); - if(m) { + if (m) { Py_DECREF(m); return m; } diff --git a/source/gameengine/Ketsji/KX_PythonInitTypes.cpp b/source/gameengine/Ketsji/KX_PythonInitTypes.cpp index 6a60fc08244..84c5e019e47 100644 --- a/source/gameengine/Ketsji/KX_PythonInitTypes.cpp +++ b/source/gameengine/Ketsji/KX_PythonInitTypes.cpp @@ -107,7 +107,7 @@ static void PyType_Attr_Set(PyGetSetDef *attr_getset, PyAttributeDef *attr) attr_getset->get= reinterpret_cast<getter>(PyObjectPlus::py_get_attrdef); - if(attr->m_access==KX_PYATTRIBUTE_RO) + if (attr->m_access==KX_PYATTRIBUTE_RO) attr_getset->set= NULL; else attr_getset->set= reinterpret_cast<setter>(PyObjectPlus::py_set_attrdef); @@ -119,35 +119,35 @@ static void PyType_Ready_ADD(PyObject *dict, PyTypeObject *tp, PyAttributeDef *a { PyAttributeDef *attr; - if(init_getset) { + if (init_getset) { /* we need to do this for all types before calling PyType_Ready * since they will call the parents PyType_Ready and those might not have initialized vars yet */ //if(tp->tp_base==NULL) // printf("Debug: No Parents - '%s'\n" , tp->tp_name); - if(tp->tp_getset==NULL && ((attributes && attributes->m_name) || (attributesPtr && attributesPtr->m_name))) { + if (tp->tp_getset==NULL && ((attributes && attributes->m_name) || (attributesPtr && attributesPtr->m_name))) { PyGetSetDef *attr_getset; int attr_tot= 0; if (attributes) { - for(attr= attributes; attr->m_name; attr++, attr_tot++) + for (attr= attributes; attr->m_name; attr++, attr_tot++) attr->m_usePtr = false; } if (attributesPtr) { - for(attr= attributesPtr; attr->m_name; attr++, attr_tot++) + for (attr= attributesPtr; attr->m_name; attr++, attr_tot++) attr->m_usePtr = true; } tp->tp_getset = attr_getset = reinterpret_cast<PyGetSetDef *>(PyMem_Malloc((attr_tot+1) * sizeof(PyGetSetDef))); // XXX - Todo, free if (attributes) { - for(attr= attributes; attr->m_name; attr++, attr_getset++) { + for (attr= attributes; attr->m_name; attr++, attr_getset++) { PyType_Attr_Set(attr_getset, attr); } } if (attributesPtr) { - for(attr= attributesPtr; attr->m_name; attr++, attr_getset++) { + for (attr= attributesPtr; attr->m_name; attr++, attr_getset++) { PyType_Attr_Set(attr_getset, attr); } } @@ -179,7 +179,7 @@ void initPyTypes(void) Py_DECREF(mod); - for(int init_getset= 1; init_getset > -1; init_getset--) { /* run twice, once to init the getsets another to run PyType_Ready */ + for (int init_getset= 1; init_getset > -1; init_getset--) { /* run twice, once to init the getsets another to run PyType_Ready */ PyType_Ready_Attr(dict, BL_ActionActuator, init_getset); PyType_Ready_Attr(dict, BL_Shader, init_getset); PyType_Ready_Attr(dict, BL_ShapeActionActuator, init_getset); diff --git a/source/gameengine/Ketsji/KX_PythonSeq.cpp b/source/gameengine/Ketsji/KX_PythonSeq.cpp index 959127def5c..6eadc0cbef3 100644 --- a/source/gameengine/Ketsji/KX_PythonSeq.cpp +++ b/source/gameengine/Ketsji/KX_PythonSeq.cpp @@ -73,7 +73,7 @@ static Py_ssize_t KX_PythonSeq_len( PyObject * self ) { PyObjectPlus *self_plus= BGE_PROXY_REF(((KX_PythonSeq *)self)->base); - if(self_plus==NULL) { + if (self_plus==NULL) { PyErr_SetString(PyExc_SystemError, "len(seq): "BGE_PROXY_ERROR_MSG); return -1; } @@ -104,7 +104,7 @@ static PyObject *KX_PythonSeq_getIndex(PyObject* self, int index) { PyObjectPlus *self_plus= BGE_PROXY_REF(((KX_PythonSeq *)self)->base); - if(self_plus==NULL) { + if (self_plus==NULL) { PyErr_SetString(PyExc_SystemError, "val = seq[i]: "BGE_PROXY_ERROR_MSG); return NULL; } @@ -113,8 +113,8 @@ static PyObject *KX_PythonSeq_getIndex(PyObject* self, int index) case KX_PYGENSEQ_CONT_TYPE_SENSORS: { vector<SCA_ISensor*>& linkedsensors = ((SCA_IController *)self_plus)->GetLinkedSensors(); - if(index<0) index += linkedsensors.size(); - if(index<0 || index>= linkedsensors.size()) { + if (index<0) index += linkedsensors.size(); + if (index<0 || index>= linkedsensors.size()) { PyErr_SetString(PyExc_IndexError, "seq[i]: index out of range"); return NULL; } @@ -123,8 +123,8 @@ static PyObject *KX_PythonSeq_getIndex(PyObject* self, int index) case KX_PYGENSEQ_CONT_TYPE_ACTUATORS: { vector<SCA_IActuator*>& linkedactuators = ((SCA_IController *)self_plus)->GetLinkedActuators(); - if(index<0) index += linkedactuators.size(); - if(index<0 || index>= linkedactuators.size()) { + if (index<0) index += linkedactuators.size(); + if (index<0 || index>= linkedactuators.size()) { PyErr_SetString(PyExc_IndexError, "seq[i]: index out of range"); return NULL; } @@ -133,8 +133,8 @@ static PyObject *KX_PythonSeq_getIndex(PyObject* self, int index) case KX_PYGENSEQ_OB_TYPE_SENSORS: { SCA_SensorList& linkedsensors= ((KX_GameObject *)self_plus)->GetSensors(); - if(index<0) index += linkedsensors.size(); - if(index<0 || index>= linkedsensors.size()) { + if (index<0) index += linkedsensors.size(); + if (index<0 || index>= linkedsensors.size()) { PyErr_SetString(PyExc_IndexError, "seq[i]: index out of range"); return NULL; } @@ -143,8 +143,8 @@ static PyObject *KX_PythonSeq_getIndex(PyObject* self, int index) case KX_PYGENSEQ_OB_TYPE_CONTROLLERS: { SCA_ControllerList& linkedcontrollers= ((KX_GameObject *)self_plus)->GetControllers(); - if(index<0) index += linkedcontrollers.size(); - if(index<0 || index>= linkedcontrollers.size()) { + if (index<0) index += linkedcontrollers.size(); + if (index<0 || index>= linkedcontrollers.size()) { PyErr_SetString(PyExc_IndexError, "seq[i]: index out of range"); return NULL; } @@ -153,8 +153,8 @@ static PyObject *KX_PythonSeq_getIndex(PyObject* self, int index) case KX_PYGENSEQ_OB_TYPE_ACTUATORS: { SCA_ActuatorList& linkedactuators= ((KX_GameObject *)self_plus)->GetActuators(); - if(index<0) index += linkedactuators.size(); - if(index<0 || index>= linkedactuators.size()) { + if (index<0) index += linkedactuators.size(); + if (index<0 || index>= linkedactuators.size()) { PyErr_SetString(PyExc_IndexError, "seq[i]: index out of range"); return NULL; } @@ -163,9 +163,9 @@ static PyObject *KX_PythonSeq_getIndex(PyObject* self, int index) case KX_PYGENSEQ_OB_TYPE_CONSTRAINTS: { int nb_constraint = ((BL_ArmatureObject *)self_plus)->GetConstraintNumber(); - if(index<0) + if (index<0) index += nb_constraint; - if(index<0 || index>= nb_constraint) { + if (index<0 || index>= nb_constraint) { PyErr_SetString(PyExc_IndexError, "seq[i]: index out of range"); return NULL; } @@ -174,9 +174,9 @@ static PyObject *KX_PythonSeq_getIndex(PyObject* self, int index) case KX_PYGENSEQ_OB_TYPE_CHANNELS: { int nb_channel = ((BL_ArmatureObject *)self_plus)->GetChannelNumber(); - if(index<0) + if (index<0) index += nb_channel; - if(index<0 || index>= nb_channel) { + if (index<0 || index>= nb_channel) { PyErr_SetString(PyExc_IndexError, "seq[i]: index out of range"); return NULL; } @@ -268,7 +268,7 @@ static PyObject * KX_PythonSeq_subscript(PyObject * self, PyObject *key) { PyObjectPlus *self_plus= BGE_PROXY_REF(((KX_PythonSeq *)self)->base); - if(self_plus==NULL) { + if (self_plus==NULL) { PyErr_SetString(PyExc_SystemError, "val = seq[key], KX_PythonSeq: "BGE_PROXY_ERROR_MSG); return NULL; } @@ -280,7 +280,7 @@ static PyObject * KX_PythonSeq_subscript(PyObject * self, PyObject *key) const char *name = _PyUnicode_AsString(key); PyObjectPlus *ret = KX_PythonSeq_subscript__internal(self, name); - if(ret) { + if (ret) { return ret->GetProxy(); } else { PyErr_Format( PyExc_KeyError, "requested item \"%s\" does not exist", name); @@ -298,16 +298,16 @@ static int KX_PythonSeq_contains(PyObject *self, PyObject *key) { PyObjectPlus *self_plus= BGE_PROXY_REF(((KX_PythonSeq *)self)->base); - if(self_plus==NULL) { + if (self_plus==NULL) { PyErr_SetString(PyExc_SystemError, "key in seq, KX_PythonSeq: "BGE_PROXY_ERROR_MSG); return -1; } - if(!PyUnicode_Check(key)) { + if (!PyUnicode_Check(key)) { PyErr_SetString(PyExc_SystemError, "key in seq, KX_PythonSeq: key must be a string"); return -1; } - if(KX_PythonSeq_subscript__internal(self, _PyUnicode_AsString(key))) + if (KX_PythonSeq_subscript__internal(self, _PyUnicode_AsString(key))) return 1; return 0; @@ -323,7 +323,7 @@ PyObject* KX_PythonSeq_get(PyObject * self, PyObject *args) if (!PyArg_ParseTuple(args, "s|O:get", &key, &def)) return NULL; - if((ret_plus = KX_PythonSeq_subscript__internal(self, key))) + if ((ret_plus = KX_PythonSeq_subscript__internal(self, key))) return ret_plus->GetProxy(); Py_INCREF(def); @@ -361,7 +361,7 @@ PyMethodDef KX_PythonSeq_methods[] = { static PyObject *KX_PythonSeq_getIter(KX_PythonSeq *self) { - if(BGE_PROXY_REF(self->base)==NULL) { + if (BGE_PROXY_REF(self->base)==NULL) { PyErr_SetString(PyExc_SystemError, "for i in seq: "BGE_PROXY_ERROR_MSG); return NULL; } @@ -386,7 +386,7 @@ static PyObject *KX_PythonSeq_nextIter(KX_PythonSeq *self) PyObject *object = KX_PythonSeq_getIndex((PyObject *)self, self->iter); self->iter++; - if( object==NULL ) { + if ( object==NULL ) { self->iter= -1; /* for reuse */ PyErr_SetString(PyExc_StopIteration, "iterator at end"); } @@ -404,7 +404,7 @@ static PyObject *KX_PythonSeq_richcmp(PyObject *a, PyObject *b, int op) PyObject *res; int ok= -1; /* zero is true */ - if(BPy_KX_PythonSeq_Check(a) && BPy_KX_PythonSeq_Check(b)) + if (BPy_KX_PythonSeq_Check(a) && BPy_KX_PythonSeq_Check(b)) ok= KX_PythonSeq_compare((KX_PythonSeq *)a, (KX_PythonSeq *)b); switch (op) { diff --git a/source/gameengine/Ketsji/KX_RayCast.cpp b/source/gameengine/Ketsji/KX_RayCast.cpp index 6e8a2cb7671..29e9fb5bca0 100644 --- a/source/gameengine/Ketsji/KX_RayCast.cpp +++ b/source/gameengine/Ketsji/KX_RayCast.cpp @@ -61,7 +61,7 @@ void KX_RayCast::reportHit(PHY_RayCastResult* result) bool KX_RayCast::RayTest(PHY_IPhysicsEnvironment* physics_environment, const MT_Point3& _frompoint, const MT_Point3& topoint, KX_RayCast& callback) { - if(physics_environment==NULL) return false; /* prevents crashing in some cases */ + if (physics_environment==NULL) return false; /* prevents crashing in some cases */ // Loops over all physics objects between frompoint and topoint, // calling callback.RayHit for each one. diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index 17ef358a4e5..2038e7e93b2 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -102,7 +102,7 @@ void* KX_SceneReplicationFunc(SG_IObject* node,void* gameobj,void* scene) { KX_GameObject* replica = ((KX_Scene*)scene)->AddNodeReplicaObject(node,(KX_GameObject*)gameobj); - if(replica) + if (replica) replica->Release(); return (void*)replica; @@ -251,7 +251,7 @@ KX_Scene::~KX_Scene() if (m_obstacleSimulation) delete m_obstacleSimulation; - if(m_objectlist) + if (m_objectlist) m_objectlist->Release(); if (m_parentlist) @@ -688,7 +688,7 @@ void KX_Scene::DupliGroupRecurse(CValue* obj, int level) m_groupGameObjects.clear(); group = blgroupobj->dup_group; - for(go=(GroupObject*)group->gobject.first; go; go=(GroupObject*)go->next) + for (go=(GroupObject*)group->gobject.first; go; go=(GroupObject*)go->next) { Object* blenderobj = go->ob; if (blgroupobj == blenderobj) @@ -1066,12 +1066,12 @@ void KX_Scene::ReplaceMesh(class CValue* obj,void* meshobj, bool use_gfx, bool u KX_GameObject* gameobj = static_cast<KX_GameObject*>(obj); RAS_MeshObject* mesh = static_cast<RAS_MeshObject*>(meshobj); - if(!gameobj) { + if (!gameobj) { std::cout << "KX_Scene::ReplaceMesh Warning: invalid object, doing nothing" << std::endl; return; } - if(use_gfx && mesh != NULL) + if (use_gfx && mesh != NULL) { gameobj->RemoveMeshes(); gameobj->AddMesh(mesh); @@ -1207,7 +1207,7 @@ void KX_Scene::ReplaceMesh(class CValue* obj,void* meshobj, bool use_gfx, bool u #endif // release parent reference if its not being used - if( releaseParent && parentobj) + if ( releaseParent && parentobj) parentobj->Release(); } } @@ -1216,7 +1216,7 @@ void KX_Scene::ReplaceMesh(class CValue* obj,void* meshobj, bool use_gfx, bool u } #ifdef USE_BULLET - if(use_phys) { /* update the new assigned mesh with the physics mesh */ + if (use_phys) { /* update the new assigned mesh with the physics mesh */ KX_ReInstanceBulletShapeFromMesh(gameobj, NULL, use_gfx?NULL:mesh); } #endif @@ -1393,7 +1393,7 @@ void KX_Scene::MarkVisible(RAS_IRasterizer* rasty, KX_GameObject* gameobj,KX_Cam return; // Shadow lamp layers - if(layer && !(gameobj->GetLayer() & layer)) { + if (layer && !(gameobj->GetLayer() & layer)) { gameobj->SetCulled(true); gameobj->UpdateBuckets(false); return; @@ -1455,7 +1455,7 @@ void KX_Scene::PhysicsCullingCallback(KX_ClientObjectInfo* objectInfo, void* cul if (!gameobj->GetVisible()) // ideally, invisible objects should be removed from the culling tree temporarily return; - if(((CullingInfo*)cullingInfo)->m_layer && !(gameobj->GetLayer() & ((CullingInfo*)cullingInfo)->m_layer)) + if (((CullingInfo*)cullingInfo)->m_layer && !(gameobj->GetLayer() & ((CullingInfo*)cullingInfo)->m_layer)) // used for shadow: object is not in shadow layer return; @@ -1688,7 +1688,7 @@ void KX_Scene::SetSceneConverter(class KX_BlenderSceneConverter* sceneConverter) void KX_Scene::SetPhysicsEnvironment(class PHY_IPhysicsEnvironment* physEnv) { m_physicsEnvironment = physEnv; - if(m_physicsEnvironment) { + if (m_physicsEnvironment) { KX_TouchEventManager* touchmgr = new KX_TouchEventManager(m_logicmgr, physEnv); m_logicmgr->RegisterEventManager(touchmgr); } @@ -1728,14 +1728,14 @@ static void MergeScene_LogicBrick(SCA_ILogicBrick* brick, KX_Scene *to) brick->Replace_NetworkScene(to->GetNetworkScene()); SCA_ISensor *sensor= dynamic_cast<class SCA_ISensor *>(brick); - if(sensor) { + if (sensor) { sensor->Replace_EventManager(logicmgr); } /* near sensors have physics controllers */ #ifdef USE_BULLET KX_TouchSensor *touch_sensor = dynamic_cast<class KX_TouchSensor *>(brick); - if(touch_sensor) { + if (touch_sensor) { touch_sensor->GetPhysicsController()->SetPhysicsEnvironment(to->GetPhysicsEnvironment()); } #endif @@ -1794,15 +1794,15 @@ static void MergeScene_GameObject(KX_GameObject* gameobj, KX_Scene *to, KX_Scene /* graphics controller */ PHY_IGraphicController *ctrl = gameobj->GetGraphicController(); - if(ctrl) { + if (ctrl) { /* SHOULD update the m_cullingTree */ ctrl->SetPhysicsEnvironment(to->GetPhysicsEnvironment()); } /* SG_Node can hold a scene reference */ SG_Node *sg= gameobj->GetSGNode(); - if(sg) { - if(sg->GetSGClientInfo() == from) { + if (sg) { + if (sg->GetSGClientInfo() == from) { sg->SetSGClientInfo(to); /* Make sure to grab the children too since they might not be tied to a game object */ @@ -1839,7 +1839,7 @@ bool KX_Scene::MergeScene(KX_Scene *other) CcdPhysicsEnvironment *env= dynamic_cast<CcdPhysicsEnvironment *>(this->GetPhysicsEnvironment()); CcdPhysicsEnvironment *env_other= dynamic_cast<CcdPhysicsEnvironment *>(other->GetPhysicsEnvironment()); - if((env==NULL) != (env_other==NULL)) /* TODO - even when both scenes have NONE physics, the other is loaded with bullet enabled, ??? */ + if ((env==NULL) != (env_other==NULL)) /* TODO - even when both scenes have NONE physics, the other is loaded with bullet enabled, ??? */ { printf("KX_Scene::MergeScene: physics scenes type differ, aborting\n"); printf("\tsource %d, terget %d\n", (int)(env!=NULL), (int)(env_other!=NULL)); @@ -1847,7 +1847,7 @@ bool KX_Scene::MergeScene(KX_Scene *other) } #endif // USE_BULLET - if(GetSceneConverter() != other->GetSceneConverter()) { + if (GetSceneConverter() != other->GetSceneConverter()) { printf("KX_Scene::MergeScene: converters differ, aborting\n"); return false; } @@ -1889,7 +1889,7 @@ bool KX_Scene::MergeScene(KX_Scene *other) other->GetLightList()->ReleaseAndRemoveAll(); #ifdef USE_BULLET - if(env) /* bullet scene? - dummy scenes don't need touching */ + if (env) /* bullet scene? - dummy scenes don't need touching */ env->MergeEnvironment(env_other); #endif @@ -1904,10 +1904,10 @@ bool KX_Scene::MergeScene(KX_Scene *other) //SCA_EventManager *evtmgr; SCA_EventManager *evtmgr_other; - for(unsigned int i= 0; i < evtmgrs.size(); i++) { + for (unsigned int i= 0; i < evtmgrs.size(); i++) { evtmgr_other= logicmgr_other->FindEventManager(evtmgrs[i]->GetType()); - if(evtmgr_other) /* unlikely but possible one scene has a joystick and not the other */ + if (evtmgr_other) /* unlikely but possible one scene has a joystick and not the other */ evtmgr_other->Replace_LogicManager(logicmgr); /* when merging objects sensors are moved across into the new manager, don't need to do this here */ @@ -1918,7 +1918,7 @@ bool KX_Scene::MergeScene(KX_Scene *other) SCA_TimeEventManager *timemgr_other= other->GetTimeEventManager(); vector<CValue*> times = timemgr_other->GetTimeValues(); - for(unsigned int i= 0; i < times.size(); i++) { + for (unsigned int i= 0; i < times.size(); i++) { timemgr->AddTimeProperty(times[i]); } @@ -2028,7 +2028,7 @@ static PyObject *Map_GetItem(PyObject *self_v, PyObject *item) return pyconvert; } else { - if(attr_str) PyErr_Format(PyExc_KeyError, "value = scene[key]: KX_Scene, key \"%s\" does not exist", attr_str); + if (attr_str) PyErr_Format(PyExc_KeyError, "value = scene[key]: KX_Scene, key \"%s\" does not exist", attr_str); else PyErr_SetString(PyExc_KeyError, "value = scene[key]: KX_Scene, key does not exist"); return NULL; } @@ -2039,7 +2039,7 @@ static int Map_SetItem(PyObject *self_v, PyObject *key, PyObject *val) { KX_Scene* self= static_cast<KX_Scene*>BGE_PROXY_REF(self_v); const char *attr_str= _PyUnicode_AsString(key); - if(attr_str==NULL) + if (attr_str==NULL) PyErr_Clear(); if (self==NULL) { @@ -2050,11 +2050,11 @@ static int Map_SetItem(PyObject *self_v, PyObject *key, PyObject *val) if (val==NULL) { /* del ob["key"] */ int del= 0; - if(self->m_attr_dict) + if (self->m_attr_dict) del |= (PyDict_DelItem(self->m_attr_dict, key)==0) ? 1:0; if (del==0) { - if(attr_str) PyErr_Format(PyExc_KeyError, "scene[key] = value: KX_Scene, key \"%s\" could not be set", attr_str); + if (attr_str) PyErr_Format(PyExc_KeyError, "scene[key] = value: KX_Scene, key \"%s\" could not be set", attr_str); else PyErr_SetString(PyExc_KeyError, "del scene[key]: KX_Scene, key could not be deleted"); return -1; } @@ -2069,12 +2069,12 @@ static int Map_SetItem(PyObject *self_v, PyObject *key, PyObject *val) self->m_attr_dict= PyDict_New(); - if(PyDict_SetItem(self->m_attr_dict, key, val)==0) + if (PyDict_SetItem(self->m_attr_dict, key, val)==0) set= 1; else PyErr_SetString(PyExc_KeyError, "scene[key] = value: KX_Scene, key not be added to internal dictionary"); - if(set==0) + if (set==0) return -1; /* pythons error value */ } @@ -2184,7 +2184,7 @@ PyObject* KX_Scene::pyattr_get_drawing_callback_pre(void *self_v, const KX_PYATT { KX_Scene* self = static_cast<KX_Scene*>(self_v); - if(self->m_draw_call_pre==NULL) + if (self->m_draw_call_pre==NULL) self->m_draw_call_pre= PyList_New(0); Py_INCREF(self->m_draw_call_pre); return self->m_draw_call_pre; @@ -2194,7 +2194,7 @@ PyObject* KX_Scene::pyattr_get_drawing_callback_post(void *self_v, const KX_PYAT { KX_Scene* self = static_cast<KX_Scene*>(self_v); - if(self->m_draw_call_post==NULL) + if (self->m_draw_call_post==NULL) self->m_draw_call_post= PyList_New(0); Py_INCREF(self->m_draw_call_post); return self->m_draw_call_post; diff --git a/source/gameengine/Ketsji/KX_SceneActuator.cpp b/source/gameengine/Ketsji/KX_SceneActuator.cpp index 33708059784..781c1fdab87 100644 --- a/source/gameengine/Ketsji/KX_SceneActuator.cpp +++ b/source/gameengine/Ketsji/KX_SceneActuator.cpp @@ -276,7 +276,7 @@ int KX_SceneActuator::pyattr_set_camera(void *self, const struct KX_PYATTRIBUTE_ if (actuator->m_camera) actuator->m_camera->UnregisterActuator(actuator); - if(camOb==NULL) { + if (camOb==NULL) { actuator->m_camera= NULL; } else { diff --git a/source/gameengine/Ketsji/KX_SoundActuator.cpp b/source/gameengine/Ketsji/KX_SoundActuator.cpp index 5c4cb7216dd..91f6224e197 100644 --- a/source/gameengine/Ketsji/KX_SoundActuator.cpp +++ b/source/gameengine/Ketsji/KX_SoundActuator.cpp @@ -74,16 +74,16 @@ KX_SoundActuator::KX_SoundActuator(SCA_IObject* gameobj, KX_SoundActuator::~KX_SoundActuator() { - if(!m_handle.isNull()) + if (!m_handle.isNull()) m_handle->stop(); } void KX_SoundActuator::play() { - if(!m_handle.isNull()) + if (!m_handle.isNull()) m_handle->stop(); - if(m_sound.isNull()) + if (m_sound.isNull()) return; // this is the sound that will be played and not deleted afterwards @@ -119,7 +119,7 @@ void KX_SoundActuator::play() AUD_Reference<AUD_I3DHandle> handle3d = AUD_Reference<AUD_I3DHandle>(m_handle); - if(m_is3d && !handle3d.isNull()) + if (m_is3d && !handle3d.isNull()) { handle3d->setRelative(true); handle3d->setVolumeMaximum(m_3d.max_gain); @@ -132,7 +132,7 @@ void KX_SoundActuator::play() handle3d->setConeVolumeOuter(m_3d.cone_outer_gain); } - if(loop) + if (loop) m_handle->setLoopCount(-1); m_handle->setPitch(m_pitch); m_handle->setVolume(m_volume); @@ -164,7 +164,7 @@ bool KX_SoundActuator::Update(double curtime, bool frame) RemoveAllEvents(); - if(m_sound.isNull()) + if (m_sound.isNull()) return false; // actual audio device playing state @@ -182,7 +182,7 @@ bool KX_SoundActuator::Update(double curtime, bool frame) case KX_SOUNDACT_LOOPBIDIRECTIONAL_STOP: { // stop immediately - if(!m_handle.isNull()) + if (!m_handle.isNull()) m_handle->stop(); m_handle = AUD_Reference<AUD_IHandle>(); break; @@ -196,7 +196,7 @@ bool KX_SoundActuator::Update(double curtime, bool frame) case KX_SOUNDACT_LOOPBIDIRECTIONAL: { // stop the looping so that the sound stops when it finished - if(!m_handle.isNull()) + if (!m_handle.isNull()) m_handle->setLoopCount(0); break; } @@ -214,7 +214,7 @@ bool KX_SoundActuator::Update(double curtime, bool frame) // m_posevent==false && m_posevent==false, in this case IsNegativeEvent() returns false // and assumes this is a positive event. // check that we actually have a positive event so as not to play sounds when being disabled. - else if(bPositiveEvent) { // <- added since 2.49 + else if (bPositiveEvent) { // <- added since 2.49 #else else { // <- works in most cases except a loop-end sound will never stop unless // the negative pulse is done continuesly @@ -229,7 +229,7 @@ bool KX_SoundActuator::Update(double curtime, bool frame) { AUD_Reference<AUD_I3DHandle> handle3d = AUD_Reference<AUD_I3DHandle>(m_handle); - if(m_is3d && !handle3d.isNull()) + if (m_is3d && !handle3d.isNull()) { KX_Camera* cam = KX_GetActiveScene()->GetActiveCamera(); if (cam) @@ -342,7 +342,7 @@ KX_PYMETHODDEF_DOC_NOARGS(KX_SoundActuator, pauseSound, "pauseSound()\n" "\tPauses the sound.\n") { - if(!m_handle.isNull()) + if (!m_handle.isNull()) m_handle->pause(); Py_RETURN_NONE; } @@ -351,7 +351,7 @@ KX_PYMETHODDEF_DOC_NOARGS(KX_SoundActuator, stopSound, "stopSound()\n" "\tStops the sound.\n") { - if(!m_handle.isNull()) + if (!m_handle.isNull()) m_handle->stop(); m_handle = AUD_Reference<AUD_IHandle>(); Py_RETURN_NONE; @@ -364,7 +364,7 @@ PyObject* KX_SoundActuator::pyattr_get_3d_property(void *self, const struct KX_P const char* prop = attrdef->m_name; float result_value = 0.0; - if(!strcmp(prop, "volume_maximum")) { + if (!strcmp(prop, "volume_maximum")) { result_value = actuator->m_3d.max_gain; } else if (!strcmp(prop, "volume_minimum")) { @@ -401,7 +401,7 @@ PyObject* KX_SoundActuator::pyattr_get_audposition(void *self, const struct KX_P KX_SoundActuator * actuator = static_cast<KX_SoundActuator *> (self); float position = 0.0; - if(!actuator->m_handle.isNull()) + if (!actuator->m_handle.isNull()) position = actuator->m_handle->getPosition(); PyObject* result = PyFloat_FromDouble(position); @@ -432,7 +432,7 @@ PyObject* KX_SoundActuator::pyattr_get_pitch(void *self, const struct KX_PYATTRI PyObject* KX_SoundActuator::pyattr_get_sound(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) { KX_SoundActuator * actuator = static_cast<KX_SoundActuator *> (self); - if(!actuator->m_sound.isNull()) + if (!actuator->m_sound.isNull()) return AUD_getPythonFactory(&actuator->m_sound); else Py_RETURN_NONE; @@ -449,47 +449,47 @@ int KX_SoundActuator::pyattr_set_3d_property(void *self, const struct KX_PYATTRI AUD_Reference<AUD_I3DHandle> handle3d = AUD_Reference<AUD_I3DHandle>(actuator->m_handle); // if sound is working and 3D, set the new setting - if(!actuator->m_is3d) + if (!actuator->m_is3d) return PY_SET_ATTR_FAIL; - if(!strcmp(prop, "volume_maximum")) { + if (!strcmp(prop, "volume_maximum")) { actuator->m_3d.max_gain = prop_value; - if(!handle3d.isNull()) + if (!handle3d.isNull()) handle3d->setVolumeMaximum(prop_value); } else if (!strcmp(prop, "volume_minimum")) { actuator->m_3d.min_gain = prop_value; - if(!handle3d.isNull()) + if (!handle3d.isNull()) handle3d->setVolumeMinimum(prop_value); } else if (!strcmp(prop, "distance_reference")) { actuator->m_3d.reference_distance = prop_value; - if(!handle3d.isNull()) + if (!handle3d.isNull()) handle3d->setDistanceReference(prop_value); } else if (!strcmp(prop, "distance_maximum")) { actuator->m_3d.max_distance = prop_value; - if(!handle3d.isNull()) + if (!handle3d.isNull()) handle3d->setDistanceMaximum(prop_value); } else if (!strcmp(prop, "attenuation")) { actuator->m_3d.rolloff_factor = prop_value; - if(!handle3d.isNull()) + if (!handle3d.isNull()) handle3d->setAttenuation(prop_value); } else if (!!strcmp(prop, "cone_angle_inner")) { actuator->m_3d.cone_inner_angle = prop_value; - if(!handle3d.isNull()) + if (!handle3d.isNull()) handle3d->setConeAngleInner(prop_value); } else if (!strcmp(prop, "cone_angle_outer")) { actuator->m_3d.cone_outer_angle = prop_value; - if(!handle3d.isNull()) + if (!handle3d.isNull()) handle3d->setConeAngleOuter(prop_value); } else if (!strcmp(prop, "cone_volume_outer")) { actuator->m_3d.cone_outer_gain = prop_value; - if(!handle3d.isNull()) + if (!handle3d.isNull()) handle3d->setConeVolumeOuter(prop_value); } else { @@ -507,7 +507,7 @@ int KX_SoundActuator::pyattr_set_audposition(void *self, const struct KX_PYATTRI if (!PyArg_Parse(value, "f", &position)) return PY_SET_ATTR_FAIL; - if(!actuator->m_handle.isNull()) + if (!actuator->m_handle.isNull()) actuator->m_handle->seek(position); return PY_SET_ATTR_SUCCESS; } @@ -520,7 +520,7 @@ int KX_SoundActuator::pyattr_set_gain(void *self, const struct KX_PYATTRIBUTE_DE return PY_SET_ATTR_FAIL; actuator->m_volume = gain; - if(!actuator->m_handle.isNull()) + if (!actuator->m_handle.isNull()) actuator->m_handle->setVolume(gain); return PY_SET_ATTR_SUCCESS; @@ -534,7 +534,7 @@ int KX_SoundActuator::pyattr_set_pitch(void *self, const struct KX_PYATTRIBUTE_D return PY_SET_ATTR_FAIL; actuator->m_pitch = pitch; - if(!actuator->m_handle.isNull()) + if (!actuator->m_handle.isNull()) actuator->m_handle->setPitch(pitch); return PY_SET_ATTR_SUCCESS; @@ -548,7 +548,7 @@ int KX_SoundActuator::pyattr_set_sound(void *self, const struct KX_PYATTRIBUTE_D return PY_SET_ATTR_FAIL; AUD_Reference<AUD_IFactory>* snd = reinterpret_cast<AUD_Reference<AUD_IFactory>*>(AUD_getPythonSound(sound)); - if(snd) + if (snd) { actuator->m_sound = *snd; delete snd; diff --git a/source/gameengine/Ketsji/KX_SteeringActuator.cpp b/source/gameengine/Ketsji/KX_SteeringActuator.cpp index c4688af687b..f3aecd9e0ba 100644 --- a/source/gameengine/Ketsji/KX_SteeringActuator.cpp +++ b/source/gameengine/Ketsji/KX_SteeringActuator.cpp @@ -484,7 +484,7 @@ void KX_SteeringActuator::HandleActorFace(MT_Vector3& velocity) KX_GameObject* parentObject = curobj->GetParent(); - if(parentObject) + if (parentObject) { MT_Point3 localpos; localpos = curobj->GetSGNode()->GetLocalPosition(); diff --git a/source/gameengine/Ketsji/KX_TouchEventManager.cpp b/source/gameengine/Ketsji/KX_TouchEventManager.cpp index 939aa5d20d4..d2a5ce58641 100644 --- a/source/gameengine/Ketsji/KX_TouchEventManager.cpp +++ b/source/gameengine/Ketsji/KX_TouchEventManager.cpp @@ -101,7 +101,7 @@ bool KX_TouchEventManager::newBroadphaseResponse(void *client_data, case KX_ClientObjectInfo::OBACTORSENSOR: // this object may have multiple collision sensors, // check is any of them is interested in this object - for(std::list<SCA_ISensor*>::iterator it = info->m_sensors.begin(); + for (std::list<SCA_ISensor*>::iterator it = info->m_sensors.begin(); it != info->m_sensors.end(); ++it) { diff --git a/source/gameengine/Ketsji/KX_TrackToActuator.cpp b/source/gameengine/Ketsji/KX_TrackToActuator.cpp index a08e57c8d76..d1e0a74c8be 100644 --- a/source/gameengine/Ketsji/KX_TrackToActuator.cpp +++ b/source/gameengine/Ketsji/KX_TrackToActuator.cpp @@ -153,14 +153,14 @@ void compatible_eulFast(float *eul, float *oldrot) dy= eul[1] - oldrot[1]; dz= eul[2] - oldrot[2]; - if( fabs(dx) > MT_PI) { - if(dx > 0.0) eul[0] -= MT_2_PI; else eul[0]+= MT_2_PI; + if ( fabs(dx) > MT_PI) { + if (dx > 0.0) eul[0] -= MT_2_PI; else eul[0]+= MT_2_PI; } - if( fabs(dy) > MT_PI) { - if(dy > 0.0) eul[1] -= MT_2_PI; else eul[1]+= MT_2_PI; + if ( fabs(dy) > MT_PI) { + if (dy > 0.0) eul[1] -= MT_2_PI; else eul[1]+= MT_2_PI; } - if( fabs(dz) > MT_PI ) { - if(dz > 0.0) eul[2] -= MT_2_PI; else eul[2]+= MT_2_PI; + if ( fabs(dz) > MT_PI ) { + if (dz > 0.0) eul[2] -= MT_2_PI; else eul[2]+= MT_2_PI; } } @@ -391,7 +391,7 @@ bool KX_TrackToActuator::Update(double curtime, bool frame) mat= matrix3x3_interpol(oldmat, mat, m_time); - if(m_parentobj){ // check if the model is parented and calculate the child transform + if (m_parentobj){ // check if the model is parented and calculate the child transform MT_Point3 localpos; localpos = curobj->GetSGNode()->GetLocalPosition(); diff --git a/source/gameengine/Ketsji/KX_VertexProxy.cpp b/source/gameengine/Ketsji/KX_VertexProxy.cpp index a07e32850a5..1739f26ab6f 100644 --- a/source/gameengine/Ketsji/KX_VertexProxy.cpp +++ b/source/gameengine/Ketsji/KX_VertexProxy.cpp @@ -548,7 +548,7 @@ PyObject* KX_VertexProxy::PySetUV2(PyObject* args) unsigned int unit= RAS_TexVert::SECOND_UV; PyObject* list= NULL; - if(!PyArg_ParseTuple(args, "O|i:setUV2", &list, &unit)) + if (!PyArg_ParseTuple(args, "O|i:setUV2", &list, &unit)) return NULL; if (!PyVecTo(list, vec)) |