Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-04-29 21:11:40 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-04-29 21:11:40 +0400
commit343edf2722a9e114b98944c1147676e630e699b7 (patch)
tree7b969239ccab922b6390e040f85e96afa956932a /source/gameengine
parentb6c1850fd35c040c9d489eb42c2190f38564d381 (diff)
style cleanup: function calls & whitespace.
Diffstat (limited to 'source/gameengine')
-rw-r--r--source/gameengine/Ketsji/BL_Shader.h44
-rw-r--r--source/gameengine/Ketsji/KX_BlenderMaterial.h10
-rw-r--r--source/gameengine/Ketsji/KX_FontObject.h8
-rw-r--r--source/gameengine/Ketsji/KX_PyMath.h2
-rw-r--r--source/gameengine/Rasterizer/RAS_ICanvas.h10
5 files changed, 37 insertions, 37 deletions
diff --git a/source/gameengine/Ketsji/BL_Shader.h b/source/gameengine/Ketsji/BL_Shader.h
index 3015dd204c8..47221365816 100644
--- a/source/gameengine/Ketsji/BL_Shader.h
+++ b/source/gameengine/Ketsji/BL_Shader.h
@@ -231,30 +231,30 @@ public:
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 );
- KX_PYMETHOD_DOC( BL_Shader, delSource );
- KX_PYMETHOD_DOC( BL_Shader, getVertexProg );
- KX_PYMETHOD_DOC( BL_Shader, getFragmentProg );
- KX_PYMETHOD_DOC( BL_Shader, setNumberOfPasses );
- KX_PYMETHOD_DOC( BL_Shader, isValid);
- KX_PYMETHOD_DOC( BL_Shader, validate);
+ KX_PYMETHOD_DOC(BL_Shader, setSource);
+ KX_PYMETHOD_DOC(BL_Shader, delSource);
+ KX_PYMETHOD_DOC(BL_Shader, getVertexProg);
+ KX_PYMETHOD_DOC(BL_Shader, getFragmentProg);
+ KX_PYMETHOD_DOC(BL_Shader, setNumberOfPasses);
+ KX_PYMETHOD_DOC(BL_Shader, isValid);
+ KX_PYMETHOD_DOC(BL_Shader, validate);
// -----------------------------------
- KX_PYMETHOD_DOC( BL_Shader, setUniform4f );
- KX_PYMETHOD_DOC( BL_Shader, setUniform3f );
- KX_PYMETHOD_DOC( BL_Shader, setUniform2f );
- KX_PYMETHOD_DOC( BL_Shader, setUniform1f );
- KX_PYMETHOD_DOC( BL_Shader, setUniform4i );
- KX_PYMETHOD_DOC( BL_Shader, setUniform3i );
- KX_PYMETHOD_DOC( BL_Shader, setUniform2i );
- KX_PYMETHOD_DOC( BL_Shader, setUniform1i );
- KX_PYMETHOD_DOC( BL_Shader, setUniformfv );
- KX_PYMETHOD_DOC( BL_Shader, setUniformiv );
- KX_PYMETHOD_DOC( BL_Shader, setUniformMatrix4 );
- KX_PYMETHOD_DOC( BL_Shader, setUniformMatrix3 );
- KX_PYMETHOD_DOC( BL_Shader, setUniformDef );
- KX_PYMETHOD_DOC( BL_Shader, setAttrib );
- KX_PYMETHOD_DOC( BL_Shader, setSampler);
+ KX_PYMETHOD_DOC(BL_Shader, setUniform4f);
+ KX_PYMETHOD_DOC(BL_Shader, setUniform3f);
+ KX_PYMETHOD_DOC(BL_Shader, setUniform2f);
+ KX_PYMETHOD_DOC(BL_Shader, setUniform1f);
+ KX_PYMETHOD_DOC(BL_Shader, setUniform4i);
+ KX_PYMETHOD_DOC(BL_Shader, setUniform3i);
+ KX_PYMETHOD_DOC(BL_Shader, setUniform2i);
+ KX_PYMETHOD_DOC(BL_Shader, setUniform1i);
+ KX_PYMETHOD_DOC(BL_Shader, setUniformfv);
+ KX_PYMETHOD_DOC(BL_Shader, setUniformiv);
+ KX_PYMETHOD_DOC(BL_Shader, setUniformMatrix4);
+ KX_PYMETHOD_DOC(BL_Shader, setUniformMatrix3);
+ KX_PYMETHOD_DOC(BL_Shader, setUniformDef);
+ KX_PYMETHOD_DOC(BL_Shader, setAttrib);
+ KX_PYMETHOD_DOC(BL_Shader, setSampler);
#endif
};
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.h b/source/gameengine/Ketsji/KX_BlenderMaterial.h
index af6771933eb..3a6dda06320 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.h
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h
@@ -113,12 +113,12 @@ public:
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 );
- KX_PYMETHOD_DOC( KX_BlenderMaterial, getMaterialIndex );
- KX_PYMETHOD_DOC( KX_BlenderMaterial, getTexture );
- KX_PYMETHOD_DOC( KX_BlenderMaterial, setTexture );
+ KX_PYMETHOD_DOC(KX_BlenderMaterial, getShader);
+ KX_PYMETHOD_DOC(KX_BlenderMaterial, getMaterialIndex);
+ KX_PYMETHOD_DOC(KX_BlenderMaterial, getTexture);
+ KX_PYMETHOD_DOC(KX_BlenderMaterial, setTexture);
- KX_PYMETHOD_DOC( KX_BlenderMaterial, setBlending );
+ KX_PYMETHOD_DOC(KX_BlenderMaterial, setBlending);
#endif // WITH_PYTHON
// --------------------------------
diff --git a/source/gameengine/Ketsji/KX_FontObject.h b/source/gameengine/Ketsji/KX_FontObject.h
index affa882427f..30fe89162c0 100644
--- a/source/gameengine/Ketsji/KX_FontObject.h
+++ b/source/gameengine/Ketsji/KX_FontObject.h
@@ -39,10 +39,10 @@ class KX_FontObject : public KX_GameObject
{
public:
Py_Header
- KX_FontObject( void* sgReplicationInfo,
- SG_Callbacks callbacks,
- RAS_IRenderTools* rendertools,
- Object *ob);
+ KX_FontObject(void* sgReplicationInfo,
+ SG_Callbacks callbacks,
+ RAS_IRenderTools* rendertools,
+ Object *ob);
virtual ~KX_FontObject();
diff --git a/source/gameengine/Ketsji/KX_PyMath.h b/source/gameengine/Ketsji/KX_PyMath.h
index 392a6633067..b0000405893 100644
--- a/source/gameengine/Ketsji/KX_PyMath.h
+++ b/source/gameengine/Ketsji/KX_PyMath.h
@@ -108,7 +108,7 @@ bool PyMatTo(PyObject* pymat, T& mat)
noerror = false;
else
{
- for( unsigned int col = 0; col < cols; col++)
+ for(unsigned int col = 0; col < cols; col++)
{
PyObject *item = PySequence_GetItem(pyrow, col); /* new ref */
mat[row][col] = PyFloat_AsDouble(item);
diff --git a/source/gameengine/Rasterizer/RAS_ICanvas.h b/source/gameengine/Rasterizer/RAS_ICanvas.h
index 337ea247ce3..dae70c5c343 100644
--- a/source/gameengine/Rasterizer/RAS_ICanvas.h
+++ b/source/gameengine/Rasterizer/RAS_ICanvas.h
@@ -133,25 +133,25 @@ public:
virtual
int
- GetMouseX( int x
+ GetMouseX(int x
)=0;
virtual
int
- GetMouseY( int y
+ GetMouseY(int y
)= 0;
virtual
float
- GetMouseNormalizedX( int x
+ GetMouseNormalizedX(int x
)=0;
virtual
float
- GetMouseNormalizedY( int y
+ GetMouseNormalizedY(int y
)= 0;
- virtual
+ virtual
const RAS_Rect &
GetDisplayArea(
) const = 0;