diff options
Diffstat (limited to 'source/gameengine/BlenderRoutines')
4 files changed, 48 insertions, 48 deletions
diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp index d8bb45707e5..eb31070f265 100644 --- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp +++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp @@ -192,7 +192,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c bool mouse_state = startscene->gm.flag & GAME_SHOW_MOUSE; bool restrictAnimFPS = startscene->gm.flag & GAME_RESTRICT_ANIM_UPDATES; - if(animation_record) usefixed= true; /* override since you's always want fixed time for sim recording */ + if (animation_record) usefixed= true; /* override since you's always want fixed time for sim recording */ // create the canvas, rasterizer and rendertools RAS_ICanvas* canvas = new KX_BlenderCanvas(win, area_rect, ar); @@ -205,7 +205,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c RAS_IRenderTools* rendertools = new KX_BlenderRenderTools(); RAS_IRasterizer* rasterizer = NULL; - if(displaylists) { + if (displaylists) { if (GLEW_VERSION_1_1 && !novertexarrays) rasterizer = new RAS_ListRasterizer(canvas, true, true); else @@ -263,8 +263,8 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c float camzoom; int draw_letterbox = 0; - if(rv3d->persp==RV3D_CAMOB) { - if(startscene->gm.framing.type == SCE_GAMEFRAMING_BARS) { /* Letterbox */ + if (rv3d->persp==RV3D_CAMOB) { + if (startscene->gm.framing.type == SCE_GAMEFRAMING_BARS) { /* Letterbox */ camzoom = 1.0f; draw_letterbox = 1; } @@ -318,7 +318,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c blenderdata = bfd->main; startscenename = bfd->curscene->id.name + 2; - if(blenderdata) { + if (blenderdata) { BLI_strncpy(G.main->name, blenderdata->name, sizeof(G.main->name)); BLI_strncpy(pathname, blenderdata->name, sizeof(pathname)); #ifdef WITH_PYTHON @@ -341,7 +341,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c ketsjiengine->SetAnimRecordMode(animation_record, startFrame); // Quad buffered needs a special window. - if(scene->gm.stereoflag == STEREO_ENABLED){ + if (scene->gm.stereoflag == STEREO_ENABLED){ if (scene->gm.stereomode != RAS_IRasterizer::RAS_STEREO_QUADBUFFERED) rasterizer->SetStereoMode((RAS_IRasterizer::StereoMode) scene->gm.stereomode); @@ -359,7 +359,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c ketsjiengine->SetCameraOverrideUseOrtho((rv3d->persp == RV3D_ORTHO)); ketsjiengine->SetCameraOverrideProjectionMatrix(MT_CmMatrix4x4(rv3d->winmat)); ketsjiengine->SetCameraOverrideViewMatrix(MT_CmMatrix4x4(rv3d->viewmat)); - if(rv3d->persp == RV3D_ORTHO) + if (rv3d->persp == RV3D_ORTHO) { ketsjiengine->SetCameraOverrideClipping(-v3d->far, v3d->far); } @@ -379,17 +379,17 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c bool usemat = false, useglslmat = false; - if(GLEW_ARB_multitexture && GLEW_VERSION_1_1) + if (GLEW_ARB_multitexture && GLEW_VERSION_1_1) usemat = true; - if(GPU_glsl_support()) + if (GPU_glsl_support()) useglslmat = true; - else if(gs.matmode == GAME_MAT_GLSL) + else if (gs.matmode == GAME_MAT_GLSL) usemat = false; - if(usemat && (gs.matmode != GAME_MAT_TEXFACE)) + if (usemat && (gs.matmode != GAME_MAT_TEXFACE)) sceneconverter->SetMaterials(true); - if(useglslmat && (gs.matmode == GAME_MAT_GLSL)) + if (useglslmat && (gs.matmode == GAME_MAT_GLSL)) sceneconverter->SetGLSLMaterials(true); KX_Scene* startscene = new KX_Scene(keyboarddevice, @@ -406,12 +406,12 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c #endif // WITH_PYTHON //initialize Dome Settings - if(scene->gm.stereoflag == STEREO_DOME) + if (scene->gm.stereoflag == STEREO_DOME) ketsjiengine->InitDome(scene->gm.dome.res, scene->gm.dome.mode, scene->gm.dome.angle, scene->gm.dome.resbuf, scene->gm.dome.tilt, scene->gm.dome.warptext); // initialize 3D Audio Settings AUD_I3DDevice* dev = AUD_get3DDevice(); - if(dev) + if (dev) { dev->setSpeedOfSound(scene->audio.speed_of_sound); dev->setDopplerFactor(scene->audio.doppler_factor); @@ -457,7 +457,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c if (render) { - if(draw_letterbox) { + if (draw_letterbox) { // Clear screen to border color // We do this here since we set the canvas to be within the frames. This means the engine // itself is unaware of the extra space, so we clear the whole region for it. @@ -502,7 +502,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c wm_event_free(event); } - if(win != CTX_wm_window(C)) { + if (win != CTX_wm_window(C)) { exitrequested= KX_EXIT_REQUEST_OUTSIDE; /* window closed while bge runs */ } } @@ -557,7 +557,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c startscene->camera= tmp_camera; } - if(exitrequested != KX_EXIT_REQUEST_OUTSIDE) + if (exitrequested != KX_EXIT_REQUEST_OUTSIDE) { // set the cursor back to normal canvas->SetMouseState(RAS_ICanvas::MOUSE_NORMAL); diff --git a/source/gameengine/BlenderRoutines/BL_System.cpp b/source/gameengine/BlenderRoutines/BL_System.cpp index a97d1a6d5e9..251182a07aa 100644 --- a/source/gameengine/BlenderRoutines/BL_System.cpp +++ b/source/gameengine/BlenderRoutines/BL_System.cpp @@ -44,7 +44,7 @@ static SingletonSystem *_system_instance = NULL; SYS_SystemHandle SYS_GetSystem() { - if(!_system_instance) + if (!_system_instance) _system_instance = new SingletonSystem(); return (SYS_SystemHandle)_system_instance; @@ -52,7 +52,7 @@ SYS_SystemHandle SYS_GetSystem() void SYS_DeleteSystem(SYS_SystemHandle sys) { - if(_system_instance) { + if (_system_instance) { delete _system_instance; _system_instance = NULL; } @@ -61,7 +61,7 @@ void SYS_DeleteSystem(SYS_SystemHandle sys) int SYS_GetCommandLineInt(SYS_SystemHandle sys, const char *paramname, int defaultvalue) { int *result = ((SingletonSystem *)sys)->int_params[paramname]; - if(result) + if (result) return *result; return defaultvalue; @@ -70,7 +70,7 @@ int SYS_GetCommandLineInt(SYS_SystemHandle sys, const char *paramname, int defau float SYS_GetCommandLineFloat(SYS_SystemHandle sys, const char *paramname, float defaultvalue) { float *result = ((SingletonSystem *)sys)->float_params[paramname]; - if(result) + if (result) return *result; return defaultvalue; @@ -79,7 +79,7 @@ float SYS_GetCommandLineFloat(SYS_SystemHandle sys, const char *paramname, float const char *SYS_GetCommandLineString(SYS_SystemHandle sys, const char *paramname, const char *defaultvalue) { STR_String *result = ((SingletonSystem *)sys)->string_params[paramname]; - if(result) + if (result) return *result; return defaultvalue; diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp index 7a99a4a1419..19a84acf027 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp @@ -95,34 +95,34 @@ void DisableForText() { glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); /* needed for texture fonts otherwise they render as wireframe */ - if(glIsEnabled(GL_BLEND)) glDisable(GL_BLEND); - if(glIsEnabled(GL_ALPHA_TEST)) glDisable(GL_ALPHA_TEST); + if (glIsEnabled(GL_BLEND)) glDisable(GL_BLEND); + if (glIsEnabled(GL_ALPHA_TEST)) glDisable(GL_ALPHA_TEST); - if(glIsEnabled(GL_LIGHTING)) { + if (glIsEnabled(GL_LIGHTING)) { glDisable(GL_LIGHTING); glDisable(GL_COLOR_MATERIAL); } - if(GLEW_ARB_multitexture) { - for(int i=0; i<MAXTEX; i++) { + if (GLEW_ARB_multitexture) { + for (int i=0; i<MAXTEX; i++) { glActiveTextureARB(GL_TEXTURE0_ARB+i); - if(GLEW_ARB_texture_cube_map) - if(glIsEnabled(GL_TEXTURE_CUBE_MAP_ARB)) + if (GLEW_ARB_texture_cube_map) + if (glIsEnabled(GL_TEXTURE_CUBE_MAP_ARB)) glDisable(GL_TEXTURE_CUBE_MAP_ARB); - if(glIsEnabled(GL_TEXTURE_2D)) + if (glIsEnabled(GL_TEXTURE_2D)) glDisable(GL_TEXTURE_2D); } glActiveTextureARB(GL_TEXTURE0_ARB); } else { - if(GLEW_ARB_texture_cube_map) - if(glIsEnabled(GL_TEXTURE_CUBE_MAP_ARB)) + if (GLEW_ARB_texture_cube_map) + if (glIsEnabled(GL_TEXTURE_CUBE_MAP_ARB)) glDisable(GL_TEXTURE_CUBE_MAP_ARB); - if(glIsEnabled(GL_TEXTURE_2D)) + if (glIsEnabled(GL_TEXTURE_2D)) glDisable(GL_TEXTURE_2D); } } @@ -261,7 +261,7 @@ void BL_MakeScreenShot(ScrArea *curarea, const char* filename) int dumpsx, dumpsy; dumprect= screenshot(curarea, &dumpsx, &dumpsy); - if(dumprect) { + if (dumprect) { ImBuf *ibuf; BLI_path_abs(path, G.main->name); /* BKE_add_image_extension() checks for if extension was already set */ diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp index 43166c0698a..9156102ab0d 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp @@ -92,23 +92,23 @@ void KX_BlenderRenderTools::ProcessLighting(RAS_IRasterizer *rasty, bool useligh int layer= -1; /* find the layer */ - if(uselights) { - if(m_clientobject) + if (uselights) { + if (m_clientobject) layer = static_cast<KX_GameObject*>(m_clientobject)->GetLayer(); } /* avoid state switching */ - if(m_lastlightlayer == layer && m_lastauxinfo == m_auxilaryClientInfo) + if (m_lastlightlayer == layer && m_lastauxinfo == m_auxilaryClientInfo) return; m_lastlightlayer = layer; m_lastauxinfo = m_auxilaryClientInfo; /* enable/disable lights as needed */ - if(layer >= 0) + if (layer >= 0) enable = applyLights(layer, viewmat); - if(enable) + if (enable) EnableOpenGLLights(rasty); else DisableOpenGLLights(); @@ -116,7 +116,7 @@ void KX_BlenderRenderTools::ProcessLighting(RAS_IRasterizer *rasty, bool useligh void KX_BlenderRenderTools::EnableOpenGLLights(RAS_IRasterizer *rasty) { - if(m_lastlighting == true) + if (m_lastlighting == true) return; glEnable(GL_LIGHTING); @@ -133,7 +133,7 @@ void KX_BlenderRenderTools::EnableOpenGLLights(RAS_IRasterizer *rasty) void KX_BlenderRenderTools::DisableOpenGLLights() { - if(m_lastlighting == false) + if (m_lastlighting == false) return; glDisable(GL_LIGHTING); @@ -297,7 +297,7 @@ void KX_BlenderRenderTools::RenderText2D(RAS_TEXT_RENDER_MODE mode, int width, int height) { - if(mode == RAS_IRenderTools::RAS_TEXT_PADDED) + if (mode == RAS_IRenderTools::RAS_TEXT_PADDED) BL_print_gamedebug_line_padded(text, xco, yco, width, height); else BL_print_gamedebug_line(text, xco, yco, width, height); @@ -317,7 +317,7 @@ void KX_BlenderRenderTools::RenderText( struct MTFace* tface = 0; unsigned int *col = 0; - if(flag & RAS_BLENDERMAT) { + if (flag & RAS_BLENDERMAT) { KX_BlenderMaterial *bl_mat = static_cast<KX_BlenderMaterial*>(polymat); tface = bl_mat->GetMTFace(); col = bl_mat->GetMCol(); @@ -350,7 +350,7 @@ int KX_BlenderRenderTools::applyLights(int objectlayer, const MT_Transform& view unsigned int count; std::vector<struct RAS_LightObject*>::iterator lit = m_lights.begin(); - for(count=0; count<m_numgllights; count++) + for (count=0; count<m_numgllights; count++) glDisable((GLenum)(GL_LIGHT0+count)); viewmat.getValue(glviewmat); @@ -362,7 +362,7 @@ int KX_BlenderRenderTools::applyLights(int objectlayer, const MT_Transform& view RAS_LightObject* lightdata = (*lit); KX_LightObject *kxlight = (KX_LightObject*)lightdata->m_light; - if(kxlight->ApplyLight(kxscene, objectlayer, count)) + if (kxlight->ApplyLight(kxscene, objectlayer, count)) count++; } glPopMatrix(); @@ -374,16 +374,16 @@ void KX_BlenderRenderTools::MotionBlur(RAS_IRasterizer* rasterizer) { int state = rasterizer->GetMotionBlurState(); float motionblurvalue; - if(state) + if (state) { motionblurvalue = rasterizer->GetMotionBlurValue(); - if(state==1) + if (state==1) { //bugfix:load color buffer into accum buffer for the first time(state=1) glAccum(GL_LOAD, 1.0); rasterizer->SetMotionBlurState(2); } - else if(motionblurvalue>=0.0 && motionblurvalue<=1.0) + else if (motionblurvalue>=0.0 && motionblurvalue<=1.0) { glAccum(GL_MULT, motionblurvalue); glAccum(GL_ACCUM, 1-motionblurvalue); |