diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-09-16 08:58:18 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-16 08:58:18 +0400 |
commit | 2fb82920059257fd7ac8e33bfe53de13e7ed53bd (patch) | |
tree | cb8de3a839cb9878d0869d4e436a235346109c16 /source/gameengine/Ketsji | |
parent | c2a1dcf6218cbd56126a5deb1aeaf212d67e54cb (diff) |
style cleanup
Diffstat (limited to 'source/gameengine/Ketsji')
80 files changed, 791 insertions, 786 deletions
diff --git a/source/gameengine/Ketsji/BL_Shader.cpp b/source/gameengine/Ketsji/BL_Shader.cpp index c0fca88c426..e0ad1539b4a 100644 --- a/source/gameengine/Ketsji/BL_Shader.cpp +++ b/source/gameengine/Ketsji/BL_Shader.cpp @@ -431,7 +431,7 @@ void BL_Shader::SetProg(bool enable) glUseProgramObjectARB(mShader); } else { - glUseProgramObjectARB(0); + glUseProgramObjectARB(0); } } } @@ -613,7 +613,7 @@ void BL_Shader::SetUniform(int uniform, const MT_Tuple3& vec) GLEW_ARB_vertex_shader && GLEW_ARB_shader_objects ) - { + { float value[3]; vec.getValue(value); glUniform3fvARB(uniform, 1, value); @@ -931,7 +931,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniform1f, "setUniform1f(name, fx)" ) { #ifdef SORT_UNIFORMS SetUniformfv(loc, BL_Uniform::UNI_FLOAT, &value, sizeof(float)); -#else +#else SetUniform( loc, (float)value ); #endif } @@ -1142,7 +1142,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformfv, "setUniformfv( float (list2 or list #ifdef SORT_UNIFORMS SetUniformfv(loc, BL_Uniform::UNI_FLOAT2, array2, sizeof(float)*2); #else - SetUniform(loc, array2, 2); + SetUniform(loc, array2, 2); #endif Py_RETURN_NONE; } break; @@ -1152,7 +1152,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformfv, "setUniformfv( float (list2 or list #ifdef SORT_UNIFORMS SetUniformfv(loc, BL_Uniform::UNI_FLOAT3, array3, sizeof(float)*3); #else - SetUniform(loc, array3, 3); + SetUniform(loc, array3, 3); #endif Py_RETURN_NONE; }break; @@ -1162,7 +1162,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformfv, "setUniformfv( float (list2 or list #ifdef SORT_UNIFORMS SetUniformfv(loc, BL_Uniform::UNI_FLOAT4, array4, sizeof(float)*4); #else - SetUniform(loc, array4, 4); + SetUniform(loc, array4, 4); #endif Py_RETURN_NONE; }break; @@ -1226,7 +1226,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformiv, "setUniformiv( uniform_name, (list2 #ifdef SORT_UNIFORMS SetUniformiv(loc, BL_Uniform::UNI_INT2, array2, sizeof(int)*2); #else - SetUniform(loc, array2, 2); + SetUniform(loc, array2, 2); #endif Py_RETURN_NONE; } break; @@ -1237,7 +1237,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformiv, "setUniformiv( uniform_name, (list2 SetUniformiv(loc, BL_Uniform::UNI_INT3, array3, sizeof(int)*3); #else - SetUniform(loc, array3, 3); + SetUniform(loc, array3, 3); #endif Py_RETURN_NONE; }break; @@ -1248,7 +1248,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformiv, "setUniformiv( uniform_name, (list2 SetUniformiv(loc, BL_Uniform::UNI_INT4, array4, sizeof(int)*4); #else - SetUniform(loc, array4, 4); + SetUniform(loc, array4, 4); #endif Py_RETURN_NONE; }break; diff --git a/source/gameengine/Ketsji/BL_Shader.h b/source/gameengine/Ketsji/BL_Shader.h index 2bb094f12ee..b577a1849a0 100644 --- a/source/gameengine/Ketsji/BL_Shader.h +++ b/source/gameengine/Ketsji/BL_Shader.h @@ -222,7 +222,7 @@ public: // Python interface #ifdef WITH_PYTHON - virtual PyObject* py_repr(void) { return PyUnicode_FromFormat("BL_Shader\n\tvertex shader:%s\n\n\tfragment shader%s\n\n", vertProg, fragProg); } + virtual PyObject *py_repr(void) { return PyUnicode_FromFormat("BL_Shader\n\tvertex shader:%s\n\n\tfragment shader%s\n\n", vertProg, fragProg); } // ----------------------------------- KX_PYMETHOD_DOC(BL_Shader, setSource); diff --git a/source/gameengine/Ketsji/BL_Texture.cpp b/source/gameengine/Ketsji/BL_Texture.cpp index b8cc4ebeff9..7196c1ec664 100644 --- a/source/gameengine/Ketsji/BL_Texture.cpp +++ b/source/gameengine/Ketsji/BL_Texture.cpp @@ -47,7 +47,7 @@ static int power_of_2_min_i(int num) { while (!is_power_of_2_i(num)) num= num&(num-1); - return num; + return num; } // Place holder for a full texture manager @@ -427,7 +427,7 @@ void BL_Texture::DisableAllTextures() glMatrixMode(GL_TEXTURE); glLoadIdentity(); glMatrixMode(GL_MODELVIEW); - glDisable(GL_TEXTURE_2D); + glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_GEN_S); glDisable(GL_TEXTURE_GEN_T); glDisable(GL_TEXTURE_GEN_R); @@ -447,14 +447,14 @@ void BL_Texture::ActivateTexture() if (mType == GL_TEXTURE_CUBE_MAP_ARB && GLEW_ARB_texture_cube_map) { - glBindTexture( GL_TEXTURE_CUBE_MAP_ARB, mTexture ); + glBindTexture( GL_TEXTURE_CUBE_MAP_ARB, mTexture ); glEnable(GL_TEXTURE_CUBE_MAP_ARB); } else { if (GLEW_ARB_texture_cube_map ) glDisable(GL_TEXTURE_CUBE_MAP_ARB); - glBindTexture( GL_TEXTURE_2D, mTexture ); + glBindTexture( GL_TEXTURE_2D, mTexture ); glEnable(GL_TEXTURE_2D); } } @@ -659,7 +659,7 @@ void my_envmap_split_ima(EnvMap *env, ImBuf *ibuf) { int dx, part; - my_free_envmapdata(env); + my_free_envmapdata(env); dx= ibuf->y; dx/= 2; diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp index a69f02baa57..6260596159d 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp @@ -38,7 +38,7 @@ #include "NG_NetworkMessage.h" #include "NG_NetworkScene.h" #include "NG_NetworkObject.h" -#include "SCA_IObject.h" +#include "SCA_IObject.h" #include "InputParser.h" #include "ListValue.h" #include "StringValue.h" @@ -201,7 +201,7 @@ PyAttributeDef KX_NetworkMessageSensor::Attributes[] = { { NULL } //Sentinel }; -PyObject* KX_NetworkMessageSensor::pyattr_get_bodies(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_NetworkMessageSensor::pyattr_get_bodies(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_NetworkMessageSensor *self = static_cast<KX_NetworkMessageSensor*>(self_v); if (self->m_BodyList) { @@ -211,7 +211,7 @@ PyObject* KX_NetworkMessageSensor::pyattr_get_bodies(void *self_v, const KX_PYAT } } -PyObject* KX_NetworkMessageSensor::pyattr_get_subjects(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_NetworkMessageSensor::pyattr_get_subjects(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_NetworkMessageSensor *self = static_cast<KX_NetworkMessageSensor*>(self_v); if (self->m_SubjectList) { diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h index 66f723d072c..6b9779de6e3 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h @@ -80,7 +80,7 @@ public: /* ------------------------------------------------------------- */ /* attributes */ - static PyObject* pyattr_get_bodies(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject* pyattr_get_bodies(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef); static PyObject* pyattr_get_subjects(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef); #endif // WITH_PYTHON diff --git a/source/gameengine/Ketsji/KX_ArmatureSensor.cpp b/source/gameengine/Ketsji/KX_ArmatureSensor.cpp index f72d9c1dee6..523f3ceeaea 100644 --- a/source/gameengine/Ketsji/KX_ArmatureSensor.cpp +++ b/source/gameengine/Ketsji/KX_ArmatureSensor.cpp @@ -86,7 +86,7 @@ void KX_ArmatureSensor::FindConstraint() /* this constraint is not valid, can't use it */ break; m_constraint = pcon; - break; + break; } } break; @@ -193,13 +193,13 @@ PyAttributeDef KX_ArmatureSensor::Attributes[] = { { NULL } //Sentinel }; -PyObject* KX_ArmatureSensor::pyattr_get_constraint(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_ArmatureSensor::pyattr_get_constraint(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) { KX_ArmatureSensor* sensor = static_cast<KX_ArmatureSensor*>(self); if (sensor->m_gameobj->GetGameObjectType() == SCA_IObject::OBJ_ARMATURE) { BL_ArmatureObject* armobj = (BL_ArmatureObject*)sensor->m_gameobj; BL_ArmatureConstraint* constraint = armobj->GetConstraint(sensor->m_posechannel, sensor->m_constraintname); - if (constraint) + if (constraint) return constraint->GetProxy(); } Py_RETURN_NONE; diff --git a/source/gameengine/Ketsji/KX_ArmatureSensor.h b/source/gameengine/Ketsji/KX_ArmatureSensor.h index 9c3faa355a6..74603b3ff01 100644 --- a/source/gameengine/Ketsji/KX_ArmatureSensor.h +++ b/source/gameengine/Ketsji/KX_ArmatureSensor.h @@ -72,7 +72,7 @@ public: /* --------------------------------------------------------------------- */ /* Python interface ---------------------------------------------------- */ /* --------------------------------------------------------------------- */ - static PyObject* pyattr_get_constraint(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_constraint(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); #endif // WITH_PYTHON diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp index b602ba447ad..2337e9569f3 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp @@ -412,7 +412,7 @@ KX_BlenderMaterial::ActivatShaders( if ((mMaterial->ras_mode &WIRE) || (rasty->GetDrawingMode() <= RAS_IRasterizer::KX_WIREFRAME)) - { + { if (mMaterial->ras_mode &WIRE) rasty->SetCullFace(false); rasty->SetLines(true); @@ -457,7 +457,7 @@ KX_BlenderMaterial::ActivateBlenderShaders( if ((mMaterial->ras_mode &WIRE) || (rasty->GetDrawingMode() <= RAS_IRasterizer::KX_WIREFRAME)) - { + { if (mMaterial->ras_mode &WIRE) rasty->SetCullFace(false); rasty->SetLines(true); @@ -506,7 +506,7 @@ KX_BlenderMaterial::ActivateMat( if ((mMaterial->ras_mode &WIRE) || (rasty->GetDrawingMode() <= RAS_IRasterizer::KX_WIREFRAME)) - { + { if (mMaterial->ras_mode &WIRE) rasty->SetCullFace(false); rasty->SetLines(true); @@ -614,7 +614,7 @@ void KX_BlenderMaterial::ActivatGLMaterials( RAS_IRasterizer* rasty )const mMaterial->matcolor[2]*mMaterial->ref+mMaterial->emit, 1.0f); - rasty->SetEmissive( + rasty->SetEmissive( mMaterial->matcolor[0]*mMaterial->emit, mMaterial->matcolor[1]*mMaterial->emit, mMaterial->matcolor[2]*mMaterial->emit, @@ -835,19 +835,19 @@ PyTypeObject KX_BlenderMaterial::Type = { py_base_new }; -PyObject* KX_BlenderMaterial::pyattr_get_shader(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_BlenderMaterial::pyattr_get_shader(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_BlenderMaterial* self= static_cast<KX_BlenderMaterial*>(self_v); return self->PygetShader(NULL, NULL); } -PyObject* KX_BlenderMaterial::pyattr_get_materialIndex(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_BlenderMaterial::pyattr_get_materialIndex(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_BlenderMaterial* self= static_cast<KX_BlenderMaterial*>(self_v); return PyLong_FromSsize_t(self->GetMaterialIndex()); } -PyObject* KX_BlenderMaterial::pyattr_get_blending(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_BlenderMaterial::pyattr_get_blending(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_BlenderMaterial* self= static_cast<KX_BlenderMaterial*>(self_v); unsigned int* bfunc = self->getBlendFunc(); @@ -857,7 +857,7 @@ PyObject* KX_BlenderMaterial::pyattr_get_blending(void *self_v, const KX_PYATTRI int KX_BlenderMaterial::pyattr_set_blending(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value) { KX_BlenderMaterial* self= static_cast<KX_BlenderMaterial*>(self_v); - PyObject* obj = self->PysetBlending(value, NULL); + PyObject *obj = self->PysetBlending(value, NULL); if (obj) { Py_DECREF(obj); diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.h b/source/gameengine/Ketsji/KX_BlenderMaterial.h index 8fc86ef9cf2..a69f5c92d19 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.h +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h @@ -106,11 +106,11 @@ public: #ifdef WITH_PYTHON // -------------------------------- - virtual PyObject* py_repr(void) { return PyUnicode_From_STR_String(mMaterial->matname); } + virtual PyObject *py_repr(void) { return PyUnicode_From_STR_String(mMaterial->matname); } - static PyObject* pyattr_get_shader(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_materialIndex(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_blending(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_shader(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_materialIndex(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_blending(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); static int pyattr_set_blending(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); KX_PYMETHOD_DOC(KX_BlenderMaterial, getShader); diff --git a/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp b/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp index b974886f60a..20c41b95dd3 100644 --- a/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp +++ b/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp @@ -269,7 +269,7 @@ void KX_BulletPhysicsController::AddCompoundChild(KX_IPhysicsController* chil rootScale[2] = 1.0/rootScale[2]; // relative scale = child_scale/parent_scale btVector3 relativeScale = childShape->getLocalScaling()*rootScale; - btMatrix3x3 rootRotInverse = rootTrans.getBasis().transpose(); + btMatrix3x3 rootRotInverse = rootTrans.getBasis().transpose(); // relative pos = parent_rot^-1 * ((parent_pos-child_pos)/parent_scale) btVector3 relativePos = rootRotInverse*((childTrans.getOrigin()-rootTrans.getOrigin())*rootScale); // relative rot = parent_rot^-1 * child_rot diff --git a/source/gameengine/Ketsji/KX_Camera.cpp b/source/gameengine/Ketsji/KX_Camera.cpp index ac17adaf052..c0071ab22f6 100644 --- a/source/gameengine/Ketsji/KX_Camera.cpp +++ b/source/gameengine/Ketsji/KX_Camera.cpp @@ -67,7 +67,7 @@ KX_Camera::~KX_Camera() delete m_pSGNode; m_pSGNode = NULL; } -} +} CValue* KX_Camera::GetReplica() @@ -119,7 +119,7 @@ const MT_Point3 KX_Camera::GetCameraLocation() const //MT_Transform trans; //trans.setBasis(NodeGetWorldOrientation()); - return NodeGetWorldPosition(); + return NodeGetWorldPosition(); } @@ -712,7 +712,7 @@ KX_PYMETHODDEF_DOC_NOARGS(KX_Camera, setOnTop, Py_RETURN_NONE; } -PyObject* KX_Camera::pyattr_get_perspective(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_Camera::pyattr_get_perspective(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_Camera* self= static_cast<KX_Camera*>(self_v); return PyBool_FromLong(self->m_camdata.m_perspective); @@ -732,7 +732,7 @@ int KX_Camera::pyattr_set_perspective(void *self_v, const KX_PYATTRIBUTE_DEF *at return PY_SET_ATTR_SUCCESS; } -PyObject* KX_Camera::pyattr_get_lens(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_Camera::pyattr_get_lens(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_Camera* self= static_cast<KX_Camera*>(self_v); return PyFloat_FromDouble(self->m_camdata.m_lens); @@ -752,7 +752,7 @@ int KX_Camera::pyattr_set_lens(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, return PY_SET_ATTR_SUCCESS; } -PyObject* KX_Camera::pyattr_get_ortho_scale(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_Camera::pyattr_get_ortho_scale(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_Camera* self= static_cast<KX_Camera*>(self_v); return PyFloat_FromDouble(self->m_camdata.m_scale); @@ -772,7 +772,7 @@ int KX_Camera::pyattr_set_ortho_scale(void *self_v, const KX_PYATTRIBUTE_DEF *at return PY_SET_ATTR_SUCCESS; } -PyObject* KX_Camera::pyattr_get_near(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_Camera::pyattr_get_near(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_Camera* self= static_cast<KX_Camera*>(self_v); return PyFloat_FromDouble(self->m_camdata.m_clipstart); @@ -792,7 +792,7 @@ int KX_Camera::pyattr_set_near(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, return PY_SET_ATTR_SUCCESS; } -PyObject* KX_Camera::pyattr_get_far(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_Camera::pyattr_get_far(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_Camera* self= static_cast<KX_Camera*>(self_v); return PyFloat_FromDouble(self->m_camdata.m_clipend); @@ -813,7 +813,7 @@ int KX_Camera::pyattr_set_far(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, P } -PyObject* KX_Camera::pyattr_get_use_viewport(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_Camera::pyattr_get_use_viewport(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_Camera* self= static_cast<KX_Camera*>(self_v); return PyBool_FromLong(self->GetViewport()); @@ -832,7 +832,7 @@ int KX_Camera::pyattr_set_use_viewport(void *self_v, const KX_PYATTRIBUTE_DEF *a } -PyObject* KX_Camera::pyattr_get_projection_matrix(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_Camera::pyattr_get_projection_matrix(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_Camera* self= static_cast<KX_Camera*>(self_v); return PyObjectFrom(self->GetProjectionMatrix()); @@ -849,34 +849,34 @@ int KX_Camera::pyattr_set_projection_matrix(void *self_v, const KX_PYATTRIBUTE_D return PY_SET_ATTR_SUCCESS; } -PyObject* KX_Camera::pyattr_get_modelview_matrix(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_Camera::pyattr_get_modelview_matrix(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_Camera* self= static_cast<KX_Camera*>(self_v); return PyObjectFrom(self->GetModelviewMatrix()); } -PyObject* KX_Camera::pyattr_get_camera_to_world(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_Camera::pyattr_get_camera_to_world(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_Camera* self= static_cast<KX_Camera*>(self_v); return PyObjectFrom(self->GetCameraToWorld()); } -PyObject* KX_Camera::pyattr_get_world_to_camera(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_Camera::pyattr_get_world_to_camera(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_Camera* self= static_cast<KX_Camera*>(self_v); return PyObjectFrom(self->GetWorldToCamera()); } -PyObject* KX_Camera::pyattr_get_INSIDE(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_Camera::pyattr_get_INSIDE(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { return PyLong_FromSsize_t(INSIDE); } -PyObject* KX_Camera::pyattr_get_OUTSIDE(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_Camera::pyattr_get_OUTSIDE(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { return PyLong_FromSsize_t(OUTSIDE); } -PyObject* KX_Camera::pyattr_get_INTERSECT(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_Camera::pyattr_get_INTERSECT(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { return PyLong_FromSsize_t(INTERSECT); } -bool ConvertPythonToCamera(PyObject * value, KX_Camera **object, bool py_none_ok, const char *error_prefix) +bool ConvertPythonToCamera(PyObject *value, KX_Camera **object, bool py_none_ok, const char *error_prefix) { if (value==NULL) { PyErr_Format(PyExc_TypeError, "%s, python pointer NULL, should never happen", error_prefix); @@ -976,7 +976,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); + PyObject *ret = PyTuple_New(2); if (ret) { PyTuple_SET_ITEM(ret, 0, PyFloat_FromDouble(vect[0])); PyTuple_SET_ITEM(ret, 1, PyFloat_FromDouble(vect[1])); @@ -1040,7 +1040,7 @@ KX_PYMETHODDEF_DOC_VARARGS(KX_Camera, getScreenRay, if (!PyArg_ParseTuple(args,"ddd|s:getScreenRay",&x,&y,&dist,&propName)) return NULL; - PyObject* argValue = PyTuple_New(2); + PyObject *argValue = PyTuple_New(2); PyTuple_SET_ITEM(argValue, 0, PyFloat_FromDouble(x)); PyTuple_SET_ITEM(argValue, 1, PyFloat_FromDouble(y)); @@ -1065,7 +1065,7 @@ KX_PYMETHODDEF_DOC_VARARGS(KX_Camera, getScreenRay, if (propName) PyTuple_SET_ITEM(argValue, 2, PyUnicode_FromString(propName)); - PyObject* ret= this->PyrayCastTo(argValue,NULL); + PyObject *ret= this->PyrayCastTo(argValue,NULL); Py_DECREF(argValue); return ret; } diff --git a/source/gameengine/Ketsji/KX_Camera.h b/source/gameengine/Ketsji/KX_Camera.h index 7481b2eb7f0..d95d10e8384 100644 --- a/source/gameengine/Ketsji/KX_Camera.h +++ b/source/gameengine/Ketsji/KX_Camera.h @@ -45,7 +45,7 @@ #ifdef WITH_PYTHON /* utility conversion function */ -bool ConvertPythonToCamera(PyObject * value, KX_Camera **object, bool py_none_ok, const char *error_prefix); +bool ConvertPythonToCamera(PyObject *value, KX_Camera **object, bool py_none_ok, const char *error_prefix); #endif class KX_Camera : public KX_GameObject @@ -156,7 +156,7 @@ public: * instance allocated on the heap. Ownership of the new * object belongs with the caller. */ - virtual CValue* + virtual CValue* GetReplica( ); virtual void ProcessReplica(); @@ -286,8 +286,8 @@ public: KX_PYMETHOD_DOC_NOARGS(KX_Camera, getCameraToWorld); KX_PYMETHOD_DOC_NOARGS(KX_Camera, getWorldToCamera); - KX_PYMETHOD_DOC_VARARGS(KX_Camera, setViewport); - KX_PYMETHOD_DOC_NOARGS(KX_Camera, setOnTop); + KX_PYMETHOD_DOC_VARARGS(KX_Camera, setViewport); + KX_PYMETHOD_DOC_NOARGS(KX_Camera, setOnTop); KX_PYMETHOD_DOC_O(KX_Camera, getScreenPosition); KX_PYMETHOD_DOC_VARARGS(KX_Camera, getScreenVect); diff --git a/source/gameengine/Ketsji/KX_CameraActuator.cpp b/source/gameengine/Ketsji/KX_CameraActuator.cpp index 4c63afa7f3e..9ca1ec59a0b 100644 --- a/source/gameengine/Ketsji/KX_CameraActuator.cpp +++ b/source/gameengine/Ketsji/KX_CameraActuator.cpp @@ -394,7 +394,7 @@ PyAttributeDef KX_CameraActuator::Attributes[] = { {NULL} }; -PyObject* KX_CameraActuator::pyattr_get_object(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_CameraActuator::pyattr_get_object(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_CameraActuator* self= static_cast<KX_CameraActuator*>(self_v); if (self->m_ob==NULL) @@ -412,7 +412,7 @@ int KX_CameraActuator::pyattr_set_object(void *self_v, const KX_PYATTRIBUTE_DEF return PY_SET_ATTR_FAIL; // ConvertPythonToGameObject sets the error if (self->m_ob) - self->m_ob->UnregisterActuator(self); + self->m_ob->UnregisterActuator(self); if ((self->m_ob = (SCA_IObject*)gameobj)) self->m_ob->RegisterActuator(self); diff --git a/source/gameengine/Ketsji/KX_CameraIpoSGController.h b/source/gameengine/Ketsji/KX_CameraIpoSGController.h index 06058760332..9b7c1eddf00 100644 --- a/source/gameengine/Ketsji/KX_CameraIpoSGController.h +++ b/source/gameengine/Ketsji/KX_CameraIpoSGController.h @@ -77,13 +77,13 @@ public: m_ipotime = time; m_modified = true; } - void SetModifyLens(bool modify) { + void SetModifyLens(bool modify) { m_modify_lens = modify; } - void SetModifyClipEnd(bool modify) { + void SetModifyClipEnd(bool modify) { m_modify_clipend = modify; } - void SetModifyClipStart(bool modify) { + void SetModifyClipStart(bool modify) { m_modify_clipstart = modify; } void AddInterpolator(KX_IInterpolator* interp); diff --git a/source/gameengine/Ketsji/KX_ConstraintActuator.cpp b/source/gameengine/Ketsji/KX_ConstraintActuator.cpp index 322d6e60071..3caa4d35565 100644 --- a/source/gameengine/Ketsji/KX_ConstraintActuator.cpp +++ b/source/gameengine/Ketsji/KX_ConstraintActuator.cpp @@ -166,7 +166,7 @@ bool KX_ConstraintActuator::NeedRayCast(KX_ClientObjectInfo* client) bool KX_ConstraintActuator::Update(double curtime, bool frame) { - bool result = false; + bool result = false; bool bNegativeEvent = IsNegativeEvent(); RemoveAllEvents(); @@ -462,7 +462,7 @@ bool KX_ConstraintActuator::Update(double curtime, bool frame) // we expect a hit object if (!m_hitObject) result = false; - if (result) + if (result) { MT_Vector3 newnormal = callback.m_hitNormal; // compute new position & orientation @@ -619,7 +619,7 @@ int KX_ConstraintActuator::pyattr_check_direction(void *self, const struct KX_PY return 1; } act->m_refDirVector = dir/len; - return 0; + return 0; } #endif diff --git a/source/gameengine/Ketsji/KX_ConstraintActuator.h b/source/gameengine/Ketsji/KX_ConstraintActuator.h index f491aedba74..786e4ff53d2 100644 --- a/source/gameengine/Ketsji/KX_ConstraintActuator.h +++ b/source/gameengine/Ketsji/KX_ConstraintActuator.h @@ -43,7 +43,7 @@ class KX_GameObject; class KX_ConstraintActuator : public SCA_IActuator { Py_Header -protected: +protected: // Damp time (int), int m_posDampTime; int m_rotDampTime; diff --git a/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp b/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp index df6b08974dd..5727ed29e67 100644 --- a/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp +++ b/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp @@ -50,13 +50,13 @@ KX_ConstraintWrapper::~KX_ConstraintWrapper() #ifdef WITH_PYTHON -PyObject* KX_ConstraintWrapper::PyGetConstraintId() +PyObject *KX_ConstraintWrapper::PyGetConstraintId() { return PyLong_FromSsize_t(m_constraintId); } -PyObject* KX_ConstraintWrapper::PyGetParam(PyObject* args, PyObject* kwds) +PyObject *KX_ConstraintWrapper::PyGetParam(PyObject *args, PyObject *kwds) { int dof; float value; @@ -69,7 +69,7 @@ PyObject* KX_ConstraintWrapper::PyGetParam(PyObject* args, PyObject* kwds) } -PyObject* KX_ConstraintWrapper::PySetParam(PyObject* args, PyObject* kwds) +PyObject *KX_ConstraintWrapper::PySetParam(PyObject *args, PyObject *kwds) { int dof; float minLimit,maxLimit; @@ -117,7 +117,7 @@ PyAttributeDef KX_ConstraintWrapper::Attributes[] = { { NULL } //Sentinel }; -PyObject* KX_ConstraintWrapper::pyattr_get_constraintId(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_ConstraintWrapper::pyattr_get_constraintId(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_ConstraintWrapper* self= static_cast<KX_ConstraintWrapper*>(self_v); return self->PyGetConstraintId(); diff --git a/source/gameengine/Ketsji/KX_ConstraintWrapper.h b/source/gameengine/Ketsji/KX_ConstraintWrapper.h index a92ae83e7f0..dbc3571cad6 100644 --- a/source/gameengine/Ketsji/KX_ConstraintWrapper.h +++ b/source/gameengine/Ketsji/KX_ConstraintWrapper.h @@ -48,7 +48,7 @@ public: KX_PYMETHOD(KX_ConstraintWrapper,SetParam); KX_PYMETHOD(KX_ConstraintWrapper,GetParam); - static PyObject* pyattr_get_constraintId(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_constraintId(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); #endif private: diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp index f1038c04499..776953206fe 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp @@ -282,7 +282,7 @@ void KX_ConvertBulletObject( class KX_GameObject* gameobj, relativeRot.getValue(rot); shapeInfo->m_childTrans.getBasis().setFromOpenGLSubMatrix(rot); - parentShapeInfo->AddShape(shapeInfo); + parentShapeInfo->AddShape(shapeInfo); compoundShape->addChildShape(shapeInfo->m_childTrans,bm); //do some recalc? //recalc inertia for rigidbody @@ -439,7 +439,7 @@ void KX_ConvertBulletObject( class KX_GameObject* gameobj, { env->addCcdPhysicsController( physicscontroller); } - physicscontroller->setNewClientInfo(gameobj->getClientInfo()); + physicscontroller->setNewClientInfo(gameobj->getClientInfo()); { btRigidBody* rbody = physicscontroller->GetRigidBody(); diff --git a/source/gameengine/Ketsji/KX_Dome.cpp b/source/gameengine/Ketsji/KX_Dome.cpp index 44c9cb1dab8..fd3a18a9d2a 100644 --- a/source/gameengine/Ketsji/KX_Dome.cpp +++ b/source/gameengine/Ketsji/KX_Dome.cpp @@ -592,7 +592,7 @@ void KX_Dome::CreateMeshDome180(void) cubebottom[0].u[2] = 0.0; cubebottom[0].v[2] = 0.0; - nfacesbottom = 1; + nfacesbottom = 1; /* Left face - two triangles */ @@ -682,12 +682,12 @@ void KX_Dome::CreateMeshDome180(void) cubetop.resize(4*nfacestop); SplitFace(cubetop,&nfacestop); cubebottom.resize(4*nfacesbottom); - SplitFace(cubebottom,&nfacesbottom); + SplitFace(cubebottom,&nfacesbottom); cubeleft.resize(4*nfacesleft); SplitFace(cubeleft,&nfacesleft); cuberight.resize(4*nfacesright); SplitFace(cuberight,&nfacesright); - } + } // Turn into a hemisphere for (j=0;j<3;j++) { @@ -763,13 +763,13 @@ void KX_Dome::CreateMeshDome250(void) cubefront[0].verts[1][0] = 1.0; cubefront[0].verts[1][1] = 1.0; - cubefront[0].verts[1][2] = 1.0; + cubefront[0].verts[1][2] = 1.0; cubefront[0].u[1] = uv_ratio; cubefront[0].v[1] = uv_ratio; cubefront[0].verts[2][0] =-1.0; cubefront[0].verts[2][1] = 1.0; - cubefront[0].verts[2][2] = 1.0; + cubefront[0].verts[2][2] = 1.0; cubefront[0].u[2] = 0.0; cubefront[0].v[2] = uv_ratio; @@ -782,13 +782,13 @@ void KX_Dome::CreateMeshDome250(void) cubefront[1].verts[1][0] =-1.0; cubefront[1].verts[1][1] = 1.0; - cubefront[1].verts[1][2] =-1.0; + cubefront[1].verts[1][2] =-1.0; cubefront[1].u[1] = 0.0; cubefront[1].v[1] = 0.0; cubefront[1].verts[2][0] = 1.0; cubefront[1].verts[2][1] = 1.0; - cubefront[1].verts[2][2] =-1.0; + cubefront[1].verts[2][2] =-1.0; cubefront[1].u[2] = uv_ratio; cubefront[1].v[2] = 0.0; @@ -803,13 +803,13 @@ void KX_Dome::CreateMeshDome250(void) cubeleft[0].verts[1][0] =-1.0; cubeleft[0].verts[1][1] =-verts_height; - cubeleft[0].verts[1][2] = 1.0; + cubeleft[0].verts[1][2] = 1.0; cubeleft[0].u[1] = uv_base; cubeleft[0].v[1] = uv_ratio; cubeleft[0].verts[2][0] =-1.0; cubeleft[0].verts[2][1] =-verts_height; - cubeleft[0].verts[2][2] =-1.0; + cubeleft[0].verts[2][2] =-1.0; cubeleft[0].u[2] = uv_base; cubeleft[0].v[2] = 0.0; @@ -822,13 +822,13 @@ void KX_Dome::CreateMeshDome250(void) cubeleft[1].verts[1][0] =-1.0; cubeleft[1].verts[1][1] = 1.0; - cubeleft[1].verts[1][2] =-1.0; + cubeleft[1].verts[1][2] =-1.0; cubeleft[1].u[1] = uv_ratio; cubeleft[1].v[1] = 0.0; cubeleft[1].verts[2][0] =-1.0; cubeleft[1].verts[2][1] = 1.0; - cubeleft[1].verts[2][2] = 1.0; + cubeleft[1].verts[2][2] = 1.0; cubeleft[1].u[2] = uv_ratio; cubeleft[1].v[2] = uv_ratio; @@ -843,13 +843,13 @@ void KX_Dome::CreateMeshDome250(void) cuberight[0].verts[1][0] = 1.0; cuberight[0].verts[1][1] =-verts_height; - cuberight[0].verts[1][2] =-1.0; + cuberight[0].verts[1][2] =-1.0; cuberight[0].u[1] = uv_height; cuberight[0].v[1] = 0.0; cuberight[0].verts[2][0] = 1.0; cuberight[0].verts[2][1] =-verts_height; - cuberight[0].verts[2][2] = 1.0; + cuberight[0].verts[2][2] = 1.0; cuberight[0].u[2] = uv_height; cuberight[0].v[2] = uv_ratio; @@ -862,13 +862,13 @@ void KX_Dome::CreateMeshDome250(void) cuberight[1].verts[1][0] = 1.0; cuberight[1].verts[1][1] = 1.0; - cuberight[1].verts[1][2] = 1.0; + cuberight[1].verts[1][2] = 1.0; cuberight[1].u[1] = 0.0; cuberight[1].v[1] = uv_ratio; cuberight[1].verts[2][0] = 1.0; cuberight[1].verts[2][1] = 1.0; - cuberight[1].verts[2][2] =-1.0; + cuberight[1].verts[2][2] =-1.0; cuberight[1].u[2] = 0.0; cuberight[1].v[2] = 0.0; @@ -883,13 +883,13 @@ void KX_Dome::CreateMeshDome250(void) cubetop[0].verts[1][0] = 1.0; cubetop[0].verts[1][1] =-verts_height; - cubetop[0].verts[1][2] = 1.0; + cubetop[0].verts[1][2] = 1.0; cubetop[0].u[1] = uv_ratio; cubetop[0].v[1] = uv_height; cubetop[0].verts[2][0] =-1.0; cubetop[0].verts[2][1] =-verts_height; - cubetop[0].verts[2][2] = 1.0; + cubetop[0].verts[2][2] = 1.0; cubetop[0].u[2] = 0.0; cubetop[0].v[2] = uv_height; @@ -902,13 +902,13 @@ void KX_Dome::CreateMeshDome250(void) cubetop[1].verts[1][0] =-1.0; cubetop[1].verts[1][1] = 1.0; - cubetop[1].verts[1][2] = 1.0; + cubetop[1].verts[1][2] = 1.0; cubetop[1].u[1] = 0.0; cubetop[1].v[1] = 0.0; cubetop[1].verts[2][0] = 1.0; cubetop[1].verts[2][1] = 1.0; - cubetop[1].verts[2][2] = 1.0; + cubetop[1].verts[2][2] = 1.0; cubetop[1].u[2] = uv_ratio; cubetop[1].v[2] = 0.0; @@ -923,13 +923,13 @@ void KX_Dome::CreateMeshDome250(void) cubebottom[0].verts[1][0] = 1.0; cubebottom[0].verts[1][1] = 1.0; - cubebottom[0].verts[1][2] =-1.0; + cubebottom[0].verts[1][2] =-1.0; cubebottom[0].u[1] = uv_ratio; cubebottom[0].v[1] = uv_ratio; cubebottom[0].verts[2][0] =-1.0; cubebottom[0].verts[2][1] = 1.0; - cubebottom[0].verts[2][2] =-1.0; + cubebottom[0].verts[2][2] =-1.0; cubebottom[0].u[2] = 0.0; cubebottom[0].v[2] = uv_ratio; @@ -942,13 +942,13 @@ void KX_Dome::CreateMeshDome250(void) cubebottom[1].verts[1][0] =-1.0; cubebottom[1].verts[1][1] =-verts_height; - cubebottom[1].verts[1][2] =-1.0; + cubebottom[1].verts[1][2] =-1.0; cubebottom[1].u[1] = 0.0; cubebottom[1].v[1] = uv_base; cubebottom[1].verts[2][0] = 1.0; cubebottom[1].verts[2][1] =-verts_height; - cubebottom[1].verts[2][2] =-1.0; + cubebottom[1].verts[2][2] =-1.0; cubebottom[1].u[2] = uv_ratio; cubebottom[1].v[2] = uv_base; @@ -963,7 +963,7 @@ void KX_Dome::CreateMeshDome250(void) cubetop.resize(4*nfacestop); SplitFace(cubetop,&nfacestop); cubebottom.resize(4*nfacesbottom); - SplitFace(cubebottom,&nfacesbottom); + SplitFace(cubebottom,&nfacesbottom); cubeleft.resize(4*nfacesleft); SplitFace(cubeleft,&nfacesleft); cuberight.resize(4*nfacesright); @@ -986,13 +986,13 @@ void KX_Dome::CreateMeshDome250(void) //flatten onto xz plane for (i=0;i<nfacesfront;i++) - FlattenDome(cubefront[i].verts); + FlattenDome(cubefront[i].verts); for (i=0;i<nfacestop;i++) FlattenDome(cubetop[i].verts); for (i=0;i<nfacesbottom;i++) FlattenDome(cubebottom[i].verts); for (i=0;i<nfacesleft;i++) - FlattenDome(cubeleft[i].verts); + FlattenDome(cubeleft[i].verts); for (i=0;i<nfacesright;i++) FlattenDome(cuberight[i].verts); } @@ -1417,7 +1417,7 @@ void KX_Dome::SplitFace(vector <DomeFace>& face, int *nfaces) face[n2+2].u[2] = (face[i].u[2] + face[i].u[0]) /2; face[n2+2].v[0] = (face[i].v[0] + face[i].v[1]) /2; face[n2+2].v[1] = (face[i].v[1] + face[i].v[2]) /2; - face[n2+2].v[2] = (face[i].v[2] + face[i].v[0]) /2; + face[n2+2].v[2] = (face[i].v[2] + face[i].v[0]) /2; //face[i].verts[0] = face[i].verts[0]; face[i].verts[1] = (face[i].verts[0] + face[i].verts[1]) /2; @@ -1427,7 +1427,7 @@ void KX_Dome::SplitFace(vector <DomeFace>& face, int *nfaces) face[i].u[2] = (face[i].u[0] + face[i].u[2]) /2; //face[i].v[0] = face[i].v[0]; face[i].v[1] = (face[i].v[0] + face[i].v[1]) /2; - face[i].v[2] = (face[i].v[0] + face[i].v[2]) /2; + face[i].v[2] = (face[i].v[0] + face[i].v[2]) /2; n2 += 3; // number of faces } @@ -1858,7 +1858,7 @@ void KX_Dome::DrawDomeFisheye(void) glBindTexture(GL_TEXTURE_2D, domefacesId[0]); GLDrawTriangles(cubetop, nfacestop); - // bottom triangle + // bottom triangle glBindTexture(GL_TEXTURE_2D, domefacesId[1]); GLDrawTriangles(cubebottom, nfacesbottom); diff --git a/source/gameengine/Ketsji/KX_FontObject.cpp b/source/gameengine/Ketsji/KX_FontObject.cpp index 78134afdab0..9f6ef894f12 100644 --- a/source/gameengine/Ketsji/KX_FontObject.cpp +++ b/source/gameengine/Ketsji/KX_FontObject.cpp @@ -252,7 +252,7 @@ PyAttributeDef KX_FontObject::Attributes[] = { { NULL } //Sentinel }; -PyObject* KX_FontObject::pyattr_get_text(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_FontObject::pyattr_get_text(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_FontObject* self= static_cast<KX_FontObject*>(self_v); STR_String str = STR_String(); diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index 3818cef7d6e..fe8419d5343 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -362,7 +362,7 @@ BL_ActionManager* KX_GameObject::GetActionManager() { // We only want to create an action manager if we need it if (!m_actionManager) - { + { KX_GetActiveScene()->AddAnimatedObject(this); m_actionManager = new BL_ActionManager(this); } @@ -690,7 +690,7 @@ void KX_GameObject::SynchronizeTransformFunc(SG_IObject* node, void* gameobj, vo void KX_GameObject::SetDebugColor(unsigned int bgra) { for (size_t i=0;i<m_meshes.size();i++) - m_meshes[i]->DebugColor(bgra); + m_meshes[i]->DebugColor(bgra); } @@ -701,8 +701,8 @@ void KX_GameObject::ResetDebugColor() } void KX_GameObject::InitIPO(bool ipo_as_force, - bool ipo_add, - bool ipo_local) + bool ipo_add, + bool ipo_local) { SGControllerList::iterator it = GetSGNode()->GetSGControllerList().begin(); @@ -939,7 +939,7 @@ void KX_GameObject::AlignAxisToVect(const MT_Vector3& dir, int axis, float fac) vect /= len; orimat = GetSGNode()->GetWorldOrientation(); switch (axis) - { + { case 0: //x axis ori.setValue(orimat[0][2], orimat[1][2], orimat[2][2]); //pivot axis if (MT_abs(vect.dot(ori)) > 1.0-3.0*MT_EPSILON) //is the vector parallel to the pivot? @@ -1041,7 +1041,7 @@ MT_Vector3 KX_GameObject::GetLinearVelocity(bool local) return locvel; } } - return velocity; + return velocity; } MT_Vector3 KX_GameObject::GetAngularVelocity(bool local) @@ -1060,7 +1060,7 @@ MT_Vector3 KX_GameObject::GetAngularVelocity(bool local) return locvel; } } - return velocity; + return velocity; } MT_Vector3 KX_GameObject::GetVelocity(const MT_Point3& point) @@ -1668,7 +1668,7 @@ PyAttributeDef KX_GameObject::Attributes[] = { {NULL} //Sentinel }; -PyObject* KX_GameObject::PyReplaceMesh(PyObject* args) +PyObject *KX_GameObject::PyReplaceMesh(PyObject *args) { KX_Scene *scene = KX_GetActiveScene(); @@ -1686,7 +1686,7 @@ PyObject* KX_GameObject::PyReplaceMesh(PyObject* args) Py_RETURN_NONE; } -PyObject* KX_GameObject::PyEndObject() +PyObject *KX_GameObject::PyEndObject() { SG_Node* node = this->GetSGNode(); KX_Scene* scene = static_cast<KX_Scene*>(node->GetSGClientInfo()); @@ -1697,7 +1697,7 @@ PyObject* KX_GameObject::PyEndObject() } -PyObject* KX_GameObject::PyReinstancePhysicsMesh(PyObject* args) +PyObject *KX_GameObject::PyReinstancePhysicsMesh(PyObject *args) { KX_GameObject *gameobj= NULL; RAS_MeshObject *mesh= NULL; @@ -1724,7 +1724,7 @@ static PyObject *Map_GetItem(PyObject *self_v, PyObject *item) KX_GameObject* self= static_cast<KX_GameObject*>BGE_PROXY_REF(self_v); const char *attr_str= _PyUnicode_AsString(item); CValue* resultattr; - PyObject* pyconvert; + PyObject *pyconvert; if (self==NULL) { PyErr_SetString(PyExc_SystemError, "val = gameOb[key]: KX_GameObject, "BGE_PROXY_ERROR_MSG); @@ -1733,7 +1733,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))) { - pyconvert = resultattr->ConvertValueToPython(); + pyconvert = resultattr->ConvertValueToPython(); return pyconvert ? pyconvert:resultattr->GetProxy(); } /* no CValue attribute, try get the python only m_attr_dict attribute */ @@ -1907,13 +1907,13 @@ PyTypeObject KX_GameObject::Type = { py_base_new }; -PyObject* KX_GameObject::pyattr_get_name(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_name(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_GameObject* self= static_cast<KX_GameObject*>(self_v); return PyUnicode_From_STR_String(self->GetName()); } -PyObject* KX_GameObject::pyattr_get_parent(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_parent(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_GameObject* self= static_cast<KX_GameObject*>(self_v); KX_GameObject* parent = self->GetParent(); @@ -1924,7 +1924,7 @@ PyObject* KX_GameObject::pyattr_get_parent(void *self_v, const KX_PYATTRIBUTE_DE Py_RETURN_NONE; } -PyObject* KX_GameObject::pyattr_get_life(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_life(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_GameObject* self= static_cast<KX_GameObject*>(self_v); @@ -1937,7 +1937,7 @@ PyObject* KX_GameObject::pyattr_get_life(void *self_v, const KX_PYATTRIBUTE_DEF Py_RETURN_NONE; } -PyObject* KX_GameObject::pyattr_get_mass(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_mass(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_GameObject* self= static_cast<KX_GameObject*>(self_v); KX_IPhysicsController *spc = self->GetPhysicsController(); @@ -1960,7 +1960,7 @@ int KX_GameObject::pyattr_set_mass(void *self_v, const KX_PYATTRIBUTE_DEF *attrd return PY_SET_ATTR_SUCCESS; } -PyObject* KX_GameObject::pyattr_get_lin_vel_min(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_lin_vel_min(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_GameObject* self= static_cast<KX_GameObject*>(self_v); KX_IPhysicsController *spc = self->GetPhysicsController(); @@ -1983,7 +1983,7 @@ int KX_GameObject::pyattr_set_lin_vel_min(void *self_v, const KX_PYATTRIBUTE_DEF return PY_SET_ATTR_SUCCESS; } -PyObject* KX_GameObject::pyattr_get_lin_vel_max(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_lin_vel_max(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_GameObject* self= static_cast<KX_GameObject*>(self_v); KX_IPhysicsController *spc = self->GetPhysicsController(); @@ -2007,7 +2007,7 @@ int KX_GameObject::pyattr_set_lin_vel_max(void *self_v, const KX_PYATTRIBUTE_DEF } -PyObject* KX_GameObject::pyattr_get_visible(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_visible(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_GameObject* self= static_cast<KX_GameObject*>(self_v); return PyBool_FromLong(self->GetVisible()); @@ -2027,7 +2027,7 @@ int KX_GameObject::pyattr_set_visible(void *self_v, const KX_PYATTRIBUTE_DEF *at return PY_SET_ATTR_SUCCESS; } -PyObject* KX_GameObject::pyattr_get_worldPosition(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_worldPosition(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { #ifdef USE_MATHUTILS return Vector_CreatePyObject_cb(BGE_PROXY_FROM_REF(self_v), 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_POS_GLOBAL); @@ -2049,11 +2049,11 @@ int KX_GameObject::pyattr_set_worldPosition(void *self_v, const KX_PYATTRIBUTE_D return PY_SET_ATTR_SUCCESS; } -PyObject* KX_GameObject::pyattr_get_localPosition(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_localPosition(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { -#ifdef USE_MATHUTILS +#ifdef USE_MATHUTILS return Vector_CreatePyObject_cb(BGE_PROXY_FROM_REF(self_v), 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_POS_LOCAL); -#else +#else KX_GameObject* self= static_cast<KX_GameObject*>(self_v); return PyObjectFrom(self->NodeGetLocalPosition()); #endif @@ -2071,7 +2071,7 @@ int KX_GameObject::pyattr_set_localPosition(void *self_v, const KX_PYATTRIBUTE_D return PY_SET_ATTR_SUCCESS; } -PyObject* KX_GameObject::pyattr_get_localInertia(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_localInertia(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { #ifdef USE_MATHUTILS return Vector_CreatePyObject_cb(BGE_PROXY_FROM_REF(self_v), 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_INERTIA_LOCAL); @@ -2083,7 +2083,7 @@ PyObject* KX_GameObject::pyattr_get_localInertia(void *self_v, const KX_PYATTRIB #endif } -PyObject* KX_GameObject::pyattr_get_worldOrientation(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_worldOrientation(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { #ifdef USE_MATHUTILS return Matrix_CreatePyObject_cb(BGE_PROXY_FROM_REF(self_v), 3, 3, mathutils_kxgameob_matrix_cb_index, MATHUTILS_MAT_CB_ORI_GLOBAL); @@ -2108,7 +2108,7 @@ int KX_GameObject::pyattr_set_worldOrientation(void *self_v, const KX_PYATTRIBUT return PY_SET_ATTR_SUCCESS; } -PyObject* KX_GameObject::pyattr_get_localOrientation(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_localOrientation(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { #ifdef USE_MATHUTILS return Matrix_CreatePyObject_cb(BGE_PROXY_FROM_REF(self_v), 3, 3, mathutils_kxgameob_matrix_cb_index, MATHUTILS_MAT_CB_ORI_LOCAL); @@ -2132,7 +2132,7 @@ int KX_GameObject::pyattr_set_localOrientation(void *self_v, const KX_PYATTRIBUT return PY_SET_ATTR_SUCCESS; } -PyObject* KX_GameObject::pyattr_get_worldScaling(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_worldScaling(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { #ifdef USE_MATHUTILS return Vector_CreatePyObject_cb(BGE_PROXY_FROM_REF(self_v), 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_SCALE_GLOBAL); @@ -2154,7 +2154,7 @@ int KX_GameObject::pyattr_set_worldScaling(void *self_v, const KX_PYATTRIBUTE_DE return PY_SET_ATTR_SUCCESS; } -PyObject* KX_GameObject::pyattr_get_localScaling(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_localScaling(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { #ifdef USE_MATHUTILS return Vector_CreatePyObject_cb(BGE_PROXY_FROM_REF(self_v), 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_SCALE_LOCAL); @@ -2176,7 +2176,7 @@ int KX_GameObject::pyattr_set_localScaling(void *self_v, const KX_PYATTRIBUTE_DE return PY_SET_ATTR_SUCCESS; } -PyObject* KX_GameObject::pyattr_get_localTransform(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_localTransform(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_GameObject* self = static_cast<KX_GameObject*>(self_v); @@ -2222,7 +2222,7 @@ int KX_GameObject::pyattr_set_localTransform(void *self_v, const KX_PYATTRIBUTE_ return PY_SET_ATTR_SUCCESS; } -PyObject* KX_GameObject::pyattr_get_worldTransform(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_worldTransform(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_GameObject* self = static_cast<KX_GameObject*>(self_v); @@ -2256,7 +2256,7 @@ int KX_GameObject::pyattr_set_worldTransform(void *self_v, const KX_PYATTRIBUTE_ return PY_SET_ATTR_SUCCESS; } -PyObject* KX_GameObject::pyattr_get_worldLinearVelocity(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_worldLinearVelocity(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { #ifdef USE_MATHUTILS return Vector_CreatePyObject_cb(BGE_PROXY_FROM_REF(self_v), 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_LINVEL_GLOBAL); @@ -2278,7 +2278,7 @@ int KX_GameObject::pyattr_set_worldLinearVelocity(void *self_v, const KX_PYATTRI return PY_SET_ATTR_SUCCESS; } -PyObject* KX_GameObject::pyattr_get_localLinearVelocity(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_localLinearVelocity(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { #ifdef USE_MATHUTILS return Vector_CreatePyObject_cb(BGE_PROXY_FROM_REF(self_v), 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_LINVEL_LOCAL); @@ -2300,7 +2300,7 @@ int KX_GameObject::pyattr_set_localLinearVelocity(void *self_v, const KX_PYATTRI return PY_SET_ATTR_SUCCESS; } -PyObject* KX_GameObject::pyattr_get_worldAngularVelocity(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_worldAngularVelocity(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { #ifdef USE_MATHUTILS return Vector_CreatePyObject_cb(BGE_PROXY_FROM_REF(self_v), 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_ANGVEL_GLOBAL); @@ -2322,7 +2322,7 @@ int KX_GameObject::pyattr_set_worldAngularVelocity(void *self_v, const KX_PYATTR return PY_SET_ATTR_SUCCESS; } -PyObject* KX_GameObject::pyattr_get_localAngularVelocity(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_localAngularVelocity(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { #ifdef USE_MATHUTILS return Vector_CreatePyObject_cb(BGE_PROXY_FROM_REF(self_v), 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_ANGVEL_LOCAL); @@ -2345,7 +2345,7 @@ int KX_GameObject::pyattr_set_localAngularVelocity(void *self_v, const KX_PYATTR } -PyObject* KX_GameObject::pyattr_get_timeOffset(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_timeOffset(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_GameObject* self= static_cast<KX_GameObject*>(self_v); SG_Node* sg_parent; @@ -2372,7 +2372,7 @@ int KX_GameObject::pyattr_set_timeOffset(void *self_v, const KX_PYATTRIBUTE_DEF return PY_SET_ATTR_SUCCESS; } -PyObject* KX_GameObject::pyattr_get_state(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_state(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_GameObject* self= static_cast<KX_GameObject*>(self_v); int state = 0; @@ -2400,7 +2400,7 @@ int KX_GameObject::pyattr_set_state(void *self_v, const KX_PYATTRIBUTE_DEF *attr return PY_SET_ATTR_SUCCESS; } -PyObject* KX_GameObject::pyattr_get_meshes(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_meshes(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_GameObject* self= static_cast<KX_GameObject*>(self_v); PyObject *meshes= PyList_New(self->m_meshes.size()); @@ -2415,7 +2415,7 @@ PyObject* KX_GameObject::pyattr_get_meshes(void *self_v, const KX_PYATTRIBUTE_DE return meshes; } -PyObject* KX_GameObject::pyattr_get_obcolor(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_obcolor(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { #ifdef USE_MATHUTILS return Vector_CreatePyObject_cb(BGE_PROXY_FROM_REF(self_v), 4, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_OBJECT_COLOR); @@ -2437,35 +2437,35 @@ int KX_GameObject::pyattr_set_obcolor(void *self_v, const KX_PYATTRIBUTE_DEF *at } /* These are experimental! */ -PyObject* KX_GameObject::pyattr_get_sensors(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_sensors(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { return KX_PythonSeq_CreatePyObject((static_cast<KX_GameObject*>(self_v))->m_proxy, KX_PYGENSEQ_OB_TYPE_SENSORS); } -PyObject* KX_GameObject::pyattr_get_controllers(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_controllers(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { return KX_PythonSeq_CreatePyObject((static_cast<KX_GameObject*>(self_v))->m_proxy, KX_PYGENSEQ_OB_TYPE_CONTROLLERS); } -PyObject* KX_GameObject::pyattr_get_actuators(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_actuators(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { return KX_PythonSeq_CreatePyObject((static_cast<KX_GameObject*>(self_v))->m_proxy, KX_PYGENSEQ_OB_TYPE_ACTUATORS); } /* End experimental */ -PyObject* KX_GameObject::pyattr_get_children(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_children(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_GameObject* self= static_cast<KX_GameObject*>(self_v); return self->GetChildren()->NewProxy(true); } -PyObject* KX_GameObject::pyattr_get_children_recursive(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_children_recursive(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_GameObject* self= static_cast<KX_GameObject*>(self_v); return self->GetChildrenRecursive()->NewProxy(true); } -PyObject* KX_GameObject::pyattr_get_attrDict(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_GameObject::pyattr_get_attrDict(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_GameObject* self= static_cast<KX_GameObject*>(self_v); @@ -2476,10 +2476,10 @@ PyObject* KX_GameObject::pyattr_get_attrDict(void *self_v, const KX_PYATTRIBUTE_ return self->m_attr_dict; } -PyObject* KX_GameObject::PyApplyForce(PyObject* args) +PyObject *KX_GameObject::PyApplyForce(PyObject *args) { int local = 0; - PyObject* pyvect; + PyObject *pyvect; if (PyArg_ParseTuple(args, "O|i:applyForce", &pyvect, &local)) { MT_Vector3 force; @@ -2491,10 +2491,10 @@ PyObject* KX_GameObject::PyApplyForce(PyObject* args) return NULL; } -PyObject* KX_GameObject::PyApplyTorque(PyObject* args) +PyObject *KX_GameObject::PyApplyTorque(PyObject *args) { int local = 0; - PyObject* pyvect; + PyObject *pyvect; if (PyArg_ParseTuple(args, "O|i:applyTorque", &pyvect, &local)) { MT_Vector3 torque; @@ -2506,10 +2506,10 @@ PyObject* KX_GameObject::PyApplyTorque(PyObject* args) return NULL; } -PyObject* KX_GameObject::PyApplyRotation(PyObject* args) +PyObject *KX_GameObject::PyApplyRotation(PyObject *args) { int local = 0; - PyObject* pyvect; + PyObject *pyvect; if (PyArg_ParseTuple(args, "O|i:applyRotation", &pyvect, &local)) { MT_Vector3 rotation; @@ -2521,10 +2521,10 @@ PyObject* KX_GameObject::PyApplyRotation(PyObject* args) return NULL; } -PyObject* KX_GameObject::PyApplyMovement(PyObject* args) +PyObject *KX_GameObject::PyApplyMovement(PyObject *args) { int local = 0; - PyObject* pyvect; + PyObject *pyvect; if (PyArg_ParseTuple(args, "O|i:applyMovement", &pyvect, &local)) { MT_Vector3 movement; @@ -2536,7 +2536,7 @@ PyObject* KX_GameObject::PyApplyMovement(PyObject* args) return NULL; } -PyObject* KX_GameObject::PyGetLinearVelocity(PyObject* args) +PyObject *KX_GameObject::PyGetLinearVelocity(PyObject *args) { // only can get the velocity if we have a physics object connected to us... int local = 0; @@ -2550,10 +2550,10 @@ PyObject* KX_GameObject::PyGetLinearVelocity(PyObject* args) } } -PyObject* KX_GameObject::PySetLinearVelocity(PyObject* args) +PyObject *KX_GameObject::PySetLinearVelocity(PyObject *args) { int local = 0; - PyObject* pyvect; + PyObject *pyvect; if (PyArg_ParseTuple(args,"O|i:setLinearVelocity",&pyvect,&local)) { MT_Vector3 velocity; @@ -2565,7 +2565,7 @@ PyObject* KX_GameObject::PySetLinearVelocity(PyObject* args) return NULL; } -PyObject* KX_GameObject::PyGetAngularVelocity(PyObject* args) +PyObject *KX_GameObject::PyGetAngularVelocity(PyObject *args) { // only can get the velocity if we have a physics object connected to us... int local = 0; @@ -2579,10 +2579,10 @@ PyObject* KX_GameObject::PyGetAngularVelocity(PyObject* args) } } -PyObject* KX_GameObject::PySetAngularVelocity(PyObject* args) +PyObject *KX_GameObject::PySetAngularVelocity(PyObject *args) { int local = 0; - PyObject* pyvect; + PyObject *pyvect; if (PyArg_ParseTuple(args,"O|i:setAngularVelocity",&pyvect,&local)) { MT_Vector3 velocity; @@ -2594,7 +2594,7 @@ PyObject* KX_GameObject::PySetAngularVelocity(PyObject* args) return NULL; } -PyObject* KX_GameObject::PySetVisible(PyObject* args) +PyObject *KX_GameObject::PySetVisible(PyObject *args) { int visible, recursive = 0; if (!PyArg_ParseTuple(args,"i|i:setVisible",&visible, &recursive)) @@ -2606,7 +2606,7 @@ PyObject* KX_GameObject::PySetVisible(PyObject* args) } -PyObject* KX_GameObject::PySetOcclusion(PyObject* args) +PyObject *KX_GameObject::PySetOcclusion(PyObject *args) { int occlusion, recursive = 0; if (!PyArg_ParseTuple(args,"i|i:setOcclusion",&occlusion, &recursive)) @@ -2616,11 +2616,11 @@ PyObject* KX_GameObject::PySetOcclusion(PyObject* args) Py_RETURN_NONE; } -PyObject* KX_GameObject::PyGetVelocity(PyObject* args) +PyObject *KX_GameObject::PyGetVelocity(PyObject *args) { // only can get the velocity if we have a physics object connected to us... MT_Point3 point(0.0,0.0,0.0); - PyObject* pypos = NULL; + PyObject *pypos = NULL; if (!PyArg_ParseTuple(args, "|O:getVelocity", &pypos) || (pypos && !PyVecTo(pypos, point))) return NULL; @@ -2634,7 +2634,7 @@ PyObject* KX_GameObject::PyGetVelocity(PyObject* args) } } -PyObject* KX_GameObject::PyGetReactionForce() +PyObject *KX_GameObject::PyGetReactionForce() { // only can get the velocity if we have a physics object connected to us... @@ -2651,7 +2651,7 @@ PyObject* KX_GameObject::PyGetReactionForce() -PyObject* KX_GameObject::PyEnableRigidBody() +PyObject *KX_GameObject::PyEnableRigidBody() { if (GetPhysicsController()) GetPhysicsController()->setRigidBody(true); @@ -2661,7 +2661,7 @@ PyObject* KX_GameObject::PyEnableRigidBody() -PyObject* KX_GameObject::PyDisableRigidBody() +PyObject *KX_GameObject::PyDisableRigidBody() { if (GetPhysicsController()) GetPhysicsController()->setRigidBody(false); @@ -2670,10 +2670,10 @@ PyObject* KX_GameObject::PyDisableRigidBody() } -PyObject* KX_GameObject::PySetParent(PyObject* args) +PyObject *KX_GameObject::PySetParent(PyObject *args) { KX_Scene *scene = KX_GetActiveScene(); - PyObject* pyobj; + PyObject *pyobj; KX_GameObject *obj; int addToCompound=1, ghost=1; @@ -2687,7 +2687,7 @@ PyObject* KX_GameObject::PySetParent(PyObject* args) Py_RETURN_NONE; } -PyObject* KX_GameObject::PyRemoveParent() +PyObject *KX_GameObject::PyRemoveParent() { KX_Scene *scene = KX_GetActiveScene(); @@ -2696,7 +2696,7 @@ PyObject* KX_GameObject::PyRemoveParent() } -PyObject* KX_GameObject::PySetCollisionMargin(PyObject* value) +PyObject *KX_GameObject::PySetCollisionMargin(PyObject *value) { float collisionMargin = PyFloat_AsDouble(value); @@ -2716,10 +2716,10 @@ PyObject* KX_GameObject::PySetCollisionMargin(PyObject* value) -PyObject* KX_GameObject::PyApplyImpulse(PyObject* args) +PyObject *KX_GameObject::PyApplyImpulse(PyObject *args) { - PyObject* pyattach; - PyObject* pyimpulse; + PyObject *pyattach; + PyObject *pyimpulse; if (!m_pPhysicsController1) { PyErr_SetString(PyExc_RuntimeError, "This object has no physics controller"); @@ -2743,7 +2743,7 @@ PyObject* KX_GameObject::PyApplyImpulse(PyObject* args) -PyObject* KX_GameObject::PySuspendDynamics() +PyObject *KX_GameObject::PySuspendDynamics() { SuspendDynamics(); Py_RETURN_NONE; @@ -2751,16 +2751,16 @@ PyObject* KX_GameObject::PySuspendDynamics() -PyObject* KX_GameObject::PyRestoreDynamics() +PyObject *KX_GameObject::PyRestoreDynamics() { RestoreDynamics(); Py_RETURN_NONE; } -PyObject* KX_GameObject::PyAlignAxisToVect(PyObject* args) +PyObject *KX_GameObject::PyAlignAxisToVect(PyObject *args) { - PyObject* pyvect; + PyObject *pyvect; int axis = 2; //z axis is the default float fac = 1.0f; @@ -2780,7 +2780,7 @@ PyObject* KX_GameObject::PyAlignAxisToVect(PyObject* args) return NULL; } -PyObject* KX_GameObject::PyGetAxisVect(PyObject* value) +PyObject *KX_GameObject::PyGetAxisVect(PyObject *value) { MT_Vector3 vect; if (PyVecTo(value, vect)) @@ -2791,7 +2791,7 @@ PyObject* KX_GameObject::PyGetAxisVect(PyObject* value) } -PyObject* KX_GameObject::PyGetPhysicsId() +PyObject *KX_GameObject::PyGetPhysicsId() { KX_IPhysicsController* ctrl = GetPhysicsController(); uint_ptr physid=0; @@ -2802,7 +2802,7 @@ PyObject* KX_GameObject::PyGetPhysicsId() return PyLong_FromSsize_t((long)physid); } -PyObject* KX_GameObject::PyGetPropertyNames() +PyObject *KX_GameObject::PyGetPropertyNames() { PyObject *list= ConvertKeysToPython(); @@ -2932,7 +2932,7 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCastTo, " other = 3-tuple or object reference") { MT_Point3 toPoint; - PyObject* pyarg; + PyObject *pyarg; float dist = 0.0f; char *propName = NULL; @@ -3050,8 +3050,8 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCast, { MT_Point3 toPoint; MT_Point3 fromPoint; - PyObject* pyto; - PyObject* pyfrom = NULL; + PyObject *pyto; + PyObject *pyfrom = NULL; float dist = 0.0f; char *propName = NULL; KX_GameObject *other; @@ -3125,7 +3125,7 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCast, if (m_pHitObject) { - PyObject* returnValue = (poly==2) ? PyTuple_New(5) : (poly) ? PyTuple_New(4) : PyTuple_New(3); + PyObject *returnValue = (poly == 2) ? PyTuple_New(5) : (poly) ? PyTuple_New(4) : PyTuple_New(3); if (returnValue) { // unlikely this would ever fail, if it does python sets an error PyTuple_SET_ITEM(returnValue, 0, m_pHitObject->GetProxy()); PyTuple_SET_ITEM(returnValue, 1, PyObjectFrom(callback.m_hitPoint)); @@ -3301,11 +3301,11 @@ KX_PYMETHODDEF_DOC(KX_GameObject, isPlayingAction, /* Matches python dict.get(key, [default]) */ -PyObject* KX_GameObject::Pyget(PyObject *args) +PyObject *KX_GameObject::Pyget(PyObject *args) { PyObject *key; - PyObject* def = Py_None; - PyObject* ret; + PyObject *def = Py_None; + PyObject *ret; if (!PyArg_ParseTuple(args, "O|O:get", &key, &def)) return NULL; @@ -3331,7 +3331,7 @@ PyObject* KX_GameObject::Pyget(PyObject *args) return def; } -bool ConvertPythonToGameObject(PyObject * value, KX_GameObject **object, bool py_none_ok, const char *error_prefix) +bool ConvertPythonToGameObject(PyObject *value, KX_GameObject **object, bool py_none_ok, const char *error_prefix) { if (value==NULL) { PyErr_Format(PyExc_TypeError, "%s, python pointer NULL, should never happen", error_prefix); diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h index 2b0d13ff2f7..ea75ca4a917 100644 --- a/source/gameengine/Ketsji/KX_GameObject.h +++ b/source/gameengine/Ketsji/KX_GameObject.h @@ -68,7 +68,7 @@ struct bAction; #ifdef WITH_PYTHON /* utility conversion function */ -bool ConvertPythonToGameObject(PyObject * value, KX_GameObject **object, bool py_none_ok, const char *error_prefix); +bool ConvertPythonToGameObject(PyObject *value, KX_GameObject **object, bool py_none_ok, const char *error_prefix); #endif #ifdef USE_MATHUTILS @@ -159,7 +159,7 @@ public: * side effect of storing the result internally. The * memory for the matrix remains the property of this class. */ - double* + double * GetOpenGLMatrix( ); @@ -170,7 +170,7 @@ public: * memory for the returned matrix. */ - MT_CmMatrix4x4* + MT_CmMatrix4x4 * GetOpenGLMatrixPtr( ) { return &m_OpenGL_4x4Matrix; @@ -193,18 +193,18 @@ public: * object. It is the responsibility of the caller to decrement * the reference count when you have finished with it. */ - KX_GameObject* + KX_GameObject* GetParent( ); /** * Sets the parent of this object to a game object - */ + */ void SetParent(KX_Scene *scene, KX_GameObject *obj, bool addToCompound=true, bool ghost=true); /** * Removes the parent of this object to a game object - */ + */ void RemoveParent(KX_Scene *scene); /********************************* @@ -292,7 +292,7 @@ public: /** * Inherited from CValue -- does nothing! */ - CValue* + CValue* Calc( VALUE_OPERATOR op, CValue *val @@ -301,7 +301,7 @@ public: /** * Inherited from CValue -- does nothing! */ - CValue* + CValue* CalcFinal( VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, @@ -312,7 +312,7 @@ public: * Inherited from CValue -- does nothing! */ const - STR_String & + STR_String & GetText( ); @@ -331,14 +331,14 @@ public: /** * Inherited from CValue -- returns the name of this object. */ - STR_String& + STR_String& GetName( ); /** * Inherited from CValue -- set the name of this object. */ - void + void SetName( const char *name ); @@ -348,7 +348,7 @@ public: * instance allocated on the heap. Ownership of the new * object belongs with the caller. */ - virtual CValue* + virtual CValue* GetReplica( ); @@ -356,7 +356,7 @@ public: * Inherited from CValue -- Makes sure any internal * data owned by this class is deep copied. Called internally */ - virtual void + virtual void ProcessReplica(); /** @@ -379,7 +379,7 @@ public: /** * Return the mass of the object */ - MT_Scalar + MT_Scalar GetMass(); /** @@ -410,7 +410,7 @@ public: * Quick'n'dirty obcolor ipo stuff */ - void + void SetObjectColor( const MT_Vector4& rgbavec ); @@ -482,7 +482,7 @@ public: // adapt local position so that world position is set to desired position void NodeSetWorldPosition(const MT_Point3& trans); - void + void NodeUpdateGS( double time ); @@ -504,7 +504,7 @@ public: return m_pSGNode; } - const SG_Node* GetSGNode( ) const + const SG_Node* GetSGNode( ) const { return m_pSGNode; } @@ -581,48 +581,48 @@ public: * place. */ - void + void ApplyForce( const MT_Vector3& force, bool local ); - void + void ApplyTorque( const MT_Vector3& torque, bool local ); - void + void ApplyRotation( const MT_Vector3& drot, bool local ); - void + void ApplyMovement( const MT_Vector3& dloc, bool local ); - void + void addLinearVelocity( const MT_Vector3& lin_vel, bool local ); - void + void setLinearVelocity( const MT_Vector3& lin_vel, bool local ); - void + void setAngularVelocity( const MT_Vector3& ang_vel, bool local ); - /** + /** * Update the physics object transform based upon the current SG_Node * position. */ @@ -642,7 +642,7 @@ public: /** * Function to set IPO option at start of IPO */ - void + void InitIPO( bool ipo_as_force, bool ipo_add, @@ -652,7 +652,7 @@ public: /** * Odd function to update an ipo. ??? */ - void + void UpdateIPO( float curframetime, bool recurse @@ -676,20 +676,20 @@ public: * \section Mesh accessor functions. */ - /** + /** * Update buckets to indicate that there is a new * user of this object's meshes. */ - void + void AddMeshUser( ); - /** + /** * Update buckets with data about the mesh after * creating or duplicating the object, changing * visibility, object color, .. . */ - void + void UpdateBuckets( bool recursive ); @@ -699,7 +699,7 @@ public: * and remove from the bucketing system. * Don't think this actually deletes any of the meshes. */ - void + void RemoveMeshes( ); @@ -709,7 +709,7 @@ public: * Make sure you call RemoveMeshes() before deleting the * mesh though, */ - void + void AddMesh( RAS_MeshObject* mesh ) { @@ -719,7 +719,7 @@ public: /** * Pick out a mesh associated with the integer 'num'. */ - RAS_MeshObject* + RAS_MeshObject* GetMesh( int num ) const { @@ -730,17 +730,17 @@ public: * Return the number of meshes currently associated with this * game object. */ - int + int GetMeshCount( ) const { return m_meshes.size(); } - /** + /** * Set the debug color of the meshes associated with this * class. Does this still work? */ - void + void SetDebugColor( unsigned int bgra ); @@ -748,7 +748,7 @@ public: /** * Reset the debug color of meshes associated with this class. */ - void + void ResetDebugColor( ); @@ -855,7 +855,7 @@ public: m_bSuspendDynamics = true; } - void RestoreDynamics(void) { + void RestoreDynamics(void) { if (!m_bSuspendDynamics) { return; @@ -887,7 +887,7 @@ public: /** * \section Python interface functions. */ - virtual PyObject* py_repr(void) + virtual PyObject *py_repr(void) { return PyUnicode_From_STR_String(GetName()); } @@ -983,7 +983,7 @@ public: static PyObject* pyattr_get_worldAngularVelocity(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); static int pyattr_set_worldAngularVelocity(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); static PyObject* pyattr_get_localAngularVelocity(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static int pyattr_set_localAngularVelocity(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); + static int pyattr_set_localAngularVelocity(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); static PyObject* pyattr_get_timeOffset(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); static int pyattr_set_timeOffset(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); static PyObject* pyattr_get_state(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); diff --git a/source/gameengine/Ketsji/KX_IInterpolator.h b/source/gameengine/Ketsji/KX_IInterpolator.h index 6ca44e1f6e5..6c0bf2d85cc 100644 --- a/source/gameengine/Ketsji/KX_IInterpolator.h +++ b/source/gameengine/Ketsji/KX_IInterpolator.h @@ -38,7 +38,7 @@ #include "MEM_guardedalloc.h" #endif -class KX_IInterpolator { +class KX_IInterpolator { public: virtual ~KX_IInterpolator() {} diff --git a/source/gameengine/Ketsji/KX_IScalarInterpolator.h b/source/gameengine/Ketsji/KX_IScalarInterpolator.h index 2b5aefccfe7..1e822c49c6d 100644 --- a/source/gameengine/Ketsji/KX_IScalarInterpolator.h +++ b/source/gameengine/Ketsji/KX_IScalarInterpolator.h @@ -36,7 +36,7 @@ #include "MEM_guardedalloc.h" #endif -class KX_IScalarInterpolator { +class KX_IScalarInterpolator { public: virtual ~KX_IScalarInterpolator() {} diff --git a/source/gameengine/Ketsji/KX_IpoActuator.cpp b/source/gameengine/Ketsji/KX_IpoActuator.cpp index 5599f3e31c6..5ea7a2e7394 100644 --- a/source/gameengine/Ketsji/KX_IpoActuator.cpp +++ b/source/gameengine/Ketsji/KX_IpoActuator.cpp @@ -182,7 +182,7 @@ bool KX_IpoActuator::Update(double curtime, bool frame) m_bIpoPlaying = true; bIpoStart = true; } - } + } switch ((IpoActType)m_type) { @@ -254,7 +254,7 @@ bool KX_IpoActuator::Update(double curtime, bool frame) result = false; if (bIpoStart) - ((KX_GameObject*)GetParent())->InitIPO(m_ipo_as_force, m_ipo_add, m_ipo_local); + ((KX_GameObject*)GetParent())->InitIPO(m_ipo_as_force, m_ipo_add, m_ipo_local); ((KX_GameObject*)GetParent())->UpdateIPO(m_localtime,m_recurse); break; } @@ -309,7 +309,7 @@ bool KX_IpoActuator::Update(double curtime, bool frame) bIpoStart = true; } else - { + { /* Perform clamping */ m_localtime=m_endframe; result = false; @@ -453,7 +453,7 @@ PyAttributeDef KX_IpoActuator::Attributes[] = { { NULL } //Sentinel }; -PyObject* KX_IpoActuator::pyattr_get_frame_start(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_IpoActuator::pyattr_get_frame_start(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_IpoActuator* self= static_cast<KX_IpoActuator*>(self_v); return PyFloat_FromDouble(self->m_startframe); @@ -474,7 +474,7 @@ int KX_IpoActuator::pyattr_set_frame_start(void *self_v, const KX_PYATTRIBUTE_DE return PY_SET_ATTR_SUCCESS; } -PyObject* KX_IpoActuator::pyattr_get_frame_end(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_IpoActuator::pyattr_get_frame_end(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_IpoActuator* self= static_cast<KX_IpoActuator*>(self_v); return PyFloat_FromDouble(self->m_endframe); diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp index a560b606f5b..c2857141058 100644 --- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp +++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp @@ -253,7 +253,7 @@ void KX_KetsjiEngine::SetRasterizer(RAS_IRasterizer* rasterizer) * At the moment the bge.logic module is imported into 'pythondictionary' after this function is called. * if this function ever changes to assign a copy, make sure the game logic module is imported into this dictionary before hand. */ -void KX_KetsjiEngine::SetPyNamespace(PyObject* pythondictionary) +void KX_KetsjiEngine::SetPyNamespace(PyObject *pythondictionary) { MT_assert(pythondictionary); m_pythondictionary = pythondictionary; @@ -361,7 +361,7 @@ void KX_KetsjiEngine::RenderDome() // no FlushDebugLines } m_dome->BindImages(i); - } + } m_canvas->EndFrame();//XXX do we really need that? @@ -391,7 +391,7 @@ void KX_KetsjiEngine::RenderDome() // Draw Callback for the last scene #ifdef WITH_PYTHON scene->RunDrawingCallbacks(scene->GetPostDrawCB()); -#endif +#endif EndFrame(); } @@ -477,7 +477,7 @@ void KX_KetsjiEngine::ClearFrame() SetBackGround(firstscene->GetWorldInfo()); m_canvas->SetViewPort(clearvp.GetLeft(), clearvp.GetBottom(), - clearvp.GetRight(), clearvp.GetTop()); + clearvp.GetRight(), clearvp.GetTop()); m_rasterizer->ClearColorBuffer(); } } @@ -498,7 +498,7 @@ bool KX_KetsjiEngine::BeginFrame() } return false; -} +} void KX_KetsjiEngine::EndFrame() @@ -641,7 +641,7 @@ else scene->GetPhysicsEnvironment()->endFrame(); // Update scenegraph after physics step. This maps physics calculations - // into node positions. + // into node positions. //m_logger->StartLog(tc_scenegraph, m_kxsystem->GetTimeInSeconds(), true); //SG_SetActiveStage(SG_STAGE_PHYSICS1_UPDATE); //scene->UpdateParents(m_frameTime); @@ -692,7 +692,7 @@ else if (m_animation_record) - { + { m_sceneconverter->WritePhysicsObjectToAnimationIpo(++m_currentFrame); } @@ -725,7 +725,7 @@ else bool bUseAsyncLogicBricks= false;//true; if (bUseAsyncLogicBricks) - { + { // Logic update sub frame: this will let some logic bricks run at the // full frame rate. for (sceneit = m_scenes.begin();sceneit != m_scenes.end(); ++sceneit) @@ -756,7 +756,7 @@ else m_logger->StartLog(tc_physics, m_kxsystem->GetTimeInSeconds(), true); scene->GetPhysicsEnvironment()->proceedDeltaTime(m_clockTime,timestep,timestep); // Update scenegraph after physics step. This maps physics calculations - // into node positions. + // into node positions. m_logger->StartLog(tc_scenegraph, m_kxsystem->GetTimeInSeconds(), true); SG_SetActiveStage(SG_STAGE_PHYSICS2); scene->UpdateParents(m_clockTime); @@ -938,7 +938,7 @@ void KX_KetsjiEngine::Render() //RenderFrame(scene); RenderFrame(scene, cam); - list<class KX_Camera*>* cameras = scene->GetCameras(); + list<class KX_Camera*>* cameras = scene->GetCameras(); // Draw the scene once for each camera with an enabled viewport list<KX_Camera*>::iterator it = cameras->begin(); @@ -1013,7 +1013,7 @@ void KX_KetsjiEngine::SetBackGround(KX_WorldInfo* wi) if (wi->hasWorld()) { if (m_drawingmode == RAS_IRasterizer::KX_TEXTURED) - { + { m_rasterizer->SetBackColor( wi->getBackColorRed(), wi->getBackColorGreen(), @@ -1038,7 +1038,7 @@ void KX_KetsjiEngine::SetWorldSettings(KX_WorldInfo* wi) ); if (m_drawingmode >= RAS_IRasterizer::KX_SOLID) - { + { if (wi->hasMist()) { m_rasterizer->SetFog( @@ -1203,11 +1203,11 @@ void KX_KetsjiEngine::RenderFrame(KX_Scene* scene, KX_Camera* cam) GetSceneViewport(scene, cam, area, viewport); // store the computed viewport in the scene - scene->SetSceneViewport(viewport); + scene->SetSceneViewport(viewport); // set the viewport for this frame and scene m_canvas->SetViewPort(viewport.GetLeft(), viewport.GetBottom(), - viewport.GetRight(), viewport.GetTop()); + viewport.GetRight(), viewport.GetTop()); // see KX_BlenderMaterial::Activate //m_rasterizer->SetAmbient(); @@ -1348,7 +1348,7 @@ void KX_KetsjiEngine::PostRenderScene(KX_Scene* scene) m_rasterizer->FlushDebugShapes(); scene->Render2DFilters(m_canvas); #ifdef WITH_PYTHON - scene->RunDrawingCallbacks(scene->GetPostDrawCB()); + scene->RunDrawingCallbacks(scene->GetPostDrawCB()); #endif } @@ -1368,10 +1368,10 @@ void KX_KetsjiEngine::StopEngine() { KX_Scene* scene = *sceneit; m_sceneconverter->RemoveScene(scene); - } + } m_scenes.clear(); - // cleanup all the stuff + // cleanup all the stuff m_rasterizer->Exit(); } } @@ -1469,7 +1469,7 @@ void KX_KetsjiEngine::RenderDebugProperties() /* Profile and framerate display */ if (m_show_profile) - { + { for (int j = tc_first; j < tc_numCategories; j++) { debugtxt.Format(m_profileLabels[j]); @@ -1556,7 +1556,7 @@ void KX_KetsjiEngine::RenderDebugProperties() KX_SceneList* KX_KetsjiEngine::CurrentScenes() { - return &m_scenes; + return &m_scenes; } @@ -1572,7 +1572,7 @@ KX_Scene* KX_KetsjiEngine::FindScene(const STR_String& scenename) sceneit++; } - return ((sceneit == m_scenes.end()) ? NULL : *sceneit); + return ((sceneit == m_scenes.end()) ? NULL : *sceneit); } @@ -1635,7 +1635,7 @@ void KX_KetsjiEngine::RemoveScheduledScenes() m_scenes.erase(sceneit); break; } - } + } } m_removingScenes.clear(); } @@ -1737,7 +1737,7 @@ void KX_KetsjiEngine::ReplaceScheduledScenes() } } m_replace_scenes.clear(); - } + } } @@ -1910,7 +1910,7 @@ void KX_KetsjiEngine::SceneListsChanged(void) while ((sceneit != m_scenes.end()) && (!m_propertiesPresent)) { KX_Scene* scene = *sceneit; - vector<SCA_DebugProp*>& debugproplist = scene->GetDebugProperties(); + vector<SCA_DebugProp*>& debugproplist = scene->GetDebugProperties(); m_propertiesPresent = !debugproplist.empty(); sceneit++; } diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.h b/source/gameengine/Ketsji/KX_KetsjiEngine.h index b3bef016b0f..e05ba652bbe 100644 --- a/source/gameengine/Ketsji/KX_KetsjiEngine.h +++ b/source/gameengine/Ketsji/KX_KetsjiEngine.h @@ -98,7 +98,7 @@ private: /* The current list of scenes. */ KX_SceneList m_scenes; /* State variable recording the presence of object debug info in the current scene list. */ - bool m_propertiesPresent; + bool m_propertiesPresent; bool m_bInitialized; int m_activecam; @@ -136,7 +136,7 @@ private: int m_drawingmode; float m_cameraZoom; - bool m_overrideCam; + bool m_overrideCam; STR_String m_overrideSceneName; bool m_overrideCamUseOrtho; @@ -220,7 +220,7 @@ public: void SetRenderTools(RAS_IRenderTools* rendertools); void SetRasterizer(RAS_IRasterizer* rasterizer); #ifdef WITH_PYTHON - void SetPyNamespace(PyObject* pythondictionary); + void SetPyNamespace(PyObject *pythondictionary); PyObject* GetPyNamespace() { return m_pythondictionary; } #endif void SetSceneConverter(KX_ISceneConverter* sceneconverter); @@ -415,7 +415,7 @@ public: KX_Scene* CreateScene(const STR_String& scenename); KX_Scene* CreateScene(Scene *scene); - GlobalSettings* GetGlobalSettings(void); + GlobalSettings* GetGlobalSettings(void); void SetGlobalSettings(GlobalSettings* gs); protected: diff --git a/source/gameengine/Ketsji/KX_Light.cpp b/source/gameengine/Ketsji/KX_Light.cpp index f5aa1bb3c75..8b80daa75d3 100644 --- a/source/gameengine/Ketsji/KX_Light.cpp +++ b/source/gameengine/Ketsji/KX_Light.cpp @@ -344,7 +344,7 @@ PyAttributeDef KX_LightObject::Attributes[] = { { NULL } //Sentinel }; -PyObject* KX_LightObject::pyattr_get_color(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_LightObject::pyattr_get_color(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_LightObject* self = static_cast<KX_LightObject*>(self_v); return Py_BuildValue("[fff]", self->m_lightobj.m_red, self->m_lightobj.m_green, self->m_lightobj.m_blue); @@ -365,9 +365,9 @@ int KX_LightObject::pyattr_set_color(void *self_v, const KX_PYATTRIBUTE_DEF *att return PY_SET_ATTR_FAIL; } -PyObject* KX_LightObject::pyattr_get_typeconst(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_LightObject::pyattr_get_typeconst(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { - PyObject* retvalue; + PyObject *retvalue; const char* type = attrdef->m_name; @@ -387,13 +387,13 @@ PyObject* KX_LightObject::pyattr_get_typeconst(void *self_v, const KX_PYATTRIBUT return retvalue; } -PyObject* KX_LightObject::pyattr_get_type(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_LightObject::pyattr_get_type(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_LightObject* self = static_cast<KX_LightObject*>(self_v); return PyLong_FromSsize_t(self->m_lightobj.m_type); } -int KX_LightObject::pyattr_set_type(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject* value) +int KX_LightObject::pyattr_set_type(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value) { KX_LightObject* self = static_cast<KX_LightObject*>(self_v); int val = PyLong_AsSsize_t(value); diff --git a/source/gameengine/Ketsji/KX_Light.h b/source/gameengine/Ketsji/KX_Light.h index 9fe13f471ba..7426896a92a 100644 --- a/source/gameengine/Ketsji/KX_Light.h +++ b/source/gameengine/Ketsji/KX_Light.h @@ -76,10 +76,10 @@ public: #ifdef WITH_PYTHON /* attributes */ static PyObject* pyattr_get_color(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static int pyattr_set_color(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject* value); + static int pyattr_set_color(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); static PyObject* pyattr_get_typeconst(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef); static PyObject* pyattr_get_type(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static int pyattr_set_type(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject* value); + static int pyattr_set_type(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); #endif }; diff --git a/source/gameengine/Ketsji/KX_LightIpoSGController.h b/source/gameengine/Ketsji/KX_LightIpoSGController.h index 3a3a9677b04..4a1ceba0963 100644 --- a/source/gameengine/Ketsji/KX_LightIpoSGController.h +++ b/source/gameengine/Ketsji/KX_LightIpoSGController.h @@ -74,15 +74,15 @@ public: m_modified = true; } - void SetModifyEnergy(bool modify) { + void SetModifyEnergy(bool modify) { m_modify_energy = modify; } - void SetModifyColor(bool modify) { + void SetModifyColor(bool modify) { m_modify_color = modify; } - void SetModifyDist(bool modify) { + void SetModifyDist(bool modify) { m_modify_dist = modify; } diff --git a/source/gameengine/Ketsji/KX_MeshProxy.cpp b/source/gameengine/Ketsji/KX_MeshProxy.cpp index f1a9a93c2db..8451dc3497d 100644 --- a/source/gameengine/Ketsji/KX_MeshProxy.cpp +++ b/source/gameengine/Ketsji/KX_MeshProxy.cpp @@ -105,7 +105,7 @@ KX_MeshProxy::~KX_MeshProxy() // stuff for cvalue related things CValue* KX_MeshProxy::Calc(VALUE_OPERATOR op, CValue *val) { return NULL;} -CValue* KX_MeshProxy::CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *val) { return NULL;} +CValue* KX_MeshProxy::CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *val) { return NULL;} const STR_String & KX_MeshProxy::GetText() {return m_meshobj->GetName();}; double KX_MeshProxy::GetNumber() { return -1;} @@ -116,7 +116,7 @@ CValue* KX_MeshProxy::GetReplica() { return NULL;} // stuff for python integration -PyObject* KX_MeshProxy::PyGetMaterialName(PyObject* args, PyObject* kwds) +PyObject *KX_MeshProxy::PyGetMaterialName(PyObject *args, PyObject *kwds) { int matid= 1; STR_String matname; @@ -134,7 +134,7 @@ PyObject* KX_MeshProxy::PyGetMaterialName(PyObject* args, PyObject* kwds) } -PyObject* KX_MeshProxy::PyGetTextureName(PyObject* args, PyObject* kwds) +PyObject *KX_MeshProxy::PyGetTextureName(PyObject *args, PyObject *kwds) { int matid= 1; STR_String matname; @@ -151,7 +151,7 @@ PyObject* KX_MeshProxy::PyGetTextureName(PyObject* args, PyObject* kwds) } -PyObject* KX_MeshProxy::PyGetVertexArrayLength(PyObject* args, PyObject* kwds) +PyObject *KX_MeshProxy::PyGetVertexArrayLength(PyObject *args, PyObject *kwds) { int matid= 0; int length = 0; @@ -174,7 +174,7 @@ PyObject* KX_MeshProxy::PyGetVertexArrayLength(PyObject* args, PyObject* kwds) } -PyObject* KX_MeshProxy::PyGetVertex(PyObject* args, PyObject* kwds) +PyObject *KX_MeshProxy::PyGetVertex(PyObject *args, PyObject *kwds) { int vertexindex; int matindex; @@ -192,10 +192,10 @@ PyObject* KX_MeshProxy::PyGetVertex(PyObject* args, PyObject* kwds) return (new KX_VertexProxy(this, vertex))->NewProxy(true); } -PyObject* KX_MeshProxy::PyGetPolygon(PyObject* args, PyObject* kwds) +PyObject *KX_MeshProxy::PyGetPolygon(PyObject *args, PyObject *kwds) { int polyindex= 1; - PyObject* polyob = NULL; + PyObject *polyob = NULL; if (!PyArg_ParseTuple(args,"i:getPolygon",&polyindex)) return NULL; @@ -218,7 +218,7 @@ PyObject* KX_MeshProxy::PyGetPolygon(PyObject* args, PyObject* kwds) return polyob; } -PyObject* KX_MeshProxy::pyattr_get_materials(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_MeshProxy::pyattr_get_materials(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_MeshProxy* self= static_cast<KX_MeshProxy*>(self_v); @@ -233,7 +233,7 @@ PyObject* KX_MeshProxy::pyattr_get_materials(void *self_v, const KX_PYATTRIBUTE_ 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 */ + /* Why do we need to check for RAS_BLENDERMAT if both are cast to a (PyObject *)? - Campbell */ if (polymat->GetFlag() & RAS_BLENDERMAT) { KX_BlenderMaterial *mat = static_cast<KX_BlenderMaterial*>(polymat); @@ -243,7 +243,7 @@ PyObject* KX_MeshProxy::pyattr_get_materials(void *self_v, const KX_PYATTRIBUTE_ KX_PolygonMaterial *mat = static_cast<KX_PolygonMaterial*>(polymat); PyList_SET_ITEM(materials, i, mat->GetProxy()); } - } + } return materials; } @@ -260,7 +260,7 @@ PyObject * KX_MeshProxy::pyattr_get_numPolygons(void * selfv, const KX_PYATTRIBU } /* a close copy of ConvertPythonToGameObject but for meshes */ -bool ConvertPythonToMesh(PyObject * value, RAS_MeshObject **object, bool py_none_ok, const char *error_prefix) +bool ConvertPythonToMesh(PyObject *value, RAS_MeshObject **object, bool py_none_ok, const char *error_prefix) { if (value==NULL) { PyErr_Format(PyExc_TypeError, "%s, python pointer NULL, should never happen", error_prefix); @@ -297,7 +297,7 @@ bool ConvertPythonToMesh(PyObject * value, RAS_MeshObject **object, bool py_none if (kx_mesh==NULL) { PyErr_Format(PyExc_SystemError, "%s, " BGE_PROXY_ERROR_MSG, error_prefix); return false; - } + } *object = kx_mesh->GetMesh(); return true; diff --git a/source/gameengine/Ketsji/KX_MeshProxy.h b/source/gameengine/Ketsji/KX_MeshProxy.h index 58b5c87e494..a05ef6ab2e7 100644 --- a/source/gameengine/Ketsji/KX_MeshProxy.h +++ b/source/gameengine/Ketsji/KX_MeshProxy.h @@ -37,7 +37,7 @@ #include "SCA_IObject.h" /* utility conversion function */ -bool ConvertPythonToMesh(PyObject * value, class RAS_MeshObject **object, bool py_none_ok, const char *error_prefix); +bool ConvertPythonToMesh(PyObject *value, class RAS_MeshObject **object, bool py_none_ok, const char *error_prefix); class KX_MeshProxy : public CValue { @@ -73,8 +73,8 @@ public: KX_PYMETHOD(KX_MeshProxy,GetPolygon); static PyObject* pyattr_get_materials(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject * pyattr_get_numMaterials(void * self, const KX_PYATTRIBUTE_DEF * attrdef); - static PyObject * pyattr_get_numPolygons(void * self, const KX_PYATTRIBUTE_DEF * attrdef); + static PyObject *pyattr_get_numMaterials(void * self, const KX_PYATTRIBUTE_DEF * attrdef); + static PyObject *pyattr_get_numPolygons(void * self, const KX_PYATTRIBUTE_DEF * attrdef); }; #endif // WITH_PYTHON diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp index bfee124d443..3251cc4af46 100644 --- a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp +++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp @@ -239,7 +239,7 @@ bool KX_MouseFocusSensor::ParentObjectHasFocusCamera(KX_Camera *cam) /* build the from and to point in normalized device coordinates * Normalized device coordinates are [-1,1] in x, y, z - * + * * The actual z coordinates used don't have to be exact just infront and * behind of the near and far clip planes. */ @@ -392,19 +392,19 @@ PyAttributeDef KX_MouseFocusSensor::Attributes[] = { }; /* Attributes */ -PyObject* KX_MouseFocusSensor::pyattr_get_ray_source(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_MouseFocusSensor::pyattr_get_ray_source(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_MouseFocusSensor* self= static_cast<KX_MouseFocusSensor*>(self_v); return PyObjectFrom(self->RaySource()); } -PyObject* KX_MouseFocusSensor::pyattr_get_ray_target(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_MouseFocusSensor::pyattr_get_ray_target(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_MouseFocusSensor* self= static_cast<KX_MouseFocusSensor*>(self_v); return PyObjectFrom(self->RayTarget()); } -PyObject* KX_MouseFocusSensor::pyattr_get_ray_direction(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_MouseFocusSensor::pyattr_get_ray_direction(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_MouseFocusSensor* self= static_cast<KX_MouseFocusSensor*>(self_v); MT_Vector3 dir = self->RayTarget() - self->RaySource(); @@ -413,7 +413,7 @@ PyObject* KX_MouseFocusSensor::pyattr_get_ray_direction(void *self_v, const KX_P return PyObjectFrom(dir); } -PyObject* KX_MouseFocusSensor::pyattr_get_hit_object(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_MouseFocusSensor::pyattr_get_hit_object(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_MouseFocusSensor* self= static_cast<KX_MouseFocusSensor*>(self_v); @@ -423,19 +423,19 @@ PyObject* KX_MouseFocusSensor::pyattr_get_hit_object(void *self_v, const KX_PYAT Py_RETURN_NONE; } -PyObject* KX_MouseFocusSensor::pyattr_get_hit_position(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_MouseFocusSensor::pyattr_get_hit_position(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_MouseFocusSensor* self= static_cast<KX_MouseFocusSensor*>(self_v); return PyObjectFrom(self->HitPosition()); } -PyObject* KX_MouseFocusSensor::pyattr_get_hit_normal(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_MouseFocusSensor::pyattr_get_hit_normal(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_MouseFocusSensor* self= static_cast<KX_MouseFocusSensor*>(self_v); return PyObjectFrom(self->HitNormal()); } -PyObject* KX_MouseFocusSensor::pyattr_get_hit_uv(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_MouseFocusSensor::pyattr_get_hit_uv(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_MouseFocusSensor* self= static_cast<KX_MouseFocusSensor*>(self_v); return PyObjectFrom(self->HitUV()); diff --git a/source/gameengine/Ketsji/KX_NavMeshObject.cpp b/source/gameengine/Ketsji/KX_NavMeshObject.cpp index 35058e5fe5d..a05292f268a 100644 --- a/source/gameengine/Ketsji/KX_NavMeshObject.cpp +++ b/source/gameengine/Ketsji/KX_NavMeshObject.cpp @@ -210,7 +210,7 @@ bool KX_NavMeshObject::BuildVertIndArrays(float *&vertices, int& nverts, { //detailed mesh vertex memcpy(dvertices+3*(newIdx-nverts), allVerts+3*vi, 3*sizeof(float)); - } + } } } @@ -245,7 +245,7 @@ bool KX_NavMeshObject::BuildVertIndArrays(float *&vertices, int& nverts, { memset(vert, 0, 3*sizeof(float)); //vertex isn't in any poly, set dummy zero coordinates } - vert+=3; + vert+=3; } //create tris @@ -294,7 +294,7 @@ bool KX_NavMeshObject::BuildNavMesh() float *vertices = NULL, *dvertices = NULL; unsigned short *polys = NULL, *dtris = NULL, *dmeshes = NULL; - int nverts = 0, npolys = 0, ndvertsuniq = 0, ndtris = 0; + int nverts = 0, npolys = 0, ndvertsuniq = 0, ndtris = 0; int vertsPerPoly = 0; if (!BuildVertIndArrays(vertices, nverts, polys, npolys, dmeshes, dvertices, ndvertsuniq, dtris, ndtris, vertsPerPoly ) @@ -446,11 +446,11 @@ bool KX_NavMeshObject::BuildNavMesh() dtl.nverts = dmeshes[i*4+1]; dtl.tbase = dmeshes[i*4+2]; dtl.ntris = dmeshes[i*4+3]; - } + } } m_navMesh = new dtStatNavMesh; - m_navMesh->init(data, dataSize, true); + m_navMesh->init(data, dataSize, true); delete [] vertices; @@ -487,7 +487,7 @@ void KX_NavMeshObject::DrawNavMesh(NavMeshRenderMode renderMode) const dtStatPoly* poly = m_navMesh->getPoly(pi); for (int i = 0, j = (int)poly->nv-1; i < (int)poly->nv; j = i++) - { + { if (poly->n[j] && renderMode==RM_WALLS) continue; const float* vif = m_navMesh->getVertex(poly->v[i]); @@ -564,7 +564,7 @@ int KX_NavMeshObject::FindPath(const MT_Point3& from, const MT_Point3& to, float if (!m_navMesh) return 0; MT_Point3 localfrom = TransformToLocalCoords(from); - MT_Point3 localto = TransformToLocalCoords(to); + MT_Point3 localto = TransformToLocalCoords(to); float spos[3], epos[3]; localfrom.getValue(spos); flipAxes(spos); localto.getValue(epos); flipAxes(epos); @@ -598,7 +598,7 @@ float KX_NavMeshObject::Raycast(const MT_Point3& from, const MT_Point3& to) if (!m_navMesh) return 0.f; MT_Point3 localfrom = TransformToLocalCoords(from); - MT_Point3 localto = TransformToLocalCoords(to); + MT_Point3 localto = TransformToLocalCoords(to); float spos[3], epos[3]; localfrom.getValue(spos); flipAxes(spos); localto.getValue(epos); flipAxes(epos); diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.cpp b/source/gameengine/Ketsji/KX_ObjectActuator.cpp index a3f098c3b1f..f35090f9e9b 100644 --- a/source/gameengine/Ketsji/KX_ObjectActuator.cpp +++ b/source/gameengine/Ketsji/KX_ObjectActuator.cpp @@ -460,7 +460,7 @@ Mathutils_Callback mathutils_obactu_vector_cb = { mathutils_obactu_vector_set_index }; -PyObject* KX_ObjectActuator::pyattr_get_linV(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_ObjectActuator::pyattr_get_linV(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { return Vector_CreatePyObject_cb(BGE_PROXY_FROM_REF(self_v), 3, mathutils_kxobactu_vector_cb_index, MATHUTILS_VEC_CB_LINV); } @@ -476,7 +476,7 @@ int KX_ObjectActuator::pyattr_set_linV(void *self_v, const KX_PYATTRIBUTE_DEF *a return PY_SET_ATTR_SUCCESS; } -PyObject* KX_ObjectActuator::pyattr_get_angV(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_ObjectActuator::pyattr_get_angV(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { return Vector_CreatePyObject_cb(BGE_PROXY_FROM_REF(self_v), 3, mathutils_kxobactu_vector_cb_index, MATHUTILS_VEC_CB_ANGV); } @@ -501,7 +501,7 @@ void KX_ObjectActuator_Mathutils_Callback_Init(void) #endif // USE_MATHUTILS -PyObject* KX_ObjectActuator::pyattr_get_forceLimitX(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_ObjectActuator::pyattr_get_forceLimitX(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_ObjectActuator* self = reinterpret_cast<KX_ObjectActuator*>(self_v); PyObject *retVal = PyList_New(3); @@ -517,7 +517,7 @@ int KX_ObjectActuator::pyattr_set_forceLimitX(void *self_v, const KX_PYATTRIBUTE { KX_ObjectActuator* self = reinterpret_cast<KX_ObjectActuator*>(self_v); - PyObject* seq = PySequence_Fast(value, ""); + PyObject *seq = PySequence_Fast(value, ""); if (seq && PySequence_Fast_GET_SIZE(seq) == 3) { self->m_drot[0] = PyFloat_AsDouble(PySequence_Fast_GET_ITEM(value, 0)); @@ -537,7 +537,7 @@ int KX_ObjectActuator::pyattr_set_forceLimitX(void *self_v, const KX_PYATTRIBUTE return PY_SET_ATTR_FAIL; } -PyObject* KX_ObjectActuator::pyattr_get_forceLimitY(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_ObjectActuator::pyattr_get_forceLimitY(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_ObjectActuator* self = reinterpret_cast<KX_ObjectActuator*>(self_v); PyObject *retVal = PyList_New(3); @@ -553,7 +553,7 @@ int KX_ObjectActuator::pyattr_set_forceLimitY(void *self_v, const KX_PYATTRIBUTE { KX_ObjectActuator* self = reinterpret_cast<KX_ObjectActuator*>(self_v); - PyObject* seq = PySequence_Fast(value, ""); + PyObject *seq = PySequence_Fast(value, ""); if (seq && PySequence_Fast_GET_SIZE(seq) == 3) { self->m_drot[1] = PyFloat_AsDouble(PySequence_Fast_GET_ITEM(value, 0)); @@ -573,7 +573,7 @@ int KX_ObjectActuator::pyattr_set_forceLimitY(void *self_v, const KX_PYATTRIBUTE return PY_SET_ATTR_FAIL; } -PyObject* KX_ObjectActuator::pyattr_get_forceLimitZ(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_ObjectActuator::pyattr_get_forceLimitZ(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_ObjectActuator* self = reinterpret_cast<KX_ObjectActuator*>(self_v); PyObject *retVal = PyList_New(3); @@ -589,7 +589,7 @@ int KX_ObjectActuator::pyattr_set_forceLimitZ(void *self_v, const KX_PYATTRIBUTE { KX_ObjectActuator* self = reinterpret_cast<KX_ObjectActuator*>(self_v); - PyObject* seq = PySequence_Fast(value, ""); + PyObject *seq = PySequence_Fast(value, ""); if (seq && PySequence_Fast_GET_SIZE(seq) == 3) { self->m_drot[2] = PyFloat_AsDouble(PySequence_Fast_GET_ITEM(value, 0)); @@ -609,7 +609,7 @@ int KX_ObjectActuator::pyattr_set_forceLimitZ(void *self_v, const KX_PYATTRIBUTE return PY_SET_ATTR_FAIL; } -PyObject* KX_ObjectActuator::pyattr_get_reference(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_ObjectActuator::pyattr_get_reference(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) { KX_ObjectActuator* actuator = static_cast<KX_ObjectActuator*>(self); if (!actuator->m_reference) @@ -632,7 +632,7 @@ int KX_ObjectActuator::pyattr_set_reference(void *self, const struct KX_PYATTRIB if (refOb==NULL) { actuator->m_reference= NULL; } - else { + else { actuator->m_reference = refOb; actuator->m_reference->RegisterActuator(actuator); } diff --git a/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp b/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp index a942f87856c..99d9fc7f9ee 100644 --- a/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp +++ b/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp @@ -257,7 +257,7 @@ void KX_ObstacleSimulation::AddObstacleForObj(KX_GameObject* gameobj) } void KX_ObstacleSimulation::AddObstaclesForNavMesh(KX_NavMeshObject* navmeshobj) -{ +{ dtStatNavMesh* navmesh = navmeshobj->GetNavMesh(); if (navmesh) { @@ -267,7 +267,7 @@ void KX_ObstacleSimulation::AddObstaclesForNavMesh(KX_NavMeshObject* navmeshobj) const dtStatPoly* poly = navmesh->getPoly(pi); for (int i = 0, j = (int)poly->nv-1; i < (int)poly->nv; j = i++) - { + { if (poly->n[j]) continue; const float* vj = navmesh->getVertex(poly->v[j]); const float* vi = navmesh->getVertex(poly->v[i]); @@ -364,9 +364,9 @@ void KX_ObstacleSimulation::DrawObstacles() else if (m_obstacles[i]->m_shape==KX_OBSTACLE_CIRCLE) { KX_RasterizerDrawDebugCircle(m_obstacles[i]->m_pos, m_obstacles[i]->m_rad, bluecolor, - normal, SECTORS_NUM); + normal, SECTORS_NUM); } - } + } } static MT_Point3 nearestPointToObstacle(MT_Point3& pos ,KX_Obstacle* obstacle) @@ -424,7 +424,7 @@ KX_ObstacleSimulationTOI::KX_ObstacleSimulationTOI(MT_Scalar levelHeight, bool e void KX_ObstacleSimulationTOI::AdjustObstacleVelocity(KX_Obstacle* activeObst, KX_NavMeshObject* activeNavMeshObj, - MT_Vector3& velocity, MT_Scalar maxDeltaSpeed, MT_Scalar maxDeltaAngle) + MT_Vector3& velocity, MT_Scalar maxDeltaSpeed, MT_Scalar maxDeltaAngle) { int nobs = m_obstacles.size(); int obstidx = std::find(m_obstacles.begin(), m_obstacles.end(), activeObst) - m_obstacles.begin(); @@ -446,7 +446,7 @@ void KX_ObstacleSimulationTOI::AdjustObstacleVelocity(KX_Obstacle* activeObst, K vadd(vel, activeObst->vel, dv); velocity.x() = vel[0]; - velocity.y() = vel[1]; + velocity.y() = vel[1]; } ///////////*********TOI_rays**********///////////////// @@ -642,7 +642,7 @@ static void processSamples(KX_Obstacle* activeObst, KX_NavMeshObject* activeNavM for (int n = 0; n < nspos; ++n) { float vcand[2]; - vcpy(vcand, &spos[n*2]); + vcpy(vcand, &spos[n*2]); // Find min time of impact and exit amongst all obstacles. float tmin = maxToi; diff --git a/source/gameengine/Ketsji/KX_ObstacleSimulation.h b/source/gameengine/Ketsji/KX_ObstacleSimulation.h index 5b359fc031e..50589b5bc69 100644 --- a/source/gameengine/Ketsji/KX_ObstacleSimulation.h +++ b/source/gameengine/Ketsji/KX_ObstacleSimulation.h @@ -34,13 +34,13 @@ class KX_GameObject; class KX_NavMeshObject; enum KX_OBSTACLE_TYPE -{ +{ KX_OBSTACLE_OBJ, KX_OBSTACLE_NAV_MESH, }; enum KX_OBSTACLE_SHAPE -{ +{ KX_OBSTACLE_CIRCLE, KX_OBSTACLE_SEGMENT, }; @@ -86,9 +86,9 @@ public: void DestroyObstacleForObj(KX_GameObject* gameobj); void AddObstaclesForNavMesh(KX_NavMeshObject* navmesh); KX_Obstacle* GetObstacle(KX_GameObject* gameobj); - void UpdateObstacles(); + void UpdateObstacles(); virtual void AdjustObstacleVelocity(KX_Obstacle* activeObst, KX_NavMeshObject* activeNavMeshObj, - MT_Vector3& velocity, MT_Scalar maxDeltaSpeed,MT_Scalar maxDeltaAngle); + MT_Vector3& velocity, MT_Scalar maxDeltaSpeed,MT_Scalar maxDeltaAngle); }; class KX_ObstacleSimulationTOI: public KX_ObstacleSimulation diff --git a/source/gameengine/Ketsji/KX_ParentActuator.cpp b/source/gameengine/Ketsji/KX_ParentActuator.cpp index 5058af18d15..6926fdb1d4c 100644 --- a/source/gameengine/Ketsji/KX_ParentActuator.cpp +++ b/source/gameengine/Ketsji/KX_ParentActuator.cpp @@ -172,10 +172,10 @@ PyAttributeDef KX_ParentActuator::Attributes[] = { { NULL } //Sentinel }; -PyObject* KX_ParentActuator::pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_ParentActuator::pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) { KX_ParentActuator* actuator = static_cast<KX_ParentActuator*>(self); - if (!actuator->m_ob) + if (!actuator->m_ob) Py_RETURN_NONE; else return actuator->m_ob->GetProxy(); @@ -190,7 +190,7 @@ int KX_ParentActuator::pyattr_set_object(void *self, const struct KX_PYATTRIBUTE return PY_SET_ATTR_FAIL; // ConvertPythonToGameObject sets the error if (actuator->m_ob != NULL) - actuator->m_ob->UnregisterActuator(actuator); + actuator->m_ob->UnregisterActuator(actuator); actuator->m_ob = (SCA_IObject*) gameobj; diff --git a/source/gameengine/Ketsji/KX_ParentActuator.h b/source/gameengine/Ketsji/KX_ParentActuator.h index 6191b889da3..f2f5acd3dfb 100644 --- a/source/gameengine/Ketsji/KX_ParentActuator.h +++ b/source/gameengine/Ketsji/KX_ParentActuator.h @@ -81,7 +81,7 @@ public: /* --------------------------------------------------------------------- */ /* These are used to get and set m_ob */ - static PyObject* pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); static int pyattr_set_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); #endif // WITH_PYTHON diff --git a/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp b/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp index 225a1628b3b..f18c35c0c78 100644 --- a/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp +++ b/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp @@ -51,7 +51,7 @@ KX_PhysicsObjectWrapper::~KX_PhysicsObjectWrapper() #ifdef WITH_PYTHON -PyObject* KX_PhysicsObjectWrapper::PySetPosition(PyObject* args) +PyObject *KX_PhysicsObjectWrapper::PySetPosition(PyObject *args) { float x,y,z; if (PyArg_ParseTuple(args,"fff:setPosition",&x,&y,&z)) @@ -65,7 +65,7 @@ PyObject* KX_PhysicsObjectWrapper::PySetPosition(PyObject* args) } -PyObject* KX_PhysicsObjectWrapper::PySetLinearVelocity(PyObject* args) +PyObject *KX_PhysicsObjectWrapper::PySetLinearVelocity(PyObject *args) { float x,y,z; int local; @@ -79,7 +79,7 @@ PyObject* KX_PhysicsObjectWrapper::PySetLinearVelocity(PyObject* args) Py_RETURN_NONE; } -PyObject* KX_PhysicsObjectWrapper::PySetAngularVelocity(PyObject* args) +PyObject *KX_PhysicsObjectWrapper::PySetAngularVelocity(PyObject *args) { float x,y,z; int local; @@ -93,7 +93,7 @@ PyObject* KX_PhysicsObjectWrapper::PySetAngularVelocity(PyObject* args) Py_RETURN_NONE; } -PyObject* KX_PhysicsObjectWrapper::PySetActive(PyObject* args) +PyObject* KX_PhysicsObjectWrapper::PySetActive(PyObject *args) { int active; if (PyArg_ParseTuple(args,"i:setActive",&active)) diff --git a/source/gameengine/Ketsji/KX_PolyProxy.cpp b/source/gameengine/Ketsji/KX_PolyProxy.cpp index 85c88337d60..13b6bda4ebc 100644 --- a/source/gameengine/Ketsji/KX_PolyProxy.cpp +++ b/source/gameengine/Ketsji/KX_PolyProxy.cpp @@ -102,7 +102,7 @@ KX_PolyProxy::~KX_PolyProxy() // stuff for cvalue related things CValue* KX_PolyProxy::Calc(VALUE_OPERATOR, CValue *) { return NULL;} -CValue* KX_PolyProxy::CalcFinal(VALUE_DATA_TYPE, VALUE_OPERATOR, CValue *) { return NULL;} +CValue* KX_PolyProxy::CalcFinal(VALUE_DATA_TYPE, VALUE_OPERATOR, CValue *) { return NULL;} STR_String sPolyName="polygone"; const STR_String & KX_PolyProxy::GetText() {return sPolyName;}; double KX_PolyProxy::GetNumber() { return -1;} @@ -112,52 +112,52 @@ CValue* KX_PolyProxy::GetReplica() { return NULL;} // stuff for python integration -PyObject* KX_PolyProxy::pyattr_get_material_name(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_PolyProxy::pyattr_get_material_name(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_PolyProxy* self= static_cast<KX_PolyProxy*>(self_v); return self->PygetMaterialName(); } -PyObject* KX_PolyProxy::pyattr_get_texture_name(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_PolyProxy::pyattr_get_texture_name(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_PolyProxy* self= static_cast<KX_PolyProxy*>(self_v); return self->PygetTextureName(); } -PyObject* KX_PolyProxy::pyattr_get_material(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_PolyProxy::pyattr_get_material(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_PolyProxy* self= static_cast<KX_PolyProxy*>(self_v); return self->PygetMaterial(); } -PyObject* KX_PolyProxy::pyattr_get_material_id(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_PolyProxy::pyattr_get_material_id(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_PolyProxy* self= static_cast<KX_PolyProxy*>(self_v); return self->PygetMaterialIndex(); } -PyObject* KX_PolyProxy::pyattr_get_v1(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_PolyProxy::pyattr_get_v1(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_PolyProxy* self= static_cast<KX_PolyProxy*>(self_v); return PyLong_FromSsize_t(self->m_polygon->GetVertexOffsetAbs(self->m_mesh, 0)); } -PyObject* KX_PolyProxy::pyattr_get_v2(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_PolyProxy::pyattr_get_v2(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_PolyProxy* self= static_cast<KX_PolyProxy*>(self_v); return PyLong_FromSsize_t(self->m_polygon->GetVertexOffsetAbs(self->m_mesh, 1)); } -PyObject* KX_PolyProxy::pyattr_get_v3(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_PolyProxy::pyattr_get_v3(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_PolyProxy* self= static_cast<KX_PolyProxy*>(self_v); return PyLong_FromSsize_t(self->m_polygon->GetVertexOffsetAbs(self->m_mesh, 2)); } -PyObject* KX_PolyProxy::pyattr_get_v4(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_PolyProxy::pyattr_get_v4(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_PolyProxy* self= static_cast<KX_PolyProxy*>(self_v); @@ -168,13 +168,13 @@ PyObject* KX_PolyProxy::pyattr_get_v4(void *self_v, const KX_PYATTRIBUTE_DEF *at return PyLong_FromSsize_t(0); } -PyObject* KX_PolyProxy::pyattr_get_visible(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_PolyProxy::pyattr_get_visible(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_PolyProxy* self= static_cast<KX_PolyProxy*>(self_v); return self->PyisVisible(); } -PyObject* KX_PolyProxy::pyattr_get_collide(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_PolyProxy::pyattr_get_collide(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_PolyProxy* self= static_cast<KX_PolyProxy*>(self_v); return self->PyisCollider(); diff --git a/source/gameengine/Ketsji/KX_PolyProxy.h b/source/gameengine/Ketsji/KX_PolyProxy.h index 83c3bff0ee2..9e3556a03f8 100644 --- a/source/gameengine/Ketsji/KX_PolyProxy.h +++ b/source/gameengine/Ketsji/KX_PolyProxy.h @@ -57,16 +57,16 @@ public: // stuff for python integration - static PyObject* pyattr_get_material_name(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_texture_name(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_material(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_material_id(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_v1(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_v2(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_v3(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_v4(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_visible(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_collide(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_material_name(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_texture_name(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_material(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_material_id(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_v1(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_v2(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_v3(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_v4(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_visible(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_collide(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); KX_PYMETHOD_DOC_NOARGS(KX_PolyProxy,getMaterialIndex) KX_PYMETHOD_DOC_NOARGS(KX_PolyProxy,getNumVertex) diff --git a/source/gameengine/Ketsji/KX_PolygonMaterial.cpp b/source/gameengine/Ketsji/KX_PolygonMaterial.cpp index 2e39190f4f9..3b58a8abd83 100644 --- a/source/gameengine/Ketsji/KX_PolygonMaterial.cpp +++ b/source/gameengine/Ketsji/KX_PolygonMaterial.cpp @@ -143,7 +143,7 @@ bool KX_PolygonMaterial::Activate(RAS_IRasterizer* rasty, TCachingInfo& cachingI { PyObject *pyRasty = PyCapsule_New((void*)rasty, KX_POLYGONMATERIAL_CAPSULE_ID, NULL); /* new reference */ PyObject *pyCachingInfo = PyCapsule_New((void*) &cachingInfo, KX_POLYGONMATERIAL_CAPSULE_ID, NULL); /* new reference */ - PyObject *ret = PyObject_CallMethod(m_pymaterial, (char *)"activate", (char *)"(NNO)", pyRasty, pyCachingInfo, (PyObject*) this->m_proxy); + PyObject *ret = PyObject_CallMethod(m_pymaterial, (char *)"activate", (char *)"(NNO)", pyRasty, pyCachingInfo, (PyObject *) this->m_proxy); if (ret) { bool value = PyLong_AsSsize_t(ret); @@ -252,7 +252,7 @@ PyAttributeDef KX_PolygonMaterial::Attributes[] = { KX_PYATTRIBUTE_INT_RW("tile", INT_MIN, INT_MAX, true, KX_PolygonMaterial, m_tile), KX_PYATTRIBUTE_INT_RW("tilexrep", INT_MIN, INT_MAX, true, KX_PolygonMaterial, m_tilexrep), KX_PYATTRIBUTE_INT_RW("tileyrep", INT_MIN, INT_MAX, true, KX_PolygonMaterial, m_tileyrep), - KX_PYATTRIBUTE_INT_RW("drawingmode", INT_MIN, INT_MAX, true, KX_PolygonMaterial, m_drawingmode), + KX_PYATTRIBUTE_INT_RW("drawingmode", INT_MIN, INT_MAX, true, KX_PolygonMaterial, m_drawingmode), //KX_PYATTRIBUTE_INT_RW("lightlayer", INT_MIN, INT_MAX, true, KX_PolygonMaterial, m_lightlayer), KX_PYATTRIBUTE_BOOL_RW("transparent", KX_PolygonMaterial, m_alpha), @@ -262,7 +262,7 @@ PyAttributeDef KX_PolygonMaterial::Attributes[] = { KX_PYATTRIBUTE_FLOAT_RW("specularity", 0.0f, 1000.0f, KX_PolygonMaterial, m_specularity), KX_PYATTRIBUTE_RW_FUNCTION("diffuse", KX_PolygonMaterial, pyattr_get_diffuse, pyattr_set_diffuse), - KX_PYATTRIBUTE_RW_FUNCTION("specular",KX_PolygonMaterial, pyattr_get_specular, pyattr_set_specular), + KX_PYATTRIBUTE_RW_FUNCTION("specular",KX_PolygonMaterial, pyattr_get_specular, pyattr_set_specular), KX_PYATTRIBUTE_RO_FUNCTION("tface", KX_PolygonMaterial, pyattr_get_tface), /* How the heck is this even useful??? - Campbell */ KX_PYATTRIBUTE_RO_FUNCTION("gl_texture", KX_PolygonMaterial, pyattr_get_gl_texture), /* could be called 'bindcode' */ @@ -355,26 +355,26 @@ KX_PYMETHODDEF_DOC(KX_PolygonMaterial, activate, "activate(rasty, cachingInfo)") return NULL; } -PyObject* KX_PolygonMaterial::pyattr_get_texture(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_PolygonMaterial::pyattr_get_texture(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_PolygonMaterial* self= static_cast<KX_PolygonMaterial*>(self_v); return PyUnicode_From_STR_String(self->m_texturename); } -PyObject* KX_PolygonMaterial::pyattr_get_material(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_PolygonMaterial::pyattr_get_material(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_PolygonMaterial* self= static_cast<KX_PolygonMaterial*>(self_v); return PyUnicode_From_STR_String(self->m_materialname); } /* this does not seem useful */ -PyObject* KX_PolygonMaterial::pyattr_get_tface(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_PolygonMaterial::pyattr_get_tface(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_PolygonMaterial* self= static_cast<KX_PolygonMaterial*>(self_v); return PyCapsule_New(&self->m_tface, KX_POLYGONMATERIAL_CAPSULE_ID, NULL); } -PyObject* KX_PolygonMaterial::pyattr_get_gl_texture(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_PolygonMaterial::pyattr_get_gl_texture(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_PolygonMaterial* self= static_cast<KX_PolygonMaterial*>(self_v); int bindcode= 0; @@ -385,7 +385,7 @@ PyObject* KX_PolygonMaterial::pyattr_get_gl_texture(void *self_v, const KX_PYATT } -PyObject* KX_PolygonMaterial::pyattr_get_diffuse(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_PolygonMaterial::pyattr_get_diffuse(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_PolygonMaterial* self= static_cast<KX_PolygonMaterial*>(self_v); return PyObjectFrom(self->m_diffuse); @@ -403,7 +403,7 @@ int KX_PolygonMaterial::pyattr_set_diffuse(void *self_v, const KX_PYATTRIBUTE_DE return PY_SET_ATTR_SUCCESS; } -PyObject* KX_PolygonMaterial::pyattr_get_specular(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_PolygonMaterial::pyattr_get_specular(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_PolygonMaterial* self= static_cast<KX_PolygonMaterial*>(self_v); return PyObjectFrom(self->m_specular); diff --git a/source/gameengine/Ketsji/KX_PolygonMaterial.h b/source/gameengine/Ketsji/KX_PolygonMaterial.h index f7ad3973212..6384008fb7d 100644 --- a/source/gameengine/Ketsji/KX_PolygonMaterial.h +++ b/source/gameengine/Ketsji/KX_PolygonMaterial.h @@ -137,7 +137,7 @@ public: KX_PYMETHOD_DOC(KX_PolygonMaterial, setCustomMaterial); KX_PYMETHOD_DOC(KX_PolygonMaterial, loadProgram); - virtual PyObject* py_repr(void) { return PyUnicode_FromString(m_material ? ((ID *)m_material)->name+2 : ""); } + virtual PyObject *py_repr(void) { return PyUnicode_FromString(m_material ? ((ID *)m_material)->name+2 : ""); } static PyObject* pyattr_get_texture(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); static PyObject* pyattr_get_material(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); @@ -145,9 +145,9 @@ public: static PyObject* pyattr_get_tface(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); static PyObject* pyattr_get_gl_texture(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_diffuse(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject* pyattr_get_diffuse(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef); static int pyattr_set_diffuse(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); - static PyObject* pyattr_get_specular(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject* pyattr_get_specular(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef); static int pyattr_set_specular(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); #endif diff --git a/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp b/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp index 6fb315d51cb..5f3a4879150 100644 --- a/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp +++ b/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp @@ -89,9 +89,9 @@ static char gPyGetAppliedImpulse__doc__[] = "getAppliedImpulse(int constraintId) -static PyObject* gPySetGravity(PyObject* self, - PyObject* args, - PyObject* kwds) +static PyObject *gPySetGravity(PyObject *self, + PyObject *args, + PyObject *kwds) { float x,y,z; if (PyArg_ParseTuple(args,"fff",&x,&y,&z)) @@ -106,9 +106,9 @@ static PyObject* gPySetGravity(PyObject* self, Py_RETURN_NONE; } -static PyObject* gPySetDebugMode(PyObject* self, - PyObject* args, - PyObject* kwds) +static PyObject *gPySetDebugMode(PyObject *self, + PyObject *args, + PyObject *kwds) { int mode; if (PyArg_ParseTuple(args,"i",&mode)) @@ -129,9 +129,9 @@ static PyObject* gPySetDebugMode(PyObject* self, -static PyObject* gPySetNumTimeSubSteps(PyObject* self, - PyObject* args, - PyObject* kwds) +static PyObject *gPySetNumTimeSubSteps(PyObject *self, + PyObject *args, + PyObject *kwds) { int substep; if (PyArg_ParseTuple(args,"i",&substep)) @@ -148,9 +148,9 @@ static PyObject* gPySetNumTimeSubSteps(PyObject* self, } -static PyObject* gPySetNumIterations(PyObject* self, - PyObject* args, - PyObject* kwds) +static PyObject *gPySetNumIterations(PyObject *self, + PyObject *args, + PyObject *kwds) { int iter; if (PyArg_ParseTuple(args,"i",&iter)) @@ -167,9 +167,9 @@ static PyObject* gPySetNumIterations(PyObject* self, } -static PyObject* gPySetDeactivationTime(PyObject* self, - PyObject* args, - PyObject* kwds) +static PyObject *gPySetDeactivationTime(PyObject *self, + PyObject *args, + PyObject *kwds) { float deactive_time; if (PyArg_ParseTuple(args,"f",&deactive_time)) @@ -186,9 +186,9 @@ static PyObject* gPySetDeactivationTime(PyObject* self, } -static PyObject* gPySetDeactivationLinearTreshold(PyObject* self, - PyObject* args, - PyObject* kwds) +static PyObject *gPySetDeactivationLinearTreshold(PyObject *self, + PyObject *args, + PyObject *kwds) { float linearDeactivationTreshold; if (PyArg_ParseTuple(args,"f",&linearDeactivationTreshold)) @@ -205,9 +205,9 @@ static PyObject* gPySetDeactivationLinearTreshold(PyObject* self, } -static PyObject* gPySetDeactivationAngularTreshold(PyObject* self, - PyObject* args, - PyObject* kwds) +static PyObject *gPySetDeactivationAngularTreshold(PyObject *self, + PyObject *args, + PyObject *kwds) { float angularDeactivationTreshold; if (PyArg_ParseTuple(args,"f",&angularDeactivationTreshold)) @@ -223,9 +223,9 @@ static PyObject* gPySetDeactivationAngularTreshold(PyObject* self, Py_RETURN_NONE; } -static PyObject* gPySetContactBreakingTreshold(PyObject* self, - PyObject* args, - PyObject* kwds) +static PyObject *gPySetContactBreakingTreshold(PyObject *self, + PyObject *args, + PyObject *kwds) { float contactBreakingTreshold; if (PyArg_ParseTuple(args,"f",&contactBreakingTreshold)) @@ -242,9 +242,9 @@ static PyObject* gPySetContactBreakingTreshold(PyObject* self, } -static PyObject* gPySetCcdMode(PyObject* self, - PyObject* args, - PyObject* kwds) +static PyObject *gPySetCcdMode(PyObject *self, + PyObject *args, + PyObject *kwds) { float ccdMode; if (PyArg_ParseTuple(args,"f",&ccdMode)) @@ -260,9 +260,9 @@ static PyObject* gPySetCcdMode(PyObject* self, Py_RETURN_NONE; } -static PyObject* gPySetSorConstant(PyObject* self, - PyObject* args, - PyObject* kwds) +static PyObject *gPySetSorConstant(PyObject *self, + PyObject *args, + PyObject *kwds) { float sor; if (PyArg_ParseTuple(args,"f",&sor)) @@ -278,9 +278,9 @@ static PyObject* gPySetSorConstant(PyObject* self, Py_RETURN_NONE; } -static PyObject* gPySetSolverTau(PyObject* self, - PyObject* args, - PyObject* kwds) +static PyObject *gPySetSolverTau(PyObject *self, + PyObject *args, + PyObject *kwds) { float tau; if (PyArg_ParseTuple(args,"f",&tau)) @@ -297,9 +297,9 @@ static PyObject* gPySetSolverTau(PyObject* self, } -static PyObject* gPySetSolverDamping(PyObject* self, - PyObject* args, - PyObject* kwds) +static PyObject *gPySetSolverDamping(PyObject *self, + PyObject *args, + PyObject *kwds) { float damping; if (PyArg_ParseTuple(args,"f",&damping)) @@ -315,9 +315,9 @@ static PyObject* gPySetSolverDamping(PyObject* self, Py_RETURN_NONE; } -static PyObject* gPySetLinearAirDamping(PyObject* self, - PyObject* args, - PyObject* kwds) +static PyObject *gPySetLinearAirDamping(PyObject *self, + PyObject *args, + PyObject *kwds) { float damping; if (PyArg_ParseTuple(args,"f",&damping)) @@ -334,9 +334,9 @@ static PyObject* gPySetLinearAirDamping(PyObject* self, } -static PyObject* gPySetUseEpa(PyObject* self, - PyObject* args, - PyObject* kwds) +static PyObject *gPySetUseEpa(PyObject *self, + PyObject *args, + PyObject *kwds) { int epa; if (PyArg_ParseTuple(args,"i",&epa)) @@ -351,9 +351,9 @@ static PyObject* gPySetUseEpa(PyObject* self, } Py_RETURN_NONE; } -static PyObject* gPySetSolverType(PyObject* self, - PyObject* args, - PyObject* kwds) +static PyObject *gPySetSolverType(PyObject *self, + PyObject *args, + PyObject *kwds) { int solverType; if (PyArg_ParseTuple(args,"i",&solverType)) @@ -371,9 +371,9 @@ static PyObject* gPySetSolverType(PyObject* self, -static PyObject* gPyGetVehicleConstraint(PyObject* self, - PyObject* args, - PyObject* kwds) +static PyObject *gPyGetVehicleConstraint(PyObject *self, + PyObject *args, + PyObject *kwds) { #if defined(_WIN64) __int64 constraintid; @@ -403,9 +403,9 @@ static PyObject* gPyGetVehicleConstraint(PyObject* self, } -static PyObject* gPyCreateConstraint(PyObject* self, - PyObject* args, - PyObject* kwds) +static PyObject *gPyCreateConstraint(PyObject *self, + PyObject *args, + PyObject *kwds) { /* FIXME - physicsid is a long being cast to a pointer, should at least use PyCapsule */ #if defined(_WIN64) @@ -435,7 +435,7 @@ static PyObject* gPyCreateConstraint(PyObject* self, #else success = PyArg_ParseTuple(args,"llifff",&physicsid,&physicsid2,&constrainttype, &pivotX,&pivotY,&pivotZ); -#endif +#endif } else if (len == 9) { @@ -521,9 +521,9 @@ static PyObject* gPyCreateConstraint(PyObject* self, -static PyObject* gPyGetAppliedImpulse(PyObject* self, - PyObject* args, - PyObject* kwds) +static PyObject *gPyGetAppliedImpulse(PyObject *self, + PyObject *args, + PyObject *kwds) { float appliedImpulse = 0.f; @@ -548,9 +548,9 @@ static PyObject* gPyGetAppliedImpulse(PyObject* self, } -static PyObject* gPyRemoveConstraint(PyObject* self, - PyObject* args, - PyObject* kwds) +static PyObject *gPyRemoveConstraint(PyObject *self, + PyObject *args, + PyObject *kwds) { #if defined(_WIN64) __int64 constraintid; @@ -572,7 +572,7 @@ static PyObject* gPyRemoveConstraint(PyObject* self, Py_RETURN_NONE; } -static PyObject* gPyExportBulletFile(PyObject*, PyObject* args) +static PyObject *gPyExportBulletFile(PyObject *, PyObject *args) { char* filename; if (!PyArg_ParseTuple(args,"s:exportBulletFile",&filename)) @@ -655,13 +655,13 @@ static struct PyModuleDef PhysicsConstraints_module_def = { 0, /* m_free */ }; -PyObject* initPythonConstraintBinding() +PyObject *initPythonConstraintBinding() { - PyObject* ErrorObject; - PyObject* m; - PyObject* d; - PyObject* item; + PyObject *ErrorObject; + PyObject *m; + PyObject *d; + PyObject *item; /* Use existing module where possible * be careful not to init any runtime vars after this */ diff --git a/source/gameengine/Ketsji/KX_PyMath.cpp b/source/gameengine/Ketsji/KX_PyMath.cpp index f459b806d2f..bc324c3b140 100644 --- a/source/gameengine/Ketsji/KX_PyMath.cpp +++ b/source/gameengine/Ketsji/KX_PyMath.cpp @@ -47,7 +47,7 @@ #include "KX_Python.h" #include "KX_PyMath.h" -bool PyOrientationTo(PyObject* pyval, MT_Matrix3x3 &rot, const char *error_prefix) +bool PyOrientationTo(PyObject *pyval, MT_Matrix3x3 &rot, const char *error_prefix) { int size= PySequence_Size(pyval); @@ -80,7 +80,7 @@ bool PyOrientationTo(PyObject* pyval, MT_Matrix3x3 &rot, const char *error_prefi return false; } -bool PyQuatTo(PyObject* pyval, MT_Quaternion &qrot) +bool PyQuatTo(PyObject *pyval, MT_Quaternion &qrot) { if (!PyVecTo(pyval, qrot)) return false; @@ -95,7 +95,7 @@ bool PyQuatTo(PyObject* pyval, MT_Quaternion &qrot) return true; } -PyObject* PyObjectFrom(const MT_Matrix4x4 &mat) +PyObject *PyObjectFrom(const MT_Matrix4x4 &mat) { #ifdef USE_MATHUTILS float fmat[16]; @@ -119,7 +119,7 @@ PyObject* PyObjectFrom(const MT_Matrix4x4 &mat) #endif } -PyObject* PyObjectFrom(const MT_Matrix3x3 &mat) +PyObject *PyObjectFrom(const MT_Matrix3x3 &mat) { #ifdef USE_MATHUTILS float fmat[9]; @@ -143,7 +143,7 @@ PyObject* PyObjectFrom(const MT_Matrix3x3 &mat) } #ifdef USE_MATHUTILS -PyObject* PyObjectFrom(const MT_Quaternion &qrot) +PyObject *PyObjectFrom(const MT_Quaternion &qrot) { /* NOTE, were re-ordering here for Mathutils compat */ float fvec[4]; @@ -152,7 +152,7 @@ PyObject* PyObjectFrom(const MT_Quaternion &qrot) } #endif -PyObject* PyObjectFrom(const MT_Tuple4 &vec) +PyObject *PyObjectFrom(const MT_Tuple4 &vec) { #ifdef USE_MATHUTILS float fvec[4]; @@ -168,7 +168,7 @@ PyObject* PyObjectFrom(const MT_Tuple4 &vec) #endif } -PyObject* PyObjectFrom(const MT_Tuple3 &vec) +PyObject *PyObjectFrom(const MT_Tuple3 &vec) { #ifdef USE_MATHUTILS float fvec[3]; @@ -180,10 +180,10 @@ PyObject* PyObjectFrom(const MT_Tuple3 &vec) PyList_SET_ITEM(list, 1, PyFloat_FromDouble(vec[1])); PyList_SET_ITEM(list, 2, PyFloat_FromDouble(vec[2])); return list; -#endif +#endif } -PyObject* PyObjectFrom(const MT_Tuple2 &vec) +PyObject *PyObjectFrom(const MT_Tuple2 &vec) { #ifdef USE_MATHUTILS float fvec[2]; diff --git a/source/gameengine/Ketsji/KX_PyMath.h b/source/gameengine/Ketsji/KX_PyMath.h index aec871d7700..d79397ed807 100644 --- a/source/gameengine/Ketsji/KX_PyMath.h +++ b/source/gameengine/Ketsji/KX_PyMath.h @@ -61,7 +61,7 @@ inline unsigned int Size(const MT_Tuple4&) { return 4; } * Converts the given python matrix (column-major) to an MT class (row-major). */ template<class T> -bool PyMatTo(PyObject* pymat, T& mat) +bool PyMatTo(PyObject *pymat, T& mat) { bool noerror = true; mat.setIdentity(); @@ -133,7 +133,7 @@ bool PyMatTo(PyObject* pymat, T& mat) * Converts a python sequence to a MT class. */ template<class T> -bool PyVecTo(PyObject* pyval, T& vec) +bool PyVecTo(PyObject *pyval, T& vec) { #ifdef USE_MATHUTILS /* no need for BaseMath_ReadCallback() here, reading the sequences will do this */ @@ -235,41 +235,41 @@ bool PyVecTo(PyObject* pyval, T& vec) } -bool PyQuatTo(PyObject* pyval, MT_Quaternion &qrot); +bool PyQuatTo(PyObject *pyval, MT_Quaternion &qrot); -bool PyOrientationTo(PyObject* pyval, MT_Matrix3x3 &mat, const char *error_prefix); +bool PyOrientationTo(PyObject *pyval, MT_Matrix3x3 &mat, const char *error_prefix); /** * Converts an MT_Matrix4x4 to a python object. */ -PyObject* PyObjectFrom(const MT_Matrix4x4 &mat); +PyObject *PyObjectFrom(const MT_Matrix4x4 &mat); /** * Converts an MT_Matrix3x3 to a python object. */ -PyObject* PyObjectFrom(const MT_Matrix3x3 &mat); +PyObject *PyObjectFrom(const MT_Matrix3x3 &mat); /** * Converts an MT_Tuple2 to a python object. */ -PyObject* PyObjectFrom(const MT_Tuple2 &vec); +PyObject *PyObjectFrom(const MT_Tuple2 &vec); /** * Converts an MT_Tuple3 to a python object */ -PyObject* PyObjectFrom(const MT_Tuple3 &vec); +PyObject *PyObjectFrom(const MT_Tuple3 &vec); #ifdef USE_MATHUTILS /** * Converts an MT_Quaternion to a python object. */ -PyObject* PyObjectFrom(const MT_Quaternion &qrot); +PyObject *PyObjectFrom(const MT_Quaternion &qrot); #endif /** * Converts an MT_Tuple4 to a python object. */ -PyObject* PyObjectFrom(const MT_Tuple4 &pos); +PyObject *PyObjectFrom(const MT_Tuple4 &pos); #endif diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 7d29a20d1a2..43fca40f2da 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -210,15 +210,15 @@ static PyObject *gp_OrigPythonSysModules= NULL; #include "SCA_PythonController.h" // List of methods defined in the module -static PyObject* ErrorObject; +static PyObject *ErrorObject; static const char *gPyGetRandomFloat_doc="getRandomFloat returns a random floating point value in the range [0..1]"; -static PyObject* gPyGetRandomFloat(PyObject*) +static PyObject *gPyGetRandomFloat(PyObject *) { return PyFloat_FromDouble(MT_random()); } -static PyObject* gPySetGravity(PyObject*, PyObject* value) +static PyObject *gPySetGravity(PyObject *, PyObject *value) { MT_Vector3 vec; if (!PyVecTo(value, vec)) @@ -240,7 +240,7 @@ file to make a full path name (doesn't change during the game, even if you load\ other .blend).\n\ The function also converts the directory separator to the local file system format."; -static PyObject* gPyExpandPath(PyObject*, PyObject* args) +static PyObject *gPyExpandPath(PyObject *, PyObject *args) { char expanded[FILE_MAX]; char* filename; @@ -257,7 +257,7 @@ static char gPyStartGame_doc[] = "startGame(blend)\n\ Loads the blend file"; -static PyObject* gPyStartGame(PyObject*, PyObject* args) +static PyObject *gPyStartGame(PyObject *, PyObject *args) { char* blendfile; @@ -274,7 +274,7 @@ static char gPyEndGame_doc[] = "endGame()\n\ Ends the current game"; -static PyObject* gPyEndGame(PyObject*) +static PyObject *gPyEndGame(PyObject *) { gp_KetsjiEngine->RequestExit(KX_EXIT_REQUEST_QUIT_GAME); @@ -287,7 +287,7 @@ static char gPyRestartGame_doc[] = "restartGame()\n\ Restarts the current game by reloading the .blend file"; -static PyObject* gPyRestartGame(PyObject*) +static PyObject *gPyRestartGame(PyObject *) { gp_KetsjiEngine->RequestExit(KX_EXIT_REQUEST_RESTART_GAME); gp_KetsjiEngine->SetNameNextGame(gp_GamePythonPath); @@ -299,7 +299,7 @@ static char gPySaveGlobalDict_doc[] = "saveGlobalDict()\n" "Saves bge.logic.globalDict to a file"; -static PyObject* gPySaveGlobalDict(PyObject*) +static PyObject *gPySaveGlobalDict(PyObject *) { char marshal_path[512]; char *marshal_buffer = NULL; @@ -336,7 +336,7 @@ static char gPyLoadGlobalDict_doc[] = "LoadGlobalDict()\n" "Loads bge.logic.globalDict from a file"; -static PyObject* gPyLoadGlobalDict(PyObject*) +static PyObject *gPyLoadGlobalDict(PyObject *) { char marshal_path[512]; char *marshal_buffer = NULL; @@ -381,7 +381,7 @@ body = Message body\ to = Name of object to send the message to\ from = Name of object to send the string from"; -static PyObject* gPySendMessage(PyObject*, PyObject* args) +static PyObject *gPySendMessage(PyObject *, PyObject *args) { char* subject; char* body = (char *)""; @@ -397,9 +397,9 @@ static PyObject* gPySendMessage(PyObject*, PyObject* args) } // this gets a pointer to an array filled with floats -static PyObject* gPyGetSpectrum(PyObject*) +static PyObject *gPyGetSpectrum(PyObject *) { - PyObject* resultlist = PyList_New(512); + PyObject *resultlist = PyList_New(512); for (int index = 0; index < 512; index++) { @@ -409,7 +409,7 @@ static PyObject* gPyGetSpectrum(PyObject*) return resultlist; } -static PyObject* gPySetLogicTicRate(PyObject*, PyObject* args) +static PyObject *gPySetLogicTicRate(PyObject *, PyObject *args) { float ticrate; if (!PyArg_ParseTuple(args, "f:setLogicTicRate", &ticrate)) @@ -419,12 +419,12 @@ static PyObject* gPySetLogicTicRate(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject* gPyGetLogicTicRate(PyObject*) +static PyObject *gPyGetLogicTicRate(PyObject *) { return PyFloat_FromDouble(KX_KetsjiEngine::GetTicRate()); } -static PyObject* gPySetExitKey(PyObject*, PyObject* args) +static PyObject *gPySetExitKey(PyObject *, PyObject *args) { short exitkey; if (!PyArg_ParseTuple(args, "h:setExitKey", &exitkey)) @@ -433,12 +433,12 @@ static PyObject* gPySetExitKey(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject* gPyGetExitKey(PyObject*) +static PyObject *gPyGetExitKey(PyObject *) { return PyLong_FromSsize_t(KX_KetsjiEngine::GetExitKey()); } -static PyObject* gPySetMaxLogicFrame(PyObject*, PyObject* args) +static PyObject *gPySetMaxLogicFrame(PyObject *, PyObject *args) { int frame; if (!PyArg_ParseTuple(args, "i:setMaxLogicFrame", &frame)) @@ -448,12 +448,12 @@ static PyObject* gPySetMaxLogicFrame(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject* gPyGetMaxLogicFrame(PyObject*) +static PyObject *gPyGetMaxLogicFrame(PyObject *) { return PyLong_FromSsize_t(KX_KetsjiEngine::GetMaxLogicFrame()); } -static PyObject* gPySetMaxPhysicsFrame(PyObject*, PyObject* args) +static PyObject *gPySetMaxPhysicsFrame(PyObject *, PyObject *args) { int frame; if (!PyArg_ParseTuple(args, "i:setMaxPhysicsFrame", &frame)) @@ -463,12 +463,12 @@ static PyObject* gPySetMaxPhysicsFrame(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject* gPyGetMaxPhysicsFrame(PyObject*) +static PyObject *gPyGetMaxPhysicsFrame(PyObject *) { return PyLong_FromSsize_t(KX_KetsjiEngine::GetMaxPhysicsFrame()); } -static PyObject* gPySetPhysicsTicRate(PyObject*, PyObject* args) +static PyObject *gPySetPhysicsTicRate(PyObject *, PyObject *args) { float ticrate; if (!PyArg_ParseTuple(args, "f:setPhysicsTicRate", &ticrate)) @@ -478,7 +478,7 @@ static PyObject* gPySetPhysicsTicRate(PyObject*, PyObject* args) Py_RETURN_NONE; } #if 0 // unused -static PyObject* gPySetPhysicsDebug(PyObject*, PyObject* args) +static PyObject *gPySetPhysicsDebug(PyObject *, PyObject *args) { int debugMode; if (!PyArg_ParseTuple(args, "i:setPhysicsDebug", &debugMode)) @@ -490,21 +490,21 @@ static PyObject* gPySetPhysicsDebug(PyObject*, PyObject* args) #endif -static PyObject* gPyGetPhysicsTicRate(PyObject*) +static PyObject *gPyGetPhysicsTicRate(PyObject *) { return PyFloat_FromDouble(PHY_GetActiveEnvironment()->getFixedTimeStep()); } -static PyObject* gPyGetAverageFrameRate(PyObject*) +static PyObject *gPyGetAverageFrameRate(PyObject *) { return PyFloat_FromDouble(KX_KetsjiEngine::GetAverageFrameRate()); } -static PyObject* gPyGetBlendFileList(PyObject*, PyObject* args) +static PyObject *gPyGetBlendFileList(PyObject *, PyObject *args) { char cpath[sizeof(gp_GamePythonPath)]; char *searchpath = NULL; - PyObject* list, *value; + PyObject *list, *value; DIR *dp; struct dirent *dirp; @@ -545,7 +545,7 @@ static char gPyAddScene_doc[] = adds a scene to the game engine\n\ name = Name of the scene\n\ overlay = Overlay or underlay"; -static PyObject* gPyAddScene(PyObject*, PyObject* args) +static PyObject *gPyAddScene(PyObject *, PyObject *args) { char* name; int overlay = 1; @@ -561,7 +561,7 @@ static PyObject* gPyAddScene(PyObject*, PyObject* args) static const char *gPyGetCurrentScene_doc = "getCurrentScene()\n" "Gets a reference to the current scene.\n"; -static PyObject* gPyGetCurrentScene(PyObject* self) +static PyObject *gPyGetCurrentScene(PyObject *self) { return gp_KetsjiScene->GetProxy(); } @@ -569,10 +569,10 @@ static PyObject* gPyGetCurrentScene(PyObject* self) static const char *gPyGetSceneList_doc = "getSceneList()\n" "Return a list of converted scenes.\n"; -static PyObject* gPyGetSceneList(PyObject* self) +static PyObject *gPyGetSceneList(PyObject *self) { KX_KetsjiEngine* m_engine = KX_GetActiveEngine(); - PyObject* list; + PyObject *list; KX_SceneList* scenes = m_engine->CurrentScenes(); int numScenes = scenes->size(); int i; @@ -665,7 +665,7 @@ static PyObject *pyPrintExt(PyObject *,PyObject *,PyObject *) Py_RETURN_NONE; } -static PyObject *gLibLoad(PyObject*, PyObject* args, PyObject* kwds) +static PyObject *gLibLoad(PyObject *, PyObject *args, PyObject *kwds) { KX_Scene *kx_scene= gp_KetsjiScene; char *path; @@ -721,7 +721,7 @@ static PyObject *gLibLoad(PyObject*, PyObject* args, PyObject* kwds) Py_RETURN_FALSE; } -static PyObject *gLibNew(PyObject*, PyObject* args) +static PyObject *gLibNew(PyObject *, PyObject *args) { KX_Scene *kx_scene= gp_KetsjiScene; char *path; @@ -779,7 +779,7 @@ static PyObject *gLibNew(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject *gLibFree(PyObject*, PyObject* args) +static PyObject *gLibFree(PyObject *, PyObject *args) { KX_Scene *kx_scene= gp_KetsjiScene; char *path; @@ -796,7 +796,7 @@ static PyObject *gLibFree(PyObject*, PyObject* args) } } -static PyObject *gLibList(PyObject*, PyObject* args) +static PyObject *gLibList(PyObject *, PyObject *args) { vector<Main*> &dynMaggie = gp_KetsjiScene->GetSceneConverter()->GetMainDynamic(); int i= 0; @@ -866,14 +866,14 @@ static struct PyMethodDef game_methods[] = { {NULL, (PyCFunction) NULL, 0, NULL } }; -static PyObject* gPyGetWindowHeight(PyObject*, PyObject* args) +static PyObject *gPyGetWindowHeight(PyObject *, PyObject *args) { return PyLong_FromSsize_t((gp_Canvas ? gp_Canvas->GetHeight() : 0)); } -static PyObject* gPyGetWindowWidth(PyObject*, PyObject* args) +static PyObject *gPyGetWindowWidth(PyObject *, PyObject *args) { return PyLong_FromSsize_t((gp_Canvas ? gp_Canvas->GetWidth() : 0)); } @@ -883,7 +883,7 @@ static PyObject* gPyGetWindowWidth(PyObject*, PyObject* args) // temporarility visibility thing, will be moved to rasterizer/renderer later bool gUseVisibilityTemp = false; -static PyObject* gPyEnableVisibility(PyObject*, PyObject* args) +static PyObject *gPyEnableVisibility(PyObject *, PyObject *args) { int visible; if (!PyArg_ParseTuple(args,"i:enableVisibility",&visible)) @@ -895,7 +895,7 @@ static PyObject* gPyEnableVisibility(PyObject*, PyObject* args) -static PyObject* gPyShowMouse(PyObject*, PyObject* args) +static PyObject *gPyShowMouse(PyObject *, PyObject *args) { int visible; if (!PyArg_ParseTuple(args,"i:showMouse",&visible)) @@ -916,7 +916,7 @@ static PyObject* gPyShowMouse(PyObject*, PyObject* args) -static PyObject* gPySetMousePosition(PyObject*, PyObject* args) +static PyObject *gPySetMousePosition(PyObject *, PyObject *args) { int x,y; if (!PyArg_ParseTuple(args,"ii:setMousePosition",&x,&y)) @@ -928,7 +928,7 @@ static PyObject* gPySetMousePosition(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject* gPySetEyeSeparation(PyObject*, PyObject* args) +static PyObject *gPySetEyeSeparation(PyObject *, PyObject *args) { float sep; if (!PyArg_ParseTuple(args, "f:setEyeSeparation", &sep)) @@ -944,7 +944,7 @@ static PyObject* gPySetEyeSeparation(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject* gPyGetEyeSeparation(PyObject*) +static PyObject *gPyGetEyeSeparation(PyObject *) { if (!gp_Rasterizer) { PyErr_SetString(PyExc_RuntimeError, "Rasterizer.getEyeSeparation(), Rasterizer not available"); @@ -954,7 +954,7 @@ static PyObject* gPyGetEyeSeparation(PyObject*) return PyFloat_FromDouble(gp_Rasterizer->GetEyeSeparation()); } -static PyObject* gPySetFocalLength(PyObject*, PyObject* args) +static PyObject *gPySetFocalLength(PyObject *, PyObject *args) { float focus; if (!PyArg_ParseTuple(args, "f:setFocalLength", &focus)) @@ -970,7 +970,7 @@ static PyObject* gPySetFocalLength(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject* gPyGetFocalLength(PyObject*, PyObject*, PyObject*) +static PyObject *gPyGetFocalLength(PyObject *, PyObject *, PyObject *) { if (!gp_Rasterizer) { PyErr_SetString(PyExc_RuntimeError, "Rasterizer.getFocalLength(), Rasterizer not available"); @@ -982,7 +982,7 @@ static PyObject* gPyGetFocalLength(PyObject*, PyObject*, PyObject*) Py_RETURN_NONE; } -static PyObject* gPySetBackgroundColor(PyObject*, PyObject* value) +static PyObject *gPySetBackgroundColor(PyObject *, PyObject *value) { MT_Vector4 vec; @@ -1003,7 +1003,7 @@ static PyObject* gPySetBackgroundColor(PyObject*, PyObject* value) -static PyObject* gPySetMistColor(PyObject*, PyObject* value) +static PyObject *gPySetMistColor(PyObject *, PyObject *value) { MT_Vector3 vec; @@ -1013,25 +1013,25 @@ static PyObject* gPySetMistColor(PyObject*, PyObject* value) if (!gp_Rasterizer) { PyErr_SetString(PyExc_RuntimeError, "Rasterizer.setMistColor(color), Rasterizer not available"); return NULL; - } + } gp_Rasterizer->SetFogColor((float)vec[0], (float)vec[1], (float)vec[2]); Py_RETURN_NONE; } -static PyObject* gPyDisableMist(PyObject*) +static PyObject *gPyDisableMist(PyObject *) { if (!gp_Rasterizer) { PyErr_SetString(PyExc_RuntimeError, "Rasterizer.setMistColor(color), Rasterizer not available"); return NULL; - } + } gp_Rasterizer->DisableFog(); Py_RETURN_NONE; } -static PyObject* gPySetMistStart(PyObject*, PyObject* args) +static PyObject *gPySetMistStart(PyObject *, PyObject *args) { float miststart; @@ -1050,7 +1050,7 @@ static PyObject* gPySetMistStart(PyObject*, PyObject* args) -static PyObject* gPySetMistEnd(PyObject*, PyObject* args) +static PyObject *gPySetMistEnd(PyObject *, PyObject *args) { float mistend; @@ -1068,7 +1068,7 @@ static PyObject* gPySetMistEnd(PyObject*, PyObject* args) } -static PyObject* gPySetAmbientColor(PyObject*, PyObject* value) +static PyObject *gPySetAmbientColor(PyObject *, PyObject *value) { MT_Vector3 vec; @@ -1078,7 +1078,7 @@ static PyObject* gPySetAmbientColor(PyObject*, PyObject* value) if (!gp_Rasterizer) { PyErr_SetString(PyExc_RuntimeError, "Rasterizer.setAmbientColor(color), Rasterizer not available"); return NULL; - } + } gp_Rasterizer->SetAmbientColor((float)vec[0], (float)vec[1], (float)vec[2]); Py_RETURN_NONE; @@ -1087,7 +1087,7 @@ static PyObject* gPySetAmbientColor(PyObject*, PyObject* value) -static PyObject* gPyMakeScreenshot(PyObject*, PyObject* args) +static PyObject *gPyMakeScreenshot(PyObject *, PyObject *args) { char* filename; if (!PyArg_ParseTuple(args,"s:makeScreenshot",&filename)) @@ -1101,7 +1101,7 @@ static PyObject* gPyMakeScreenshot(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject* gPyEnableMotionBlur(PyObject*, PyObject* args) +static PyObject *gPyEnableMotionBlur(PyObject *, PyObject *args) { float motionblurvalue; if (!PyArg_ParseTuple(args,"f:enableMotionBlur",&motionblurvalue)) @@ -1117,7 +1117,7 @@ static PyObject* gPyEnableMotionBlur(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject* gPyDisableMotionBlur(PyObject*) +static PyObject *gPyDisableMotionBlur(PyObject *) { if (!gp_Rasterizer) { PyErr_SetString(PyExc_RuntimeError, "Rasterizer.disableMotionBlur(), Rasterizer not available"); @@ -1147,9 +1147,9 @@ static int getGLSLSettingFlag(const char *setting) return -1; } -static PyObject* gPySetGLSLMaterialSetting(PyObject*, - PyObject* args, - PyObject*) +static PyObject *gPySetGLSLMaterialSetting(PyObject *, + PyObject *args, + PyObject *) { GlobalSettings *gs= gp_KetsjiEngine->GetGlobalSettings(); char *setting; @@ -1190,9 +1190,9 @@ static PyObject* gPySetGLSLMaterialSetting(PyObject*, Py_RETURN_NONE; } -static PyObject* gPyGetGLSLMaterialSetting(PyObject*, - PyObject* args, - PyObject*) +static PyObject *gPyGetGLSLMaterialSetting(PyObject *, + PyObject *args, + PyObject *) { GlobalSettings *gs= gp_KetsjiEngine->GetGlobalSettings(); char *setting; @@ -1216,9 +1216,9 @@ static PyObject* gPyGetGLSLMaterialSetting(PyObject*, #define KX_BLENDER_MULTITEX_MATERIAL 1 #define KX_BLENDER_GLSL_MATERIAL 2 -static PyObject* gPySetMaterialType(PyObject*, - PyObject* args, - PyObject*) +static PyObject *gPySetMaterialType(PyObject *, + PyObject *args, + PyObject *) { GlobalSettings *gs= gp_KetsjiEngine->GetGlobalSettings(); int type; @@ -1240,7 +1240,7 @@ static PyObject* gPySetMaterialType(PyObject*, Py_RETURN_NONE; } -static PyObject* gPyGetMaterialType(PyObject*) +static PyObject *gPyGetMaterialType(PyObject *) { GlobalSettings *gs= gp_KetsjiEngine->GetGlobalSettings(); int flag; @@ -1255,7 +1255,7 @@ static PyObject* gPyGetMaterialType(PyObject*) return PyLong_FromSsize_t(flag); } -static PyObject* gPySetAnisotropicFiltering(PyObject*, PyObject* args) +static PyObject *gPySetAnisotropicFiltering(PyObject *, PyObject *args) { short level; @@ -1272,16 +1272,16 @@ static PyObject* gPySetAnisotropicFiltering(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject* gPyGetAnisotropicFiltering(PyObject*, PyObject* args) +static PyObject *gPyGetAnisotropicFiltering(PyObject *, PyObject *args) { return PyLong_FromLong(gp_Rasterizer->GetAnisotropicFiltering()); } -static PyObject* gPyDrawLine(PyObject*, PyObject* args) +static PyObject *gPyDrawLine(PyObject *, PyObject *args) { - PyObject* ob_from; - PyObject* ob_to; - PyObject* ob_color; + PyObject *ob_from; + PyObject *ob_to; + PyObject *ob_color; if (!gp_Rasterizer) { PyErr_SetString(PyExc_RuntimeError, "Rasterizer.drawLine(obFrom, obTo, color): Rasterizer not available"); @@ -1306,7 +1306,7 @@ static PyObject* gPyDrawLine(PyObject*, PyObject* args) Py_RETURN_NONE; } -static PyObject* gPySetWindowSize(PyObject*, PyObject* args) +static PyObject *gPySetWindowSize(PyObject *, PyObject *args) { int width, height; if (!PyArg_ParseTuple(args, "ii:resize", &width, &height)) @@ -1383,11 +1383,11 @@ static struct PyModuleDef GameLogic_module_def = { 0, /* m_free */ }; -PyObject* initGameLogic(KX_KetsjiEngine *engine, KX_Scene* scene) // quick hack to get gravity hook +PyObject *initGameLogic(KX_KetsjiEngine *engine, KX_Scene* scene) // quick hack to get gravity hook { - PyObject* m; - PyObject* d; - PyObject* item; /* temp PyObject* storage */ + PyObject *m; + PyObject *d; + PyObject *item; /* temp PyObject *storage */ gp_KetsjiEngine = engine; gp_KetsjiScene = scene; @@ -1405,7 +1405,7 @@ PyObject* initGameLogic(KX_KetsjiEngine *engine, KX_Scene* scene) // quick hack } else { PyErr_Clear(); - // Create the module and add the functions + // Create the module and add the functions m = PyModule_Create(&GameLogic_module_def); PyDict_SetItemString(PySys_GetObject("modules"), GameLogic_module_def.m_name, m); } @@ -1832,7 +1832,7 @@ static void restorePySysObjects(void) PyDict_Clear(sys_mods); PyDict_Update(sys_mods, gp_OrigPythonSysModules); Py_DECREF(gp_OrigPythonSysModules); - gp_OrigPythonSysModules= NULL; + gp_OrigPythonSysModules= NULL; // fprintf(stderr, "\nRestore Path: %d ", PyList_GET_SIZE(sys_path)); @@ -1862,7 +1862,7 @@ static struct _inittab bge_internal_modules[]= { * Python is not initialized. * see bpy_interface.c's BPY_python_start() which shares the same functionality in blender. */ -PyObject* initGamePlayerPythonScripting(const STR_String& progname, TPythonSecurityLevel level, Main *maggie, int argc, char** argv) +PyObject *initGamePlayerPythonScripting(const STR_String& progname, TPythonSecurityLevel level, Main *maggie, int argc, char** argv) { /* Yet another gotcha in the py api * Cant run PySys_SetArgv more then once because this adds the @@ -1935,7 +1935,7 @@ PyObject* initGamePlayerPythonScripting(const STR_String& progname, TPythonSecur } void exitGamePlayerPythonScripting() -{ +{ /* Clean up the Python mouse and keyboard */ delete gp_PythonKeyboard; gp_PythonKeyboard = NULL; @@ -1956,7 +1956,7 @@ void exitGamePlayerPythonScripting() /** * Python is already initialized. */ -PyObject* initGamePythonScripting(const STR_String& progname, TPythonSecurityLevel level, Main *maggie) +PyObject *initGamePythonScripting(const STR_String& progname, TPythonSecurityLevel level, Main *maggie) { #if 0 // XXX TODO Py3 STR_String pname = progname; @@ -1998,9 +1998,10 @@ void exitGamePythonScripting() /* similar to the above functions except it sets up the namespace * and other more general things */ -void setupGamePython(KX_KetsjiEngine* ketsjiengine, KX_Scene* startscene, Main *blenderdata, PyObject * pyGlobalDict, PyObject **gameLogic, PyObject **gameLogic_keys, int argc, char** argv) +void setupGamePython(KX_KetsjiEngine* ketsjiengine, KX_Scene *startscene, Main *blenderdata, + PyObject *pyGlobalDict, PyObject **gameLogic, PyObject **gameLogic_keys, int argc, char** argv) { - PyObject* dictionaryobject; + PyObject *dictionaryobject; if (argv) /* player only */ dictionaryobject= initGamePlayerPythonScripting("Ketsji", psl_Lowest, blenderdata, argc, argv); @@ -2053,15 +2054,15 @@ static struct PyModuleDef Rasterizer_module_def = { 0, /* m_free */ }; -PyObject* initRasterizer(RAS_IRasterizer* rasty,RAS_ICanvas* canvas) +PyObject *initRasterizer(RAS_IRasterizer* rasty,RAS_ICanvas* canvas) { gp_Canvas = canvas; gp_Rasterizer = rasty; - PyObject* m; - PyObject* d; - PyObject* item; + PyObject *m; + PyObject *d; + PyObject *item; /* Use existing module where possible * be careful not to init any runtime vars after this */ @@ -2114,9 +2115,9 @@ static char gPyEventToString_doc[] = "EventToString(event) - Take a valid event from the GameKeys module or Keyboard Sensor and return a name" ; -static PyObject* gPyEventToString(PyObject*, PyObject* value) +static PyObject *gPyEventToString(PyObject *, PyObject *value) { - PyObject* mod, *dict, *key, *val, *ret = NULL; + PyObject *mod, *dict, *key, *val, *ret = NULL; Py_ssize_t pos = 0; mod = PyImport_ImportModule( "GameKeys" ); @@ -2144,7 +2145,7 @@ static char gPyEventToCharacter_doc[] = "EventToCharacter(event, is_shift) - Take a valid event from the GameKeys module or Keyboard Sensor and return a character" ; -static PyObject* gPyEventToCharacter(PyObject*, PyObject* args) +static PyObject *gPyEventToCharacter(PyObject *, PyObject *args) { int event, shift; if (!PyArg_ParseTuple(args,"ii:EventToCharacter", &event, &shift)) @@ -2179,11 +2180,11 @@ static struct PyModuleDef GameKeys_module_def = { 0, /* m_free */ }; -PyObject* initGameKeys() +PyObject *initGameKeys() { - PyObject* m; - PyObject* d; - PyObject* item; + PyObject *m; + PyObject *d; + PyObject *item; /* Use existing module where possible */ m = PyImport_ImportModule( "GameKeys" ); @@ -2231,24 +2232,24 @@ PyObject* initGameKeys() KX_MACRO_addTypesToDict(d, YKEY, SCA_IInputDevice::KX_YKEY); KX_MACRO_addTypesToDict(d, ZKEY, SCA_IInputDevice::KX_ZKEY); - KX_MACRO_addTypesToDict(d, ZEROKEY, SCA_IInputDevice::KX_ZEROKEY); - KX_MACRO_addTypesToDict(d, ONEKEY, SCA_IInputDevice::KX_ONEKEY); - KX_MACRO_addTypesToDict(d, TWOKEY, SCA_IInputDevice::KX_TWOKEY); + KX_MACRO_addTypesToDict(d, ZEROKEY, SCA_IInputDevice::KX_ZEROKEY); + KX_MACRO_addTypesToDict(d, ONEKEY, SCA_IInputDevice::KX_ONEKEY); + KX_MACRO_addTypesToDict(d, TWOKEY, SCA_IInputDevice::KX_TWOKEY); KX_MACRO_addTypesToDict(d, THREEKEY, SCA_IInputDevice::KX_THREEKEY); - KX_MACRO_addTypesToDict(d, FOURKEY, SCA_IInputDevice::KX_FOURKEY); - KX_MACRO_addTypesToDict(d, FIVEKEY, SCA_IInputDevice::KX_FIVEKEY); - KX_MACRO_addTypesToDict(d, SIXKEY, SCA_IInputDevice::KX_SIXKEY); + KX_MACRO_addTypesToDict(d, FOURKEY, SCA_IInputDevice::KX_FOURKEY); + KX_MACRO_addTypesToDict(d, FIVEKEY, SCA_IInputDevice::KX_FIVEKEY); + KX_MACRO_addTypesToDict(d, SIXKEY, SCA_IInputDevice::KX_SIXKEY); KX_MACRO_addTypesToDict(d, SEVENKEY, SCA_IInputDevice::KX_SEVENKEY); KX_MACRO_addTypesToDict(d, EIGHTKEY, SCA_IInputDevice::KX_EIGHTKEY); - KX_MACRO_addTypesToDict(d, NINEKEY, SCA_IInputDevice::KX_NINEKEY); + KX_MACRO_addTypesToDict(d, NINEKEY, SCA_IInputDevice::KX_NINEKEY); KX_MACRO_addTypesToDict(d, CAPSLOCKKEY, SCA_IInputDevice::KX_CAPSLOCKKEY); - KX_MACRO_addTypesToDict(d, LEFTCTRLKEY, SCA_IInputDevice::KX_LEFTCTRLKEY); + KX_MACRO_addTypesToDict(d, LEFTCTRLKEY, SCA_IInputDevice::KX_LEFTCTRLKEY); KX_MACRO_addTypesToDict(d, LEFTALTKEY, SCA_IInputDevice::KX_LEFTALTKEY); KX_MACRO_addTypesToDict(d, RIGHTALTKEY, SCA_IInputDevice::KX_RIGHTALTKEY); KX_MACRO_addTypesToDict(d, RIGHTCTRLKEY, SCA_IInputDevice::KX_RIGHTCTRLKEY); - KX_MACRO_addTypesToDict(d, RIGHTSHIFTKEY, SCA_IInputDevice::KX_RIGHTSHIFTKEY); + KX_MACRO_addTypesToDict(d, RIGHTSHIFTKEY, SCA_IInputDevice::KX_RIGHTSHIFTKEY); KX_MACRO_addTypesToDict(d, LEFTSHIFTKEY, SCA_IInputDevice::KX_LEFTSHIFTKEY); KX_MACRO_addTypesToDict(d, ESCKEY, SCA_IInputDevice::KX_ESCKEY); @@ -2256,25 +2257,25 @@ PyObject* initGameKeys() KX_MACRO_addTypesToDict(d, RETKEY, SCA_IInputDevice::KX_RETKEY); KX_MACRO_addTypesToDict(d, ENTERKEY, SCA_IInputDevice::KX_RETKEY); KX_MACRO_addTypesToDict(d, SPACEKEY, SCA_IInputDevice::KX_SPACEKEY); - KX_MACRO_addTypesToDict(d, LINEFEEDKEY, SCA_IInputDevice::KX_LINEFEEDKEY); + KX_MACRO_addTypesToDict(d, LINEFEEDKEY, SCA_IInputDevice::KX_LINEFEEDKEY); KX_MACRO_addTypesToDict(d, BACKSPACEKEY, SCA_IInputDevice::KX_BACKSPACEKEY); KX_MACRO_addTypesToDict(d, DELKEY, SCA_IInputDevice::KX_DELKEY); KX_MACRO_addTypesToDict(d, SEMICOLONKEY, SCA_IInputDevice::KX_SEMICOLONKEY); - KX_MACRO_addTypesToDict(d, PERIODKEY, SCA_IInputDevice::KX_PERIODKEY); - KX_MACRO_addTypesToDict(d, COMMAKEY, SCA_IInputDevice::KX_COMMAKEY); - KX_MACRO_addTypesToDict(d, QUOTEKEY, SCA_IInputDevice::KX_QUOTEKEY); - KX_MACRO_addTypesToDict(d, ACCENTGRAVEKEY, SCA_IInputDevice::KX_ACCENTGRAVEKEY); - KX_MACRO_addTypesToDict(d, MINUSKEY, SCA_IInputDevice::KX_MINUSKEY); - KX_MACRO_addTypesToDict(d, SLASHKEY, SCA_IInputDevice::KX_SLASHKEY); + KX_MACRO_addTypesToDict(d, PERIODKEY, SCA_IInputDevice::KX_PERIODKEY); + KX_MACRO_addTypesToDict(d, COMMAKEY, SCA_IInputDevice::KX_COMMAKEY); + KX_MACRO_addTypesToDict(d, QUOTEKEY, SCA_IInputDevice::KX_QUOTEKEY); + KX_MACRO_addTypesToDict(d, ACCENTGRAVEKEY, SCA_IInputDevice::KX_ACCENTGRAVEKEY); + KX_MACRO_addTypesToDict(d, MINUSKEY, SCA_IInputDevice::KX_MINUSKEY); + KX_MACRO_addTypesToDict(d, SLASHKEY, SCA_IInputDevice::KX_SLASHKEY); KX_MACRO_addTypesToDict(d, BACKSLASHKEY, SCA_IInputDevice::KX_BACKSLASHKEY); - KX_MACRO_addTypesToDict(d, EQUALKEY, SCA_IInputDevice::KX_EQUALKEY); - KX_MACRO_addTypesToDict(d, LEFTBRACKETKEY, SCA_IInputDevice::KX_LEFTBRACKETKEY); - KX_MACRO_addTypesToDict(d, RIGHTBRACKETKEY, SCA_IInputDevice::KX_RIGHTBRACKETKEY); + KX_MACRO_addTypesToDict(d, EQUALKEY, SCA_IInputDevice::KX_EQUALKEY); + KX_MACRO_addTypesToDict(d, LEFTBRACKETKEY, SCA_IInputDevice::KX_LEFTBRACKETKEY); + KX_MACRO_addTypesToDict(d, RIGHTBRACKETKEY, SCA_IInputDevice::KX_RIGHTBRACKETKEY); KX_MACRO_addTypesToDict(d, LEFTARROWKEY, SCA_IInputDevice::KX_LEFTARROWKEY); KX_MACRO_addTypesToDict(d, DOWNARROWKEY, SCA_IInputDevice::KX_DOWNARROWKEY); - KX_MACRO_addTypesToDict(d, RIGHTARROWKEY, SCA_IInputDevice::KX_RIGHTARROWKEY); - KX_MACRO_addTypesToDict(d, UPARROWKEY, SCA_IInputDevice::KX_UPARROWKEY); + KX_MACRO_addTypesToDict(d, RIGHTARROWKEY, SCA_IInputDevice::KX_RIGHTARROWKEY); + KX_MACRO_addTypesToDict(d, UPARROWKEY, SCA_IInputDevice::KX_UPARROWKEY); KX_MACRO_addTypesToDict(d, PAD2 , SCA_IInputDevice::KX_PAD2); KX_MACRO_addTypesToDict(d, PAD4 , SCA_IInputDevice::KX_PAD4); @@ -2347,14 +2348,14 @@ PyObject* initGameKeys() int saveGamePythonConfig( char **marshal_buffer) { int marshal_length = 0; - PyObject* gameLogic = PyImport_ImportModule("GameLogic"); + PyObject *gameLogic = PyImport_ImportModule("GameLogic"); if (gameLogic) { - PyObject* pyGlobalDict = PyDict_GetItemString(PyModule_GetDict(gameLogic), "globalDict"); // Same as importing the module + PyObject *pyGlobalDict = PyDict_GetItemString(PyModule_GetDict(gameLogic), "globalDict"); // Same as importing the module if (pyGlobalDict) { -#ifdef Py_MARSHAL_VERSION - PyObject* pyGlobalDictMarshal = PyMarshal_WriteObjectToString( pyGlobalDict, 2); // Py_MARSHAL_VERSION == 2 as of Py2.5 +#ifdef Py_MARSHAL_VERSION + PyObject *pyGlobalDictMarshal = PyMarshal_WriteObjectToString( pyGlobalDict, 2); // Py_MARSHAL_VERSION == 2 as of Py2.5 #else - PyObject* pyGlobalDictMarshal = PyMarshal_WriteObjectToString( pyGlobalDict ); + PyObject *pyGlobalDictMarshal = PyMarshal_WriteObjectToString( pyGlobalDict ); #endif if (pyGlobalDictMarshal) { // for testing only @@ -2384,12 +2385,12 @@ int loadGamePythonConfig(char *marshal_buffer, int marshal_length) { /* Restore the dict */ if (marshal_buffer) { - PyObject* gameLogic = PyImport_ImportModule("GameLogic"); + PyObject *gameLogic = PyImport_ImportModule("GameLogic"); if (gameLogic) { - PyObject* pyGlobalDict = PyMarshal_ReadObjectFromString(marshal_buffer, marshal_length); + PyObject *pyGlobalDict = PyMarshal_ReadObjectFromString(marshal_buffer, marshal_length); if (pyGlobalDict) { - PyObject* pyGlobalDict_orig = PyDict_GetItemString(PyModule_GetDict(gameLogic), "globalDict"); // Same as importing the module. + PyObject *pyGlobalDict_orig = PyDict_GetItemString(PyModule_GetDict(gameLogic), "globalDict"); // Same as importing the module. if (pyGlobalDict_orig) { PyDict_Clear(pyGlobalDict_orig); PyDict_Update(pyGlobalDict_orig, pyGlobalDict); @@ -2405,10 +2406,11 @@ int loadGamePythonConfig(char *marshal_buffer, int marshal_length) PyErr_Clear(); printf("Error could not marshall string\n"); } - } else { + } + else { PyErr_Clear(); printf("Error, bge.logic failed to import bge.logic.globalDict will be lost\n"); - } + } } return 0; } diff --git a/source/gameengine/Ketsji/KX_PythonInit.h b/source/gameengine/Ketsji/KX_PythonInit.h index 1500dd97ae1..69517b2b1e9 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.h +++ b/source/gameengine/Ketsji/KX_PythonInit.h @@ -52,7 +52,8 @@ void exitGamePlayerPythonScripting(); PyObject* initGamePythonScripting(const STR_String& progname, TPythonSecurityLevel level, struct Main *maggie); void exitGamePythonScripting(); -void setupGamePython(KX_KetsjiEngine* ketsjiengine, KX_Scene* startscene, Main *blenderdata, PyObject *pyGlobalDict, PyObject **gameLogic, PyObject **gameLogic_keys, int argc, char** argv); +void setupGamePython(KX_KetsjiEngine *ketsjiengine, KX_Scene *startscene, Main *blenderdata, + PyObject *pyGlobalDict, PyObject **gameLogic, PyObject **gameLogic_keys, int argc, char** argv); void setGamePythonPath(const char *path); void resetGamePythonPath(); @@ -72,11 +73,12 @@ class KX_Scene* KX_GetActiveScene(); class KX_KetsjiEngine* KX_GetActiveEngine(); typedef int (*PyNextFrameFunc)(void *); + struct PyNextFrameState { - //state: can be either a GPG_NextFrameState or a BL_KetsjiNextFrameState - void *state; - //func: can be either GPG_PyNextFrame or BL_KetsjiPyNextFrame - PyNextFrameFunc func; + /** can be either a GPG_NextFrameState or a BL_KetsjiNextFrameState */ + void *state; + /** can be either GPG_PyNextFrame or BL_KetsjiPyNextFrame */ + PyNextFrameFunc func; }; extern struct PyNextFrameState pynextframestate; @@ -84,7 +86,7 @@ extern struct PyNextFrameState pynextframestate; void KX_RasterizerDrawDebugLine(const MT_Vector3& from,const MT_Vector3& to,const MT_Vector3& color); void KX_RasterizerDrawDebugCircle(const MT_Vector3& center, const MT_Scalar radius, const MT_Vector3& color, - const MT_Vector3& normal, int nsector); + const MT_Vector3& normal, int nsector); #endif //__KX_PYTHONINIT_H__ diff --git a/source/gameengine/Ketsji/KX_PythonInitTypes.h b/source/gameengine/Ketsji/KX_PythonInitTypes.h index a06fe46a0ea..d8ee4f75fdd 100644 --- a/source/gameengine/Ketsji/KX_PythonInitTypes.h +++ b/source/gameengine/Ketsji/KX_PythonInitTypes.h @@ -29,11 +29,11 @@ * \ingroup ketsji */ -#ifndef _adr_py_init_types_h_ // only process once, -#define _adr_py_init_types_h_ // even if multiply included +#ifndef __KX_PYTHON_INIT_TYPES__ +#define __KX_PYTHON_INIT_TYPES__ #ifdef WITH_PYTHON void initPyTypes(void); #endif -#endif +#endif /* __KX_PYTHON_INIT_TYPES__ */ diff --git a/source/gameengine/Ketsji/KX_PythonSeq.cpp b/source/gameengine/Ketsji/KX_PythonSeq.cpp index 5d082c8394a..5ab3de15fb3 100644 --- a/source/gameengine/Ketsji/KX_PythonSeq.cpp +++ b/source/gameengine/Ketsji/KX_PythonSeq.cpp @@ -69,7 +69,7 @@ static void KX_PythonSeq_dealloc(KX_PythonSeq * self) PyObject_GC_Del(self); } -static Py_ssize_t KX_PythonSeq_len( PyObject * self ) +static Py_ssize_t KX_PythonSeq_len( PyObject *self ) { PyObjectPlus *self_plus= BGE_PROXY_REF(((KX_PythonSeq *)self)->base); @@ -100,7 +100,7 @@ static Py_ssize_t KX_PythonSeq_len( PyObject * self ) } } -static PyObject *KX_PythonSeq_getIndex(PyObject* self, int index) +static PyObject *KX_PythonSeq_getIndex(PyObject *self, int index) { PyObjectPlus *self_plus= BGE_PROXY_REF(((KX_PythonSeq *)self)->base); @@ -264,7 +264,7 @@ static PyObjectPlus * KX_PythonSeq_subscript__internal(PyObject *self, const cha } -static PyObject * KX_PythonSeq_subscript(PyObject * self, PyObject *key) +static PyObject * KX_PythonSeq_subscript(PyObject *self, PyObject *key) { PyObjectPlus *self_plus= BGE_PROXY_REF(((KX_PythonSeq *)self)->base); @@ -314,10 +314,10 @@ static int KX_PythonSeq_contains(PyObject *self, PyObject *key) } /* Matches python dict.get(key, [default]) */ -static PyObject* KX_PythonSeq_get(PyObject * self, PyObject *args) +static PyObject *KX_PythonSeq_get(PyObject *self, PyObject *args) { char *key; - PyObject* def = Py_None; + PyObject *def = Py_None; PyObjectPlus* ret_plus; if (!PyArg_ParseTuple(args, "s|O:get", &key, &def)) @@ -396,7 +396,7 @@ static PyObject *KX_PythonSeq_nextIter(KX_PythonSeq *self) static int KX_PythonSeq_compare( KX_PythonSeq * a, KX_PythonSeq * b ) { - return ( a->type == b->type && a->base == b->base) ? 0 : -1; + return ( a->type == b->type && a->base == b->base) ? 0 : -1; } static PyObject *KX_PythonSeq_richcmp(PyObject *a, PyObject *b, int op) diff --git a/source/gameengine/Ketsji/KX_RadarSensor.cpp b/source/gameengine/Ketsji/KX_RadarSensor.cpp index 74009f51078..fb949fffa8a 100644 --- a/source/gameengine/Ketsji/KX_RadarSensor.cpp +++ b/source/gameengine/Ketsji/KX_RadarSensor.cpp @@ -217,7 +217,7 @@ PyAttributeDef KX_RadarSensor::Attributes[] = { {NULL} //Sentinel }; -PyObject* KX_RadarSensor::pyattr_get_angle(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_RadarSensor::pyattr_get_angle(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_RadarSensor* self= static_cast<KX_RadarSensor*>(self_v); diff --git a/source/gameengine/Ketsji/KX_RaySensor.cpp b/source/gameengine/Ketsji/KX_RaySensor.cpp index 58ca847b617..14786e8429e 100644 --- a/source/gameengine/Ketsji/KX_RaySensor.cpp +++ b/source/gameengine/Ketsji/KX_RaySensor.cpp @@ -361,7 +361,7 @@ PyAttributeDef KX_RaySensor::Attributes[] = { { NULL } //Sentinel }; -PyObject* KX_RaySensor::pyattr_get_hitobject(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_RaySensor::pyattr_get_hitobject(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_RaySensor* self = static_cast<KX_RaySensor*>(self_v); if (self->m_hitObject) diff --git a/source/gameengine/Ketsji/KX_RaySensor.h b/source/gameengine/Ketsji/KX_RaySensor.h index f5d1c72d098..27aaa442dcd 100644 --- a/source/gameengine/Ketsji/KX_RaySensor.h +++ b/source/gameengine/Ketsji/KX_RaySensor.h @@ -94,7 +94,7 @@ public: #ifdef WITH_PYTHON /* Attributes */ - static PyObject* pyattr_get_hitobject(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_hitobject(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); #endif // WITH_PYTHON diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp index 841feda5237..d850168afdf 100644 --- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp +++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp @@ -203,10 +203,10 @@ PyAttributeDef KX_SCA_AddObjectActuator::Attributes[] = { { NULL } //Sentinel }; -PyObject* KX_SCA_AddObjectActuator::pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_SCA_AddObjectActuator::pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) { KX_SCA_AddObjectActuator* actuator = static_cast<KX_SCA_AddObjectActuator*>(self); - if (!actuator->m_OriginalObject) + if (!actuator->m_OriginalObject) Py_RETURN_NONE; else return actuator->m_OriginalObject->GetProxy(); @@ -221,7 +221,7 @@ int KX_SCA_AddObjectActuator::pyattr_set_object(void *self, const struct KX_PYAT return PY_SET_ATTR_FAIL; // ConvertPythonToGameObject sets the error if (actuator->m_OriginalObject != NULL) - actuator->m_OriginalObject->UnregisterActuator(actuator); + actuator->m_OriginalObject->UnregisterActuator(actuator); actuator->m_OriginalObject = (SCA_IObject*)gameobj; @@ -231,7 +231,7 @@ int KX_SCA_AddObjectActuator::pyattr_set_object(void *self, const struct KX_PYAT return PY_SET_ATTR_SUCCESS; } -PyObject* KX_SCA_AddObjectActuator::pyattr_get_objectLastCreated(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_SCA_AddObjectActuator::pyattr_get_objectLastCreated(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) { KX_SCA_AddObjectActuator* actuator = static_cast<KX_SCA_AddObjectActuator*>(self); if (!actuator->m_lastCreatedObject) @@ -240,7 +240,7 @@ PyObject* KX_SCA_AddObjectActuator::pyattr_get_objectLastCreated(void *self, con return actuator->m_lastCreatedObject->GetProxy(); } -PyObject* KX_SCA_AddObjectActuator::PyInstantAddObject() +PyObject *KX_SCA_AddObjectActuator::PyInstantAddObject() { InstantAddObject(); @@ -253,7 +253,7 @@ void KX_SCA_AddObjectActuator::InstantAddObject() { if (m_OriginalObject) { - // Add an identical object, with properties inherited from the original object + // Add an identical object, with properties inherited from the original object // Now it needs to be added to the current scene. SCA_IObject* replica = m_scene->AddReplicaObject(m_OriginalObject,GetParent(),m_timeProp ); KX_GameObject * game_obj = static_cast<KX_GameObject *>(replica); diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h index f49f2473036..9c8cbfa3d09 100644 --- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h +++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h @@ -112,7 +112,7 @@ public: virtual bool Update(); - SCA_IObject* + SCA_IObject * GetLastCreatedObject( ) const; @@ -122,9 +122,9 @@ public: KX_PYMETHOD_DOC_NOARGS(KX_SCA_AddObjectActuator,InstantAddObject); - static PyObject* pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); static int pyattr_set_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); - static PyObject* pyattr_get_objectLastCreated(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_objectLastCreated(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); #endif // WITH_PYTHON diff --git a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp index f408b2cd7c9..5dc67a4cff3 100644 --- a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp +++ b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp @@ -119,14 +119,14 @@ bool KX_SCA_DynamicActuator::Update() switch (m_dyn_operation) { - case 0: - obj->RestoreDynamics(); + case 0: + obj->RestoreDynamics(); break; case 1: obj->SuspendDynamics(); break; case 2: - controller->setRigidBody(true); + controller->setRigidBody(true); break; case 3: controller->setRigidBody(false); diff --git a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp index ffe5556cfe6..b105256836b 100644 --- a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp +++ b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp @@ -87,7 +87,7 @@ PyAttributeDef KX_SCA_ReplaceMeshActuator::Attributes[] = { { NULL } //Sentinel }; -PyObject* KX_SCA_ReplaceMeshActuator::pyattr_get_mesh(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_SCA_ReplaceMeshActuator::pyattr_get_mesh(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) { KX_SCA_ReplaceMeshActuator* actuator = static_cast<KX_SCA_ReplaceMeshActuator*>(self); if (!actuator->m_mesh) diff --git a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h index 6db16a0e1b6..52a20142442 100644 --- a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h +++ b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h @@ -84,7 +84,7 @@ class KX_SCA_ReplaceMeshActuator : public SCA_IActuator m_scene= val; }; - static PyObject* pyattr_get_mesh(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_mesh(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); static int pyattr_set_mesh(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); KX_PYMETHOD_DOC(KX_SCA_ReplaceMeshActuator,instantReplaceMesh); diff --git a/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp b/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp index 13200696ffb..19b9d13087d 100644 --- a/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp +++ b/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp @@ -51,14 +51,14 @@ KX_BoneParentRelation:: New(Bone* bone ) { return new KX_BoneParentRelation(bone); -} +} bool KX_BoneParentRelation:: UpdateChildCoordinates( SG_Spatial * child, const SG_Spatial * parent, - bool& parentUpdated + bool& parentUpdated ) { MT_assert(child != NULL); @@ -71,7 +71,7 @@ UpdateChildCoordinates( // we don't know if the armature has been updated or not, assume yes parentUpdated = true; - // the childs world locations which we will update. + // the childs world locations which we will update. MT_Vector3 child_w_scale; MT_Point3 child_w_pos; diff --git a/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h b/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h index 76fefdebe08..6f4fd482198 100644 --- a/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h +++ b/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h @@ -57,7 +57,7 @@ public : static KX_BoneParentRelation * New(Bone* bone - ); + ); /** * Updates the childs world coordinates relative to the parent's diff --git a/source/gameengine/Ketsji/KX_SG_NodeRelationships.cpp b/source/gameengine/Ketsji/KX_SG_NodeRelationships.cpp index 699b267496d..e80de76861e 100644 --- a/source/gameengine/Ketsji/KX_SG_NodeRelationships.cpp +++ b/source/gameengine/Ketsji/KX_SG_NodeRelationships.cpp @@ -45,14 +45,14 @@ KX_NormalParentRelation:: New( ) { return new KX_NormalParentRelation(); -} +} bool KX_NormalParentRelation:: UpdateChildCoordinates( SG_Spatial * child, const SG_Spatial * parent, - bool& parentUpdated + bool& parentUpdated ) { MT_assert(child != NULL); @@ -67,7 +67,7 @@ UpdateChildCoordinates( return true; //false; } else { - // the childs world locations which we will update. + // the childs world locations which we will update. const MT_Vector3 & p_world_scale = parent->GetWorldScaling(); const MT_Point3 & p_world_pos = parent->GetWorldPosition(); const MT_Matrix3x3 & p_world_rotation = parent->GetWorldOrientation(); @@ -121,7 +121,7 @@ KX_VertexParentRelation:: UpdateChildCoordinates( SG_Spatial * child, const SG_Spatial * parent, - bool& parentUpdated + bool& parentUpdated ) { MT_assert(child != NULL); @@ -176,7 +176,7 @@ New( MT_Scalar relaxation ) { return new KX_SlowParentRelation(relaxation); -} +} /** * Method inherited from KX_ParentRelation @@ -187,7 +187,7 @@ KX_SlowParentRelation:: UpdateChildCoordinates( SG_Spatial * child, const SG_Spatial * parent, - bool& parentUpdated + bool& parentUpdated ) { MT_assert(child != NULL); @@ -198,7 +198,7 @@ UpdateChildCoordinates( const MT_Point3 & child_pos = child->GetLocalPosition(); const MT_Matrix3x3 & child_rotation = child->GetLocalOrientation(); - // the childs world locations which we will update. + // the childs world locations which we will update. MT_Vector3 child_w_scale; MT_Point3 child_w_pos; @@ -230,7 +230,7 @@ UpdateChildCoordinates( child_w_scale = child->GetWorldScaling(); child_w_pos = child->GetWorldPosition(); - child_w_rotation = child->GetWorldOrientation(); + child_w_rotation = child->GetWorldOrientation(); // now 'interpolate' the normal coordinates with the last // world coordinates to get the new world coordinates. diff --git a/source/gameengine/Ketsji/KX_SG_NodeRelationships.h b/source/gameengine/Ketsji/KX_SG_NodeRelationships.h index b5ab5302910..5d777f5028f 100644 --- a/source/gameengine/Ketsji/KX_SG_NodeRelationships.h +++ b/source/gameengine/Ketsji/KX_SG_NodeRelationships.h @@ -57,7 +57,7 @@ public : static KX_NormalParentRelation * New( - ); + ); /** * Method inherited from KX_ParentRelation @@ -67,7 +67,7 @@ public : UpdateChildCoordinates( SG_Spatial * child, const SG_Spatial * parent, - bool& parentUpdated + bool& parentUpdated ); /** @@ -106,7 +106,7 @@ public : static KX_VertexParentRelation * New( - ); + ); /** * Method inherited from KX_ParentRelation @@ -116,7 +116,7 @@ public : UpdateChildCoordinates( SG_Spatial * child, const SG_Spatial * parent, - bool& parentUpdated + bool& parentUpdated ); /** @@ -162,7 +162,7 @@ public : KX_SlowParentRelation * New( MT_Scalar relaxation - ); + ); /** * Method inherited from KX_ParentRelation @@ -172,7 +172,7 @@ public : UpdateChildCoordinates( SG_Spatial * child, const SG_Spatial * parent, - bool& parentUpdated + bool& parentUpdated ); /** diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index f77cb535eed..652ed2ab2dd 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -368,7 +368,7 @@ void KX_Scene::SetFramingType(RAS_FrameSettings & frame_settings) const RAS_FrameSettings& KX_Scene::GetFramingType() const { return m_frame_settings; -}; +}; @@ -441,7 +441,7 @@ void KX_Scene::EnableZBufferClearing(bool isclearingZbuffer) void KX_Scene::RemoveNodeDestructObject(class SG_IObject* node,class CValue* gameobj) { - KX_GameObject* orgobj = (KX_GameObject*)gameobj; + KX_GameObject* orgobj = (KX_GameObject*)gameobj; if (NewRemoveObject(orgobj) != 0) { // object is not yet deleted because a reference is hanging somewhere. @@ -1072,7 +1072,7 @@ void KX_Scene::ReplaceMesh(class CValue* obj,void* meshobj, bool use_gfx, bool u } if (use_gfx && mesh != NULL) - { + { gameobj->RemoveMeshes(); gameobj->AddMesh(mesh); @@ -1278,7 +1278,7 @@ void KX_Scene::AddCamera(KX_Camera* cam) KX_Camera* KX_Scene::GetActiveCamera() -{ +{ // NULL if not defined return m_active_camera; } @@ -1634,16 +1634,17 @@ void KX_Scene::UpdateObjectActivity(void) * Manhattan distance. */ MT_Point3 obpos = ob->NodeGetWorldPosition(); - if ( (fabs(camloc[0] - obpos[0]) > m_activity_box_radius) - || (fabs(camloc[1] - obpos[1]) > m_activity_box_radius) - || (fabs(camloc[2] - obpos[2]) > m_activity_box_radius) ) - { + if ((fabs(camloc[0] - obpos[0]) > m_activity_box_radius) || + (fabs(camloc[1] - obpos[1]) > m_activity_box_radius) || + (fabs(camloc[2] - obpos[2]) > m_activity_box_radius) ) + { ob->Suspend(); - } else { + } + else { ob->Resume(); } } - } + } } } @@ -1944,15 +1945,15 @@ void KX_Scene::Render2DFilters(RAS_ICanvas* canvas) #ifdef WITH_PYTHON -void KX_Scene::RunDrawingCallbacks(PyObject* cb_list) +void KX_Scene::RunDrawingCallbacks(PyObject *cb_list) { Py_ssize_t len; if (cb_list && (len=PyList_GET_SIZE(cb_list))) { - PyObject* args= PyTuple_New(0); // save python creating each call - PyObject* func; - PyObject* ret; + PyObject *args = PyTuple_New(0); // save python creating each call + PyObject *func; + PyObject *ret; // Iterate the list and run the callbacks for (Py_ssize_t pos=0; pos < len; pos++) @@ -2019,7 +2020,7 @@ static PyObject *Map_GetItem(PyObject *self_v, PyObject *item) { KX_Scene* self= static_cast<KX_Scene*>BGE_PROXY_REF(self_v); const char *attr_str= _PyUnicode_AsString(item); - PyObject* pyconvert; + PyObject *pyconvert; if (self==NULL) { PyErr_SetString(PyExc_SystemError, "val = scene[key]: KX_Scene, "BGE_PROXY_ERROR_MSG); @@ -2122,31 +2123,31 @@ PySequenceMethods KX_Scene::Sequence = { (ssizeargfunc) NULL, /* sq_inplace_repeat */ }; -PyObject* KX_Scene::pyattr_get_name(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_Scene::pyattr_get_name(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_Scene* self= static_cast<KX_Scene*>(self_v); return PyUnicode_From_STR_String(self->GetName()); } -PyObject* KX_Scene::pyattr_get_objects(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_Scene::pyattr_get_objects(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_Scene* self= static_cast<KX_Scene*>(self_v); return self->GetObjectList()->GetProxy(); } -PyObject* KX_Scene::pyattr_get_objects_inactive(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_Scene::pyattr_get_objects_inactive(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_Scene* self= static_cast<KX_Scene*>(self_v); return self->GetInactiveList()->GetProxy(); } -PyObject* KX_Scene::pyattr_get_lights(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_Scene::pyattr_get_lights(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_Scene* self= static_cast<KX_Scene*>(self_v); return self->GetLightList()->GetProxy(); } -PyObject* KX_Scene::pyattr_get_cameras(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_Scene::pyattr_get_cameras(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { /* With refcounts in this case... * the new CListValue is owned by python, so its possible python holds onto it longer then the BGE @@ -2167,7 +2168,7 @@ PyObject* KX_Scene::pyattr_get_cameras(void *self_v, const KX_PYATTRIBUTE_DEF *a return clist->NewProxy(true); } -PyObject* KX_Scene::pyattr_get_active_camera(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_Scene::pyattr_get_active_camera(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_Scene* self= static_cast<KX_Scene*>(self_v); KX_Camera* cam= self->GetActiveCamera(); @@ -2190,7 +2191,7 @@ int KX_Scene::pyattr_set_active_camera(void *self_v, const KX_PYATTRIBUTE_DEF *a return PY_SET_ATTR_SUCCESS; } -PyObject* KX_Scene::pyattr_get_drawing_callback_pre(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_Scene::pyattr_get_drawing_callback_pre(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_Scene* self = static_cast<KX_Scene*>(self_v); @@ -2200,7 +2201,7 @@ PyObject* KX_Scene::pyattr_get_drawing_callback_pre(void *self_v, const KX_PYATT return self->m_draw_call_pre; } -PyObject* KX_Scene::pyattr_get_drawing_callback_post(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_Scene::pyattr_get_drawing_callback_post(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_Scene* self = static_cast<KX_Scene*>(self_v); @@ -2354,8 +2355,8 @@ KX_PYMETHODDEF_DOC(KX_Scene, drawObstacleSimulation, KX_PYMETHODDEF_DOC(KX_Scene, get, "") { PyObject *key; - PyObject* def = Py_None; - PyObject* ret; + PyObject *def = Py_None; + PyObject *ret; if (!PyArg_ParseTuple(args, "O|O:get", &key, &def)) return NULL; diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h index f8480753395..bb329da99de 100644 --- a/source/gameengine/Ketsji/KX_Scene.h +++ b/source/gameengine/Ketsji/KX_Scene.h @@ -237,7 +237,7 @@ protected: /** * The execution priority of replicated object actuators? - */ + */ int m_ueberExecutionPriority; /** @@ -295,7 +295,7 @@ protected: KX_ObstacleSimulation* m_obstacleSimulation; -public: +public: KX_Scene(class SCA_IInputDevice* keyboarddevice, class SCA_IInputDevice* mousedevice, class NG_NetworkDeviceInterface* ndi, @@ -303,7 +303,7 @@ public: struct Scene* scene, class RAS_ICanvas* canvas); - virtual + virtual ~KX_Scene(); RAS_BucketManager* GetBucketManager(); @@ -349,11 +349,11 @@ public: void LogicUpdateFrame(double curtime, bool frame); void UpdateAnimations(double curtime); - void + void LogicEndFrame( ); - CListValue* + CListValue* GetTempObjectList( ); @@ -361,23 +361,23 @@ public: GetObjectList( ); - CListValue* + CListValue* GetInactiveList( ); - CListValue* + CListValue* GetRootParentList( ); - CListValue* + CListValue* GetLightList( ); - SCA_LogicManager* + SCA_LogicManager * GetLogicManager( ); - SCA_TimeEventManager* + SCA_TimeEventManager * GetTimeEventManager( ); @@ -426,7 +426,7 @@ public: ); /** Find the currently active camera. */ - KX_Camera* + KX_Camera* GetActiveCamera( ); @@ -435,7 +435,7 @@ public: * camera is not present in the camera list, it will be added */ - void + void SetActiveCamera( class KX_Camera* ); @@ -453,7 +453,7 @@ public: * Activates new desired canvas width set at design time. * \param width The new desired width. */ - void + void SetCanvasDesignWidth( unsigned int width ); @@ -461,7 +461,7 @@ public: * Activates new desired canvas height set at design time. * \param width The new desired height. */ - void + void SetCanvasDesignHeight( unsigned int height ); @@ -469,7 +469,7 @@ public: * Returns the current desired canvas width set at design time. * \return The desired width. */ - unsigned int + unsigned int GetCanvasDesignWidth( void ) const; @@ -478,7 +478,7 @@ public: * Returns the current desired canvas height set at design time. * \return The desired height. */ - unsigned int + unsigned int GetCanvasDesignHeight( void ) const; @@ -617,7 +617,7 @@ public: static PyObject* pyattr_get_drawing_callback_post(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); static int pyattr_set_drawing_callback_post(void *selv_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); - virtual PyObject* py_repr(void) { return PyUnicode_From_STR_String(GetName()); } + virtual PyObject *py_repr(void) { return PyUnicode_From_STR_String(GetName()); } /* getitem/setitem */ static PyMappingMethods Mapping; @@ -626,10 +626,10 @@ public: /** * Run the registered python drawing functions. */ - void RunDrawingCallbacks(PyObject* cb_list); + void RunDrawingCallbacks(PyObject *cb_list); - PyObject* GetPreDrawCB() { return m_draw_call_pre; } - PyObject* GetPostDrawCB() { return m_draw_call_post; } + PyObject *GetPreDrawCB() { return m_draw_call_pre; } + PyObject *GetPostDrawCB() { return m_draw_call_post; } #endif /** diff --git a/source/gameengine/Ketsji/KX_SceneActuator.cpp b/source/gameengine/Ketsji/KX_SceneActuator.cpp index 781c1fdab87..83b57dee7c1 100644 --- a/source/gameengine/Ketsji/KX_SceneActuator.cpp +++ b/source/gameengine/Ketsji/KX_SceneActuator.cpp @@ -256,7 +256,7 @@ PyAttributeDef KX_SceneActuator::Attributes[] = { { NULL } //Sentinel }; -PyObject* KX_SceneActuator::pyattr_get_camera(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_SceneActuator::pyattr_get_camera(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) { KX_SceneActuator* actuator = static_cast<KX_SceneActuator*>(self); if (!actuator->m_camera) @@ -279,7 +279,7 @@ int KX_SceneActuator::pyattr_set_camera(void *self, const struct KX_PYATTRIBUTE_ if (camOb==NULL) { actuator->m_camera= NULL; } - else { + else { actuator->m_camera = camOb; actuator->m_camera->RegisterActuator(actuator); } diff --git a/source/gameengine/Ketsji/KX_SceneActuator.h b/source/gameengine/Ketsji/KX_SceneActuator.h index 8e157544e2e..0b633334cce 100644 --- a/source/gameengine/Ketsji/KX_SceneActuator.h +++ b/source/gameengine/Ketsji/KX_SceneActuator.h @@ -99,7 +99,7 @@ class KX_SceneActuator : public SCA_IActuator /* Python interface ---------------------------------------------------- */ /* --------------------------------------------------------------------- */ - static PyObject* pyattr_get_camera(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_camera(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); static int pyattr_set_camera(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); #endif // WITH_PYTHON diff --git a/source/gameengine/Ketsji/KX_SoundActuator.cpp b/source/gameengine/Ketsji/KX_SoundActuator.cpp index db91cea9074..c0191db640a 100644 --- a/source/gameengine/Ketsji/KX_SoundActuator.cpp +++ b/source/gameengine/Ketsji/KX_SoundActuator.cpp @@ -358,7 +358,7 @@ KX_PYMETHODDEF_DOC_NOARGS(KX_SoundActuator, stopSound, } /* Atribute setting and getting -------------------------------------------- */ -PyObject* KX_SoundActuator::pyattr_get_3d_property(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_SoundActuator::pyattr_get_3d_property(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) { KX_SoundActuator * actuator = static_cast<KX_SoundActuator *> (self); const char* prop = attrdef->m_name; @@ -392,11 +392,11 @@ PyObject* KX_SoundActuator::pyattr_get_3d_property(void *self, const struct KX_P Py_RETURN_NONE; } - PyObject* result = PyFloat_FromDouble(result_value); + PyObject *result = PyFloat_FromDouble(result_value); return result; } -PyObject* KX_SoundActuator::pyattr_get_audposition(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_SoundActuator::pyattr_get_audposition(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) { KX_SoundActuator * actuator = static_cast<KX_SoundActuator *> (self); float position = 0.0; @@ -404,32 +404,32 @@ PyObject* KX_SoundActuator::pyattr_get_audposition(void *self, const struct KX_P if (!actuator->m_handle.isNull()) position = actuator->m_handle->getPosition(); - PyObject* result = PyFloat_FromDouble(position); + PyObject *result = PyFloat_FromDouble(position); return result; } -PyObject* KX_SoundActuator::pyattr_get_gain(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_SoundActuator::pyattr_get_gain(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) { KX_SoundActuator * actuator = static_cast<KX_SoundActuator *> (self); float gain = actuator->m_volume; - PyObject* result = PyFloat_FromDouble(gain); + PyObject *result = PyFloat_FromDouble(gain); return result; } -PyObject* KX_SoundActuator::pyattr_get_pitch(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_SoundActuator::pyattr_get_pitch(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) { KX_SoundActuator * actuator = static_cast<KX_SoundActuator *> (self); float pitch = actuator->m_pitch; - PyObject* result = PyFloat_FromDouble(pitch); + PyObject *result = PyFloat_FromDouble(pitch); return result; } -PyObject* KX_SoundActuator::pyattr_get_sound(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) +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()) @@ -542,7 +542,7 @@ int KX_SoundActuator::pyattr_set_pitch(void *self, const struct KX_PYATTRIBUTE_D int KX_SoundActuator::pyattr_set_sound(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value) { - PyObject* sound = NULL; + PyObject *sound = NULL; KX_SoundActuator * actuator = static_cast<KX_SoundActuator *> (self); if (!PyArg_Parse(value, "O", &sound)) return PY_SET_ATTR_FAIL; diff --git a/source/gameengine/Ketsji/KX_SoundActuator.h b/source/gameengine/Ketsji/KX_SoundActuator.h index dbdb17d0da5..fcaf214dd90 100644 --- a/source/gameengine/Ketsji/KX_SoundActuator.h +++ b/source/gameengine/Ketsji/KX_SoundActuator.h @@ -115,12 +115,12 @@ public: static int pyattr_set_type(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); static int pyattr_set_sound(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); - static PyObject* pyattr_get_3d_property(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_audposition(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_gain(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_pitch(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_type(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_sound(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_3d_property(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_audposition(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_gain(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_pitch(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_type(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_sound(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); #endif // WITH_PYTHON diff --git a/source/gameengine/Ketsji/KX_SteeringActuator.cpp b/source/gameengine/Ketsji/KX_SteeringActuator.cpp index 16b9285386a..2fa72c04a20 100644 --- a/source/gameengine/Ketsji/KX_SteeringActuator.cpp +++ b/source/gameengine/Ketsji/KX_SteeringActuator.cpp @@ -253,7 +253,7 @@ bool KX_SteeringActuator::Update(double curtime, bool frame) static const MT_Vector3 PATH_COLOR(1,0,0); m_navmesh->DrawPath(m_path, m_pathLen, PATH_COLOR); } - } + } } break; @@ -285,7 +285,7 @@ bool KX_SteeringActuator::Update(double curtime, bool frame) //temporary solution: set 2D steering velocity directly to obj //correct way is to apply physical force MT_Vector3 curvel = obj->GetLinearVelocity(); - newvel.z() = curvel.z(); + newvel.z() = curvel.z(); obj->setLinearVelocity(newvel, false); } else @@ -356,8 +356,8 @@ static bool getNavmeshNormal(dtStatNavMesh* navmesh, const MT_Vector3& pos, MT_V { static const float polyPickExt[3] = {2, 4, 2}; float spos[3]; - pos.getValue(spos); - flipAxes(spos); + pos.getValue(spos); + flipAxes(spos); dtStatPolyRef sPolyRef = navmesh->findNearestPoly(spos, polyPickExt); if (sPolyRef == 0) return false; @@ -382,7 +382,7 @@ static bool getNavmeshNormal(dtStatNavMesh* navmesh, const MT_Vector3& pos, MT_V { distMin = dist; idxMin = i; - } + } } if (idxMin>=0) @@ -416,7 +416,7 @@ void KX_SteeringActuator::HandleActorFace(MT_Vector3& velocity) KX_GameObject* curobj = (KX_GameObject*) GetParent(); MT_Vector3 dir = m_facingMode==0 ? curobj->NodeGetLocalOrientation().getColumn(1) : velocity; if (dir.fuzzyZero()) - return; + return; dir.normalize(); MT_Vector3 up(0,0,1); MT_Vector3 left; @@ -431,7 +431,7 @@ void KX_SteeringActuator::HandleActorFace(MT_Vector3& velocity) { left = (dir.cross(up)).safe_normalized(); - dir = (-left.cross(normal)).safe_normalized(); + dir = (-left.cross(normal)).safe_normalized(); up = normal; } } @@ -495,7 +495,7 @@ void KX_SteeringActuator::HandleActorFace(MT_Vector3& velocity) MT_Point3 localpos; localpos = curobj->GetSGNode()->GetLocalPosition(); MT_Matrix3x3 parentmatinv; - parentmatinv = parentObject->NodeGetWorldOrientation ().inverse (); + parentmatinv = parentObject->NodeGetWorldOrientation ().inverse (); mat = parentmatinv * mat; mat = m_parentlocalmat * mat; curobj->NodeSetLocalOrientation(mat); @@ -551,16 +551,16 @@ PyAttributeDef KX_SteeringActuator::Attributes[] = { KX_PYATTRIBUTE_FLOAT_RW("turnspeed", 0.0f, 720.0f, KX_SteeringActuator, m_turnspeed), KX_PYATTRIBUTE_BOOL_RW("selfterminated", KX_SteeringActuator, m_isSelfTerminated), KX_PYATTRIBUTE_BOOL_RW("enableVisualization", KX_SteeringActuator, m_enableVisualization), - KX_PYATTRIBUTE_RO_FUNCTION("steeringVec", KX_SteeringActuator, pyattr_get_steeringVec), + KX_PYATTRIBUTE_RO_FUNCTION("steeringVec", KX_SteeringActuator, pyattr_get_steeringVec), KX_PYATTRIBUTE_SHORT_RW("facingMode", 0, 6, true, KX_SteeringActuator, m_facingMode), KX_PYATTRIBUTE_INT_RW("pathUpdatePeriod", -1, 100000, true, KX_SteeringActuator, m_pathUpdatePeriod), { NULL } //Sentinel }; -PyObject* KX_SteeringActuator::pyattr_get_target(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_SteeringActuator::pyattr_get_target(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) { KX_SteeringActuator* actuator = static_cast<KX_SteeringActuator*>(self); - if (!actuator->m_target) + if (!actuator->m_target) Py_RETURN_NONE; else return actuator->m_target->GetProxy(); @@ -575,7 +575,7 @@ int KX_SteeringActuator::pyattr_set_target(void *self, const struct KX_PYATTRIBU return PY_SET_ATTR_FAIL; // ConvertPythonToGameObject sets the error if (actuator->m_target != NULL) - actuator->m_target->UnregisterActuator(actuator); + actuator->m_target->UnregisterActuator(actuator); actuator->m_target = (KX_GameObject*) gameobj; @@ -585,10 +585,10 @@ int KX_SteeringActuator::pyattr_set_target(void *self, const struct KX_PYATTRIBU return PY_SET_ATTR_SUCCESS; } -PyObject* KX_SteeringActuator::pyattr_get_navmesh(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_SteeringActuator::pyattr_get_navmesh(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) { KX_SteeringActuator* actuator = static_cast<KX_SteeringActuator*>(self); - if (!actuator->m_navmesh) + if (!actuator->m_navmesh) Py_RETURN_NONE; else return actuator->m_navmesh->GetProxy(); @@ -609,7 +609,7 @@ int KX_SteeringActuator::pyattr_set_navmesh(void *self, const struct KX_PYATTRIB } if (actuator->m_navmesh != NULL) - actuator->m_navmesh->UnregisterActuator(actuator); + actuator->m_navmesh->UnregisterActuator(actuator); actuator->m_navmesh = static_cast<KX_NavMeshObject*>(gameobj); @@ -619,7 +619,7 @@ int KX_SteeringActuator::pyattr_set_navmesh(void *self, const struct KX_PYATTRIB return PY_SET_ATTR_SUCCESS; } -PyObject* KX_SteeringActuator::pyattr_get_steeringVec(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_SteeringActuator::pyattr_get_steeringVec(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) { KX_SteeringActuator* actuator = static_cast<KX_SteeringActuator*>(self); const MT_Vector3& steeringVec = actuator->GetSteeringVec(); diff --git a/source/gameengine/Ketsji/KX_SteeringActuator.h b/source/gameengine/Ketsji/KX_SteeringActuator.h index c22a636cd95..341421d8948 100644 --- a/source/gameengine/Ketsji/KX_SteeringActuator.h +++ b/source/gameengine/Ketsji/KX_SteeringActuator.h @@ -82,7 +82,7 @@ public: KX_GameObject *navmesh, float distance, float velocity, - float acceleration, + float acceleration, float turnspeed, bool isSelfTerminated, int pathUpdatePeriod, @@ -107,11 +107,11 @@ public: /* --------------------------------------------------------------------- */ /* These are used to get and set m_target */ - static PyObject* pyattr_get_target(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); - static int pyattr_set_target(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); - static PyObject* pyattr_get_navmesh(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); - static int pyattr_set_navmesh(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); - static PyObject* pyattr_get_steeringVec(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_target(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); + static int pyattr_set_target(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); + static PyObject *pyattr_get_navmesh(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); + static int pyattr_set_navmesh(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); + static PyObject *pyattr_get_steeringVec(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); #endif // WITH_PYTHON diff --git a/source/gameengine/Ketsji/KX_TouchSensor.cpp b/source/gameengine/Ketsji/KX_TouchSensor.cpp index d7bcf1306a1..885ac70061e 100644 --- a/source/gameengine/Ketsji/KX_TouchSensor.cpp +++ b/source/gameengine/Ketsji/KX_TouchSensor.cpp @@ -331,7 +331,7 @@ PyAttributeDef KX_TouchSensor::Attributes[] = { /* Python API */ -PyObject* KX_TouchSensor::pyattr_get_object_hit(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_TouchSensor::pyattr_get_object_hit(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_TouchSensor* self= static_cast<KX_TouchSensor*>(self_v); @@ -341,7 +341,7 @@ PyObject* KX_TouchSensor::pyattr_get_object_hit(void *self_v, const KX_PYATTRIBU Py_RETURN_NONE; } -PyObject* KX_TouchSensor::pyattr_get_object_hit_list(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_TouchSensor::pyattr_get_object_hit_list(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_TouchSensor* self= static_cast<KX_TouchSensor*>(self_v); return self->m_colliders->GetProxy(); diff --git a/source/gameengine/Ketsji/KX_TouchSensor.h b/source/gameengine/Ketsji/KX_TouchSensor.h index d739144d70d..c80b8598e43 100644 --- a/source/gameengine/Ketsji/KX_TouchSensor.h +++ b/source/gameengine/Ketsji/KX_TouchSensor.h @@ -56,7 +56,7 @@ protected: /** * The sensor should only look for objects with this property. */ - STR_String m_touchedpropname; + STR_String m_touchedpropname; bool m_bFindMaterial; bool m_bTouchPulse; /* changes in the colliding objects trigger pulses */ diff --git a/source/gameengine/Ketsji/KX_TrackToActuator.cpp b/source/gameengine/Ketsji/KX_TrackToActuator.cpp index 17274159545..1597948bafe 100644 --- a/source/gameengine/Ketsji/KX_TrackToActuator.cpp +++ b/source/gameengine/Ketsji/KX_TrackToActuator.cpp @@ -166,7 +166,7 @@ static void compatible_eulFast(float *eul, float *oldrot) static MT_Matrix3x3 matrix3x3_interpol(MT_Matrix3x3 oldmat, MT_Matrix3x3 mat, int m_time) { - float eul[3], oldeul[3]; + float eul[3], oldeul[3]; Mat3ToEulOld(oldmat, oldeul); Mat3ToEulOld(mat, eul); @@ -238,7 +238,7 @@ void KX_TrackToActuator::Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map) bool KX_TrackToActuator::Update(double curtime, bool frame) { - bool result = false; + bool result = false; bool bNegativeEvent = IsNegativeEvent(); RemoveAllEvents(); @@ -395,7 +395,7 @@ bool KX_TrackToActuator::Update(double curtime, bool frame) localpos = curobj->GetSGNode()->GetLocalPosition(); // Get the inverse of the parent matrix MT_Matrix3x3 parentmatinv; - parentmatinv = m_parentobj->NodeGetWorldOrientation ().inverse (); + parentmatinv = m_parentobj->NodeGetWorldOrientation ().inverse (); // transform the local coordinate system into the parents system mat = parentmatinv * mat; // append the initial parent local rotation matrix @@ -458,10 +458,10 @@ PyAttributeDef KX_TrackToActuator::Attributes[] = { { NULL } //Sentinel }; -PyObject* KX_TrackToActuator::pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_TrackToActuator::pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) { KX_TrackToActuator* actuator = static_cast<KX_TrackToActuator*>(self); - if (!actuator->m_object) + if (!actuator->m_object) Py_RETURN_NONE; else return actuator->m_object->GetProxy(); @@ -476,7 +476,7 @@ int KX_TrackToActuator::pyattr_set_object(void *self, const struct KX_PYATTRIBUT return PY_SET_ATTR_FAIL; // ConvertPythonToGameObject sets the error if (actuator->m_object != NULL) - actuator->m_object->UnregisterActuator(actuator); + actuator->m_object->UnregisterActuator(actuator); actuator->m_object = (SCA_IObject*) gameobj; diff --git a/source/gameengine/Ketsji/KX_TrackToActuator.h b/source/gameengine/Ketsji/KX_TrackToActuator.h index fb2ced2a415..6329c7b34d9 100644 --- a/source/gameengine/Ketsji/KX_TrackToActuator.h +++ b/source/gameengine/Ketsji/KX_TrackToActuator.h @@ -74,8 +74,8 @@ class KX_TrackToActuator : public SCA_IActuator /* Python part */ /* These are used to get and set m_ob */ - static PyObject* pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); - static int pyattr_set_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); + static PyObject *pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); + static int pyattr_set_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); #endif // WITH_PYTHON diff --git a/source/gameengine/Ketsji/KX_VehicleWrapper.cpp b/source/gameengine/Ketsji/KX_VehicleWrapper.cpp index 1c03df80dc1..b5d6f11a2d5 100644 --- a/source/gameengine/Ketsji/KX_VehicleWrapper.cpp +++ b/source/gameengine/Ketsji/KX_VehicleWrapper.cpp @@ -34,11 +34,11 @@ KX_VehicleWrapper::~KX_VehicleWrapper() #ifdef WITH_PYTHON -PyObject* KX_VehicleWrapper::PyAddWheel(PyObject* args) +PyObject *KX_VehicleWrapper::PyAddWheel(PyObject *args) { - PyObject* pylistPos,*pylistDir,*pylistAxleDir; - PyObject* wheelGameObject; + PyObject *pylistPos,*pylistDir,*pylistAxleDir; + PyObject *wheelGameObject; float suspensionRestLength,wheelRadius; int hasSteering; @@ -83,7 +83,7 @@ PyObject* KX_VehicleWrapper::PyAddWheel(PyObject* args) -PyObject* KX_VehicleWrapper::PyGetWheelPosition(PyObject* args) +PyObject *KX_VehicleWrapper::PyGetWheelPosition(PyObject *args) { int wheelIndex; @@ -98,7 +98,7 @@ PyObject* KX_VehicleWrapper::PyGetWheelPosition(PyObject* args) return NULL; } -PyObject* KX_VehicleWrapper::PyGetWheelRotation(PyObject* args) +PyObject *KX_VehicleWrapper::PyGetWheelRotation(PyObject *args) { int wheelIndex; if (PyArg_ParseTuple(args,"i:getWheelRotation",&wheelIndex)) @@ -108,7 +108,7 @@ PyObject* KX_VehicleWrapper::PyGetWheelRotation(PyObject* args) return NULL; } -PyObject* KX_VehicleWrapper::PyGetWheelOrientationQuaternion(PyObject* args) +PyObject *KX_VehicleWrapper::PyGetWheelOrientationQuaternion(PyObject *args) { int wheelIndex; if (PyArg_ParseTuple(args,"i:getWheelOrientationQuaternion",&wheelIndex)) @@ -124,20 +124,20 @@ PyObject* KX_VehicleWrapper::PyGetWheelOrientationQuaternion(PyObject* args) } -PyObject* KX_VehicleWrapper::PyGetNumWheels(PyObject* args) +PyObject *KX_VehicleWrapper::PyGetNumWheels(PyObject *args) { return PyLong_FromSsize_t(m_vehicle->GetNumWheels()); } -PyObject* KX_VehicleWrapper::PyGetConstraintId(PyObject* args) +PyObject *KX_VehicleWrapper::PyGetConstraintId(PyObject *args) { return PyLong_FromSsize_t(m_vehicle->GetUserConstraintId()); } -PyObject* KX_VehicleWrapper::PyApplyEngineForce(PyObject* args) +PyObject *KX_VehicleWrapper::PyApplyEngineForce(PyObject *args) { float force; int wheelIndex; @@ -153,7 +153,7 @@ PyObject* KX_VehicleWrapper::PyApplyEngineForce(PyObject* args) Py_RETURN_NONE; } -PyObject* KX_VehicleWrapper::PySetTyreFriction(PyObject* args) +PyObject *KX_VehicleWrapper::PySetTyreFriction(PyObject *args) { float wheelFriction; int wheelIndex; @@ -168,7 +168,7 @@ PyObject* KX_VehicleWrapper::PySetTyreFriction(PyObject* args) Py_RETURN_NONE; } -PyObject* KX_VehicleWrapper::PySetSuspensionStiffness(PyObject* args) +PyObject *KX_VehicleWrapper::PySetSuspensionStiffness(PyObject *args) { float suspensionStiffness; int wheelIndex; @@ -183,7 +183,7 @@ PyObject* KX_VehicleWrapper::PySetSuspensionStiffness(PyObject* args) Py_RETURN_NONE; } -PyObject* KX_VehicleWrapper::PySetSuspensionDamping(PyObject* args) +PyObject *KX_VehicleWrapper::PySetSuspensionDamping(PyObject *args) { float suspensionDamping; int wheelIndex; @@ -197,7 +197,7 @@ PyObject* KX_VehicleWrapper::PySetSuspensionDamping(PyObject* args) Py_RETURN_NONE; } -PyObject* KX_VehicleWrapper::PySetSuspensionCompression(PyObject* args) +PyObject *KX_VehicleWrapper::PySetSuspensionCompression(PyObject *args) { float suspensionCompression; int wheelIndex; @@ -211,7 +211,7 @@ PyObject* KX_VehicleWrapper::PySetSuspensionCompression(PyObject* args) Py_RETURN_NONE; } -PyObject* KX_VehicleWrapper::PySetRollInfluence(PyObject* args) +PyObject *KX_VehicleWrapper::PySetRollInfluence(PyObject *args) { float rollInfluence; int wheelIndex; @@ -227,7 +227,7 @@ PyObject* KX_VehicleWrapper::PySetRollInfluence(PyObject* args) } -PyObject* KX_VehicleWrapper::PyApplyBraking(PyObject* args) +PyObject *KX_VehicleWrapper::PyApplyBraking(PyObject *args) { float braking; int wheelIndex; @@ -245,7 +245,7 @@ PyObject* KX_VehicleWrapper::PyApplyBraking(PyObject* args) -PyObject* KX_VehicleWrapper::PySetSteeringValue(PyObject* args) +PyObject *KX_VehicleWrapper::PySetSteeringValue(PyObject *args) { float steeringValue; int wheelIndex; @@ -261,7 +261,7 @@ PyObject* KX_VehicleWrapper::PySetSteeringValue(PyObject* args) } -PyObject* KX_VehicleWrapper::PyGetConstraintType(PyObject* args) +PyObject *KX_VehicleWrapper::PyGetConstraintType(PyObject *args) { return PyLong_FromSsize_t(m_vehicle->GetUserConstraintType()); } diff --git a/source/gameengine/Ketsji/KX_VertexProxy.cpp b/source/gameengine/Ketsji/KX_VertexProxy.cpp index d489c015273..461563d4512 100644 --- a/source/gameengine/Ketsji/KX_VertexProxy.cpp +++ b/source/gameengine/Ketsji/KX_VertexProxy.cpp @@ -101,85 +101,85 @@ PyAttributeDef KX_VertexProxy::Attributes[] = { { NULL } //Sentinel }; -PyObject* KX_VertexProxy::pyattr_get_x(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_VertexProxy::pyattr_get_x(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_VertexProxy* self= static_cast<KX_VertexProxy*>(self_v); return PyFloat_FromDouble(self->m_vertex->getXYZ()[0]); } -PyObject* KX_VertexProxy::pyattr_get_y(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_VertexProxy::pyattr_get_y(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_VertexProxy* self= static_cast<KX_VertexProxy*>(self_v); return PyFloat_FromDouble(self->m_vertex->getXYZ()[1]); } -PyObject* KX_VertexProxy::pyattr_get_z(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_VertexProxy::pyattr_get_z(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_VertexProxy* self= static_cast<KX_VertexProxy*>(self_v); return PyFloat_FromDouble(self->m_vertex->getXYZ()[2]); } -PyObject* KX_VertexProxy::pyattr_get_r(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_VertexProxy::pyattr_get_r(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_VertexProxy* self= static_cast<KX_VertexProxy*>(self_v); return PyFloat_FromDouble(self->m_vertex->getRGBA()[0]/255.0); } -PyObject* KX_VertexProxy::pyattr_get_g(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_VertexProxy::pyattr_get_g(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_VertexProxy* self= static_cast<KX_VertexProxy*>(self_v); return PyFloat_FromDouble(self->m_vertex->getRGBA()[1]/255.0); } -PyObject* KX_VertexProxy::pyattr_get_b(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_VertexProxy::pyattr_get_b(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_VertexProxy* self= static_cast<KX_VertexProxy*>(self_v); return PyFloat_FromDouble(self->m_vertex->getRGBA()[2]/255.0); } -PyObject* KX_VertexProxy::pyattr_get_a(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_VertexProxy::pyattr_get_a(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_VertexProxy* self= static_cast<KX_VertexProxy*>(self_v); return PyFloat_FromDouble(self->m_vertex->getRGBA()[3]/255.0); } -PyObject* KX_VertexProxy::pyattr_get_u(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_VertexProxy::pyattr_get_u(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_VertexProxy* self= static_cast<KX_VertexProxy*>(self_v); return PyFloat_FromDouble(self->m_vertex->getUV1()[0]); } -PyObject* KX_VertexProxy::pyattr_get_v(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_VertexProxy::pyattr_get_v(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_VertexProxy* self= static_cast<KX_VertexProxy*>(self_v); return PyFloat_FromDouble(self->m_vertex->getUV1()[1]); } -PyObject* KX_VertexProxy::pyattr_get_u2(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_VertexProxy::pyattr_get_u2(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_VertexProxy* self= static_cast<KX_VertexProxy*>(self_v); return PyFloat_FromDouble(self->m_vertex->getUV2()[0]); } -PyObject* KX_VertexProxy::pyattr_get_v2(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_VertexProxy::pyattr_get_v2(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_VertexProxy* self= static_cast<KX_VertexProxy*>(self_v); return PyFloat_FromDouble(self->m_vertex->getUV2()[1]); } -PyObject* KX_VertexProxy::pyattr_get_XYZ(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_VertexProxy::pyattr_get_XYZ(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_VertexProxy* self= static_cast<KX_VertexProxy*>(self_v); return PyObjectFrom(MT_Vector3(self->m_vertex->getXYZ())); } -PyObject* KX_VertexProxy::pyattr_get_UV(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_VertexProxy::pyattr_get_UV(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_VertexProxy* self= static_cast<KX_VertexProxy*>(self_v); return PyObjectFrom(MT_Point2(self->m_vertex->getUV1())); } -PyObject* KX_VertexProxy::pyattr_get_color(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_VertexProxy::pyattr_get_color(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_VertexProxy* self= static_cast<KX_VertexProxy*>(self_v); const unsigned char *colp = self->m_vertex->getRGBA(); @@ -188,7 +188,7 @@ PyObject* KX_VertexProxy::pyattr_get_color(void *self_v, const KX_PYATTRIBUTE_DE return PyObjectFrom(color); } -PyObject* KX_VertexProxy::pyattr_get_normal(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *KX_VertexProxy::pyattr_get_normal(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_VertexProxy* self= static_cast<KX_VertexProxy*>(self_v); return PyObjectFrom(MT_Vector3(self->m_vertex->getNormal())); @@ -459,12 +459,12 @@ CValue* KX_VertexProxy::GetReplica() { return NULL;} // stuff for python integration -PyObject* KX_VertexProxy::PyGetXYZ() +PyObject *KX_VertexProxy::PyGetXYZ() { return PyObjectFrom(MT_Point3(m_vertex->getXYZ())); } -PyObject* KX_VertexProxy::PySetXYZ(PyObject* value) +PyObject *KX_VertexProxy::PySetXYZ(PyObject *value) { MT_Point3 vec; if (!PyVecTo(value, vec)) @@ -475,12 +475,12 @@ PyObject* KX_VertexProxy::PySetXYZ(PyObject* value) Py_RETURN_NONE; } -PyObject* KX_VertexProxy::PyGetNormal() +PyObject *KX_VertexProxy::PyGetNormal() { return PyObjectFrom(MT_Vector3(m_vertex->getNormal())); } -PyObject* KX_VertexProxy::PySetNormal(PyObject* value) +PyObject *KX_VertexProxy::PySetNormal(PyObject *value) { MT_Vector3 vec; if (!PyVecTo(value, vec)) @@ -492,13 +492,13 @@ PyObject* KX_VertexProxy::PySetNormal(PyObject* value) } -PyObject* KX_VertexProxy::PyGetRGBA() +PyObject *KX_VertexProxy::PyGetRGBA() { int *rgba = (int *) m_vertex->getRGBA(); return PyLong_FromSsize_t(*rgba); } -PyObject* KX_VertexProxy::PySetRGBA(PyObject* value) +PyObject *KX_VertexProxy::PySetRGBA(PyObject *value) { if (PyLong_Check(value)) { int rgba = PyLong_AsSsize_t(value); @@ -521,12 +521,12 @@ PyObject* KX_VertexProxy::PySetRGBA(PyObject* value) } -PyObject* KX_VertexProxy::PyGetUV() +PyObject *KX_VertexProxy::PyGetUV() { return PyObjectFrom(MT_Vector2(m_vertex->getUV1())); } -PyObject* KX_VertexProxy::PySetUV(PyObject* value) +PyObject *KX_VertexProxy::PySetUV(PyObject *value) { MT_Point2 vec; if (!PyVecTo(value, vec)) @@ -537,17 +537,17 @@ PyObject* KX_VertexProxy::PySetUV(PyObject* value) Py_RETURN_NONE; } -PyObject* KX_VertexProxy::PyGetUV2() +PyObject *KX_VertexProxy::PyGetUV2() { return PyObjectFrom(MT_Vector2(m_vertex->getUV2())); } -PyObject* KX_VertexProxy::PySetUV2(PyObject* args) +PyObject *KX_VertexProxy::PySetUV2(PyObject *args) { MT_Point2 vec; unsigned int unit= RAS_TexVert::SECOND_UV; - PyObject* list= NULL; + PyObject *list = NULL; if (!PyArg_ParseTuple(args, "O|i:setUV2", &list, &unit)) return NULL; diff --git a/source/gameengine/Ketsji/KX_VertexProxy.h b/source/gameengine/Ketsji/KX_VertexProxy.h index 3084e5fac93..f56e2be26a3 100644 --- a/source/gameengine/Ketsji/KX_VertexProxy.h +++ b/source/gameengine/Ketsji/KX_VertexProxy.h @@ -59,21 +59,21 @@ public: // stuff for python integration - static PyObject* pyattr_get_x(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_y(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_z(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_r(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_g(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_b(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_a(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_u(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_v(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_u2(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_v2(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_XYZ(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_UV(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_color(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); - static PyObject* pyattr_get_normal(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_x(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_y(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_z(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_r(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_g(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_b(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_a(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_u(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_v(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_u2(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_v2(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_XYZ(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_UV(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_color(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); + static PyObject *pyattr_get_normal(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); static int pyattr_set_x(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); static int pyattr_set_y(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); static int pyattr_set_z(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value); diff --git a/source/gameengine/Ketsji/KX_WorldIpoController.h b/source/gameengine/Ketsji/KX_WorldIpoController.h index 409b1fec321..575d4e72f14 100644 --- a/source/gameengine/Ketsji/KX_WorldIpoController.h +++ b/source/gameengine/Ketsji/KX_WorldIpoController.h @@ -72,15 +72,15 @@ public: m_modified = true; } - void SetModifyMistStart(bool modify) { + void SetModifyMistStart(bool modify) { m_modify_mist_start = modify; } - void SetModifyMistColor(bool modify) { + void SetModifyMistColor(bool modify) { m_modify_mist_color = modify; } - void SetModifyMistDist(bool modify) { + void SetModifyMistDist(bool modify) { m_modify_mist_dist = modify; } |