Changeset 7238 in orxonox.OLD

Timestamp:

Mar 22, 2006, 11:25:52 AM (18 years ago)

Author:

bensch

Message:

orxonox/branches/resources: compiles again

Location:

branches/resources/src/lib

Files:

• BuildLibs.am (modified) (1 diff)
• util/loading/resource.cc (modified) (2 diffs)
• util/loading/resource_manager.h (modified) (2 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)/libORXlibs.a
+                $(LIB_PREFIX)/libORXlibs.a \
+                $(LIB_PREFIX)/math/libORXmath.a

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

@@ -21 +21 @@
 namespace Loading
 {
+  Resource::SharedResource::SharedResource()
+  {
+    this->referenceCount = 1;
+    this->type = CL_NULL;
+    this->prio = RP_NO;
+  }
+
 
   /**
@@ -35 +42 @@
    * standard deconstructor
    */
-//   Resource::~Resource ()
+  //   Resource::~Resource ()
+  //   {
+  //   }
+
+
+  bool Resource::load(std::string& fileName, ResourcePriority prio,
+                      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)
+  {}
+
+
+  // reloads the resource.
+//  bool Resource::reload()
+//  {}
+  // unloads the sharedResource (from this Resource)
+  bool Resource::unload()
+  {}
+
+  // checks if a resource was already loaded.
+  bool Resource::isLoaded(std::string& fileName,
+                          const MultiType& param0, const MultiType& param1, const MultiType& param2)
+  {}
+
+  // raises the priority can only be raised
+  void Resource::raisePriority(ResourcePriority prio)
+  {}
+
+//   const SharedResource* findResource(std::string& fileName,
+//                                      const MultiType& param0, const MultiType& param1, const MultiType& param2)
 //   {
 //   }
 
-  Resource::SharedResource::SharedResource()
-  {
-    this->referenceCount = 1;
-    this->type = CL_NULL;
-    this->prio = RP_NO;
-  }
-
-
 
 }

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

@@ -21 +21 @@
 
 #include "base_object.h"
+#include "resource.h"
+
 #include "multi_type.h"
+
 
 #include <vector>
@@ -50 +53 @@
 };
 
-//! An enumerator for different UNLOAD-types.
+//! An enumerator for different (UN)LOAD-types.
 /**
-   RP_NO:        will be unloaded on request
-   RP_LEVEL:     will be unloaded at the end of a Level
-   RP_CAMPAIGN:  will be unloaded at the end of a Campaign
-   RP_GAME:      will be unloaded at the end of the whole Game (when closing orxonox)
-*/
-typedef enum ResourcePriority
+ * RP_NO:        will be unloaded on request
+ * RP_LEVEL:     will be unloaded at the end of a Level
+ * RP_CAMPAIGN:  will be unloaded at the end of a Campaign
+ * RP_GAME:      will be unloaded at the end of the whole Game (when closing orxonox)
+ */
+  typedef enum ResourcePriority
 {
   RP_NO        =   0,
   RP_LEVEL     =   1,
   RP_CAMPAIGN  =   2,
-  RP_GAME      =   4
+  RP_GAME      =   3
 };
+
 
 //! A Struct that keeps track about a resource its name its Type, and so on