add perlibn/worley menu items

and bump version to 8.4

Author: jcupitt

ChangeLog

@@ -1,3 +1,6 @@
+started 8.4
+- added Perlin and Worley menu items
+
 started 8.3.1 on 19/5/16
 - disable debug by default, thanks Benjamin
 - configure changes to help win64

configure.ac

@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([nip2], [8.3.1], [[email protected]])
+AC_INIT([nip2], [8.4.0], [[email protected]])
 
 # foreign stops complaints about a missing README (we use README.md instead)
 # and missing INSTALL (the standard Gnu INSTALL is not very useful)
@@ -16,8 +16,8 @@ dnl of them.
 dnl
 
 m4_define([nip_major_version], [8])
-m4_define([nip_minor_version], [3])
-m4_define([nip_micro_version], [1])
+m4_define([nip_minor_version], [4])
+m4_define([nip_micro_version], [0])
 m4_define([nip_version],
           [nip_major_version.nip_minor_version.nip_micro_version])
 

share/nip2/start/Image.def

@@ -1644,33 +1644,73 @@ Pattern_images_item = class
 		}
 	}
 
-	Gaussian_item = class 
-		Menuaction "Gaussian _Noise" "make an image of gaussian noise" {
-		action = class
-			_result {
-			_vislevel = 3;
+	Noise_item = class
+		Menupullright "_Noise" "various noise generators" {
+		Gaussian_item = class 
+			Menuaction "_Gaussian" "make an image of gaussian noise" {
+			action = class
+				_result {
+				_vislevel = 3;
 
-			nwidth = Expression "Image width (pixels)" 64;
-			nheight = Expression "Image height (pixels)" 64;
-			mean = Scale "Mean" 0 255 128;
-			deviation = Scale "Deviation" 0 128 50;
+				nwidth = Expression "Image width (pixels)" 64;
+				nheight = Expression "Image height (pixels)" 64;
+				mean = Scale "Mean" 0 255 128;
+				deviation = Scale "Deviation" 0 128 50;
 
-			_result = Image (im_gaussnoise (to_real nwidth) (to_real nheight) 
-				mean.value deviation.value);
+				_result = Image (im_gaussnoise 
+					(to_real nwidth) (to_real nheight) 
+					mean.value deviation.value);
+			}
 		}
-	}
 
-	Fractal_item = class 
-		Menuaction "_Fractal" "make a fractal image" {
-		action = class
-			_result {
-			_vislevel = 3;
+		Fractal_item = class 
+			Menuaction "_Fractal" "make a fractal noise image" {
+			action = class
+				_result {
+				_vislevel = 3;
 
-			nsize = Expression "Image size (pixels)" 64;
-			dimension = Scale "Dimension" 2.001 2.999 2.001;
+				nsize = Expression "Image size (pixels)" 64;
+				dimension = Scale "Dimension" 2.001 2.999 2.001;
+
+				_result = Image (im_fractsurf (to_real nsize) dimension.value); 
+			}
+		}
+
+		Perlin_item = class 
+			Menuaction "_Perlin" "Perlin noise image" {
+			action = class
+				_result {
+				_vislevel = 3;
+
+				nwidth = Expression "Image width (pixels)" 64;
+				nheight = Expression "Image height (pixels)" 64;
+				cell_size = Expression "Cell size (pixels)" 8;
+				eight = Toggle "Eight bit output" true;
+
+				_result 
+					= 128 * im + 128, eight
+					= im
+				{
+					im = perlin cell_size nwidth nheight;
+				}
+			}
+		}
+
+		Worley_item = class 
+			Menuaction "_Worley" "Worley noise image" {
+			action = class
+				_result {
+				_vislevel = 3;
+
+				nwidth = Expression "Image width (pixels)" 512;
+				nheight = Expression "Image height (pixels)" 512;
+				cell_size = Expression "Cell size (pixels)" 256;
 
-			_result = Image (im_fractsurf (to_real nsize) dimension.value); 
+				_result 
+					= worley cell_size nwidth nheight;
+			}
 		}
+
 	}
 
 	Checkerboard_item = class 

share/nip2/start/_stdenv.def

@@ -2505,3 +2505,19 @@ mapim interp ind in
 		[out] = vips_call "mapim" [im, ind] [$interpolate => interp];
 	}
 }
+
+perlin cell width height
+	= Image im
+{
+	[im] = vips_call "perlin" [to_real width, to_real height] [
+		$cell_size => to_real cell 
+	];
+}
+
+worley cell width height
+	= Image im
+{
+	[im] = vips_call "worley" [to_real width, to_real height] [
+		$cell_size => to_real cell 
+	];
+}