Merged 0.0 changes from revision 3234 to 3317 to trunk.

5 files changed, 218 insertions, 113 deletions

diff --git a/src/utils/fastsqrt.h b/src/utils/fastsqrt.h
new file mode 100644
index 00000000..8da1d354
--- /dev/null
+++ b/src/utils/fastsqrt.h
@@ -0,0 +1,24 @@
+/* A very fast function to calculate the approximate inverse square root of a

+ * floating point value and a helper function that uses it for getting the

+ * normal squareroot. For an explanation of the inverse squareroot function

+ * read:

+ * http://www.math.purdue.edu/~clomont/Math/Papers/2003/InvSqrt.pdf

+ *

+ * Unfortunately the original creator of this function seems to be unknown.

+ */

+

+float fastInvSqrt(float x)

+{

+    union { int i; float x; } tmp;

+    float xhalf = 0.5f * x;

+    tmp.x = x;

+    tmp.i = 0x5f375a86 - (tmp.i >> 1);

+    x = tmp.x;

+    x = x * (1.5f - xhalf * x * x);

+    return x;

+}

+

+float fastSqrt(float x)

+{

+    return 1.0f / fastInvSqrt(x);

+}

diff --git a/src/utils/minmax.h b/src/utils/minmax.h
new file mode 100644
index 00000000..1add2b7e
--- /dev/null
+++ b/src/utils/minmax.h
@@ -0,0 +1,47 @@
+/*

+ *  The Mana World

+ *  Copyright 2006 The Mana World Development Team

+ *

+ *  This file is part of The Mana World.

+ *

+ *  The Mana World 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

+ *  any later version.

+ *

+ *  The Mana World 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 The Mana World; if not, write to the Free Software

+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+ *

+ */

+

+/**

+ * Returns a random numeric value that is larger than or equal min and smaller

+ * than max

+ */

+

+template <typename T> struct MinMax

+{

+    void set(T min, T max)

+    {

+        minVal=min; maxVal=max;

+    }

+

+    void set(T val)

+    {

+        set(val, val);

+    }

+

+    T value()

+    {

+        return (T)(minVal + (maxVal - minVal) * (rand() / ((double) RAND_MAX + 1)));

+    }

+

+    T minVal;

+    T maxVal;

+};

diff --git a/src/utils/wingettimeofday.h b/src/utils/wingettimeofday.h
index a5537f39..28afb7e5 100644
--- a/src/utils/wingettimeofday.h
+++ b/src/utils/wingettimeofday.h
@@ -1,113 +1,113 @@
-/*

- *  The Mana World

- *  Copyright 2004 The Mana World Development Team

- *

- *  This file is part of The Mana World.

- *

- *  The Mana World 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

- *  any later version.

- *

- *  The Mana World 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 The Mana World; if not, write to the Free Software

- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- *

- *  $Id$

- */

-

-#ifndef _TMW_WINGETTIMEOFDAY_H_

-#define _TMW_WINGETTIMEOFDAY_H_

-

-#ifdef WIN32

-

-#include <windows.h>

-

-/*

- * the function gettimeofday() is available on UNIX but not on windows.

- * this header defines a windows implementation as a

- * GetSystemTimeAsFileTime() wrapper.

- */

-

-int gettimeofday(struct timeval* tv, void *tz)

-/*---------------------------------------------------------------

- * Copyright (c) 1999,2000,2001,2002,2003

- * The Board of Trustees of the University of Illinois

- * All Rights Reserved.

- *---------------------------------------------------------------

- * Permission is hereby granted, free of charge, to any person

- * obtaining a copy of this software (Iperf) and associated

- * documentation files (the "Software"), to deal in the Software

- * without restriction, including without limitation the

- * rights to use, copy, modify, merge, publish, distribute,

- * sublicense, and/or sell copies of the Software, and to permit

- * persons to whom the Software is furnished to do

- * so, subject to the following conditions:

- *

- *

- * Redistributions of source code must retain the above

- * copyright notice, this list of conditions and

- * the following disclaimers.

- *

- *

- * Redistributions in binary form must reproduce the above

- * copyright notice, this list of conditions and the following

- * disclaimers in the documentation and/or other materials

- * provided with the distribution.

- *

- *

- * Neither the names of the University of Illinois, NCSA,

- * nor the names of its contributors may be used to endorse

- * or promote products derived from this Software without

- * specific prior written permission.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

- * NONINFRINGEMENT. IN NO EVENT SHALL THE CONTIBUTORS OR COPYRIGHT

- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE

- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- * ________________________________________________________________

- * National Laboratory for Applied Network Research

- * National Center for Supercomputing Applications

- * University of Illinois at Urbana-Champaign

- * http://www.ncsa.uiuc.edu

- * ________________________________________________________________

- *

- * gettimeofday.c

- * by Mark Gates <mgates@nlanr.net>

- * -------------------------------------------------------------------

- * A (hack) implementation of gettimeofday for Windows.

- * Since I send sec/usec in UDP packets, this made the most sense.

- * ------------------------------------------------------------------- */

-{

-    FILETIME time;

-    double   timed;

-

-    GetSystemTimeAsFileTime( &time );

-

-    // Apparently Win32 has units of 1e-7 sec (tenths of microsecs)

-    // 4294967296 is 2^32, to shift high word over

-    // 11644473600 is the number of seconds between

-    // the Win32 epoch 1601-Jan-01 and the Unix epoch 1970-Jan-01

-    // Tests found floating point to be 10x faster than 64bit int math.

-

-    timed = ((time.dwHighDateTime * 4294967296e-7) - 11644473600.0) +

-            (time.dwLowDateTime  * 1e-7);

-

-    tv->tv_sec  = (long) timed;

-    tv->tv_usec = (long) ((timed - tv->tv_sec) * 1e6);

-

-    return 0;

-}

-

-

-#endif // WIN32

-#endif

+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World 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
+ *  any later version.
+ *
+ *  The Mana World 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 The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_WINGETTIMEOFDAY_H_
+#define _TMW_WINGETTIMEOFDAY_H_
+
+#ifdef WIN32
+
+#include <windows.h>
+
+/*
+ * the function gettimeofday() is available on UNIX but not on windows.
+ * this header defines a windows implementation as a
+ * GetSystemTimeAsFileTime() wrapper.
+ */
+
+int gettimeofday(struct timeval* tv, void *tz)
+/*---------------------------------------------------------------
+ * Copyright (c) 1999,2000,2001,2002,2003
+ * The Board of Trustees of the University of Illinois
+ * All Rights Reserved.
+ *---------------------------------------------------------------
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software (Iperf) and associated
+ * documentation files (the "Software"), to deal in the Software
+ * without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit
+ * persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ *
+ * Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and
+ * the following disclaimers.
+ *
+ *
+ * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimers in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ *
+ * Neither the names of the University of Illinois, NCSA,
+ * nor the names of its contributors may be used to endorse
+ * or promote products derived from this Software without
+ * specific prior written permission.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE CONTIBUTORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * ________________________________________________________________
+ * National Laboratory for Applied Network Research
+ * National Center for Supercomputing Applications
+ * University of Illinois at Urbana-Champaign
+ * http://www.ncsa.uiuc.edu
+ * ________________________________________________________________
+ *
+ * gettimeofday.c
+ * by Mark Gates <mgates@nlanr.net>
+ * -------------------------------------------------------------------
+ * A (hack) implementation of gettimeofday for Windows.
+ * Since I send sec/usec in UDP packets, this made the most sense.
+ * ------------------------------------------------------------------- */
+{
+    FILETIME time;
+    double   timed;
+
+    GetSystemTimeAsFileTime( &time );
+
+    // Apparently Win32 has units of 1e-7 sec (tenths of microsecs)
+    // 4294967296 is 2^32, to shift high word over
+    // 11644473600 is the number of seconds between
+    // the Win32 epoch 1601-Jan-01 and the Unix epoch 1970-Jan-01
+    // Tests found floating point to be 10x faster than 64bit int math.
+
+    timed = ((time.dwHighDateTime * 4294967296e-7) - 11644473600.0) +
+            (time.dwLowDateTime  * 1e-7);
+
+    tv->tv_sec  = (long) timed;
+    tv->tv_usec = (long) ((timed - tv->tv_sec) * 1e6);
+
+    return 0;
+}
+
+
+#endif // WIN32
+#endif
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index 7c917dc0..e30450f0 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -39,6 +39,20 @@ namespace XML
         return ret;
     }
 
+    double
+    getFloatProperty(xmlNodePtr node, const char* name, double def)
+    {
+        double &ret = def;
+
+        xmlChar *prop = xmlGetProp(node, BAD_CAST name);
+        if (prop) {
+            ret = atof((char*)prop);
+            xmlFree(prop);
+        }
+
+        return ret;
+    }
+
     std::string
     getProperty(xmlNodePtr node, const char *name, const std::string &def)
     {
@@ -51,4 +65,13 @@ namespace XML
 
         return def;
     }
+
+    xmlNodePtr findFirstChildByName(xmlNodePtr parent, const char *name)
+    {
+        for_each_xml_child_node(child, parent)
+            if (xmlStrEqual(child->name, BAD_CAST name))
+                return child;
+
+        return NULL;
+    }
 }
diff --git a/src/utils/xml.h b/src/utils/xml.h
index db4c264a..ef3bad3d 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -40,10 +40,21 @@ namespace XML
     getProperty(xmlNodePtr node, const char *name, int def);
 
     /**
+     * Gets an floating point property from an xmlNodePtr.
+     */
+    double
+    getFloatProperty(xmlNodePtr node, const char *name, double def);
+
+    /**
      * Gets a string property from an xmlNodePtr.
      */
     std::string
     getProperty(xmlNodePtr node, const char *name, const std::string &def);
+
+    /**
+     * Finds the first child node with the given name
+     */
+    xmlNodePtr findFirstChildByName(xmlNodePtr parent, const char *name);
 }
 
 #define for_each_xml_child_node(var, parent) \