Browse Source

Added noise extension and test files

Christophe Riccio 14 years ago
parent
commit
a805b42f8b
6 changed files with 118 additions and 0 deletions
  1. 1 0
      glm/ext.hpp
  2. 2 0
      glm/gtx/bit.hpp
  3. 70 0
      glm/gtx/noise.hpp
  4. 27 0
      glm/gtx/noise.inl
  5. 1 0
      test/gtx/CMakeLists.txt
  6. 17 0
      test/gtx/gtx-noise.cpp

+ 1 - 0
glm/ext.hpp

@@ -53,6 +53,7 @@
 #include "./gtx/matrix_query.hpp"
 #include "./gtx/mixed_product.hpp"
 #include "./gtx/multiple.hpp"
+#include "./gtx/noise.hpp"
 #include "./gtx/norm.hpp"
 #include "./gtx/normal.hpp"
 #include "./gtx/normalize_dot.hpp"

+ 2 - 0
glm/gtx/bit.hpp

@@ -36,6 +36,7 @@ namespace glm
 
 		/// \addtogroup gtx_bit
 		///@{
+
 		//! Build a mask of 'count' bits
 		//! From GLM_GTX_bit extension.
 		template <typename genIType>
@@ -99,6 +100,7 @@ namespace glm
 		//! From GLM_GTX_bit extension.
 		template <typename genType>
 		genType bitRotateLeft(genType const & In, std::size_t Shift);
+
 		///@}
 
 	}//namespace bit

+ 70 - 0
glm/gtx/noise.hpp

@@ -0,0 +1,70 @@
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net)
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// Based on the work of Stefan Gustavson and Ashima Arts on "webgl-noise": 
+// https://github.com/ashima/webgl-noise 
+// Following Stefan Gustavson's paper "Simplex noise demystified": 
+// http://www.itn.liu.se/~stegu/simplexnoise/simplexnoise.pdf
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// Created : 2011-04-21
+// Updated : 2011-04-21
+// Licence : This source is under MIT License
+// File    : glm/gtx/noise.hpp
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// Dependency:
+// - GLM core
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#ifndef glm_gtx_noise
+#define glm_gtx_noise
+
+// Dependency:
+#include "../glm.hpp"
+
+#if(defined(GLM_MESSAGES) && !defined(glm_ext))
+#	pragma message("GLM: GLM_GTX_noise extension included")
+#endif
+
+namespace glm
+{
+	namespace test{
+		void main_gtx_noise();
+	}//namespace test
+
+	namespace gtx{
+	//! GLM_GTX_noise extension: Comparison functions for a user defined epsilon values.
+	namespace noise
+	{
+		/// \addtogroup gtx_noise
+		///@{
+
+		//! Classic perlin noise.
+		//! From GLM_GTX_noise extension.
+		template <typename vecType> 
+		typename vecType::value_type cnoise(
+			vecType const & p);
+		
+		//! Periodic perlin noise.
+		//! From GLM_GTX_noise extension.
+		template <typename vecType> 
+		typename vecType::value_type pnoise(
+			vecType const & p, 
+			vecType const & rep);
+
+		//! Simplex noise.
+		//! From GLM_GTX_noise extension.
+		template <typename vecType> 
+		typename vecType::value_type snoise(
+			vecType const & p);
+
+		///@}
+
+	}//namespace noise
+	}//namespace gtx
+}//namespace glm
+
+#include "noise.inl"
+
+namespace glm{using namespace gtx::noise;}
+
+#endif//glm_gtx_noise

+ 27 - 0
glm/gtx/noise.inl

@@ -0,0 +1,27 @@
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net)
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// Based on the work of Stefan Gustavson and Ashima Arts on "webgl-noise": 
+// https://github.com/ashima/webgl-noise 
+// Following Stefan Gustavson's paper "Simplex noise demystified": 
+// http://www.itn.liu.se/~stegu/simplexnoise/simplexnoise.pdf
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// Created : 2011-04-21
+// Updated : 2011-04-21
+// Licence : This source is under MIT License
+// File    : glm/gtx/noise.inl
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// Dependency:
+// - GLM core
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+namespace glm{
+namespace gtx{
+namespace noise
+{
+
+
+
+}//namespace noise
+}//namespace gtx
+}//namespace glm

+ 1 - 0
test/gtx/CMakeLists.txt

@@ -1,3 +1,4 @@
 glmCreateTestGTC(gtx-bit)
+glmCreateTestGTC(gtx-noise)
 glmCreateTestGTC(gtx-simd-vec4)
 glmCreateTestGTC(gtx-simd-mat4)

+ 17 - 0
test/gtx/gtx-noise.cpp

@@ -0,0 +1,17 @@
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net)
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// Created : 2011-04-21
+// Updated : 2011-04-21
+// Licence : This source is under MIT licence
+// File    : test/gtx/noise.cpp
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#include <glm/glm.hpp>
+#include <glm/gtx/noise.hpp>
+#include <iostream>
+
+int main()
+{
+
+}