Changeset 7237 in orxonox.OLD

Timestamp:

Mar 21, 2006, 10:07:48 PM (18 years ago)

Author:

bensch

Message:

orxonox/branches/resource: some strange errors while linking

Location:

branches/resources/src/lib

Files:

• BuildLibs.am (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• util/loading/resource.cc (modified) (2 diffs)
• util/loading/resource.h (modified) (4 diffs)

branches/resources/src/lib/BuildLibs.am

@@ -17 +17 @@
                 $(LIB_PREFIX)/parser/ini_parser/libIniParser.a \
                 $(LIB_PREFIX)/shell/libORXshell.a \
-                $(LIB_PREFIX)/math/libORXmath.a
+                $(LIB_PREFIX)/math/libORXmath.a \
+                $(LIB_PREFIX)/libORXlibs.a

branches/resources/src/lib/Makefile.am

@@ -16 +16 @@
                 util/executor/executor.cc \
                 \
+                util/loading/resource.cc \
                 util/loading/resource_manager.cc \
-                util/loading/resource.cc \
                 util/loading/game_loader.cc \
                 util/loading/load_param.cc \
@@ -40 +40 @@
                 util/executor/functor_list.h \
                 \
+                util/loading/resource.h \
                 util/loading/resource_manager.h \
-                util/loading/resource.h \
                 util/loading/game_loader.h \
                 util/loading/load_param.h \

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

@@ -35 +35 @@
    * standard deconstructor
    */
-  Resource::~Resource ()
-  {
-    // delete what has to be deleted here
-  }
+//   Resource::~Resource ()
+//   {
+//   }
 
   Resource::SharedResource::SharedResource()
@@ -46 +45 @@
     this->prio = RP_NO;
   }
+
+
+
 }

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

@@ -65 +65 @@
   public:
     Resource(const std::string& fileName = "", ResourcePriority prio = RP_LEVEL);
-    virtual ~Resource();
+    virtual ~Resource() {};
 
     // looks if the resource was already loaded and (if not) loads it.
@@ -73 +73 @@
                       const MultiType& param1 = MT_NULL,
                       const MultiType& param2 = MT_NULL);
+    virtual bool cache(std::string& fileName = "",
+                       ResourcePriority prio = RP_LEVEL,
+                       const MultiType& param0 = MT_NULL,
+                       const MultiType& param1 = MT_NULL,
+                       const MultiType& param2 = MT_NULL);
+
+
     // reloads the resource.
     virtual bool reload() { };
@@ -86 +93 @@
     // raises the priority can only be raised
     void raisePriority(ResourcePriority prio);
+
     /** @returns the referenceCount of the shared resource behind this resource or 0 if no internal Resource is stored */
   unsigned int referenceCount() const { return (this->resource)? this->resource->referenceCount : 0; };
@@ -95 +103 @@
                                        const MultiType& param2 = MT_NULL);
 
+  private:
+    static SharedResource* locateResourceByPointer(const void* sharedResource);
+
+    static SharedResource* locateResourceByInfo(std::string& fileName,
+        const MultiType& param0 = MT_NULL,
+        const MultiType& param1 = MT_NULL,
+        const MultiType& param2 = MT_NULL);
+
   protected:
-    SharedResource*     resource;          //!< The internal Resource, this Resource is keeping (at the moment).
+    SharedResource*         resource;          //!< The internal Resource, this Resource is keeping (at the moment).
 
-    static std::map<ClassID, std::vector<SharedResource> > storedResources;
+    /** A Map of all stored Resources. */
+    static std::map<ClassID, std::vector<SharedResource> >    storedResources;
   };