From b9c02b60a5db60b1e6aaf6343cc6c05429e6f0cd Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 25 Nov 2011 08:55:56 +0000 Subject: [PATCH] Commit patch by teedee to fix CollisionBox reporting in PStats --- panda/src/display/graphicsEngine.cxx | 4 ++++ panda/src/display/graphicsEngine.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/panda/src/display/graphicsEngine.cxx b/panda/src/display/graphicsEngine.cxx index d89070cda3..1ef87c2e35 100644 --- a/panda/src/display/graphicsEngine.cxx +++ b/panda/src/display/graphicsEngine.cxx @@ -103,6 +103,8 @@ PStatCollector GraphicsEngine::_volume_plane_pcollector("Collision Volumes:Colli PStatCollector GraphicsEngine::_test_plane_pcollector("Collision Tests:CollisionPlane"); PStatCollector GraphicsEngine::_volume_sphere_pcollector("Collision Volumes:CollisionSphere"); PStatCollector GraphicsEngine::_test_sphere_pcollector("Collision Tests:CollisionSphere"); +PStatCollector GraphicsEngine::_volume_box_pcollector("Collision Volumes:CollisionBox"); +PStatCollector GraphicsEngine::_test_box_pcollector("Collision Tests:CollisionBox"); PStatCollector GraphicsEngine::_volume_tube_pcollector("Collision Volumes:CollisionTube"); PStatCollector GraphicsEngine::_test_tube_pcollector("Collision Tests:CollisionTube"); PStatCollector GraphicsEngine::_volume_inv_sphere_pcollector("Collision Volumes:CollisionInvSphere"); @@ -818,6 +820,8 @@ render_frame() { _test_plane_pcollector.clear_level(); _volume_sphere_pcollector.clear_level(); _test_sphere_pcollector.clear_level(); + _volume_box_pcollector.clear_level(); + _test_box_pcollector.clear_level(); _volume_tube_pcollector.clear_level(); _test_tube_pcollector.clear_level(); _volume_inv_sphere_pcollector.clear_level(); diff --git a/panda/src/display/graphicsEngine.h b/panda/src/display/graphicsEngine.h index 2fafeb99e4..e862fa6d8d 100644 --- a/panda/src/display/graphicsEngine.h +++ b/panda/src/display/graphicsEngine.h @@ -379,6 +379,8 @@ private: static PStatCollector _test_plane_pcollector; static PStatCollector _volume_sphere_pcollector; static PStatCollector _test_sphere_pcollector; + static PStatCollector _volume_box_pcollector; + static PStatCollector _test_box_pcollector; static PStatCollector _volume_tube_pcollector; static PStatCollector _test_tube_pcollector; static PStatCollector _volume_inv_sphere_pcollector;