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:
authorHG1 <HG1_public@gmx.net>2013-12-23 22:44:54 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-12-23 22:44:54 +0400
commitd94db03ac8ef9f6a10e42f01d622421fe3f216bb (patch)
tree83c90ef394571027d0c417cc69ebc11543fcfa00 /source/gameengine/Ketsji
parent0a5e00e8e836983149157155ca560c01f18e5609 (diff)
Style cleanup: BGE
Diffstat (limited to 'source/gameengine/Ketsji')
-rw-r--r--source/gameengine/Ketsji/KX_PythonInit.h49
-rw-r--r--source/gameengine/Ketsji/KX_WorldInfo.h42
2 files changed, 45 insertions, 46 deletions
diff --git a/source/gameengine/Ketsji/KX_PythonInit.h b/source/gameengine/Ketsji/KX_PythonInit.h
index 859c31adcd3..719a74ee219 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.h
+++ b/source/gameengine/Ketsji/KX_PythonInit.h
@@ -34,32 +34,33 @@
#include "KX_Python.h"
#include "STR_String.h"
+#include "MT_Vector3.h"
typedef enum {
psl_Lowest = 0,
- psl_Highest
+ psl_Highest,
} TPythonSecurityLevel;
extern bool gUseVisibilityTemp;
#ifdef WITH_PYTHON
-PyObject* initGameLogic(class KX_KetsjiEngine *engine, class KX_Scene* ketsjiscene);
-PyObject* initGameKeys();
-PyObject* initRasterizer(class RAS_IRasterizer* rasty,class RAS_ICanvas* canvas);
-PyObject* initGamePlayerPythonScripting(const STR_String& progname, TPythonSecurityLevel level, struct Main *maggie, int argc, char** argv);
-PyObject* initVideoTexture(void);
-void exitGamePlayerPythonScripting();
-PyObject* initGamePythonScripting(const STR_String& progname, TPythonSecurityLevel level, struct Main *maggie);
-void exitGamePythonScripting();
-
+PyObject *initGameLogic(class KX_KetsjiEngine *engine, class KX_Scene *ketsjiscene);
+PyObject *initGameKeys();
+PyObject *initRasterizer(class RAS_IRasterizer *rasty,class RAS_ICanvas *canvas);
+PyObject *initGamePlayerPythonScripting(const STR_String &progname, TPythonSecurityLevel level,
+ struct Main *maggie, int argc, char **argv);
+PyObject *initVideoTexture(void);
+PyObject *initGamePythonScripting(const STR_String &progname, TPythonSecurityLevel level, struct Main *maggie);
+
+void exitGamePlayerPythonScripting();
+void exitGamePythonScripting();
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();
-void pathGamePythonConfig( char *path );
-int saveGamePythonConfig( char **marshal_buffer);
-int loadGamePythonConfig(char *marshal_buffer, int marshal_length);
+ PyObject *pyGlobalDict, PyObject **gameLogic, PyObject **gameLogic_keys, int argc, char **argv);
+void setGamePythonPath(const char *path);
+void resetGamePythonPath();
+void pathGamePythonConfig(char *path);
+int saveGamePythonConfig(char **marshal_buffer);
+int loadGamePythonConfig(char *marshal_buffer, int marshal_length);
#endif
void addImportMain(struct Main *maggie);
@@ -68,9 +69,9 @@ void removeImportMain(struct Main *maggie);
class KX_KetsjiEngine;
class KX_Scene;
-void KX_SetActiveScene(class KX_Scene* scene);
-class KX_Scene* KX_GetActiveScene();
-class KX_KetsjiEngine* KX_GetActiveEngine();
+void KX_SetActiveScene(class KX_Scene *scene);
+class KX_Scene *KX_GetActiveScene();
+class KX_KetsjiEngine *KX_GetActiveEngine();
typedef int (*PyNextFrameFunc)(void *);
@@ -82,11 +83,9 @@ struct PyNextFrameState {
};
extern struct PyNextFrameState pynextframestate;
-#include "MT_Vector3.h"
-
-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);
+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);
#endif /* __KX_PYTHONINIT_H__ */
diff --git a/source/gameengine/Ketsji/KX_WorldInfo.h b/source/gameengine/Ketsji/KX_WorldInfo.h
index a64ca5c191e..90b16fe1242 100644
--- a/source/gameengine/Ketsji/KX_WorldInfo.h
+++ b/source/gameengine/Ketsji/KX_WorldInfo.h
@@ -46,29 +46,29 @@ public:
KX_WorldInfo() {}
virtual ~KX_WorldInfo();
- virtual bool hasWorld()=0;
- virtual bool hasMist()=0;
- virtual float getBackColorRed()=0;
- virtual float getBackColorGreen()=0;
- virtual float getBackColorBlue()=0;
- virtual float getMistStart()=0;
- virtual float getMistDistance()=0;
- virtual float getMistColorRed()=0;
- virtual float getMistColorGreen()=0;
- virtual float getMistColorBlue()=0;
+ virtual bool hasWorld() = 0;
+ virtual bool hasMist() = 0;
+ virtual float getBackColorRed() = 0;
+ virtual float getBackColorGreen() = 0;
+ virtual float getBackColorBlue() = 0;
+ virtual float getMistStart() = 0;
+ virtual float getMistDistance() = 0;
+ virtual float getMistColorRed() = 0;
+ virtual float getMistColorGreen() = 0;
+ virtual float getMistColorBlue() = 0;
+
+ virtual float getAmbientColorRed() = 0;
+ virtual float getAmbientColorGreen() = 0;
+ virtual float getAmbientColorBlue() = 0;
+
+ virtual void setBackColor(float, float, float) = 0;
+ virtual void setMistStart(float) = 0;
+ virtual void setMistDistance(float) = 0;
+ virtual void setMistColorRed(float) = 0;
+ virtual void setMistColorGreen(float) = 0;
+ virtual void setMistColorBlue(float) = 0;
- virtual float getAmbientColorRed()=0;
- virtual float getAmbientColorGreen()=0;
- virtual float getAmbientColorBlue()=0;
- virtual void setBackColor(float,float,float)=0;
- virtual void setMistStart(float)=0;
- virtual void setMistDistance(float)=0;
- virtual void setMistColorRed(float)=0;
- virtual void setMistColorGreen(float)=0;
- virtual void setMistColorBlue(float)=0;
-
-
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_WorldInfo")
#endif