Changeset 9846 in orxonox.OLD

Timestamp:

Sep 27, 2006, 11:23:43 PM (18 years ago)

Author:

bensch

Message:

new KeepLevel definitions

Location:

branches/new_class_id/src/lib

Files:

• graphics/importer/md2/resource_md2.h (modified) (1 diff)
• graphics/importer/resource_obj.h (modified) (1 diff)
• graphics/importer/resource_texture.h (modified) (1 diff)
• graphics/resource_shader.h (modified) (1 diff)
• graphics/text_engine/resource_font.h (modified) (1 diff)
• sound/resource_sound_buffer.h (modified) (1 diff)
• util/loading/resource.cc (modified) (1 diff)
• util/loading/resource.h (modified) (3 diffs)

branches/new_class_id/src/lib/graphics/importer/md2/resource_md2.h

@@ -25 +25 @@
     MD2ResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const MD2Data::Pointer& data);
     inline const MD2Data::Pointer& ptr() const { return pointer; }
-private:
+    virtual bool last() const { return pointer.count() == 1; }
+  private:
     MD2Data::Pointer pointer;
   };

branches/new_class_id/src/lib/graphics/importer/resource_obj.h

@@ -23 +23 @@
     OBJResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const StaticModelData::Pointer& data);
     inline const StaticModelData::Pointer& ptr() const { return pointer; }
+    virtual bool last() const { return pointer.count() == 1; }
 private:
     StaticModelData::Pointer pointer;

branches/new_class_id/src/lib/graphics/importer/resource_texture.h

@@ -24 +24 @@
     TextureResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const TextureData::Pointer& data);
     inline const TextureData::Pointer& ptr() const { return pointer; }
-private:
+    virtual bool last() const { return pointer.count() == 1; }
+  private:
     TextureData::Pointer pointer;
   };

branches/new_class_id/src/lib/graphics/resource_shader.h

@@ -24 +24 @@
     ShaderResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const ShaderData::Pointer& data);
     inline const ShaderData::Pointer& ptr() const { return pointer; }
+    virtual bool last() const { return pointer.count() == 1; }
   private:
     ShaderData::Pointer pointer;

branches/new_class_id/src/lib/graphics/text_engine/resource_font.h

@@ -24 +24 @@
     FontResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const FontData::Pointer& data);
     inline const FontData::Pointer& ptr() const { return pointer; }
-private:
+    virtual bool last() const { return pointer.count() == 1; }
+  private:
     FontData::Pointer pointer;
   };

branches/new_class_id/src/lib/sound/resource_sound_buffer.h

@@ -26 +26 @@
       SoundBufferResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const SoundBufferData::Pointer& data);
       inline const SoundBufferData::Pointer& ptr() const { return pointer; }
+      virtual bool last() const { return pointer.count() == 1; }
     private:
       SoundBufferData::Pointer pointer;

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

@@ -178 +178 @@
     std::vector<Resources::StorePointer*>::iterator it;
     for (it = this->_storedResources.begin(); it != this->_storedResources.end(); ++it)
-      if((*it)->keepLevel() < keepLevel)
+      if((*it)->keepLevel() < keepLevel && (*it)->last())
     {
       delete (*it);

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

@@ -26 +26 @@
   public:
     /** @param keepLevel the level to set. */
-    KeepLevel(unsigned int keepLevel) { _keepLevel = keepLevel; };
+    inline KeepLevel(unsigned int keepLevel) { _keepLevel = keepLevel; };
     KeepLevel(const std::string& keepLevelName);
 
-    bool operator==(const KeepLevel& keepLevel) const { return this->_keepLevel == keepLevel._keepLevel; };
-    bool operator!=(const KeepLevel& keepLevel) const { return this->_keepLevel != keepLevel._keepLevel; };
-    bool operator<=(const KeepLevel& keepLevel) const { return this->_keepLevel <= keepLevel._keepLevel; };
-    bool operator<(const KeepLevel& keepLevel) const { return this->_keepLevel < keepLevel._keepLevel; };
+    inline bool operator==(const KeepLevel& keepLevel) const { return this->_keepLevel == keepLevel._keepLevel; };
+    inline bool operator!=(const KeepLevel& keepLevel) const { return this->_keepLevel != keepLevel._keepLevel; };
+    inline bool operator<=(const KeepLevel& keepLevel) const { return this->_keepLevel <= keepLevel._keepLevel; };
+    inline bool operator<(const KeepLevel& keepLevel) const { return this->_keepLevel < keepLevel._keepLevel; };
 
     /** @returns the KeepLevel */
-    unsigned int keepLevel() const { return _keepLevel; };
+    inline unsigned int keepLevel() const { return _keepLevel; };
     const std::string& name() const;
   private:
@@ -41 +41 @@
   };
 
+
+
   //! Stores a Resource-Pointer, the LoadString and it's keepLevel.
   class StorePointer
   {
   public:
-    StorePointer(const std::string& loadString, const Resources::KeepLevel& keeplevel);
     //! Virtual Destructor, that removes the Stored information-pointer.
     virtual ~StorePointer() {};
@@ -54 +55 @@
     const Resources::KeepLevel& keepLevel() const { return _keepLevel; };
 
+    virtual bool last() const = 0;
+
+    protected:
+      StorePointer(const std::string& loadString, const Resources::KeepLevel& keeplevel);
+
+    private:
+      StorePointer(const StorePointer&) : _keepLevel(0) {};
+
   private:
     std::string                 _loadString;             //!< An identifier, to match when loading a File.
     Resources::KeepLevel        _keepLevel;              //!< The Priority of this resource. (can only be increased, so none else will delete this)
   };
+
+
+
 
   //! A Type of Resources.