Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4941 in orxonox.OLD for orxonox/trunk/src/world_entities/weapons


Ignore:
Timestamp:
Jul 23, 2005, 1:08:39 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: new garbage-collection-algorithm works, but the entities are not correctly setup for re-entering the scene.

Location:
orxonox/trunk/src/world_entities/weapons
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/world_entities/weapons/projectile.cc

    r4932 r4941  
    2424#include "model.h"
    2525#include "vector.h"
     26
     27#include "garbage_collector.h"
    2628
    2729using namespace std;
     
    9395    PRINTF(5)("current life cycle is: %f\n", this->lifeCycle);
    9496    PRINTF(5)("FINALIZE===========================\n");
    95     this->finalize();
     97    //this->finalize();
     98    GarbageCollector::getInstance()->collect(this);
    9699  }
    97100}
  • orxonox/trunk/src/world_entities/weapons/test_bullet.cc

    r4933 r4941  
    2121#include "model.h"
    2222#include "vector.h"
    23 #include "object_manager.h"
     23#include "garbage_collector.h"
    2424
    2525using namespace std;
     
    6868      PRINTF(5)("current life cycle is: %f\n", this->lifeCycle);
    6969      PRINTF(5)("FINALIZE===========================\n");
    70       this->finalize();
     70//      this->finalize();
     71      GarbageCollector::getInstance()->collect(this);
     72
    7173    }
    7274}
Note: See TracChangeset for help on using the changeset viewer.