diff options
Diffstat (limited to 'source/gameengine/GamePlayer')
8 files changed, 22 insertions, 20 deletions
diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.cpp b/source/gameengine/GamePlayer/common/GPC_Canvas.cpp index f4224b9e255..7581484a41f 100644 --- a/source/gameengine/GamePlayer/common/GPC_Canvas.cpp +++ b/source/gameengine/GamePlayer/common/GPC_Canvas.cpp @@ -99,7 +99,7 @@ void GPC_Canvas::Resize(int width, int height) void GPC_Canvas::EndFrame() { if (m_bannersEnabled) - DrawAllBanners(); + DrawAllBanners(); } diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.h b/source/gameengine/GamePlayer/common/GPC_Canvas.h index 25a50fbcac3..453b9505183 100644 --- a/source/gameengine/GamePlayer/common/GPC_Canvas.h +++ b/source/gameengine/GamePlayer/common/GPC_Canvas.h @@ -163,7 +163,7 @@ public: void SetMouseState(RAS_MouseState mousestate) { - // not yet + // not yet } void SetMousePosition(int x, int y) @@ -250,7 +250,7 @@ protected: int oldWriteMask; }; - void + void PushRenderState( CanvasRenderState & render_state ); diff --git a/source/gameengine/GamePlayer/common/GPC_MouseDevice.cpp b/source/gameengine/GamePlayer/common/GPC_MouseDevice.cpp index a38bba7788b..e38a9e3d6cb 100644 --- a/source/gameengine/GamePlayer/common/GPC_MouseDevice.cpp +++ b/source/gameengine/GamePlayer/common/GPC_MouseDevice.cpp @@ -67,7 +67,8 @@ void GPC_MouseDevice::NextFrame() for (int mouseevent= KX_BEGINMOUSE; mouseevent< KX_ENDMOUSEBUTTONS; mouseevent++) { SCA_InputEvent& oldevent = m_eventStatusTables[previousTable][mouseevent]; if (oldevent.m_status == SCA_InputEvent::KX_JUSTACTIVATED || - oldevent.m_status == SCA_InputEvent::KX_ACTIVE) { + oldevent.m_status == SCA_InputEvent::KX_ACTIVE) + { m_eventStatusTables[m_currentTable][mouseevent] = oldevent; m_eventStatusTables[m_currentTable][mouseevent].m_status = SCA_InputEvent::KX_ACTIVE; } @@ -76,7 +77,8 @@ void GPC_MouseDevice::NextFrame() SCA_InputEvent& oldevent = m_eventStatusTables[previousTable][mousemove]; m_eventStatusTables[m_currentTable][mousemove] = oldevent; if (oldevent.m_status == SCA_InputEvent::KX_JUSTACTIVATED || - oldevent.m_status == SCA_InputEvent::KX_ACTIVE) { + oldevent.m_status == SCA_InputEvent::KX_ACTIVE) + { m_eventStatusTables[m_currentTable][mousemove].m_status = SCA_InputEvent::KX_JUSTRELEASED; } else { diff --git a/source/gameengine/GamePlayer/common/GPC_RawImage.cpp b/source/gameengine/GamePlayer/common/GPC_RawImage.cpp index 9f129c1cdfb..c0d66541800 100644 --- a/source/gameengine/GamePlayer/common/GPC_RawImage.cpp +++ b/source/gameengine/GamePlayer/common/GPC_RawImage.cpp @@ -89,7 +89,7 @@ bool GPC_RawImage::Load( // Put original in upper left corner // Add vertical offset - dst += offsetY * dstBytesWidth; + dst += offsetY * dstBytesWidth; // Add horizontal offset dst += offsetX * 4; for (int row = 0; row < numRows; row++) diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp index 749e7748e19..9cd6715f3d2 100644 --- a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp +++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp @@ -442,7 +442,7 @@ void GPC_RenderTools::PopMatrix() int GPC_RenderTools::applyLights(int objectlayer, const MT_Transform& viewmat) { - // taken from blender source, incompatibility between Blender Object / GameObject + // taken from blender source, incompatibility between Blender Object / GameObject KX_Scene* kxscene = (KX_Scene*)m_auxilaryClientInfo; float glviewmat[16]; unsigned int count; diff --git a/source/gameengine/GamePlayer/common/bmfont.cpp b/source/gameengine/GamePlayer/common/bmfont.cpp index 4c1c6ae5604..6f40d13fe7a 100644 --- a/source/gameengine/GamePlayer/common/bmfont.cpp +++ b/source/gameengine/GamePlayer/common/bmfont.cpp @@ -110,7 +110,7 @@ void readBitmapFontVersion0(ImBuf * ibuf, unsigned char * rect, int step) buffer = (unsigned char*)MEM_mallocN(bytes, "readBitmapFontVersion0:buffer"); - index = 0; + index = 0; for (i = 0; i < bytes; i++) { buffer[i] = rect[index]; index += step; diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp index 21de7011eda..40b52c3212a 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp @@ -479,7 +479,7 @@ bool GPG_Application::processEvent(GHOST_IEvent* event) // // first check if we want to exit // m_exitRequested = m_ketsjiengine->GetExitCode(); - // + // // // kick the engine // bool renderFrame = m_ketsjiengine->NextFrame(); // if (renderFrame) @@ -546,7 +546,7 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode) return false; // SYS_WriteCommandLineInt(syshandle, "fixedtime", 0); - // SYS_WriteCommandLineInt(syshandle, "vertexarrays",1); + // SYS_WriteCommandLineInt(syshandle, "vertexarrays",1); GameData *gm= &m_startScene->gm; bool properties = (SYS_GetCommandLineInt(syshandle, "show_properties", 0) != 0); bool profile = (SYS_GetCommandLineInt(syshandle, "show_profile", 0) != 0); @@ -576,7 +576,7 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode) m_canvas->Init(); if (gm->flag & GAME_SHOW_MOUSE) - m_canvas->SetMouseState(RAS_ICanvas::MOUSE_NORMAL); + m_canvas->SetMouseState(RAS_ICanvas::MOUSE_NORMAL); m_rendertools = new GPC_RenderTools(); if (!m_rendertools) @@ -681,7 +681,7 @@ bool GPG_Application::startEngine(void) // Temporary hack to disable banner display for NaN approved content. /* - m_canvas->SetBannerDisplayEnabled(true); + m_canvas->SetBannerDisplayEnabled(true); Camera* cam; cam = (Camera*)scene->camera->data; if (cam) { @@ -730,7 +730,7 @@ bool GPG_Application::startEngine(void) // Set the GameLogic.globalDict from marshal'd data, so we can // load new blend files and keep data in GameLogic.globalDict loadGamePythonConfig(m_pyGlobalDictString, m_pyGlobalDictString_Length); -#endif +#endif m_sceneconverter->ConvertScene( startscene, m_rendertools, diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index d8b07fd50d9..7500a55a059 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -57,10 +57,10 @@ extern "C" { #endif // __cplusplus #include "MEM_guardedalloc.h" -#include "BKE_blender.h" -#include "BKE_global.h" -#include "BKE_icons.h" -#include "BKE_node.h" +#include "BKE_blender.h" +#include "BKE_global.h" +#include "BKE_icons.h" +#include "BKE_node.h" #include "BKE_report.h" #include "BKE_library.h" #include "BLI_threads.h" @@ -223,7 +223,7 @@ void usage(const char* program, bool isBlenderPlayer) printf(" --Optional parameters--\n"); printf(" angle = field of view in degrees\n"); printf(" tilt = tilt angle in degrees\n"); - printf(" warpdata = a file to use for warping the image (absolute path)\n"); + printf(" warpdata = a file to use for warping the image (absolute path)\n"); printf(" mode: fisheye (Fisheye)\n"); printf(" truncatedfront (Front-Truncated)\n"); printf(" truncatedrear (Rear-Truncated)\n"); @@ -1016,12 +1016,12 @@ int main(int argc, char** argv) gpg_nextframestate.app = &app; gpg_nextframestate.gs = &gs; pynextframestate.state = &gpg_nextframestate; - pynextframestate.func = &GPG_PyNextFrame; + pynextframestate.func = &GPG_PyNextFrame; printf("Yielding control to Python script '%s'...\n", python_main); PyRun_SimpleString(python_code); printf("Exit Python script '%s'\n", python_main); -#endif // WITH_PYTHON +#endif // WITH_PYTHON MEM_freeN(python_code); } else { |