diff options
Diffstat (limited to 'source/gameengine/Ketsji/KX_PythonInit.cpp')
-rw-r--r-- | source/gameengine/Ketsji/KX_PythonInit.cpp | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index b804bacf79e..0ca84870944 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -523,7 +523,7 @@ static PyObject* gPyGetBlendFileList(PyObject*, PyObject* args) BLI_split_dir_part(gp_GamePythonPath, cpath, sizeof(cpath)); } - if((dp = opendir(cpath)) == NULL) { + if ((dp = opendir(cpath)) == NULL) { /* todo, show the errno, this shouldnt happen anyway if the blendfile is readable */ fprintf(stderr, "Could not read directoty (%s) failed, code %d (%s)\n", cpath, errno, strerror(errno)); return list; @@ -607,7 +607,7 @@ static PyObject *pyPrintExt(PyObject *,PyObject *,PyObject *) support= GLEW_ARB_vertex_shader; pprint(" GL_ARB_vertex_shader supported? "<< (support?"yes.":"no.")); count = 1; - if(support){ + if (support){ pprint(" ----------Details----------"); int max=0; glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB, (GLint*)&max); @@ -627,7 +627,7 @@ static PyObject *pyPrintExt(PyObject *,PyObject *,PyObject *) support=GLEW_ARB_fragment_shader; pprint(" GL_ARB_fragment_shader supported? "<< (support?"yes.":"no.")); count = 1; - if(support){ + if (support){ pprint(" ----------Details----------"); int max=0; glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB, (GLint*)&max); @@ -638,7 +638,7 @@ static PyObject *pyPrintExt(PyObject *,PyObject *,PyObject *) support = GLEW_ARB_texture_cube_map; pprint(" GL_ARB_texture_cube_map supported? "<< (support?"yes.":"no.")); count = 1; - if(support){ + if (support){ pprint(" ----------Details----------"); int size=0; glGetIntegerv(GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB, (GLint*)&size); @@ -649,7 +649,7 @@ static PyObject *pyPrintExt(PyObject *,PyObject *,PyObject *) support = GLEW_ARB_multitexture; count = 1; pprint(" GL_ARB_multitexture supported? "<< (support?"yes.":"no.")); - if(support){ + if (support){ pprint(" ----------Details----------"); int units=0; glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, (GLint*)&units); @@ -660,7 +660,7 @@ static PyObject *pyPrintExt(PyObject *,PyObject *,PyObject *) pprint(" GL_ARB_texture_env_combine supported? "<< (GLEW_ARB_texture_env_combine?"yes.":"no.")); count = 1; - if(!count) + if (!count) pprint("No extenstions are used in this build"); Py_RETURN_NONE; @@ -697,14 +697,14 @@ static PyObject *gLibLoad(PyObject*, PyObject* args, PyObject* kwds) BLI_strncpy(abs_path, path, sizeof(abs_path)); BLI_path_abs(abs_path, gp_GamePythonPath); - if(kx_scene->GetSceneConverter()->LinkBlendFilePath(abs_path, group, kx_scene, &err_str, options)) { + if (kx_scene->GetSceneConverter()->LinkBlendFilePath(abs_path, group, kx_scene, &err_str, options)) { Py_RETURN_TRUE; } } else { - if(kx_scene->GetSceneConverter()->LinkBlendFileMemory(py_buffer.buf, py_buffer.len, path, group, kx_scene, &err_str, options)) { + if (kx_scene->GetSceneConverter()->LinkBlendFileMemory(py_buffer.buf, py_buffer.len, path, group, kx_scene, &err_str, options)) { PyBuffer_Release(&py_buffer); Py_RETURN_TRUE; } @@ -712,7 +712,7 @@ static PyObject *gLibLoad(PyObject*, PyObject* args, PyObject* kwds) PyBuffer_Release(&py_buffer); } - if(err_str) { + if (err_str) { PyErr_SetString(PyExc_ValueError, err_str); return NULL; } @@ -732,14 +732,14 @@ static PyObject *gLibNew(PyObject*, PyObject* args) if (!PyArg_ParseTuple(args,"ssO!:LibNew",&path, &group, &PyList_Type, &names)) return NULL; - if(kx_scene->GetSceneConverter()->GetMainDynamicPath(path)) + if (kx_scene->GetSceneConverter()->GetMainDynamicPath(path)) { PyErr_SetString(PyExc_KeyError, "the name of the path given exists"); return NULL; } idcode= BKE_idcode_from_name(group); - if(idcode==0) { + if (idcode==0) { PyErr_Format(PyExc_ValueError, "invalid group given \"%s\"", group); return NULL; } @@ -749,14 +749,14 @@ static PyObject *gLibNew(PyObject*, PyObject* args) strncpy(maggie->name, path, sizeof(maggie->name)-1); /* Copy the object into main */ - if(idcode==ID_ME) { + if (idcode==ID_ME) { PyObject *ret= PyList_New(0); PyObject *item; - for(Py_ssize_t i= 0; i < PyList_GET_SIZE(names); i++) { + for (Py_ssize_t i= 0; i < PyList_GET_SIZE(names); i++) { name= _PyUnicode_AsString(PyList_GET_ITEM(names, i)); - if(name) { + if (name) { RAS_MeshObject *meshobj= kx_scene->GetSceneConverter()->ConvertMeshSpecial(kx_scene, maggie, name); - if(meshobj) { + if (meshobj) { KX_MeshProxy* meshproxy = new KX_MeshProxy(meshobj); item= meshproxy->NewProxy(true); PyList_Append(ret, item); @@ -1113,17 +1113,17 @@ static PyObject* gPyDisableMotionBlur(PyObject*) static int getGLSLSettingFlag(const char *setting) { - if(strcmp(setting, "lights") == 0) + if (strcmp(setting, "lights") == 0) return GAME_GLSL_NO_LIGHTS; - else if(strcmp(setting, "shaders") == 0) + else if (strcmp(setting, "shaders") == 0) return GAME_GLSL_NO_SHADERS; - else if(strcmp(setting, "shadows") == 0) + else if (strcmp(setting, "shadows") == 0) return GAME_GLSL_NO_SHADOWS; - else if(strcmp(setting, "ramps") == 0) + else if (strcmp(setting, "ramps") == 0) return GAME_GLSL_NO_RAMPS; - else if(strcmp(setting, "nodes") == 0) + else if (strcmp(setting, "nodes") == 0) return GAME_GLSL_NO_NODES; - else if(strcmp(setting, "extra_textures") == 0) + else if (strcmp(setting, "extra_textures") == 0) return GAME_GLSL_NO_EXTRA_TEX; else return -1; @@ -1155,14 +1155,14 @@ static PyObject* gPySetGLSLMaterialSetting(PyObject*, gs->glslflag |= flag; /* display lists and GLSL materials need to be remade */ - if(sceneflag != gs->glslflag) { + if (sceneflag != gs->glslflag) { GPU_materials_free(); - if(gp_KetsjiEngine) { + if (gp_KetsjiEngine) { KX_SceneList *scenes = gp_KetsjiEngine->CurrentScenes(); KX_SceneList::iterator it; - for(it=scenes->begin(); it!=scenes->end(); it++) - if((*it)->GetBucketManager()) { + for (it=scenes->begin(); it!=scenes->end(); it++) + if ((*it)->GetBucketManager()) { (*it)->GetBucketManager()->ReleaseDisplayLists(); (*it)->GetBucketManager()->ReleaseMaterials(); } @@ -1208,11 +1208,11 @@ static PyObject* gPySetMaterialType(PyObject*, if (!PyArg_ParseTuple(args,"i:setMaterialType",&type)) return NULL; - if(type == KX_BLENDER_GLSL_MATERIAL) + if (type == KX_BLENDER_GLSL_MATERIAL) gs->matmode= GAME_MAT_GLSL; - else if(type == KX_BLENDER_MULTITEX_MATERIAL) + else if (type == KX_BLENDER_MULTITEX_MATERIAL) gs->matmode= GAME_MAT_MULTITEX; - else if(type == KX_TEXFACE_MATERIAL) + else if (type == KX_TEXFACE_MATERIAL) gs->matmode= GAME_MAT_TEXFACE; else { PyErr_SetString(PyExc_ValueError, "Rasterizer.setMaterialType(int): material type is not known"); @@ -1227,9 +1227,9 @@ static PyObject* gPyGetMaterialType(PyObject*) GlobalSettings *gs= gp_KetsjiEngine->GetGlobalSettings(); int flag; - if(gs->matmode == GAME_MAT_GLSL) + if (gs->matmode == GAME_MAT_GLSL) flag = KX_BLENDER_GLSL_MATERIAL; - else if(gs->matmode == GAME_MAT_MULTITEX) + else if (gs->matmode == GAME_MAT_MULTITEX) flag = KX_BLENDER_MULTITEX_MATERIAL; else flag = KX_TEXFACE_MATERIAL; @@ -1381,7 +1381,7 @@ PyObject* initGameLogic(KX_KetsjiEngine *engine, KX_Scene* scene) // quick hack /* Use existing module where possible * be careful not to init any runtime vars after this */ m = PyImport_ImportModule( "GameLogic" ); - if(m) { + if (m) { Py_DECREF(m); return m; } @@ -1762,7 +1762,7 @@ static void initPySysObjects__append(PyObject *sys_path, const char *filename) // printf("SysPath - '%s', '%s', '%s'\n", expanded, filename, gp_GamePythonPath); - if(PySequence_Index(sys_path, item) == -1) { + if (PySequence_Index(sys_path, item) == -1) { PyErr_Clear(); /* PySequence_Index sets a ValueError */ PyList_Insert(sys_path, 0, item); } @@ -1859,7 +1859,7 @@ PyObject* initGamePlayerPythonScripting(const STR_String& progname, TPythonSecur Py_Initialize(); - if(argv && first_time) { /* browser plugins don't currently set this */ + if (argv && first_time) { /* browser plugins don't currently set this */ // Until python support ascii again, we use our own. // PySys_SetArgv(argc, argv); int i; @@ -1971,7 +1971,7 @@ void setupGamePython(KX_KetsjiEngine* ketsjiengine, KX_Scene* startscene, Main * { PyObject* dictionaryobject; - if(argv) /* player only */ + if (argv) /* player only */ dictionaryobject= initGamePlayerPythonScripting("Ketsji", psl_Lowest, blenderdata, argc, argv); else dictionaryobject= initGamePythonScripting("Ketsji", psl_Lowest, blenderdata); @@ -1981,7 +1981,7 @@ void setupGamePython(KX_KetsjiEngine* ketsjiengine, KX_Scene* startscene, Main * *gameLogic = initGameLogic(ketsjiengine, startscene); /* is set in initGameLogic so only set here if we want it to persist between scenes */ - if(pyGlobalDict) + if (pyGlobalDict) PyDict_SetItemString(PyModule_GetDict(*gameLogic), "globalDict", pyGlobalDict); // Same as importing the module. *gameLogic_keys = PyDict_Keys(PyModule_GetDict(*gameLogic)); @@ -2027,7 +2027,7 @@ PyObject* initRasterizer(RAS_IRasterizer* rasty,RAS_ICanvas* canvas) /* Use existing module where possible * be careful not to init any runtime vars after this */ m = PyImport_ImportModule( "Rasterizer" ); - if(m) { + if (m) { Py_DECREF(m); return m; } @@ -2111,7 +2111,7 @@ static PyObject* gPyEventToCharacter(PyObject*, PyObject* args) if (!PyArg_ParseTuple(args,"ii:EventToCharacter", &event, &shift)) return NULL; - if(IsPrintable(event)) { + if (IsPrintable(event)) { char ch[2] = {'\0', '\0'}; ch[0] = ToCharacter(event, (bool)shift); return PyUnicode_FromString(ch); @@ -2148,7 +2148,7 @@ PyObject* initGameKeys() /* Use existing module where possible */ m = PyImport_ImportModule( "GameKeys" ); - if(m) { + if (m) { Py_DECREF(m); return m; } |