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-03-24 11:52:14 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-24 11:52:14 +0400
commitb8a71efeba70d6c3ebc579f5043daa4162da86e8 (patch)
treed2d89da2a59f8955583f4968a35e48c578fd4d4c /source/gameengine/GamePlayer/ghost
parent81d8f17843f92c6d6abbacb652ca22917910f4bc (diff)
style cleanup: follow style guide for/with/if spacing
Diffstat (limited to 'source/gameengine/GamePlayer/ghost')
-rw-r--r--source/gameengine/GamePlayer/ghost/GPG_Application.cpp20
-rw-r--r--source/gameengine/GamePlayer/ghost/GPG_ghost.cpp44
2 files changed, 32 insertions, 32 deletions
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
index f7c366599ef..eccb83fe80c 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
@@ -138,7 +138,7 @@ GPG_Application::GPG_Application(GHOST_ISystem* system)
GPG_Application::~GPG_Application(void)
{
- if(m_pyGlobalDictString) {
+ if (m_pyGlobalDictString) {
delete [] m_pyGlobalDictString;
m_pyGlobalDictString = 0;
m_pyGlobalDictString_Length = 0;
@@ -558,12 +558,12 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
bool nodepwarnings = (SYS_GetCommandLineInt(syshandle, "ignore_deprecation_warnings", 1) != 0);
bool restrictAnimFPS = gm->flag & GAME_RESTRICT_ANIM_UPDATES;
- if(GLEW_ARB_multitexture && GLEW_VERSION_1_1)
+ if (GLEW_ARB_multitexture && GLEW_VERSION_1_1)
m_blendermat = (SYS_GetCommandLineInt(syshandle, "blender_material", 1) != 0);
- if(GPU_glsl_support())
+ if (GPU_glsl_support())
m_blenderglslmat = (SYS_GetCommandLineInt(syshandle, "blender_glsl_material", 1) != 0);
- else if(m_globalSettings->matmode == GAME_MAT_GLSL)
+ else if (m_globalSettings->matmode == GAME_MAT_GLSL)
m_blendermat = false;
// create the canvas, rasterizer and rendertools
@@ -579,8 +579,8 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
if (!m_rendertools)
goto initFailed;
- if(useLists) {
- if(GLEW_VERSION_1_1)
+ if (useLists) {
+ if (GLEW_VERSION_1_1)
m_rasterizer = new RAS_ListRasterizer(m_canvas, true);
else
m_rasterizer = new RAS_ListRasterizer(m_canvas);
@@ -701,9 +701,9 @@ bool GPG_Application::startEngine(void)
// if (always_use_expand_framing)
// sceneconverter->SetAlwaysUseExpandFraming(true);
- if(m_blendermat && (m_globalSettings->matmode != GAME_MAT_TEXFACE))
+ if (m_blendermat && (m_globalSettings->matmode != GAME_MAT_TEXFACE))
m_sceneconverter->SetMaterials(true);
- if(m_blenderglslmat && (m_globalSettings->matmode == GAME_MAT_GLSL))
+ if (m_blenderglslmat && (m_globalSettings->matmode == GAME_MAT_GLSL))
m_sceneconverter->SetGLSLMaterials(true);
KX_Scene* startscene = new KX_Scene(m_keyboard,
@@ -720,7 +720,7 @@ bool GPG_Application::startEngine(void)
#endif // WITH_PYTHON
//initialize Dome Settings
- if(m_startScene->gm.stereoflag == STEREO_DOME)
+ if (m_startScene->gm.stereoflag == STEREO_DOME)
m_ketsjiengine->InitDome(m_startScene->gm.dome.res, m_startScene->gm.dome.mode, m_startScene->gm.dome.angle, m_startScene->gm.dome.resbuf, m_startScene->gm.dome.tilt, m_startScene->gm.dome.warptext);
#ifdef WITH_PYTHON
@@ -764,7 +764,7 @@ void GPG_Application::stopEngine()
// GameLogic.globalDict gets converted into a buffer, and sorted in
// m_pyGlobalDictString so we can restore after python has stopped
// and started between .blend file loads.
- if(m_pyGlobalDictString) {
+ if (m_pyGlobalDictString) {
delete [] m_pyGlobalDictString;
m_pyGlobalDictString = 0;
}
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index 36c38682244..d477c87936f 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -297,7 +297,7 @@ static void get_filename(int argc, char **argv, char *filename)
#else
filename[0] = '\0';
- if(argc > 1)
+ if (argc > 1)
BLI_strncpy(filename, argv[argc-1], FILE_MAX);
#endif // !_APPLE
}
@@ -606,29 +606,29 @@ int main(int argc, char** argv)
if (stereomode < RAS_IRasterizer::RAS_STEREO_NOSTEREO || stereomode >= RAS_IRasterizer::RAS_STEREO_MAXSTEREO)
stereomode = RAS_IRasterizer::RAS_STEREO_NOSTEREO;
- if(!strcmp(argv[i], "nostereo")) // ok, redundant but clear
+ if (!strcmp(argv[i], "nostereo")) // ok, redundant but clear
stereomode = RAS_IRasterizer::RAS_STEREO_NOSTEREO;
// only the hardware pageflip method needs a stereo window
- else if(!strcmp(argv[i], "hwpageflip")) {
+ else if (!strcmp(argv[i], "hwpageflip")) {
stereomode = RAS_IRasterizer::RAS_STEREO_QUADBUFFERED;
stereoWindow = true;
}
- else if(!strcmp(argv[i], "syncdoubling"))
+ else if (!strcmp(argv[i], "syncdoubling"))
stereomode = RAS_IRasterizer::RAS_STEREO_ABOVEBELOW;
- else if(!strcmp(argv[i], "anaglyph"))
+ else if (!strcmp(argv[i], "anaglyph"))
stereomode = RAS_IRasterizer::RAS_STEREO_ANAGLYPH;
- else if(!strcmp(argv[i], "sidebyside"))
+ else if (!strcmp(argv[i], "sidebyside"))
stereomode = RAS_IRasterizer::RAS_STEREO_SIDEBYSIDE;
- else if(!strcmp(argv[i], "vinterlace"))
+ else if (!strcmp(argv[i], "vinterlace"))
stereomode = RAS_IRasterizer::RAS_STEREO_VINTERLACE;
#if 0
// future stuff
- else if(!strcmp(argv[i], "stencil")
+ else if (!strcmp(argv[i], "stencil")
stereomode = RAS_STEREO_STENCIL;
#endif
@@ -648,33 +648,33 @@ int main(int argc, char** argv)
i++;
if ((i + 1) <= validArguments)
{
- if(!strcmp(argv[i], "angle")){
+ if (!strcmp(argv[i], "angle")){
i++;
domeFov = atoi(argv[i++]);
}
- if(!strcmp(argv[i], "tilt")){
+ if (!strcmp(argv[i], "tilt")){
i++;
domeTilt = atoi(argv[i++]);
}
- if(!strcmp(argv[i], "warpdata")){
+ if (!strcmp(argv[i], "warpdata")){
i++;
domeWarp = argv[i++];
}
- if(!strcmp(argv[i], "mode")){
+ if (!strcmp(argv[i], "mode")){
i++;
- if(!strcmp(argv[i], "fisheye"))
+ if (!strcmp(argv[i], "fisheye"))
domeMode = DOME_FISHEYE;
- else if(!strcmp(argv[i], "truncatedfront"))
+ else if (!strcmp(argv[i], "truncatedfront"))
domeMode = DOME_TRUNCATED_FRONT;
- else if(!strcmp(argv[i], "truncatedrear"))
+ else if (!strcmp(argv[i], "truncatedrear"))
domeMode = DOME_TRUNCATED_REAR;
- else if(!strcmp(argv[i], "cubemap"))
+ else if (!strcmp(argv[i], "cubemap"))
domeMode = DOME_ENVMAP;
- else if(!strcmp(argv[i], "sphericalpanoramic"))
+ else if (!strcmp(argv[i], "sphericalpanoramic"))
domeMode = DOME_PANORAM_SPH;
else
@@ -749,7 +749,7 @@ int main(int argc, char** argv)
char *titlename;
get_filename(argc_py_clamped, argv, filename);
- if(filename[0])
+ if (filename[0])
BLI_path_cwd(filename);
@@ -846,7 +846,7 @@ int main(int argc, char** argv)
// Check whether the game should be displayed in stereo
if (!stereoParFound)
{
- if(scene->gm.stereoflag == STEREO_ENABLED){
+ if (scene->gm.stereoflag == STEREO_ENABLED){
stereomode = (RAS_IRasterizer::StereoMode) scene->gm.stereomode;
if (stereomode != RAS_IRasterizer::RAS_STEREO_QUADBUFFERED)
stereoWindow = true;
@@ -871,7 +871,7 @@ int main(int argc, char** argv)
{
//XXX to do: convert relative to absolute path
domeText= add_text(domeWarp, "");
- if(!domeText)
+ if (!domeText)
printf("error: invalid warpdata text file - %s\n", domeWarp);
else
scene->gm.dome.warptext = domeText;
@@ -881,7 +881,7 @@ int main(int argc, char** argv)
// GPG_Application app (system, maggie, startscenename);
app.SetGameEngineData(maggie, scene, &gs, argc, argv); /* this argc cant be argc_py_clamped, since python uses it */
BLI_strncpy(pathname, maggie->name, sizeof(pathname));
- if(G.main != maggie) {
+ if (G.main != maggie) {
BLI_strncpy(G.main->name, maggie->name, sizeof(G.main->name));
}
#ifdef WITH_PYTHON
@@ -1014,7 +1014,7 @@ int main(int argc, char** argv)
SYS_DeleteSystem(syshandle);
int totblock= MEM_get_memory_blocks_in_use();
- if(totblock!=0) {
+ if (totblock!=0) {
printf("Error Totblock: %d\n",totblock);
MEM_set_error_callback(mem_error_cb);
MEM_printmemlist();