[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55663] trunk/blender/source/gameengine: style cleanup
Campbell Barton
ideasman42 at gmail.com
Fri Mar 29 07:21:29 CET 2013
Revision: 55663
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55663
Author: campbellbarton
Date: 2013-03-29 06:21:28 +0000 (Fri, 29 Mar 2013)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/gameengine/Expressions/Value.h
trunk/blender/source/gameengine/Expressions/VoidValue.h
trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.h
trunk/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_BucketManager.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_BucketManager.h
trunk/blender/source/gameengine/VideoTexture/Exception.h
trunk/blender/source/gameengine/VideoTexture/FilterBase.cpp
trunk/blender/source/gameengine/VideoTexture/FilterBase.h
trunk/blender/source/gameengine/VideoTexture/FilterBlueScreen.h
trunk/blender/source/gameengine/VideoTexture/FilterNormal.h
trunk/blender/source/gameengine/VideoTexture/FilterSource.h
trunk/blender/source/gameengine/VideoTexture/ImageBase.cpp
trunk/blender/source/gameengine/VideoTexture/ImageBase.h
trunk/blender/source/gameengine/VideoTexture/ImageBuff.cpp
trunk/blender/source/gameengine/VideoTexture/ImageMix.cpp
trunk/blender/source/gameengine/VideoTexture/ImageMix.h
trunk/blender/source/gameengine/VideoTexture/ImageRender.cpp
trunk/blender/source/gameengine/VideoTexture/ImageRender.h
trunk/blender/source/gameengine/VideoTexture/PyTypeList.cpp
trunk/blender/source/gameengine/VideoTexture/VideoBase.cpp
trunk/blender/source/gameengine/VideoTexture/VideoBase.h
trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h
Modified: trunk/blender/source/gameengine/Expressions/Value.h
===================================================================
--- trunk/blender/source/gameengine/Expressions/Value.h 2013-03-29 04:38:10 UTC (rev 55662)
+++ trunk/blender/source/gameengine/Expressions/Value.h 2013-03-29 06:21:28 UTC (rev 55663)
@@ -222,7 +222,7 @@
virtual CValue *ConvertPythonToValue(PyObject *pyobj, const char *error_prefix);
- static PyObject *pyattr_get_name(void * self, const KX_PYATTRIBUTE_DEF * attrdef);
+ static PyObject *pyattr_get_name(void *self, const KX_PYATTRIBUTE_DEF *attrdef);
virtual PyObject *ConvertKeysToPython( void );
#endif /* WITH_PYTHON */
Modified: trunk/blender/source/gameengine/Expressions/VoidValue.h
===================================================================
--- trunk/blender/source/gameengine/Expressions/VoidValue.h 2013-03-29 04:38:10 UTC (rev 55662)
+++ trunk/blender/source/gameengine/Expressions/VoidValue.h 2013-03-29 06:21:28 UTC (rev 55663)
@@ -46,7 +46,7 @@
public:
/// Construction/destruction
CVoidValue() : m_bDeleteOnDestruct(false), m_pAnything(NULL) { }
- CVoidValue(void * voidptr, bool bDeleteOnDestruct, AllocationTYPE alloctype) :
+ CVoidValue(void *voidptr, bool bDeleteOnDestruct, AllocationTYPE alloctype) :
m_bDeleteOnDestruct(bDeleteOnDestruct),
m_pAnything(voidptr)
{
Modified: trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.h 2013-03-29 04:38:10 UTC (rev 55662)
+++ trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.h 2013-03-29 06:21:28 UTC (rev 55663)
@@ -74,9 +74,9 @@
KX_PYMETHOD(KX_MeshProxy,Transform);
KX_PYMETHOD(KX_MeshProxy,TransformUV);
- 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_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);
};
#endif /* WITH_PYTHON */
Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp 2013-03-29 04:38:10 UTC (rev 55662)
+++ trunk/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp 2013-03-29 06:21:28 UTC (rev 55663)
@@ -189,7 +189,7 @@
return NULL;
}
-static PyObjectPlus * KX_PythonSeq_subscript__internal(PyObject *self, const char *key)
+static PyObjectPlus *KX_PythonSeq_subscript__internal(PyObject *self, const char *key)
{
PyObjectPlus *self_plus= BGE_PROXY_REF(((KX_PythonSeq *)self)->base);
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_BucketManager.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_BucketManager.cpp 2013-03-29 04:38:10 UTC (rev 55662)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_BucketManager.cpp 2013-03-29 06:21:28 UTC (rev 55663)
@@ -254,7 +254,7 @@
rendertools->SetClientObject(rasty, NULL);
}
-RAS_MaterialBucket* RAS_BucketManager::FindBucket(RAS_IPolyMaterial * material, bool &bucketCreated)
+RAS_MaterialBucket *RAS_BucketManager::FindBucket(RAS_IPolyMaterial *material, bool &bucketCreated)
{
BucketList::iterator it;
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_BucketManager.h
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_BucketManager.h 2013-03-29 04:38:10 UTC (rev 55662)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_BucketManager.h 2013-03-29 06:21:28 UTC (rev 55663)
@@ -54,13 +54,13 @@
void Renderbuckets(const MT_Transform & cameratrans,
RAS_IRasterizer* rasty, RAS_IRenderTools* rendertools);
- RAS_MaterialBucket* FindBucket(RAS_IPolyMaterial * material, bool &bucketCreated);
+ RAS_MaterialBucket* FindBucket(RAS_IPolyMaterial *material, bool &bucketCreated);
void OptimizeBuckets(MT_Scalar distance);
- void ReleaseDisplayLists(RAS_IPolyMaterial * material = NULL);
- void ReleaseMaterials(RAS_IPolyMaterial * material = NULL);
+ void ReleaseDisplayLists(RAS_IPolyMaterial *material = NULL);
+ void ReleaseMaterials(RAS_IPolyMaterial *material = NULL);
- void RemoveMaterial(RAS_IPolyMaterial * mat); // freeing scenes only
+ void RemoveMaterial(RAS_IPolyMaterial *mat); // freeing scenes only
/* for merging */
void MergeBucketManager(RAS_BucketManager *other, SCA_IScene *scene);
Modified: trunk/blender/source/gameengine/VideoTexture/Exception.h
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/Exception.h 2013-03-29 04:38:10 UTC (rev 55662)
+++ trunk/blender/source/gameengine/VideoTexture/Exception.h 2013-03-29 06:21:28 UTC (rev 55663)
@@ -105,7 +105,7 @@
// returns 0, if exception identification don't match at all
// returns 1, if only exception identification is matching
// returns 2, if both exception identification and result are matching
- int isExp (ExceptionID * exp, RESULT hres = S_OK) throw()
+ int isExp (ExceptionID *exp, RESULT hres = S_OK) throw()
{
// check exception identification
if (&m_expID == exp)
Modified: trunk/blender/source/gameengine/VideoTexture/FilterBase.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/FilterBase.cpp 2013-03-29 04:38:10 UTC (rev 55662)
+++ trunk/blender/source/gameengine/VideoTexture/FilterBase.cpp 2013-03-29 06:21:28 UTC (rev 55663)
@@ -58,7 +58,7 @@
// set new previous filter
-void FilterBase::setPrevious (PyFilter * filt, bool useRefCnt)
+void FilterBase::setPrevious(PyFilter *filt, bool useRefCnt)
{
// if reference counting has to be used
if (useRefCnt)
Modified: trunk/blender/source/gameengine/VideoTexture/FilterBase.h
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/FilterBase.h 2013-03-29 04:38:10 UTC (rev 55662)
+++ trunk/blender/source/gameengine/VideoTexture/FilterBase.h 2013-03-29 06:21:28 UTC (rev 55663)
@@ -79,7 +79,7 @@
/// get previous filter
PyFilter * getPrevious (void) { return m_previous; }
/// set previous filter
- void setPrevious (PyFilter * filt, bool useRefCnt = true);
+ void setPrevious (PyFilter *filt, bool useRefCnt = true);
/// find first filter in chain
FilterBase * findFirst (void);
@@ -92,20 +92,20 @@
PyFilter * m_previous;
/// filter pixel, source byte buffer
- virtual unsigned int filter (unsigned char * src, short x, short y,
- short * size, unsigned int pixSize, unsigned int val = 0)
+ virtual unsigned int filter(unsigned char *src, short x, short y,
+ short *size, unsigned int pixSize, unsigned int val = 0)
{ return val; }
/// filter pixel, source int buffer
- virtual unsigned int filter (unsigned int * src, short x, short y,
- short * size, unsigned int pixSize, unsigned int val = 0)
+ virtual unsigned int filter(unsigned int *src, short x, short y,
+ short *size, unsigned int pixSize, unsigned int val = 0)
{ return val; }
/// filter pixel, source float buffer
- virtual unsigned int filter (float * src, short x, short y,
- short * size, unsigned int pixSize, unsigned int val = 0)
+ virtual unsigned int filter(float *src, short x, short y,
+ short *size, unsigned int pixSize, unsigned int val = 0)
{ return val; }
/// get source pixel size
- virtual unsigned int getPixelSize (void) { return 1; }
+ virtual unsigned int getPixelSize(void) { return 1; }
/// get converted pixel from previous filters
template <class SRC> unsigned int convertPrevious (SRC src, short x, short y,
Modified: trunk/blender/source/gameengine/VideoTexture/FilterBlueScreen.h
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/FilterBlueScreen.h 2013-03-29 04:38:10 UTC (rev 55662)
+++ trunk/blender/source/gameengine/VideoTexture/FilterBlueScreen.h 2013-03-29 06:21:28 UTC (rev 55663)
@@ -92,12 +92,12 @@
}
/// virtual filtering function for byte source
- virtual unsigned int filter (unsigned char * src, short x, short y,
- short * size, unsigned int pixSize, unsigned int val = 0)
+ virtual unsigned int filter (unsigned char *src, short x, short y,
+ short * size, unsigned int pixSize, unsigned int val = 0)
{ return tFilter(src, x, y, size, pixSize, val); }
/// virtual filtering function for unsigned int source
- virtual unsigned int filter (unsigned int * src, short x, short y,
- short * size, unsigned int pixSize, unsigned int val = 0)
+ virtual unsigned int filter (unsigned int *src, short x, short y,
+ short * size, unsigned int pixSize, unsigned int val = 0)
{ return tFilter(src, x, y, size, pixSize, val); }
};
Modified: trunk/blender/source/gameengine/VideoTexture/FilterNormal.h
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/FilterNormal.h 2013-03-29 04:38:10 UTC (rev 55662)
+++ trunk/blender/source/gameengine/VideoTexture/FilterNormal.h 2013-03-29 06:21:28 UTC (rev 55663)
@@ -70,8 +70,8 @@
unsigned short m_colIdx;
/// filter pixel, source int buffer
- template <class SRC> unsigned int tFilter (SRC * src, short x, short y,
- short * size, unsigned int pixSize, unsigned int val = 0)
+ template <class SRC> unsigned int tFilter (SRC *src, short x, short y,
+ short * size, unsigned int pixSize, unsigned int val = 0)
{
// get value of required color
int actPix = int(VT_C(val,m_colIdx));
Modified: trunk/blender/source/gameengine/VideoTexture/FilterSource.h
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/FilterSource.h 2013-03-29 04:38:10 UTC (rev 55662)
+++ trunk/blender/source/gameengine/VideoTexture/FilterSource.h 2013-03-29 06:21:28 UTC (rev 55663)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list