Changeset 792 for code/branches/core/src/util

Timestamp:

Feb 9, 2008, 7:32:06 PM (17 years ago)

Author:

landauf

Message:

upload of the work i did before the exams (not yet finished nor working)

Location:

code/branches/core/src/util

Files:

• CMakeLists.txt (modified) (1 diff)
• Convert.h (modified) (5 diffs)
• Math.cc (added)
• Math.h (modified) (2 diffs)
• MultiType.h (added)
• MultiTypeMath.cc (added)
• MultiTypeMath.h (added)
• MultiTypePrimitive.cc (added)
• MultiTypePrimitive.h (added)
• MultiTypeString.cc (added)
• MultiTypeString.h (added)
• String.cc (added)
• String.h (added)
• String2Number.h (modified) (2 diffs)
• UtilPrereqs.h (added)
• substring.h (modified) (2 diffs)

code/branches/core/src/util/CMakeLists.txt

@@ -5 +5 @@
 SET (UTIL_SRC_FILES
   ${TINYXML_SRC_FILES}
+  Math.cc
+  String.cc
   substring.cc
+  MultiTypePrimitive.cc
+  MultiTypeString.cc
+  MultiTypeMath.cc
 )
 
-IF(WIN32)
-  ADD_LIBRARY( util ${UTIL_SRC_FILES} )
-ELSE(WIN32)
-  ADD_LIBRARY( util SHARED ${UTIL_SRC_FILES} )
-ENDIF(WIN32)
+ADD_LIBRARY( util SHARED ${UTIL_SRC_FILES} )
 SET_TARGET_PROPERTIES( util PROPERTIES LINK_FLAGS "--no-undefined" )
-
 
 IF(TESTING_ENABLED)
   ADD_SUBDIRECTORY(testing)
 ENDIF(TESTING_ENABLED)
+
+TARGET_LINK_LIBRARIES( util
+  ${OGRE_LIBRARIES}
+)

code/branches/core/src/util/Convert.h

@@ -36 +36 @@
 #include <sstream>
 
+#include "UtilPrereqs.h"
 
 // DEFAULT CLASS
 template <typename FromType, typename ToType>
-class Converter
+class _UtilExport Converter
 {
  public:
@@ -50 +51 @@
 // PARTIAL SPECIALIZATION TO CONVERT TO STRINGS
 template<typename FromType>
-class Converter<FromType, std::string>
+class _UtilExport Converter<FromType, std::string>
 {
  public:
@@ -68 +69 @@
 // PARTIAL SPECIALIZATION TO CONVERT FROM STRING
 template<typename ToType>
-class Converter<std::string, ToType>
+class _UtilExport Converter<std::string, ToType>
 {
  public:
@@ -83 +84 @@
 // FUNCTION SO WE DO NOT HAVE TO TELL THE COMPILER ABOUT THE TYPE
 template<typename FromType, typename ToType>
-static bool ConvertValue(ToType* output, const FromType& input)
+static _UtilExport bool ConvertValue(ToType* output, const FromType& input)
 {
   Converter<FromType, ToType> converter;
@@ -91 +92 @@
 // THE SAME, BUT WITH DEFAULT VALUE
 template<typename FromType, typename ToType>
-static bool ConvertValue(ToType* output, const FromType& input, const ToType& fallback)
+static _UtilExport bool ConvertValue(ToType* output, const FromType& input, const ToType& fallback)
 {
   Converter<FromType, ToType> converter;

code/branches/core/src/util/Math.h

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+#ifndef _Math_H__
+#define _Math_H__
+
+#include <ostream>
+
+#include "UtilPrereqs.h"
+
 #include <OgreMath.h>
 #include <OgreVector2.h>
@@ -18 +52 @@
   typedef Ogre::ColourValue ColourValue;
 }
+
+_UtilExport std::ostream& operator<<(std::ostream& out, const orxonox::Radian& radian);
+_UtilExport std::istream& operator>>(std::istream& in, orxonox::Radian& radian);
+_UtilExport std::ostream& operator<<(std::ostream& out, const orxonox::Degree& degree);
+_UtilExport std::istream& operator>>(std::istream& in, orxonox::Degree& degree);
+
+template <typename T>
+inline _UtilExport T sgn(T x)
+{
+    return (x >= 0) ? 1 : -1;
+}
+
+template <typename T>
+inline _UtilExport T min(T a, T b)
+{
+    return (a <= b) ? a : b;
+}
+
+template <typename T>
+inline _UtilExport T max(T a, T b)
+{
+    return (a >= b) ? a : b;
+}
+
+template <typename T>
+inline _UtilExport T clamp(T x, T min, T max)
+{
+    if (x < min)
+        return min;
+
+    if (x > max)
+        return max;
+
+    return x;
+}
+
+template <typename T>
+inline _UtilExport T square(T x)
+{
+    return x*x;
+}
+
+template <typename T>
+inline _UtilExport T cube(T x)
+{
+    return x*x*x;
+}
+
+template <typename T>
+inline _UtilExport int floor(T x)
+{
+    return (int)(x);
+}
+
+template <typename T>
+inline _UtilExport int ceil(T x)
+{
+    int temp = floor(x);
+    return (temp != x) ? (temp + 1) : temp;
+}
+
+template <typename T>
+inline _UtilExport int round(T x)
+{
+    return (int)(x + 0.5);
+}
+
+template <typename T>
+_UtilExport T interpolate(float time, const T& start, const T& end)
+{
+    return time * (end - start) + start;
+}
+
+template <typename T>
+_UtilExport T interpolateSmooth(float time, const T& start, const T& end)
+{
+    return (-2 * (end - start) * cube(time)) + (3 * (end - start) * square(time)) + start;
+}
+
+inline _UtilExport float rnd()
+{
+    return ((float)rand() / RAND_MAX);
+}
+
+inline _UtilExport float rnd(float max)
+{
+    return rnd() * max;
+}
+
+inline _UtilExport float rnd(float min, float max)
+{
+    return rnd(max - min) + min;
+}
+
+#endif /* _Math_H__ */

code/branches/core/src/util/String2Number.h

@@ -7 +7 @@
 
 #include "core/Debug.h"
+#include "UtilPrereqs.h"
 
 /**
@@ -23 +24 @@
 
 template <class T>
-class String2Number
+class _UtilExport String2Number
 {
   private:

code/branches/core/src/util/substring.h

@@ -59 +59 @@
 #include <string>
 
+#include "UtilPrereqs.h"
 
 //! A class that can load one string and split it in multipe ones
@@ -65 +66 @@
  * It can be used, to Split strings append them and join them again.
  */
-class SubString
+class _UtilExport SubString
 {
 public: