diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2012-04-29 04:44:49 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2012-04-29 04:44:49 +0400 |
| commit | b23186b2a4635d6fba4c5a4ac43dc1883de19d66 (patch) | |
| tree | e658c953b3af2465d321f03dba59d322ae50ce30 /source/gameengine | |
| parent | 88750597c741389af7dec62606a02ff02465c71e (diff) | |
compile fixes:
* near and far var names confused mingw64, renamed
* mingw defines a macro named DrawText, confusing the DrawText function usage from KX_FontObject.
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Ketsji/KX_KetsjiEngine.cpp | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp index dbcfe7983c7..83b02acf1c3 100644 --- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp +++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp @@ -52,12 +52,9 @@ #include "RAS_IRasterizer.h" #include "RAS_IRenderTools.h" #include "RAS_ICanvas.h" -#include "STR_String.h" #include "MT_Vector3.h" #include "MT_Transform.h" #include "SCA_IInputDevice.h" -#include "KX_Scene.h" -#include "MT_CmMatrix4x4.h" #include "KX_Camera.h" #include "KX_FontObject.h" #include "KX_Dome.h" @@ -90,6 +87,12 @@ #define DEFAULT_LOGIC_TIC_RATE 60.0 #define DEFAULT_PHYSICS_TIC_RATE 60.0 +#ifdef FREE_WINDOWS /* XXX mingw64 (gcc 4.7.0) defines a macro for DrawText that translates to DrawTextA. Not good */ +#ifdef DrawText +#undef DrawText +#endif +#endif + const char KX_KetsjiEngine::m_profileLabels[tc_numCategories][15] = { "Physics:", // tc_physics "Logic:", // tc_logic @@ -1063,37 +1066,30 @@ void KX_KetsjiEngine::EnableCameraOverride(const STR_String& forscene) m_overrideSceneName = forscene; } - - void KX_KetsjiEngine::SetCameraZoom(float camzoom) { m_cameraZoom = camzoom; } - - void KX_KetsjiEngine::SetCameraOverrideUseOrtho(bool useOrtho) { m_overrideCamUseOrtho = useOrtho; } - - void KX_KetsjiEngine::SetCameraOverrideProjectionMatrix(const MT_CmMatrix4x4& mat) { m_overrideCamProjMat = mat; } - void KX_KetsjiEngine::SetCameraOverrideViewMatrix(const MT_CmMatrix4x4& mat) { m_overrideCamViewMat = mat; } -void KX_KetsjiEngine::SetCameraOverrideClipping(float near, float far) +void KX_KetsjiEngine::SetCameraOverrideClipping(float nearfrust, float farfrust) { - m_overrideCamNear = near; - m_overrideCamFar = far; + m_overrideCamNear = nearfrust; + m_overrideCamFar = farfrust; } void KX_KetsjiEngine::SetCameraOverrideLens(float lens) |