diff options
| author | Stijn Buys <ingar@osirion.org> | 2010-10-17 21:25:27 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2010-10-17 21:25:27 +0000 |
| commit | 1032161366da1b2153de8d804465061e6bcc4fce (patch) | |
| tree | d9163c92c79791c9495e6d5f2944aea27c24e77f /src/render | |
| parent | 31c4ff4ff080ea34389c60ba4edd268dc7f3c08a (diff) | |
moved bullet objets to core::Entity,
moved docking functions to game.cc and removed entity->dock(),
enabled depth testing for bullet debug draw
Diffstat (limited to 'src/render')
| -rw-r--r-- | src/render/draw.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/draw.cc b/src/render/draw.cc index 656653b..04ccce4 100644 --- a/src/render/draw.cc +++ b/src/render/draw.cc @@ -1294,9 +1294,6 @@ void draw(float seconds) glDisableClientState(GL_NORMAL_ARRAY); glDisableClientState(GL_TEXTURE_COORD_ARRAY); - gl::depthmask(GL_TRUE); // enable depth buffer writing - gl::disable(GL_DEPTH_TEST); // disable depth buffer testing - // draw physics if (r_physics && r_physics->value()) { if (zone->physics()) { @@ -1310,7 +1307,10 @@ void draw(float seconds) gl::end(); } } - + + gl::depthmask(GL_TRUE); // enable depth buffer writing + gl::disable(GL_DEPTH_TEST); // disable depth buffer testing + gl::disable(GL_COLOR_MATERIAL); // disable color tracking gl::disable(GL_CULL_FACE); // disable culling |