Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Jun 5, 2006, 11:49:26 AM (19 years ago)
Author:
bensch
Message:

trunk: merged the gui back
merged with command:
svn merge -r8114:HEAD https://svn.orxonox.net/orxonox/branches/gui .
→ no conflicts

Location:
trunk/src/lib/util
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified trunk/src/lib/util/color.h

    r7195 r8145  
    1616{
    1717public:
     18  Color(float r, float g, float b, float a) :_r(r), _g(g), _b(b), _a(a) {};
     19  Color(const Color& c) { _r = c._r; _g = c._g; _b = c._b; _a = c._a; };
     20
     21  float r() const { return _r; }
     22  float& r() { return _r; }
     23  float g() const { return _g; }
     24  float& g() { return _g; }
     25  float b() const { return _b; }
     26  float& b() { return _b; }
     27  float a() const { return _a; }
     28  float& a() { return _a; }
     29
     30public:
    1831  static Vector RGBtoHSV (const Vector& RGB);
    1932  static void RGBtoHSV (const Vector& RGB, Vector& HSV);
     
    2437  static float minrgb(float r, float g, float b);
    2538  static float maxrgb(float r, float g, float b);
     39
     40  float       _r;     //!< Red Value.
     41  float       _g;     //!< Green Value.
     42  float       _b;     //!< Blue Value.
     43  float       _a;     //!< Alpha Value.
     44
    2645};
    2746
  • TabularUnified trunk/src/lib/util/count_pointer.h

    r6669 r8145  
    1111    explicit CountPointer(X* p = 0) // allocate a new counter
    1212        : itsCounter(0) { if (p) itsCounter = new counter(p); }
    13     ~CountPointer() { release(); }
     13    virtual ~CountPointer() { release(); }
    1414    CountPointer(const CountPointer& r) { acquire(r.itsCounter); }
    1515    CountPointer& operator=(const CountPointer& r)
Note: See TracChangeset for help on using the changeset viewer.