Changeset 9783 in orxonox.OLD for branches

Timestamp:

Sep 21, 2006, 7:10:42 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: more implementation on Resources

Location:

branches/new_class_id/src

Files:

• lib/coord/p_node.cc (modified) (3 diffs)
• lib/util/loading/resource.cc (modified) (1 diff)
• lib/util/loading/resource.h (modified) (3 diffs)
• world_entities/projectiles/projectile.cc (modified) (1 diff)

branches/new_class_id/src/lib/coord/p_node.cc

@@ -80 +80 @@
   PRINTF(4)("delete %s::%s\n", this->getClassCName(), this->getCName());
   // remove the Node, delete it's children (if required).
+  PNode* last = NULL;
+  this->debugNode(0);
+
   while(!this->children.empty())
   {
     PNode* deleteNode = this->children.front();
+    if (deleteNode == last)
+    {
+      PRINTF(1)("Node same as last that was tried to be deleted. FORCE delete of %p\n", deleteNode);
+      delete deleteNode;
+      continue;
+    }
     if ((this->parentMode & PNODE_PROHIBIT_CHILD_DELETE) ||
         (deleteNode->parentMode & PNODE_PROHIBIT_DELETE_WITH_PARENT))
@@ -108 +117 @@
       delete deleteNode;
     }
+    last = deleteNode;
   }
 
@@ -913 +923 @@
   int childNodeCount = 0;
   this->countChildNodes(childNodeCount);
-
+  printf("%p:", this);
   PRINT(0)("PNode(%s::%s) - absCoord: (%0.2f, %0.2f, %0.2f), relCoord(%0.2f, %0.2f, %0.2f), direction(%0.2f, %0.2f, %0.2f) - %s - %d childs\n",
            this->getClassCName(),

branches/new_class_id/src/lib/util/loading/resource.cc

@@ -37 +37 @@
   // delete what has to be deleted here
 }
+
+
+
+
+
+
+
+
+void Resource::KeepLevel::setKeepLevelName(unsigned int level, const std::string& name)
+{
+  if (_keepLevelName.size() <= level)
+    _keepLevelName.resize(level+1);
+  _keepLevelName[level] = name;
+}

branches/new_class_id/src/lib/util/loading/resource.h

@@ -24 +24 @@
   {
   public:
-    void setKeepLevelName(unsigned int level, const std::string& name)
-    {
-      if (_keepLevelName.size() <= level)
-        _keepLevelName.resize(level+1);
-      _keepLevelName[level] = name;
-    }
+    void setKeepLevelName(unsigned int level, const std::string& name);
   private:
     std::vector<std::string>     _keepLevelName;
   };
 
-
+protected:
   class Type
   {
   public:
-    Type(const ClassID& classID) : _classID(classID) { };
+    Type(const ClassID& classID) : _id(-1), _classID(classID) { };
 
     void addExtension(const std::string& extension);
 
+    const ClassID& storedClassID() const { return _classID; };
+    int id() const { return _id; };
+    const std::vector<std::string>& resourcePaths() const { return _resourcePaths; };
+
+
+    void setID(int id);
+
   private:
+    int                           _id;
     const ClassID&                _classID;
     std::vector<std::string>      _resourcePaths;
@@ -49 +52 @@
   };
 
+  class Pointer {};
 
 
@@ -55 +59 @@
   virtual ~Resource();
 
-  virtual bool load(std::string& fileName, const MultiType& param1, const MultiType& param2);
+  bool loadResource(std::string& fileName, Resource::Pointer* ptr);
   virtual bool reload();
   virtual bool unload();
 
 
+
 private:
+  std::string              _loadString;             //!< An identifier, to match when loading a File.
   std::string              _fileName;
   MultiType                _parameters[3];          //!< The Parameters given to this Resource.

branches/new_class_id/src/world_entities/projectiles/projectile.cc

@@ -149 +149 @@
 {
   if (this->target == NULL)
-    this->target = new PNode(target, PNODE_PARENT_MODE_DEFAULT | PNODE_REPARENT_ON_PARENTS_REMOVE);
+    this->target = new PNode(target, PNODE_REPARENT_ON_PARENTS_REMOVE | PNODE_REPARENT_TO_NULL | PNODE_PROHIBIT_DELETE_WITH_PARENT);
   else
     this->target->setParent(target);