diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2009-12-31 07:56:23 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2009-12-31 07:56:23 +0300 |
| commit | 3e5b6ed469f84df5eb25eb9da49592218ec18c05 (patch) | |
| tree | fd798d65e368a8bd032140aa04502a018783b69d /source/gameengine | |
| parent | 453945e9e3e2ef360976e57a01c587c3c8a0bb93 (diff) | |
BGE: (1) stereo tooltip update (2) blenderplayer working with new stereo setting (3) blenderplayer building again (patch by Mitchell Stokes - Moguri)
(1) the new text suggest what was the default eye separation before. Now I'm confident that changing the eye separation for the UI is a good move
(2) no big deal here. It's not reading the parameter from the command line. But does it ever read it?
(3) stubs.c update and glew linking statically. patch by Mitchell Stokes, thanks for that.
And now we finish 2009 with a building blenderplayer =D
Diffstat (limited to 'source/gameengine')
5 files changed, 9 insertions, 2 deletions
diff --git a/source/gameengine/GamePlayer/common/CMakeLists.txt b/source/gameengine/GamePlayer/common/CMakeLists.txt index c865cf5ce25..2898d07e63d 100644 --- a/source/gameengine/GamePlayer/common/CMakeLists.txt +++ b/source/gameengine/GamePlayer/common/CMakeLists.txt @@ -71,5 +71,7 @@ SET(INC ${ZLIB_INC} ) +ADD_DEFINITIONS(-DGLEW_STATIC) + BLENDERLIB_NOLIST(gp_common "${SRC}" "${INC}") #env.BlenderLib (libname='gp_common', sources=source_files, includes=incs, defines = [], libtype='player', priority=5, compileflags=cflags) diff --git a/source/gameengine/GamePlayer/common/SConscript b/source/gameengine/GamePlayer/common/SConscript index 51fc2fc7334..b66d644f9f5 100644 --- a/source/gameengine/GamePlayer/common/SConscript +++ b/source/gameengine/GamePlayer/common/SConscript @@ -58,7 +58,7 @@ incs = ['.', # 'unix/GPU_System.cpp'] # gp_common_env.Append ( CPPPATH = ['unix']) -defs = [] +defs = [ 'GLEW_STATIC' ] if env['WITH_BF_PYTHON']: incs += Split(env['BF_PYTHON_INC']) diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt index d50784cb967..8d73a6f248b 100644 --- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt +++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt @@ -66,6 +66,8 @@ SET(INC ${PYTHON_INC} ) +ADD_DEFINITIONS(-DGLEW_STATIC) + IF(WITH_FFMPEG) ADD_DEFINITIONS(-DWITH_FFMPEG) ENDIF(WITH_FFMPEG) diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp index e771d12988c..c6952a68a58 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp @@ -565,7 +565,10 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode) else m_rasterizer = new RAS_OpenGLRasterizer(m_canvas); + /* Stereo parameters - Eye Separation from the UI - stereomode from the command-line/UI */ m_rasterizer->SetStereoMode((RAS_IRasterizer::StereoMode) stereoMode); + m_rasterizer->SetEyeSeparation(m_startScene->gm.eyeseparation); + if (!m_rasterizer) goto initFailed; diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript index 93769e60401..2269b6400e3 100644 --- a/source/gameengine/GamePlayer/ghost/SConscript +++ b/source/gameengine/GamePlayer/ghost/SConscript @@ -40,7 +40,7 @@ incs = ['.', '#source/blender/gpu', '#extern/glew/include'] -defs = [] +defs = [ 'GLEW_STATIC' ] if env['WITH_BF_PYTHON']: incs += Split(env['BF_PYTHON_INC']) |