From 64d161de87c82094ce8ea63bc69aded59f7f588d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 26 Mar 2013 07:29:01 +0000 Subject: style cleanup: also rename mesh_getVertexCos() --> BKE_mesh_vertexCos_get() to match curve function. --- .../BlenderRoutines/KX_BlenderCanvas.cpp | 2 +- source/gameengine/BlenderRoutines/KX_BlenderGL.cpp | 6 +- source/gameengine/BlenderRoutines/KX_BlenderGL.h | 2 +- .../BlenderRoutines/KX_BlenderRenderTools.cpp | 2 +- source/gameengine/Converter/BL_ActionActuator.cpp | 2 +- source/gameengine/Expressions/EmptyValue.cpp | 4 +- source/gameengine/Expressions/KX_HashedPtr.cpp | 2 +- source/gameengine/Expressions/KX_HashedPtr.h | 2 +- source/gameengine/Expressions/ListValue.cpp | 4 +- source/gameengine/Expressions/Operator1Expr.cpp | 2 +- source/gameengine/Expressions/Value.cpp | 2 +- source/gameengine/Expressions/VectorValue.cpp | 4 +- source/gameengine/Expressions/VectorValue.h | 4 +- .../GamePlayer/common/GPC_RenderTools.cpp | 2 +- source/gameengine/GamePlayer/common/bmfont.cpp | 14 ++-- source/gameengine/Ketsji/KX_ConstraintActuator.cpp | 4 +- source/gameengine/Ketsji/KX_Dome.cpp | 2 +- source/gameengine/Ketsji/KX_GameObject.cpp | 6 +- source/gameengine/Ketsji/KX_MeshProxy.cpp | 8 +- source/gameengine/Ketsji/KX_MouseFocusSensor.cpp | 2 +- source/gameengine/Ketsji/KX_NearSensor.cpp | 6 +- source/gameengine/Ketsji/KX_PythonSeq.cpp | 10 +-- source/gameengine/Ketsji/KX_RayCast.cpp | 2 +- source/gameengine/Ketsji/KX_RaySensor.cpp | 4 +- source/gameengine/Ketsji/KX_Scene.cpp | 2 +- source/gameengine/Ketsji/KX_SceneActuator.cpp | 2 +- source/gameengine/Ketsji/KX_TouchEventManager.cpp | 2 +- source/gameengine/Ketsji/KX_TouchSensor.cpp | 10 +-- .../Physics/Bullet/CcdPhysicsEnvironment.cpp | 2 +- source/gameengine/SceneGraph/SG_IObject.h | 6 +- source/gameengine/VideoTexture/Exception.cpp | 6 +- source/gameengine/VideoTexture/FilterBase.cpp | 2 +- source/gameengine/VideoTexture/FilterColor.cpp | 4 +- source/gameengine/VideoTexture/ImageBase.cpp | 16 ++-- source/gameengine/VideoTexture/ImageBase.h | 90 +++++++++++----------- source/gameengine/VideoTexture/ImageRender.cpp | 2 +- source/gameengine/VideoTexture/ImageViewport.h | 12 +-- source/gameengine/VideoTexture/VideoFFmpeg.cpp | 6 +- source/gameengine/VideoTexture/VideoFFmpeg.h | 4 +- 39 files changed, 132 insertions(+), 132 deletions(-) (limited to 'source/gameengine') diff --git a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp index 6ab1d032bf2..e51daf615b8 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp @@ -248,7 +248,7 @@ void KX_BlenderCanvas::SetMousePosition(int x,int y) -void KX_BlenderCanvas::MakeScreenShot(const char* filename) +void KX_BlenderCanvas::MakeScreenShot(const char *filename) { ScrArea area_dummy= {0}; area_dummy.totrct.xmin = m_frame_rect.GetLeft(); diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp index f24392352b0..f808b1b7272 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp @@ -190,7 +190,7 @@ void BL_print_game_line(int fontid, const char *text, int size, int dpi, float * BLF_disable(fontid, BLF_MATRIX|BLF_ASPECT); } -void BL_print_gamedebug_line(const char* text, int xco, int yco, int width, int height) +void BL_print_gamedebug_line(const char *text, int xco, int yco, int width, int height) { /* gl prepping */ DisableForText(); @@ -219,7 +219,7 @@ void BL_print_gamedebug_line(const char* text, int xco, int yco, int width, int glEnable(GL_DEPTH_TEST); } -void BL_print_gamedebug_line_padded(const char* text, int xco, int yco, int width, int height) +void BL_print_gamedebug_line_padded(const char *text, int xco, int yco, int width, int height) { /* This is a rather important line :( The gl-mode hasn't been left * behind quite as neatly as we'd have wanted to. I don't know @@ -296,7 +296,7 @@ static unsigned int *screenshot(ScrArea *curarea, int *dumpsx, int *dumpsy) } /* based on screendump.c::screenshot_exec */ -void BL_MakeScreenShot(ScrArea *curarea, const char* filename) +void BL_MakeScreenShot(ScrArea *curarea, const char *filename) { char path[MAX_FILE_LENGTH]; strcpy(path,filename); diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.h b/source/gameengine/BlenderRoutines/KX_BlenderGL.h index 5c3f0684764..2545cd34acb 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderGL.h +++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.h @@ -44,7 +44,7 @@ void BL_SwapBuffers(struct wmWindow *win); void BL_warp_pointer(struct wmWindow *win,int x,int y); -void BL_MakeScreenShot(struct ScrArea *curarea, const char* filename); +void BL_MakeScreenShot(struct ScrArea *curarea, const char *filename); void BL_HideMouse(struct wmWindow *win); void BL_NormalMouse(struct wmWindow *win); diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp index 64ed384e961..4c162376b36 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp @@ -154,7 +154,7 @@ void KX_BlenderRenderTools::SetClientObject(RAS_IRasterizer *rasty, void* obj) } } -bool KX_BlenderRenderTools::RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data) +bool KX_BlenderRenderTools::RayHit(KX_ClientObjectInfo *client, KX_RayCast *result, void * const data) { double* const oglmatrix = (double* const) data; MT_Point3 resultpoint(result->m_hitPoint); diff --git a/source/gameengine/Converter/BL_ActionActuator.cpp b/source/gameengine/Converter/BL_ActionActuator.cpp index 2918ec8bce7..af537db0203 100644 --- a/source/gameengine/Converter/BL_ActionActuator.cpp +++ b/source/gameengine/Converter/BL_ActionActuator.cpp @@ -59,7 +59,7 @@ extern "C" { #include "RNA_define.h" } -BL_ActionActuator::BL_ActionActuator(SCA_IObject* gameobj, +BL_ActionActuator::BL_ActionActuator(SCA_IObject *gameobj, const STR_String& propname, const STR_String& framepropname, float starttime, diff --git a/source/gameengine/Expressions/EmptyValue.cpp b/source/gameengine/Expressions/EmptyValue.cpp index 8170c588a28..7f3af9f649d 100644 --- a/source/gameengine/Expressions/EmptyValue.cpp +++ b/source/gameengine/Expressions/EmptyValue.cpp @@ -50,7 +50,7 @@ CEmptyValue::~CEmptyValue() -CValue * CEmptyValue::Calc(VALUE_OPERATOR op, CValue * val) +CValue *CEmptyValue::Calc(VALUE_OPERATOR op, CValue *val) /* * pre: * ret: a new object containing the result of applying operator op to this @@ -63,7 +63,7 @@ CValue * CEmptyValue::Calc(VALUE_OPERATOR op, CValue * val) -CValue * CEmptyValue::CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue * val) +CValue * CEmptyValue::CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *val) /* * pre: the type of val is dtype * ret: a new object containing the result of applying operator op to val and diff --git a/source/gameengine/Expressions/KX_HashedPtr.cpp b/source/gameengine/Expressions/KX_HashedPtr.cpp index 51550d52636..555ef7f9500 100644 --- a/source/gameengine/Expressions/KX_HashedPtr.cpp +++ b/source/gameengine/Expressions/KX_HashedPtr.cpp @@ -32,7 +32,7 @@ #include "KX_HashedPtr.h" -unsigned int KX_Hash(void * inDWord) +unsigned int KX_Hash(void *inDWord) { #if defined(_WIN64) && !defined(FREE_WINDOWS64) unsigned __int64 key = (unsigned __int64)inDWord; diff --git a/source/gameengine/Expressions/KX_HashedPtr.h b/source/gameengine/Expressions/KX_HashedPtr.h index d822af38c44..acd9d4daafa 100644 --- a/source/gameengine/Expressions/KX_HashedPtr.h +++ b/source/gameengine/Expressions/KX_HashedPtr.h @@ -36,7 +36,7 @@ #include "MEM_guardedalloc.h" #endif -unsigned int KX_Hash(void * inDWord); +unsigned int KX_Hash(void *inDWord); class CHashedPtr { diff --git a/source/gameengine/Expressions/ListValue.cpp b/source/gameengine/Expressions/ListValue.cpp index 5f97b03fed4..20c66bd7bc9 100644 --- a/source/gameengine/Expressions/ListValue.cpp +++ b/source/gameengine/Expressions/ListValue.cpp @@ -123,7 +123,7 @@ void CListValue::ReleaseAndRemoveAll() -CValue* CListValue::FindValue(const STR_String & name) +CValue* CListValue::FindValue(const STR_String &name) { for (int i=0; i < GetCount(); i++) if (GetValue(i)->GetName() == name) @@ -132,7 +132,7 @@ CValue* CListValue::FindValue(const STR_String & name) return NULL; } -CValue* CListValue::FindValue(const char * name) +CValue* CListValue::FindValue(const char *name) { for (int i=0; i < GetCount(); i++) if (GetValue(i)->GetName() == name) diff --git a/source/gameengine/Expressions/Operator1Expr.cpp b/source/gameengine/Expressions/Operator1Expr.cpp index 98228dfbe7d..b985f76825d 100644 --- a/source/gameengine/Expressions/Operator1Expr.cpp +++ b/source/gameengine/Expressions/Operator1Expr.cpp @@ -31,7 +31,7 @@ effect: constucts an empty COperator1Expr m_lhs = NULL; } -COperator1Expr::COperator1Expr(VALUE_OPERATOR op, CExpression * lhs) +COperator1Expr::COperator1Expr(VALUE_OPERATOR op, CExpression *lhs) /* pre: effect: constucts a COperator1Expr with op and lhs in it diff --git a/source/gameengine/Expressions/Value.cpp b/source/gameengine/Expressions/Value.cpp index 7b20b4b2d97..30a56c9165a 100644 --- a/source/gameengine/Expressions/Value.cpp +++ b/source/gameengine/Expressions/Value.cpp @@ -531,7 +531,7 @@ PyAttributeDef CValue::Attributes[] = { { NULL } //Sentinel }; -PyObject *CValue::pyattr_get_name(void * self_v, const KX_PYATTRIBUTE_DEF *attrdef) +PyObject *CValue::pyattr_get_name(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { CValue * self = static_cast (self_v); return PyUnicode_From_STR_String(self->GetName()); diff --git a/source/gameengine/Expressions/VectorValue.cpp b/source/gameengine/Expressions/VectorValue.cpp index 612de658ce9..a0e1b616d5e 100644 --- a/source/gameengine/Expressions/VectorValue.cpp +++ b/source/gameengine/Expressions/VectorValue.cpp @@ -47,7 +47,7 @@ CVectorValue::CVectorValue(float x,float y,float z, AllocationTYPE alloctype) m_vec[KX_Z] = m_transformedvec[KX_Z] = z; } -CVectorValue::CVectorValue(double vec[],const char *name,AllocationTYPE alloctype) +CVectorValue::CVectorValue(double vec[3], const char *name,AllocationTYPE alloctype) { SetCustomFlag1(false);//FancyOutput=false; @@ -65,7 +65,7 @@ CVectorValue::CVectorValue(double vec[],const char *name,AllocationTYPE alloctyp SetName(name); } -CVectorValue::CVectorValue(double vec[],AllocationTYPE alloctype) +CVectorValue::CVectorValue(double vec[3], AllocationTYPE alloctype) { SetCustomFlag1(false);//FancyOutput=false; diff --git a/source/gameengine/Expressions/VectorValue.h b/source/gameengine/Expressions/VectorValue.h index 9b9f9612810..69f2d4b54ae 100644 --- a/source/gameengine/Expressions/VectorValue.h +++ b/source/gameengine/Expressions/VectorValue.h @@ -45,10 +45,10 @@ public: CValue* CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *val); - CVectorValue(double vec[],const char *name,AllocationTYPE alloctype=CValue::HEAPVALUE); + CVectorValue(double vec[3], const char *name,AllocationTYPE alloctype=CValue::HEAPVALUE); CVectorValue() {}; - CVectorValue(double vec[],AllocationTYPE alloctype=CValue::HEAPVALUE); + CVectorValue(double vec[3], AllocationTYPE alloctype=CValue::HEAPVALUE); CVectorValue(float x,float y,float z, AllocationTYPE alloctype = CValue::HEAPVALUE); virtual ~CVectorValue(); //virtual bool ExportT3D(File *txtfile,bool bNoName=false); diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp index bab4aa14bbd..d81140992ec 100644 --- a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp +++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp @@ -163,7 +163,7 @@ void GPC_RenderTools::SetClientObject(RAS_IRasterizer *rasty, void* obj) } } -bool GPC_RenderTools::RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data) +bool GPC_RenderTools::RayHit(KX_ClientObjectInfo *client, KX_RayCast *result, void * const data) { double* const oglmatrix = (double* const) data; MT_Point3 resultpoint(result->m_hitPoint); diff --git a/source/gameengine/GamePlayer/common/bmfont.cpp b/source/gameengine/GamePlayer/common/bmfont.cpp index 8ffbe757222..8e073f7d17b 100644 --- a/source/gameengine/GamePlayer/common/bmfont.cpp +++ b/source/gameengine/GamePlayer/common/bmfont.cpp @@ -43,7 +43,7 @@ * detects if an image buffer contains a bitmap font. It makes the * specific bitmap data which is stored in the bitmap invisible to blender. * - * void matrixGlyph(ImBuf * ibuf, unsigned short unicode, *float x 7) + * void matrixGlyph(ImBuf *ibuf, unsigned short unicode, *float x 7) * returns all the information about the character (unicode) in the floats * * Room for improvement: @@ -62,8 +62,8 @@ #include "BKE_bmfont.h" #include "BKE_bmfont_types.h" -/*MAART: -void printfGlyph(bmGlyph * glyph) +#if 0 +void printfGlyph(bmGlyph *glyph) { printf("unicode: %d '%c'\n", glyph->unicode, glyph->unicode); printf(" locx: %4d locy: %4d\n", glyph->locx, glyph->locy); @@ -71,9 +71,9 @@ void printfGlyph(bmGlyph * glyph) printf(" ofsx: %3d ofsy: %3d\n", glyph->ofsx, glyph->ofsy); printf(" advan: %3d reser: %3d\n", glyph->advance, glyph->reserved); } -*/ +#endif -void calcAlpha(ImBuf * ibuf) +void calcAlpha(ImBuf *ibuf) { int i; char * rect; @@ -87,7 +87,7 @@ void calcAlpha(ImBuf * ibuf) } } -void readBitmapFontVersion0(ImBuf * ibuf, unsigned char * rect, int step) +void readBitmapFontVersion0(ImBuf *ibuf, unsigned char *rect, int step) { int glyphcount, bytes, i, index, linelength, ysize; unsigned char * buffer; @@ -253,7 +253,7 @@ int locateGlyph(bmFont *bmfont, unsigned short unicode) return(current); } -void matrixGlyph(ImBuf * ibuf, unsigned short unicode, +void matrixGlyph(ImBuf *ibuf, unsigned short unicode, float *centerx, float *centery, float *sizex, float *sizey, float *transx, float *transy, diff --git a/source/gameengine/Ketsji/KX_ConstraintActuator.cpp b/source/gameengine/Ketsji/KX_ConstraintActuator.cpp index 3caa4d35565..a3059317d36 100644 --- a/source/gameengine/Ketsji/KX_ConstraintActuator.cpp +++ b/source/gameengine/Ketsji/KX_ConstraintActuator.cpp @@ -116,7 +116,7 @@ KX_ConstraintActuator::~KX_ConstraintActuator() // there's nothing to be done here, really.... } /* end of destructor */ -bool KX_ConstraintActuator::RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data) +bool KX_ConstraintActuator::RayHit(KX_ClientObjectInfo *client, KX_RayCast *result, void * const data) { m_hitObject = client->m_gameobject; @@ -150,7 +150,7 @@ bool KX_ConstraintActuator::RayHit(KX_ClientObjectInfo* client, KX_RayCast* resu /* This function is used to pre-filter the object before casting the ray on them. * This is useful for "X-Ray" option when we want to see "through" unwanted object. */ -bool KX_ConstraintActuator::NeedRayCast(KX_ClientObjectInfo* client) +bool KX_ConstraintActuator::NeedRayCast(KX_ClientObjectInfo *client) { if (client->m_type > KX_ClientObjectInfo::ACTOR) { diff --git a/source/gameengine/Ketsji/KX_Dome.cpp b/source/gameengine/Ketsji/KX_Dome.cpp index 9f530f80e37..e2fb9573129 100644 --- a/source/gameengine/Ketsji/KX_Dome.cpp +++ b/source/gameengine/Ketsji/KX_Dome.cpp @@ -1435,7 +1435,7 @@ void KX_Dome::SplitFace(vector & face, int *nfaces) *nfaces = n2; } -void KX_Dome::CalculateFrustum(KX_Camera * cam) +void KX_Dome::CalculateFrustum(KX_Camera *cam) { #if 0 // manually creating a 90deg Field of View Frustum diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index ae5758b8597..98da18dcc68 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -187,7 +187,7 @@ KX_GameObject::~KX_GameObject() #endif // WITH_PYTHON } -KX_GameObject* KX_GameObject::GetClientObject(KX_ClientObjectInfo* info) +KX_GameObject* KX_GameObject::GetClientObject(KX_ClientObjectInfo *info) { if (!info) return NULL; @@ -2987,7 +2987,7 @@ KX_PYMETHODDEF_DOC_O(KX_GameObject, getVectTo, return returnValue; } -bool KX_GameObject::RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data) +bool KX_GameObject::RayHit(KX_ClientObjectInfo *client, KX_RayCast *result, void * const data) { KX_GameObject* hitKXObj = client->m_gameobject; @@ -3006,7 +3006,7 @@ bool KX_GameObject::RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void /* this function is used to pre-filter the object before casting the ray on them. * This is useful for "X-Ray" option when we want to see "through" unwanted object. */ -bool KX_GameObject::NeedRayCast(KX_ClientObjectInfo* client) +bool KX_GameObject::NeedRayCast(KX_ClientObjectInfo *client) { KX_GameObject* hitKXObj = client->m_gameobject; diff --git a/source/gameengine/Ketsji/KX_MeshProxy.cpp b/source/gameengine/Ketsji/KX_MeshProxy.cpp index 57695df2782..8e803c46358 100644 --- a/source/gameengine/Ketsji/KX_MeshProxy.cpp +++ b/source/gameengine/Ketsji/KX_MeshProxy.cpp @@ -403,15 +403,15 @@ PyObject *KX_MeshProxy::pyattr_get_materials(void *self_v, const KX_PYATTRIBUTE_ return materials; } -PyObject * KX_MeshProxy::pyattr_get_numMaterials(void * selfv, const KX_PYATTRIBUTE_DEF * attrdef) +PyObject *KX_MeshProxy::pyattr_get_numMaterials(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { - KX_MeshProxy * self = static_cast (selfv); + KX_MeshProxy * self = static_cast (self_v); return PyLong_FromLong(self->m_meshobj->NumMaterials()); } -PyObject * KX_MeshProxy::pyattr_get_numPolygons(void * selfv, const KX_PYATTRIBUTE_DEF * attrdef) +PyObject *KX_MeshProxy::pyattr_get_numPolygons(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { - KX_MeshProxy * self = static_cast (selfv); + KX_MeshProxy * self = static_cast (self_v); return PyLong_FromLong(self->m_meshobj->NumPolygons()); } diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp index 9368bc6458f..82ae8c13633 100644 --- a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp +++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp @@ -136,7 +136,7 @@ bool KX_MouseFocusSensor::Evaluate() return result; } -bool KX_MouseFocusSensor::RayHit(KX_ClientObjectInfo* client_info, KX_RayCast* result, void * const data) +bool KX_MouseFocusSensor::RayHit(KX_ClientObjectInfo *client_info, KX_RayCast *result, void * const data) { KX_GameObject* hitKXObj = client_info->m_gameobject; diff --git a/source/gameengine/Ketsji/KX_NearSensor.cpp b/source/gameengine/Ketsji/KX_NearSensor.cpp index 232a872bf10..cbb4e77d165 100644 --- a/source/gameengine/Ketsji/KX_NearSensor.cpp +++ b/source/gameengine/Ketsji/KX_NearSensor.cpp @@ -186,7 +186,7 @@ bool KX_NearSensor::BroadPhaseFilterCollision(void*obj1,void*obj2) // need the mapping from PHY_IPhysicsController to gameobjects now assert(obj1==m_physCtrl && obj2); - KX_ClientObjectInfo* client_info = static_cast((static_cast(obj2))->getNewClientInfo()); + KX_ClientObjectInfo *client_info = static_cast((static_cast(obj2))->getNewClientInfo()); KX_GameObject* gameobj = ( client_info ? client_info->m_gameobject : @@ -208,14 +208,14 @@ bool KX_NearSensor::BroadPhaseFilterCollision(void*obj1,void*obj2) return false; } -bool KX_NearSensor::NewHandleCollision(void* obj1,void* obj2,const PHY_CollData * coll_data) +bool KX_NearSensor::NewHandleCollision(void *obj1, void *obj2, const PHY_CollData *coll_data) { // KX_TouchEventManager* toucheventmgr = static_cast(m_eventmgr); // KX_GameObject* parent = static_cast(GetParent()); // need the mapping from PHY_IPhysicsController to gameobjects now - KX_ClientObjectInfo* client_info =static_cast (obj1 == m_physCtrl? + KX_ClientObjectInfo *client_info = static_cast (obj1 == m_physCtrl? ((PHY_IPhysicsController*)obj2)->getNewClientInfo() : ((PHY_IPhysicsController*)obj1)->getNewClientInfo()); diff --git a/source/gameengine/Ketsji/KX_PythonSeq.cpp b/source/gameengine/Ketsji/KX_PythonSeq.cpp index f0e11645bc1..4c491654d1f 100644 --- a/source/gameengine/Ketsji/KX_PythonSeq.cpp +++ b/source/gameengine/Ketsji/KX_PythonSeq.cpp @@ -63,7 +63,7 @@ static int KX_PythonSeq_clear(KX_PythonSeq *self) return 0; } -static void KX_PythonSeq_dealloc(KX_PythonSeq * self) +static void KX_PythonSeq_dealloc(KX_PythonSeq *self) { KX_PythonSeq_clear(self); PyObject_GC_Del(self); @@ -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); @@ -394,9 +394,9 @@ static PyObject *KX_PythonSeq_nextIter(KX_PythonSeq *self) } -static int KX_PythonSeq_compare( KX_PythonSeq * a, KX_PythonSeq * b ) +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) @@ -434,7 +434,7 @@ static PyObject *KX_PythonSeq_richcmp(PyObject *a, PyObject *b, int op) * repr function * convert to a list and get its string value */ -static PyObject *KX_PythonSeq_repr( KX_PythonSeq * self ) +static PyObject *KX_PythonSeq_repr(KX_PythonSeq *self) { PyObject *list = PySequence_List((PyObject *)self); PyObject *repr = PyObject_Repr(list); diff --git a/source/gameengine/Ketsji/KX_RayCast.cpp b/source/gameengine/Ketsji/KX_RayCast.cpp index 878f9d267dc..f1bfb10220a 100644 --- a/source/gameengine/Ketsji/KX_RayCast.cpp +++ b/source/gameengine/Ketsji/KX_RayCast.cpp @@ -80,7 +80,7 @@ bool KX_RayCast::RayTest(PHY_IPhysicsEnvironment* physics_environment, const MT_ frompoint.x(),frompoint.y(),frompoint.z(), topoint.x(),topoint.y(),topoint.z())) != NULL) { - KX_ClientObjectInfo* info = static_cast(hit_controller->getNewClientInfo()); + KX_ClientObjectInfo *info = static_cast(hit_controller->getNewClientInfo()); if (!info) { diff --git a/source/gameengine/Ketsji/KX_RaySensor.cpp b/source/gameengine/Ketsji/KX_RaySensor.cpp index 14786e8429e..3fbce690a9f 100644 --- a/source/gameengine/Ketsji/KX_RaySensor.cpp +++ b/source/gameengine/Ketsji/KX_RaySensor.cpp @@ -108,7 +108,7 @@ bool KX_RaySensor::IsPositiveTrigger() return result; } -bool KX_RaySensor::RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data) +bool KX_RaySensor::RayHit(KX_ClientObjectInfo *client, KX_RayCast *result, void * const data) { KX_GameObject* hitKXObj = client->m_gameobject; @@ -153,7 +153,7 @@ bool KX_RaySensor::RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void /* this function is used to pre-filter the object before casting the ray on them. * This is useful for "X-Ray" option when we want to see "through" unwanted object. */ -bool KX_RaySensor::NeedRayCast(KX_ClientObjectInfo* client) +bool KX_RaySensor::NeedRayCast(KX_ClientObjectInfo *client) { if (client->m_type > KX_ClientObjectInfo::ACTOR) { diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index 3e1a81c2f4f..92e064c6e91 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -1468,7 +1468,7 @@ void KX_Scene::MarkVisible(RAS_IRasterizer* rasty, KX_GameObject* gameobj,KX_Cam } } -void KX_Scene::PhysicsCullingCallback(KX_ClientObjectInfo* objectInfo, void* cullingInfo) +void KX_Scene::PhysicsCullingCallback(KX_ClientObjectInfo *objectInfo, void* cullingInfo) { KX_GameObject* gameobj = objectInfo->m_gameobject; if (!gameobj->GetVisible()) diff --git a/source/gameengine/Ketsji/KX_SceneActuator.cpp b/source/gameengine/Ketsji/KX_SceneActuator.cpp index 83b57dee7c1..6fe33fd2f63 100644 --- a/source/gameengine/Ketsji/KX_SceneActuator.cpp +++ b/source/gameengine/Ketsji/KX_SceneActuator.cpp @@ -208,7 +208,7 @@ KX_Camera* KX_SceneActuator::FindCamera(const char *camName) -KX_Scene* KX_SceneActuator::FindScene(const char * sceneName) +KX_Scene* KX_SceneActuator::FindScene(const char *sceneName) { return m_KetsjiEngine->FindScene(sceneName); } diff --git a/source/gameengine/Ketsji/KX_TouchEventManager.cpp b/source/gameengine/Ketsji/KX_TouchEventManager.cpp index d2a5ce58641..96872f4e6fd 100644 --- a/source/gameengine/Ketsji/KX_TouchEventManager.cpp +++ b/source/gameengine/Ketsji/KX_TouchEventManager.cpp @@ -82,7 +82,7 @@ bool KX_TouchEventManager::newBroadphaseResponse(void *client_data, const PHY_CollData *coll_data) { PHY_IPhysicsController* ctrl = static_cast(object1); - KX_ClientObjectInfo* info = (ctrl) ? static_cast(ctrl->getNewClientInfo()) : NULL; + KX_ClientObjectInfo *info = (ctrl) ? static_cast(ctrl->getNewClientInfo()) : NULL; // This call back should only be called for controllers of Near and Radar sensor if (!info) return true; diff --git a/source/gameengine/Ketsji/KX_TouchSensor.cpp b/source/gameengine/Ketsji/KX_TouchSensor.cpp index 36e0bf692f1..9d87da48fae 100644 --- a/source/gameengine/Ketsji/KX_TouchSensor.cpp +++ b/source/gameengine/Ketsji/KX_TouchSensor.cpp @@ -175,7 +175,7 @@ void KX_TouchSensor::RegisterSumo(KX_TouchEventManager *touchman) { if (touchman->GetPhysicsEnvironment()->requestCollisionCallback(m_physCtrl)) { - KX_ClientObjectInfo* client_info = static_cast(m_physCtrl->getNewClientInfo()); + KX_ClientObjectInfo *client_info = static_cast(m_physCtrl->getNewClientInfo()); if (client_info->isSensor()) touchman->GetPhysicsEnvironment()->addSensor(m_physCtrl); } @@ -188,7 +188,7 @@ void KX_TouchSensor::UnregisterSumo(KX_TouchEventManager* touchman) if (touchman->GetPhysicsEnvironment()->removeCollisionCallback(m_physCtrl)) { // no more sensor on the controller, can remove it if it is a sensor object - KX_ClientObjectInfo* client_info = static_cast(m_physCtrl->getNewClientInfo()); + KX_ClientObjectInfo *client_info = static_cast(m_physCtrl->getNewClientInfo()); if (client_info->isSensor()) touchman->GetPhysicsEnvironment()->removeSensor(m_physCtrl); } @@ -203,8 +203,8 @@ bool KX_TouchSensor::BroadPhaseSensorFilterCollision(void*obj1,void*obj2) KX_GameObject* myobj = (KX_GameObject*)GetParent(); KX_GameObject* myparent = myobj->GetParent(); - KX_ClientObjectInfo* client_info = static_cast(((PHY_IPhysicsController*)obj2)->getNewClientInfo()); - KX_ClientObjectInfo* my_client_info = static_cast(m_physCtrl->getNewClientInfo()); + KX_ClientObjectInfo *client_info = static_cast(((PHY_IPhysicsController*)obj2)->getNewClientInfo()); + KX_ClientObjectInfo *my_client_info = static_cast(m_physCtrl->getNewClientInfo()); KX_GameObject* otherobj = ( client_info ? client_info->m_gameobject : NULL); // first, decrement refcount as GetParent() increases it @@ -243,7 +243,7 @@ bool KX_TouchSensor::NewHandleCollision(void*object1,void*object2,const PHY_Coll // need the mapping from PHY_IPhysicsController to gameobjects now - KX_ClientObjectInfo* client_info = static_cast (object1 == m_physCtrl? + KX_ClientObjectInfo *client_info = static_cast (object1 == m_physCtrl? ((PHY_IPhysicsController*)object2)->getNewClientInfo(): ((PHY_IPhysicsController*)object1)->getNewClientInfo()); diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp index d5ceba0ec57..29b526067fd 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp @@ -1799,7 +1799,7 @@ struct DbvtCullingCallback : btDbvt::ICollide btBroadphaseProxy* proxy=(btBroadphaseProxy*)leaf->data; // the client object is a graphic controller CcdGraphicController* ctrl = static_cast(proxy->m_clientObject); - KX_ClientObjectInfo* info = (KX_ClientObjectInfo*)ctrl->getNewClientInfo(); + KX_ClientObjectInfo *info = (KX_ClientObjectInfo*)ctrl->getNewClientInfo(); if (m_ocb) { // means we are doing occlusion culling. Check if this object is an occluders diff --git a/source/gameengine/SceneGraph/SG_IObject.h b/source/gameengine/SceneGraph/SG_IObject.h index 72a04064834..2dcf3c6492e 100644 --- a/source/gameengine/SceneGraph/SG_IObject.h +++ b/source/gameengine/SceneGraph/SG_IObject.h @@ -83,19 +83,19 @@ typedef void* (*SG_DestructionNewCallback)( void* clientinfo ); -typedef void (*SG_UpdateTransformCallback)( +typedef void (*SG_UpdateTransformCallback)( SG_IObject* sgobject, void* clientobj, void* clientinfo ); -typedef bool (*SG_ScheduleUpdateCallback)( +typedef bool (*SG_ScheduleUpdateCallback)( SG_IObject* sgobject, void* clientobj, void* clientinfo ); -typedef bool (*SG_RescheduleUpdateCallback)( +typedef bool (*SG_RescheduleUpdateCallback)( SG_IObject* sgobject, void* clientobj, void* clientinfo diff --git a/source/gameengine/VideoTexture/Exception.cpp b/source/gameengine/VideoTexture/Exception.cpp index 89d95d26971..0f571550205 100644 --- a/source/gameengine/VideoTexture/Exception.cpp +++ b/source/gameengine/VideoTexture/Exception.cpp @@ -48,7 +48,7 @@ ExpDesc errNFoundDesc(ErrNotFound, "Error description not found"); // implementation of ExpDesc // constructor -ExpDesc::ExpDesc (ExceptionID & exp, const char * desc, RESULT hres) +ExpDesc::ExpDesc (ExceptionID & exp, const char *desc, RESULT hres) : m_expID(exp), m_hRslt(hres), m_description(desc) { } @@ -105,7 +105,7 @@ const char * Exception::what() // debug version - with file and line of exception -Exception::Exception (ExceptionID & expID, RESULT rslt, const char * fil, int lin) +Exception::Exception (ExceptionID & expID, RESULT rslt, const char *fil, int lin) : m_expID (&expID), m_hRslt (rslt) { // set file and line @@ -115,7 +115,7 @@ Exception::Exception (ExceptionID & expID, RESULT rslt, const char * fil, int li // set file and line -void Exception::setFileLine (const char * fil, int lin) +void Exception::setFileLine (const char *fil, int lin) { if (fil != NULL) m_fileName = fil; m_line = lin; diff --git a/source/gameengine/VideoTexture/FilterBase.cpp b/source/gameengine/VideoTexture/FilterBase.cpp index 66552cde928..77d12ddc9e6 100644 --- a/source/gameengine/VideoTexture/FilterBase.cpp +++ b/source/gameengine/VideoTexture/FilterBase.cpp @@ -124,7 +124,7 @@ PyObject *Filter_getPrevious (PyFilter *self, void *closure) if (self->m_filter != NULL) { // pixel filter object - PyObject * filt = reinterpret_cast(self->m_filter->getPrevious()); + PyObject *filt = reinterpret_cast(self->m_filter->getPrevious()); // if filter is present if (filt != NULL) { diff --git a/source/gameengine/VideoTexture/FilterColor.cpp b/source/gameengine/VideoTexture/FilterColor.cpp index 5efb59efe4c..26b5303e365 100644 --- a/source/gameengine/VideoTexture/FilterColor.cpp +++ b/source/gameengine/VideoTexture/FilterColor.cpp @@ -141,7 +141,7 @@ static int setMatrix(PyFilter *self, PyObject *value, void *closure) for (int r = 0; valid && r < 4; ++r) { // get row object - PyObject * row = PySequence_Fast_GET_ITEM(value, r); + PyObject *row = PySequence_Fast_GET_ITEM(value, r); // check sequence valid = PySequence_Check(row) && PySequence_Size(row) == 5; // check items @@ -274,7 +274,7 @@ static int setLevels(PyFilter *self, PyObject *value, void *closure) for (int r = 0; valid && r < 4; ++r) { // get row object - PyObject * row = PySequence_Fast_GET_ITEM(value, r); + PyObject *row = PySequence_Fast_GET_ITEM(value, r); // check sequence valid = PySequence_Check(row) && PySequence_Size(row) == 2; // check items diff --git a/source/gameengine/VideoTexture/ImageBase.cpp b/source/gameengine/VideoTexture/ImageBase.cpp index 4745ce784c0..5a11cd24bcf 100644 --- a/source/gameengine/VideoTexture/ImageBase.cpp +++ b/source/gameengine/VideoTexture/ImageBase.cpp @@ -364,7 +364,7 @@ PyTypeList pyImageTypes; // functions for python interface // object allocation -PyObject *Image_allocNew (PyTypeObject *type, PyObject *args, PyObject *kwds) +PyObject *Image_allocNew(PyTypeObject *type, PyObject *args, PyObject *kwds) { // allocate object PyImage *self = reinterpret_cast(type->tp_alloc(type, 0)); @@ -394,7 +394,7 @@ void Image_dealloc(PyImage *self) } // get image data -PyObject *Image_getImage (PyImage *self, char * mode) +PyObject *Image_getImage(PyImage *self, char *mode) { try { @@ -551,7 +551,7 @@ int Image_setFlip(PyImage *self, PyObject *value, void *closure) } // get zbuff -PyObject * Image_getZbuff (PyImage * self, void * closure) +PyObject *Image_getZbuff(PyImage * self, void *closure) { if (self->m_image != NULL && self->m_image->getZbuff()) Py_RETURN_TRUE; else Py_RETURN_FALSE; @@ -573,7 +573,7 @@ int Image_setZbuff(PyImage *self, PyObject *value, void *closure) } // get depth -PyObject * Image_getDepth (PyImage * self, void * closure) +PyObject *Image_getDepth(PyImage * self, void *closure) { if (self->m_image != NULL && self->m_image->getDepth()) Py_RETURN_TRUE; else Py_RETURN_FALSE; @@ -598,7 +598,7 @@ int Image_setDepth(PyImage *self, PyObject *value, void *closure) // get filter source object -PyObject *Image_getSource (PyImage *self, PyObject *args) +PyObject *Image_getSource(PyImage *self, PyObject *args) { // get arguments char * id; @@ -622,7 +622,7 @@ PyObject *Image_getSource (PyImage *self, PyObject *args) // set filter source object -PyObject *Image_setSource (PyImage *self, PyObject *args) +PyObject *Image_setSource(PyImage *self, PyObject *args) { // get arguments char * id; @@ -657,13 +657,13 @@ PyObject *Image_setSource (PyImage *self, PyObject *args) // get pixel filter object -PyObject *Image_getFilter (PyImage *self, void *closure) +PyObject *Image_getFilter(PyImage *self, void *closure) { // if image object is available if (self->m_image != NULL) { // pixel filter object - PyObject * filt = reinterpret_cast(self->m_image->getFilter()); + PyObject *filt = reinterpret_cast(self->m_image->getFilter()); // if filter is present if (filt != NULL) { diff --git a/source/gameengine/VideoTexture/ImageBase.h b/source/gameengine/VideoTexture/ImageBase.h index 3bb9c8cb090..718191fd049 100644 --- a/source/gameengine/VideoTexture/ImageBase.h +++ b/source/gameengine/VideoTexture/ImageBase.h @@ -57,52 +57,52 @@ public: /// constructor ImageBase (bool staticSrc = false); /// destructor - virtual ~ImageBase (void); + virtual ~ImageBase(void); /// release contained objects, if returns true, object should be deleted - virtual bool release (void); + virtual bool release(void); /// is an image available bool isImageAvailable(void) { return m_avail; } /// get image - unsigned int * getImage (unsigned int texId = 0, double timestamp=-1.0); + unsigned int *getImage(unsigned int texId = 0, double timestamp=-1.0); /// get image size - short * getSize (void) { return m_size; } + short * getSize(void) { return m_size; } /// get image buffer size - unsigned long getBuffSize (void) + unsigned long getBuffSize(void) { return m_size[0] * m_size[1] * sizeof(unsigned int); } /// refresh image - invalidate its current content - virtual void refresh (void); + virtual void refresh(void); /// get scale - bool getScale (void) { return m_scale; } + bool getScale(void) { return m_scale; } /// set scale - void setScale (bool scale) { m_scale = scale; m_scaleChange = true; } + void setScale(bool scale) { m_scale = scale; m_scaleChange = true; } /// get vertical flip - bool getFlip (void) { return m_flip; } + bool getFlip(void) { return m_flip; } /// set vertical flip - void setFlip (bool flip) { m_flip = flip; } + void setFlip(bool flip) { m_flip = flip; } /// get Z buffer - bool getZbuff (void) { return m_zbuff; } + bool getZbuff(void) { return m_zbuff; } /// set Z buffer - void setZbuff (bool zbuff) { m_zbuff = zbuff; } + void setZbuff(bool zbuff) { m_zbuff = zbuff; } /// get depth - bool getDepth (void) { return m_depth; } + bool getDepth(void) { return m_depth; } /// set depth - void setDepth (bool depth) { m_depth = depth; } + void setDepth(bool depth) { m_depth = depth; } /// get source object - PyImage * getSource (const char * id); + PyImage * getSource(const char * id); /// set source object, return true, if source was set - bool setSource (const char * id, PyImage *source); + bool setSource(const char * id, PyImage *source); /// get pixel filter - PyFilter * getFilter (void) { return m_pyfilter; } + PyFilter * getFilter(void) { return m_pyfilter; } /// set pixel filter - void setFilter (PyFilter * filt); + void setFilter(PyFilter * filt); - /// calculate size (nearest power of 2) - static short calcSize (short size); + /// calculate size(nearest power of 2) + static short calcSize(short size); /// number of buffer pointing to m_image, public because not handled by this class int m_exports; @@ -137,25 +137,25 @@ protected: PyFilter * m_pyfilter; /// initialize image data - void init (short width, short height); + void init(short width, short height); /// find source - ImageSourceList::iterator findSource (const char * id); + ImageSourceList::iterator findSource(const char *id); /// create new source - virtual ImageSource * newSource (const char * id) { return NULL; } + virtual ImageSource *newSource(const char *id) { return NULL; } /// check source sizes - bool checkSourceSizes (void); + bool checkSourceSizes(void); /// calculate image from sources and set its availability - virtual void calcImage (unsigned int texId, double ts) {} + virtual void calcImage(unsigned int texId, double ts) {} /// perform loop detection - bool loopDetect (ImageBase * img); + bool loopDetect(ImageBase * img); /// template for image conversion - template void convImage (FLT & filter, SRC srcBuff, + template void convImage(FLT & filter, SRC srcBuff, short * srcSize) { // destination buffer @@ -328,7 +328,7 @@ extern PyTypeList pyImageTypes; // functions for python interface // object initialization -template static int Image_init (PyObject *pySelf, PyObject *args, PyObject *kwds) +template static int Image_init(PyObject *pySelf, PyObject *args, PyObject *kwds) { PyImage *self = reinterpret_cast(pySelf); // create source object @@ -339,43 +339,43 @@ template static int Image_init (PyObject *pySelf, PyObject *args, PyOb } // object allocation -PyObject *Image_allocNew (PyTypeObject *type, PyObject *args, PyObject *kwds); +PyObject *Image_allocNew(PyTypeObject *type, PyObject *args, PyObject *kwds); // object deallocation -void Image_dealloc (PyImage *self); +void Image_dealloc(PyImage *self); // get image data -PyObject *Image_getImage (PyImage *self, char * mode); +PyObject *Image_getImage(PyImage *self, char * mode); // get image size -PyObject *Image_getSize (PyImage *self, void *closure); +PyObject *Image_getSize(PyImage *self, void *closure); // refresh image - invalidate current content -PyObject *Image_refresh (PyImage *self); +PyObject *Image_refresh(PyImage *self); // get scale -PyObject *Image_getScale (PyImage *self, void *closure); +PyObject *Image_getScale(PyImage *self, void *closure); // set scale -int Image_setScale (PyImage *self, PyObject *value, void *closure); +int Image_setScale(PyImage *self, PyObject *value, void *closure); // get flip -PyObject *Image_getFlip (PyImage *self, void *closure); +PyObject *Image_getFlip(PyImage *self, void *closure); // set flip -int Image_setFlip (PyImage *self, PyObject *value, void *closure); +int Image_setFlip(PyImage *self, PyObject *value, void *closure); // get filter source object -PyObject *Image_getSource (PyImage *self, PyObject *args); +PyObject *Image_getSource(PyImage *self, PyObject *args); // set filter source object -PyObject *Image_setSource (PyImage *self, PyObject *args); +PyObject *Image_setSource(PyImage *self, PyObject *args); // get Z buffer -PyObject * Image_getZbuff (PyImage * self, void * closure); +PyObject *Image_getZbuff(PyImage * self, void *closure); // set Z buffer -int Image_setZbuff (PyImage * self, PyObject * value, void * closure); +int Image_setZbuff(PyImage * self, PyObject *value, void *closure); // get depth -PyObject * Image_getDepth (PyImage * self, void * closure); +PyObject *Image_getDepth(PyImage * self, void *closure); // set depth -int Image_setDepth (PyImage * self, PyObject * value, void * closure); +int Image_setDepth(PyImage * self, PyObject *value, void *closure); // get pixel filter object -PyObject *Image_getFilter (PyImage *self, void *closure); +PyObject *Image_getFilter(PyImage *self, void *closure); // set pixel filter object -int Image_setFilter (PyImage *self, PyObject *value, void *closure); +int Image_setFilter(PyImage *self, PyObject *value, void *closure); // check if a buffer can be extracted PyObject *Image_valid(PyImage *self, void *closure); // for buffer access to PyImage objects diff --git a/source/gameengine/VideoTexture/ImageRender.cpp b/source/gameengine/VideoTexture/ImageRender.cpp index 0b34824fd08..11ddec681c5 100644 --- a/source/gameengine/VideoTexture/ImageRender.cpp +++ b/source/gameengine/VideoTexture/ImageRender.cpp @@ -299,7 +299,7 @@ static int ImageRender_init(PyObject *pySelf, PyObject *args, PyObject *kwds) // parameters - scene object PyObject *scene; // camera object - PyObject * camera; + PyObject *camera; // parameter keywords static const char *kwlist[] = {"sceneObj", "cameraObj", NULL}; // get parameters diff --git a/source/gameengine/VideoTexture/ImageViewport.h b/source/gameengine/VideoTexture/ImageViewport.h index 5afd4654d62..10d894a9fb8 100644 --- a/source/gameengine/VideoTexture/ImageViewport.h +++ b/source/gameengine/VideoTexture/ImageViewport.h @@ -95,12 +95,12 @@ protected: GLint * getViewportSize (void) { return m_viewport + 2; } }; -PyObject *ImageViewport_getCaptureSize (PyImage *self, void *closure); -int ImageViewport_setCaptureSize (PyImage *self, PyObject *value, void *closure); -PyObject *ImageViewport_getWhole (PyImage *self, void *closure); -int ImageViewport_setWhole (PyImage *self, PyObject *value, void *closure); -PyObject *ImageViewport_getAlpha (PyImage *self, void *closure); -int ImageViewport_setAlpha (PyImage *self, PyObject *value, void *closure); +PyObject *ImageViewport_getCaptureSize(PyImage *self, void *closure); +int ImageViewport_setCaptureSize(PyImage *self, PyObject *value, void *closure); +PyObject *ImageViewport_getWhole(PyImage *self, void *closure); +int ImageViewport_setWhole(PyImage *self, PyObject *value, void *closure); +PyObject *ImageViewport_getAlpha(PyImage *self, void *closure); +int ImageViewport_setAlpha(PyImage *self, PyObject *value, void *closure); #endif diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.cpp b/source/gameengine/VideoTexture/VideoFFmpeg.cpp index 4e584cc89ad..be7f9392f39 100644 --- a/source/gameengine/VideoTexture/VideoFFmpeg.cpp +++ b/source/gameengine/VideoTexture/VideoFFmpeg.cpp @@ -504,7 +504,7 @@ void VideoFFmpeg::stopCache() } } -void VideoFFmpeg::releaseFrame(AVFrame* frame) +void VideoFFmpeg::releaseFrame(AVFrame *frame) { if (frame == m_frameRGB) { @@ -521,7 +521,7 @@ void VideoFFmpeg::releaseFrame(AVFrame* frame) } // open video file -void VideoFFmpeg::openFile (char * filename) +void VideoFFmpeg::openFile (char *filename) { if (openStream(filename, NULL, NULL) != 0) return; @@ -578,7 +578,7 @@ void VideoFFmpeg::openFile (char * filename) // open video capture device -void VideoFFmpeg::openCam (char * file, short camIdx) +void VideoFFmpeg::openCam (char *file, short camIdx) { // open camera source AVInputFormat *inputFormat; diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.h b/source/gameengine/VideoTexture/VideoFFmpeg.h index 92043bb1f74..2f466eb5eeb 100644 --- a/source/gameengine/VideoTexture/VideoFFmpeg.h +++ b/source/gameengine/VideoTexture/VideoFFmpeg.h @@ -51,12 +51,12 @@ extern "C" { #endif #ifdef FFMPEG_CODEC_IS_POINTER -static inline AVCodecContext* get_codec_from_stream(AVStream* stream) +static inline AVCodecContext *get_codec_from_stream(AVStream* stream) { return stream->codec; } #else -static inline AVCodecContext* get_codec_from_stream(AVStream* stream) +static inline AVCodecContext *get_codec_from_stream(AVStream* stream) { return &stream->codec; } -- cgit v1.2.3