Changeset 9718 in orxonox.OLD for branches/new_class_id/src/lib/util

Timestamp:

Sep 1, 2006, 11:56:54 PM (18 years ago)

Author:

bensch

Message:

more thoughts on Resources, and soon going to adapt… i think i've got a clue

Location:

branches/new_class_id/src/lib/util/loading

Files:

• resource.cc (modified) (2 diffs)
• resource.h (modified) (3 diffs)

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

@@ -18 +18 @@
 #include "resource.h"
 
-
+ObjectListDefinition(Resource);
 
 
@@ -26 +26 @@
 Resource::Resource (const std::string& fileName)
 {
-//   this->setClassID(CL_RESOURCE, "Resource");
+  this->registerObject(this, Resource::_objectList);
 
 }

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

@@ -19 +19 @@
 class Resource : virtual public BaseObject
 {
+  ObjectListDeclaration(Resource);
 public:
-  class Priority
+  class KeepLevel
   {
   public:
-    void setPriorityName(unsigned int level, const std::string& name)
+    void setKeepLevelName(unsigned int level, const std::string& name)
     {
-      if (_priorityName.size() <= level)
-        _priorityName.resize(level+1);
-      _priorityName[level] = name;
+      if (_keepLevelName.size() <= level)
+        _keepLevelName.resize(level+1);
+      _keepLevelName[level] = name;
     }
   private:
-    std::vector<std::string>     _priorityName;
+    std::vector<std::string>     _keepLevelName;
   };
 
@@ -46 +47 @@
     std::vector<std::string>      _resourceSubPaths;
     std::vector<std::string>      _fileExtensions;
-
   };
-
 
 public:
@@ -60 +59 @@
 
 private:
+  std::string              _fileName;
+  MultiType                _parameters[3];          //!< The Parameters given to this Resource.
+  Resource::KeepLevel      _keepLevel;              //!< The Priority of this resource. (can only be increased, so noone else will delete this)
 
-  static std::vector<std::vector<std::string> >     _resourcePaths;
 
-  static std::vector<std::string>                   _resourceClassNames;
+  static std::vector<Resource::Type>     _resourceTypes;
 
   //! GLOBALS
-  static std::string                                _mainGlobalPath;
-  static std::vector<std::string>                   _globalPaths;
-
-  std::string       fileName;
-
-  unsigned int      referenceCount;    //!< How many times this Resource has been loaded.
-  /// TODO REMOVE THIS:   ResourceType      type;              //!< ResourceType of this Resource.
-  Resource::Priority  prio;              //!< The Priority of this resource. (can only be increased, so noone else will delete this)
-
-  MultiType         param[3];          //!< The Parameters given to this Resource.
+  static std::string                     _mainGlobalPath;
+  static std::vector<std::string>        _globalPaths;
 };