diff options
| author | Hamed Zaghaghi <hamed.zaghaghi@gmail.com> | 2008-02-04 05:33:27 +0300 |
|---|---|---|
| committer | Hamed Zaghaghi <hamed.zaghaghi@gmail.com> | 2008-02-04 05:33:27 +0300 |
| commit | 47b53510a56e80a6d82589334437ffbc706b5b67 (patch) | |
| tree | ff48818dab8312318fa61c6130c62960ee6b9c78 /source/gameengine/GamePlayer | |
| parent | 2da3bd32dd34e44a326a30c43b33e75dc65ce95a (diff) | |
| parent | bf4d79c47b9865a75ab0d6bb5649a8edce53a57d (diff) | |
merging game_engine branch changes into trunk, 2d-filters and opengl speedup
Diffstat (limited to 'source/gameengine/GamePlayer')
| -rw-r--r-- | source/gameengine/GamePlayer/common/GPC_RenderTools.cpp | 10 | ||||
| -rw-r--r-- | source/gameengine/GamePlayer/common/GPC_RenderTools.h | 6 | ||||
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_Application.cpp | 6 |
3 files changed, 21 insertions, 1 deletions
diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp index cc5c392d51a..388882e67e4 100644 --- a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp +++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp @@ -593,4 +593,14 @@ void GPC_RenderTools::MotionBlur(RAS_IRasterizer* rasterizer) } } +void GPC_RenderTools::Update2DFilter(RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text) +{ + m_filtermanager.EnableFilter(filtermode, pass, text); +} + +void GPC_RenderTools::Render2DFilters(RAS_ICanvas* canvas) +{ + m_filtermanager.RenderFilters( canvas); +} + unsigned int GPC_RenderTools::m_numgllights; diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.h b/source/gameengine/GamePlayer/common/GPC_RenderTools.h index e1f2a869c22..d90f0e5da45 100644 --- a/source/gameengine/GamePlayer/common/GPC_RenderTools.h +++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.h @@ -151,6 +151,11 @@ public: bool RayHit(KX_ClientObjectInfo* client, MT_Point3& hit_point, MT_Vector3& hit_normal, void * const data); virtual void MotionBlur(RAS_IRasterizer* rasterizer); + + virtual void Update2DFilter(RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text); + + virtual void Render2DFilters(RAS_ICanvas* canvas); + protected: /** * Copied from KX_BlenderGL.cpp in KX_blenderhook @@ -176,3 +181,4 @@ protected: #endif // __GPC_RENDERTOOLS_H + diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp index 4f6c78a0fd8..5ef20514390 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp @@ -537,7 +537,11 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode) goto initFailed; if(useLists) - m_rasterizer = new RAS_ListRasterizer(m_canvas); + if (useVertexArrays) { + m_rasterizer = new RAS_ListRasterizer(m_canvas, true); + } else { + m_rasterizer = new RAS_ListRasterizer(m_canvas); + } else if (useVertexArrays && bgl::QueryVersion(1, 1)) m_rasterizer = new RAS_VAOpenGLRasterizer(m_canvas); else |