David Rose 18 лет назад
Родитель
Сommit
0cda3c165a

+ 3 - 1
panda/src/pgraph/cullableObject.cxx

@@ -37,6 +37,7 @@
 
 CullableObject::FormatMap CullableObject::_format_map;
 
+PStatCollector CullableObject::_munge_geom_pcollector("*:Munge:Geom");
 PStatCollector CullableObject::_munge_sprites_pcollector("*:Munge:Sprites");
 PStatCollector CullableObject::_munge_sprites_verts_pcollector("*:Munge:Sprites:Verts");
 PStatCollector CullableObject::_munge_sprites_prims_pcollector("*:Munge:Sprites:Prims");
@@ -61,6 +62,7 @@ munge_geom(GraphicsStateGuardianBase *gsg,
            GeomMunger *munger, const CullTraverser *traverser,
            bool force) {
   Thread *current_thread = traverser->get_current_thread();
+  PStatTimer timer(_munge_geom_pcollector, current_thread);
   if (_geom != (Geom *)NULL) {
     _munger = munger;
 
@@ -127,7 +129,7 @@ munge_geom(GraphicsStateGuardianBase *gsg,
     if (!munger->munge_geom(_geom, _munged_data, force, current_thread)) {
       return false;
     }
-    
+
     StateMunger *state_munger;
     DCAST_INTO_R(state_munger, munger, false);
     _state = state_munger->munge_state(_state);

+ 1 - 0
panda/src/pgraph/cullableObject.h

@@ -113,6 +113,7 @@ private:
   typedef pmap<CPT(GeomVertexFormat), CPT(GeomVertexFormat) > FormatMap;
   static FormatMap _format_map;
 
+  static PStatCollector _munge_geom_pcollector;
   static PStatCollector _munge_sprites_pcollector;
   static PStatCollector _munge_sprites_verts_pcollector;
   static PStatCollector _munge_sprites_prims_pcollector;

+ 1 - 0
panda/src/pstatclient/pStatProperties.cxx

@@ -134,6 +134,7 @@ static TimeCollectorProperties time_properties[] = {
   { 1, "Cull:Sort",                        { 0.3, 0.3, 0.6 } },
   { 1, "*:Show fps",                       { 0.5, 0.8, 1.0 } },
   { 0, "*:Munge",                          { 0.3, 0.3, 0.9 } },
+  { 1, "*:Munge:Geom",                     { 0.4, 0.2, 0.8 } },
   { 1, "*:Munge:Sprites",                  { 0.2, 0.8, 0.4 } },
   { 0, "*:Munge:Data",                     { 0.7, 0.5, 0.2 } },
   { 0, "*:Munge:Rotate",                   { 0.9, 0.8, 0.5 } },