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

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:

• projectile.cc (modified) (2 diffs)
• test_bullet.cc (modified) (2 diffs)

orxonox/trunk/src/world_entities/weapons/projectile.cc

@@ -24 +24 @@
 #include "model.h"
 #include "vector.h"
+
+#include "garbage_collector.h"
 
 using namespace std;
@@ -93 +95 @@
     PRINTF(5)("current life cycle is: %f\n", this->lifeCycle);
     PRINTF(5)("FINALIZE===========================\n");
-    this->finalize();
+    //this->finalize();
+    GarbageCollector::getInstance()->collect(this);
   }
 }

orxonox/trunk/src/world_entities/weapons/test_bullet.cc

@@ -21 +21 @@
 #include "model.h"
 #include "vector.h"
-#include "object_manager.h"
+#include "garbage_collector.h"
 
 using namespace std;
@@ -68 +68 @@
       PRINTF(5)("current life cycle is: %f\n", this->lifeCycle);
       PRINTF(5)("FINALIZE===========================\n");
-      this->finalize();
+//      this->finalize();
+      GarbageCollector::getInstance()->collect(this);
+
     }
 }