Changeset 7193 in orxonox.OLD for trunk/src/lib/util

Timestamp:

Mar 7, 2006, 5:05:50 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: new style for resources (prework/movement)

Location:

trunk/src/lib/util/loading

Files:

• . (moved) (moved from trunk/src/util/loading)
• dynamic_loader.h (modified) (1 diff)
• factory.cc (modified) (1 diff)
• game_loader.cc (modified) (1 diff)
• load_param.cc (modified) (1 diff)
• resource.cc (copied) (copied from trunk/src/proto/proto_class.cc) (3 diffs)
• resource.h (copied) (copied from trunk/src/proto/proto_class.h) (3 diffs)
• resource_manager.cc (modified) (2 diffs)
• resource_manager.h (modified) (1 diff)

trunk/src/lib/util/loading/dynamic_loader.h

@@ -7 +7 @@
 #define _DYNAMIC_LOADER_H
 
-#include "factory.h"
+#include "util/loading/factory.h"
 
 #include <string>

trunk/src/lib/util/loading/factory.cc

@@ -15 +15 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_LOADING
 
-#include "factory.h"
+#include "util/loading/factory.h"
 
 //#include "shell_command.h"

trunk/src/lib/util/loading/game_loader.cc

@@ -19 +19 @@
 
 #include "game_loader.h"
-#include "load_param.h"
+#include "util/loading/load_param.h"
 
 #include "shell_command.h"
 #include "campaign.h"
 
-#include "resource_manager.h"
+#include "util/loading/resource_manager.h"
 
 #include "event_handler.h"

trunk/src/lib/util/loading/load_param.cc

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_LOADING
 
-#include "load_param.h"
+#include "util/loading/load_param.h"
 #include "load_param_description.h"
 

trunk/src/lib/util/loading/resource.cc

@@ -16 +16 @@
 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
 
-#include "proto_class.h"
+#include "resource.h"
 
 using namespace std;
@@ -25 +25 @@
  * @todo this constructor is not jet implemented - do it
 */
-ProtoClass::ProtoClass ()
+Resource::Resource ()
 {
-   this->setClassID(CL_PROTO_ID, "ProtoClass");
+   this->setClassID(CL_RESOURCE, "Resource");
 
    /* If you make a new class, what is most probably the case when you write this file
@@ -45 +45 @@
  * standard deconstructor
 */
-ProtoClass::~ProtoClass ()
+Resource::~Resource ()
 {
   // delete what has to be deleted here

trunk/src/lib/util/loading/resource.h

@@ -1 +1 @@
 /*!
- * @file proto_class.h
+ * @file resource.h
  * @brief Definition of ...
 */
 
-#ifndef _PROTO_CLASS_H
-#define _PROTO_CLASS_H
+#ifndef _RESOURCE_H
+#define _RESOURCE_H
 
 #include "base_object.h"
+#include "multi_type.h"
+
 
 // FORWARD DECLARATION
@@ -14 +16 @@
 
 //! A class for ...
-class ProtoClass : public BaseObject {
+class Resource : virtual public BaseObject {
 
  public:
-  ProtoClass();
-  virtual ~ProtoClass();
+  Resource();
+  virtual ~Resource();
 
+  virtual bool load(const char* fileName, const MultiType& param1, const MultiType& param2);
+  virtual bool reload();
+  virtual bool unload();
 
  private:
@@ -25 +30 @@
 };
 
-#endif /* _PROTO_CLASS_H */
+#endif /* _RESOURCE_H */

trunk/src/lib/util/loading/resource_manager.cc

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_LOAD
 
-#include "resource_manager.h"
+#include "util/loading/resource_manager.h"
 
 #include "substring.h"
@@ -592 +592 @@
     if (resource->count == 0)
     {
-      // deleting the Resource
-      switch(resource->type)
-      {
-#ifndef NO_MODEL
-        case OBJ:
-        case PRIM:
-          delete (Model*)resource->pointer;
-          break;
-        case MD2:
-          delete (MD2Data*)resource->pointer;
-          break;
-#endif /* NO_MODEL */
-#ifndef NO_AUDIO
-        case WAV:
-          delete (SoundBuffer*)resource->pointer;
-          break;
-        case OGG:
-          delete (OggPlayer*)resource->pointer;
-          break;
-#endif /* NO_AUDIO */
-#ifndef NO_TEXT
-        case TTF:
-          delete (Font*)resource->pointer;
-          break;
-#endif /* NO_TEXT */
-#ifndef NO_TEXTURES
-        case IMAGE:
-          delete (Texture*)resource->pointer;
-          break;
-#endif /* NO_TEXTURES */
-#ifndef NO_SHADERS
-        case SHADER:
-          delete (Shader*)resource->pointer;
-          break;
-#endif /* NO_SHADERS */
-        default:
-          PRINTF(2)("NOT YET IMPLEMENTED !!FIX FIX!!\n");
-          return false;
-          break;
-      }
+      delete resource->pointer;
       // deleting the List Entry:
       PRINTF(4)("Resource %s safely removed.\n", resource->name);

trunk/src/lib/util/loading/resource_manager.h

@@ -65 +65 @@
 };
 
-//! A Struct that keeps track about A resource its name its Type, and so on
+//! A Struct that keeps track about a resource its name its Type, and so on
 struct Resource
 {