[ViewVC] Diff of: cvs/deliantra/server/include/noise.h

Comparing deliantra/server/include/noise.h (file contents):
Revision 1.16 by root, Wed Nov 28 17:32:51 2012 UTC vs.
Revision 1.19 by root, Wed Nov 16 22:14:05 2016 UTC

  */
 #ifndef NOISE_H_
 #define NOISE_H_
+#if 0 // blitz++0.09
-#include <string.h> // possible workaround for tinyvec using memcpy without including string.h
+#include <string.h> // workaround for tinyvec using memcpy without including string.h
+#include <cstdlib> // workaround for tinyvec using labs without including cstdlib
 #include <blitz/tinyvec.h>
 #include <blitz/tinyvec-et.h>
-#include "global.h"
 typedef blitz::TinyVector<float,2> vec2d;
 typedef blitz::TinyVector<float,3> vec3d;
+#else
+// blitz++ 0.10 - not working
+#include <blitz/array.h>
+#include <blitz/tinyvec2.h>
+#include <blitz/tinyvec2.cc>
+template<typename T, int length>
+struct vecnd
+: blitz::TinyVector<T, length>
+{
+  static const int numElements = length;
+  using blitz::TinyVector<T, length>::TinyVector;
+};
+typedef vecnd<float,2> vec2d;
+typedef vecnd<float,3> vec3d;
+#endif
+#include "global.h"
 vec2d
 inline floor (vec2d v)
 {
   return vec2d (fastfloor (v[0]), fastfloor (v[1]));
   frac_gen (int octaves = 3, value_t lacunarity = 2, value_t hurst_expo = .5, uint32_t seed = 0);
   value_t noise (vec_t P, uint32_t seed = 0) func_pure
   {
-    return operator() (P, seed);
+    return this->operator() (P, seed);
   }
   value_t fBm (vec_t P) func_pure;
   value_t turbulence (vec_t P) func_pure;
   value_t multifractal (vec_t P, value_t offset = 1) func_pure;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines