From 1032161366da1b2153de8d804465061e6bcc4fce Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 17 Oct 2010 21:25:27 +0000 Subject: moved bullet objets to core::Entity, moved docking functions to game.cc and removed entity->dock(), enabled depth testing for bullet debug draw --- src/render/draw.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/render') 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 -- cgit v1.2.3