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

Timestamp:

May 28, 2006, 3:48:13 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the gui branche back
merged with command:
​https://svn.orxonox.net/orxonox/branches/gui
no conflicts

Location:

trunk/src/lib/util

Files:

• color.cc (modified) (1 diff)
• timer.cc (copied) (copied from branches/gui/src/lib/util/timer.cc)
• timer.h (copied) (copied from branches/gui/src/lib/util/timer.h)

trunk/src/lib/util/color.cc

@@ -113 +113 @@
   }
   else {
-   if(h == 360.)
-     h = 0.0;
+   if(h >= 360.)
+     h = h - (float)((int)(ceilf(h) / 360.0));
     h /= 60.;
     i = (int) h;