Changeset 7195 in orxonox.OLD for trunk

Timestamp:

Mar 7, 2006, 11:12:31 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: performance issues

Location:

trunk/src/lib

Files:

• graphics/importer/texture_sequence.h (modified) (1 diff)
• graphics/shader.h (modified) (1 diff)
• util/color.cc (modified) (3 diffs)
• util/color.h (modified) (1 diff)
• util/loading/resource.cc (modified) (2 diffs)
• util/loading/resource.h (modified) (3 diffs)

trunk/src/lib/graphics/importer/texture_sequence.h

@@ -9 +9 @@
 #include "texture.h"
 
-#include "glincl.h"
-
 #include <vector>
 #include <stdarg.h>
 
-/* Forward Declaration */
-struct SDL_Surface;
 
 //! A Class, that reads in Textures from different fileformats.

trunk/src/lib/graphics/shader.h

@@ -42 +42 @@
   static bool checkShaderAbility();
 
-  inline static bool shaderActive() { return (Shader::storedShader != NULL)?true:false; };
+  inline static bool shaderActive() { return (Shader::storedShader != NULL)? true : false; };
   inline static Shader* getActiveShader() { return Shader::storedShader; };
   inline static void suspendShader() { Shader* currShader = storedShader; if (storedShader!= NULL) { Shader::deactivateShader(); Shader::storedShader = currShader;} };

trunk/src/lib/util/color.cc

@@ -17 +17 @@
 
 #include "color.h"
-#include "vector.h"
+#include <stdio.h>
 
 using namespace std;
 
 
-
-
-#include <stdio.h>
-
 /**
- * transforms from RGB to HSVtoRGB
- * @param RGB the RGB-color [0-1]
+ * @brief transforms from RGB to HSVtoRGB
+ * @param RGB: the RGB-color [0-1]
  * @returns HSV: with values (h[0-360(degree)],s[0,1],v[0,1])
  */
 Vector Color::RGBtoHSV(const Vector& RGB)
+{
+  Vector HSV;
+  RGBtoHSV(RGB, HSV);
+  return HSV;
+}
+
+/**
+ * @brief transforms from RGB to HSVtoRGB
+ * @param RGB: the RGB-color [0-1]
+ * @param HSV: with values (h[0-360(degree)],s[0,1],v[0,1])
+ */
+void Color::RGBtoHSV(const Vector& RGB, Vector& HSV)
 {
   float r = RGB.x;
@@ -70 +78 @@
       h += 360.0;
   }
-  return Vector(h, s, v);
+  HSV = Vector(h, s, v);
 }
 
 /**
- * converts a Color from HSV to RGBtoHSV
+ * @brief converts a Color from HSV to RGBtoHSV
  * @param HSV: Vector with values (h[0-360(degree)],s[0,1],v[0,1])
  * @returns RGB: Vector [0-1]
  */
 Vector Color::HSVtoRGB(const Vector& HSV)
+{
+  Vector RGB;
+  HSVtoRGB(HSV, RGB);
+  return RGB;
+}
+
+/**
+ * @brief converts a Color from HSV to RGBtoHSV
+ * @param HSV: Vector with values (h[0-360(degree)],s[0,1],v[0,1])
+ * @param RGB: Vector [0-1]
+ */
+void Color::HSVtoRGB(const Vector& HSV, Vector& RGB)
 {
   float h = HSV.x;
@@ -141 +161 @@
     }
   }
-  return Vector(r,g,b);
+  RGB = Vector(r,g,b);
 }
 

trunk/src/lib/util/color.h

@@ -10 +10 @@
 #define _COLOR_H
 
-//#include "vector.h"
-class Vector;
+#include "vector.h"
 
 //! a very abstract Class that helps transforming Colors into different Systems
 class Color
 {
-  public:
+public:
   static Vector RGBtoHSV (const Vector& RGB);
+  static void RGBtoHSV (const Vector& RGB, Vector& HSV);
   static Vector HSVtoRGB (const Vector& HSV);
+  static void HSVtoRGB (const Vector& HSV, Vector& RGB);
 
+private:
   static float minrgb(float r, float g, float b);
   static float maxrgb(float r, float g, float b);

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

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 */
 
-//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_LOADING
 
 #include "resource.h"
@@ -23 +23 @@
 /**
  * standard constructor
- * @todo this constructor is not jet implemented - do it
 */
-Resource::Resource ()
+Resource::Resource (const std::string& fileName)
 {
    this->setClassID(CL_RESOURCE, "Resource");
 
-   /* If you make a new class, what is most probably the case when you write this file
-      don't forget to:
-       1. Add the new file new_class.cc to the ./src/Makefile.am
-       2. Add the class identifier to ./src/class_id.h eg. CL_NEW_CLASS
-
-      Advanced Topics:
-      - if you want to let your object be managed via the ObjectManager make sure to read
-        the object_manager.h header comments. You will use this most certanly only if you
-        make many objects of your class, like a weapon bullet.
-   */
 }
-
 
 /**
  * standard deconstructor
-*/
+ */
 Resource::~Resource ()
 {

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

@@ -1 +1 @@
 /*!
  * @file resource.h
- * @brief Definition of ...
+ * @brief Definition of a Resource.
 */
 
@@ -9 +9 @@
 #include "base_object.h"
 #include "multi_type.h"
-
+#include <string>
 
 // FORWARD DECLARATION
@@ -15 +15 @@
 
 
-//! A class for ...
+//! 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        =   0,
+  RP_LEVEL     =   1,
+  RP_CAMPAIGN  =   2,
+  RP_GAME      =   3
+};
+
+
+
+//! A Resource is an Object, that can be loaded from Disk
+/**
+ *
+ */
 class Resource : virtual public BaseObject {
 
  public:
-  Resource();
+   Resource(const std::string& fileName);
   virtual ~Resource();
 
-  virtual bool load(const char* fileName, const MultiType& param1, const MultiType& param2);
+  virtual bool load(std::string& fileName, const MultiType& param1, const MultiType& param2);
   virtual bool reload();
   virtual bool unload();
 
  private:
+   std::string       fileName;
 
+   unsigned int      referenceCount;    //!< How many times this Resource has been loaded.
+/// TODO REMOVE THIS:   ResourceType      type;              //!< ResourceType of this Resource.
+   ResourcePriority  prio;              //!< The Priority of this resource. (can only be increased, so noone else will delete this)
+
+   MultiType         param[3];          //!< The Parameters given to this Resource.
 };