Changeset 7240 in orxonox.OLD

Timestamp:

Mar 22, 2006, 12:52:16 PM (18 years ago)

Author:

bensch

Message:

resources: lib

Location:

branches/resources

Files:

• configure.ac (modified) (1 diff)
• src/lib/BuildLibs.am (modified) (1 diff)
• src/lib/Makefile.am (modified) (3 diffs)
• src/lib/util/loading/resource.cc (modified) (7 diffs)
• src/lib/util/loading/resource.h (modified) (5 diffs)

branches/resources/configure.ac

@@ -630 +630 @@
                  src/lib/Makefile
                  src/lib/math/Makefile
+                 src/lib/util/Makefile
                  src/lib/graphics/Makefile
                  src/lib/graphics/importer/Makefile

branches/resources/src/lib/BuildLibs.am

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

branches/resources/src/lib/Makefile.am

@@ -10 +10 @@
                 coord/p_node.cc \
                 \
-                util/substring.cc \
-                util/color.cc \
-                util/helper_functions.cc \
-                util/multi_type.cc \
-                util/executor/executor.cc \
-                \
-                util/loading/resource.cc \
-                util/loading/resource_manager.cc \
-                util/loading/game_loader.cc \
-                util/loading/load_param.cc \
-                util/loading/load_param_description.cc \
-                util/loading/factory.cc \
-                util/loading/dynamic_loader.cc \
-                \
                 data/data_tank.cc
 
@@ -32 +18 @@
                 coord/p_node.h \
                 \
-                util/substring.h \
-                util/multi_type.h \
-                util/color.h \
-                util/helper_functions.h \
-                util/executor/executor.h \
-                util/executor/executor_specials.h \
-                util/executor/functor_list.h \
-                \
-                util/loading/resource.h \
-                util/loading/resource_manager.h \
-                util/loading/game_loader.h \
-                util/loading/load_param.h \
-                util/loading/load_param_description.h \
-                util/loading/factory.h \
-                util/loading/dynamic_loader.h \
-                \
-                util/count_pointer.h \
-                util/list.h \
-                \
                 \
                 data/data_tank.h
@@ -57 +24 @@
         . \
         math \
+        util \
         graphics \
         sound \

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

@@ -2 +2 @@
    orxonox - the future of 3D-vertical-scrollers
 
-   Copyright (C) 2004 orx
+   Copyright (C) 2006 orx
 
    This program is free software; you can redistribute it and/or modify
@@ -21 +21 @@
 namespace Loading
 {
+  /**
+   * @brief Initializes a shared Resource
+   */
   Resource::SharedResource::SharedResource()
   {
@@ -30 +33 @@
 
   /**
-   * standard constructor
+   * @brief standard constructor
   */
   Resource::Resource (const std::string& fileName, ResourcePriority prio)
@@ -40 +43 @@
 
   /**
-   * standard deconstructor
+   * @brief standard deconstructor
    */
-  //   Resource::~Resource ()
-  //   {
-  //   }
+  Resource::~Resource ()
+  {}
 
 
@@ -50 +52 @@
                       const MultiType& param0, const MultiType& param1, const MultiType& param2)
   {}
+
+
   bool Resource::cache(std::string& fileName, ResourcePriority prio,
                        const MultiType& param0, const MultiType& param1,  const MultiType& param2)
@@ -55 +59 @@
 
 
-  // reloads the resource.
-//  bool Resource::reload()
-//  {}
-  // unloads the sharedResource (from this Resource)
+  /**
+   * @brief reloads the resource.
+   */
+  bool Resource::reload()
+  {}
+
   bool Resource::unload()
   {}
@@ -71 +77 @@
   {}
 
-//   const SharedResource* findResource(std::string& fileName,
-//                                      const MultiType& param0, const MultiType& param1, const MultiType& param2)
-//   {
-//   }
+
+  bool Resource::reloadResourcesByType(ClassID ResourceType)
+  {}
+
+  bool Resource::reloadAllResources()
+  {}
+
+  bool Resource::unloadResourcesByType(ResourcePriority prio)
+  {}
 
 
+  bool Resource::unloadAllResources()
+  {}
+
+  void Resource::debug()
+  {}
+
+
+
+
+  const Resource::SharedResource* Resource::findResource(std::string& fileName,
+      const MultiType& param0, const MultiType& param1, const MultiType& param2)
+  {}
+
 }

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

@@ -53 +53 @@
     public:
       SharedResource();
+      bool reload();
       std::string       fileName;
 
@@ -65 +66 @@
   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 +74 @@
                       const MultiType& param1 = MT_NULL,
                       const MultiType& param2 = MT_NULL);
+
     virtual bool cache(std::string& fileName = "",
                        ResourcePriority prio = RP_LEVEL,
@@ -81 +83 @@
 
     // reloads the resource.
-    virtual bool reload() { };
+    virtual bool reload();
     // unloads the sharedResource (from this Resource)
     virtual bool unload();
 
     // checks if a resource was already loaded.
-    bool isLoaded(std::string& fileName,
-                  const MultiType& param0 = MT_NULL,
-                  const MultiType& param1 = MT_NULL,
-                  const MultiType& param2 = MT_NULL);
+    static bool isLoaded(std::string& fileName,
+                         const MultiType& param0 = MT_NULL,
+                         const MultiType& param1 = MT_NULL,
+                         const MultiType& param2 = MT_NULL);
 
     // raises the priority can only be raised
@@ -95 +97 @@
 
     /** @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; };
+    unsigned int referenceCount() const { return (this->resource)? this->resource->referenceCount : 0; };
 
+    static bool reloadResourcesByType(ClassID ResourceType);
+    static bool reloadAllResources();
+
+    static bool unloadResourcesByType(ResourcePriority prio);
+    static bool unloadAllResources();
+
+    static void debug();
   protected:
     const SharedResource* findResource(std::string& fileName,