# HG changeset patch
# User nenolod
# Date 1162325252 28800
# Node ID adf9f4b26039330d0ed6d9ff1ba8e67305bee6de
# Parent  1378854babe07504296d0e19668b5397f263ad66
[svn] - user-friendly names (UI side unimplemented still)

diff -r 1378854babe0 -r adf9f4b26039 ChangeLog
--- a/ChangeLog	Tue Oct 31 01:29:30 2006 -0800
+++ b/ChangeLog	Tue Oct 31 12:07:32 2006 -0800
@@ -1,3 +1,12 @@
+2006-10-31 09:29:30 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [308]
+  - a more complicated paranormal example preset
+  
+  trunk/src/paranormal/presets/Makefile                          |    3 
+  trunk/src/paranormal/presets/nenolod_-_flying_into_pastels.pnv |   38 ++++++++++
+  2 files changed, 40 insertions(+), 1 deletion(-)
+
+
 2006-10-31 08:20:37 +0000  William Pitcock <nenolod@nenolod.net>
   revision [306]
   - add some example presets
diff -r 1378854babe0 -r adf9f4b26039 src/paranormal/actuators.h
--- a/src/paranormal/actuators.h	Tue Oct 31 01:29:30 2006 -0800
+++ b/src/paranormal/actuators.h	Tue Oct 31 12:07:32 2006 -0800
@@ -56,7 +56,8 @@
 /* An operation's description */
 struct pn_actuator_desc
 {
-  const char *name;
+  const char *name;	/* e.g. "container_simple" */
+  const char *dispname;	/* e.g. "Simple Container" */
   const char *doc; /* documentation txt */
   const enum
   {
diff -r 1378854babe0 -r adf9f4b26039 src/paranormal/cmaps.c
--- a/src/paranormal/cmaps.c	Tue Oct 31 01:29:30 2006 -0800
+++ b/src/paranormal/cmaps.c	Tue Oct 31 12:07:32 2006 -0800
@@ -53,6 +53,7 @@
 struct pn_actuator_desc builtin_cmap_gradient =
 {
   "cmap_gradient",
+  "Normal colourmap",
   "Sets the colormap to a gradient going from <lcolor> to "
   "<hcolor>",
   0, cmap_gradient_opts,
@@ -86,6 +87,7 @@
 struct pn_actuator_desc builtin_cmap_bwgradient =
 {
   "cmap_bwgradient",
+  "Value-based colourmap",
   "Sets the colormap to a gradient going from black to "
   "while, via an intermediate color",
   0, cmap_bwgradient_opts,
diff -r 1378854babe0 -r adf9f4b26039 src/paranormal/containers.c
--- a/src/paranormal/containers.c	Tue Oct 31 01:29:30 2006 -0800
+++ b/src/paranormal/containers.c	Tue Oct 31 12:07:32 2006 -0800
@@ -80,6 +80,7 @@
 struct pn_actuator_desc builtin_container_simple =
 {
   "container_simple",
+  "Simple Container",
   "A simple (unconditional) container\n\n"
   "This is usually used as the root actuator of a list",
   ACTUATOR_FLAG_CONTAINER, NULL,
@@ -127,6 +128,7 @@
 struct pn_actuator_desc builtin_container_once =
 {
   "container_once",
+  "Initalization Container",
   "A container whose contents get executed exactly once.\n\n"
   "This is often used to set initial graphics states such as the\n"
   "pixel depth, or to display some text (such as credits)",
@@ -195,6 +197,7 @@
 struct pn_actuator_desc builtin_container_cycle =
 {
   "container_cycle",
+  "Branched-execution Container",
   "A container that alternates which of its children is executed;  it "
   "can either change children randomly or go in order.",
   ACTUATOR_FLAG_CONTAINER, container_cycle_opts,
diff -r 1378854babe0 -r adf9f4b26039 src/paranormal/freq.c
--- a/src/paranormal/freq.c	Tue Oct 31 01:29:30 2006 -0800
+++ b/src/paranormal/freq.c	Tue Oct 31 12:07:32 2006 -0800
@@ -34,6 +34,7 @@
 struct pn_actuator_desc builtin_freq_dots =
 {
   "freq_dots",
+  "Frequency Scope",
   "Draws dots varying vertically with the freqency data.",
   0, NULL,
   NULL, NULL, freq_dots_exec
@@ -56,6 +57,7 @@
 struct pn_actuator_desc builtin_freq_drops =
 {
   "freq_drops",
+  "Random Dots",
   "Draws dots at random on the image (louder music = more dots)",
   0, NULL,
   NULL, NULL, freq_drops_exec
diff -r 1378854babe0 -r adf9f4b26039 src/paranormal/general.c
--- a/src/paranormal/general.c	Tue Oct 31 01:29:30 2006 -0800
+++ b/src/paranormal/general.c	Tue Oct 31 12:07:32 2006 -0800
@@ -34,7 +34,7 @@
 
 struct pn_actuator_desc builtin_general_fade =
 {
-  "general_fade", "Decreases the color index of each pixel",
+  "general_fade", "Fade-out", "Decreases the color index of each pixel",
   0, general_fade_opts,
   NULL, NULL, general_fade_exec
 };
@@ -90,7 +90,7 @@
 
 struct pn_actuator_desc builtin_general_blur = 
 {
-  "general_blur", "A simple 1 pixel radius blur",
+  "general_blur", "Blur", "A simple 1 pixel radius blur",
   0, NULL,
   NULL, NULL, general_blur_exec
 };
diff -r 1378854babe0 -r adf9f4b26039 src/paranormal/wave.c
--- a/src/paranormal/wave.c	Tue Oct 31 01:29:30 2006 -0800
+++ b/src/paranormal/wave.c	Tue Oct 31 12:07:32 2006 -0800
@@ -51,7 +51,8 @@
 
 struct pn_actuator_desc builtin_wave_horizontal =
 {
-  "wave_horizontal", "Draws one or two waveforms horizontally across "
+  "wave_horizontal", "Horizontal Waveform",
+  "Draws one or two waveforms horizontally across "
   "the drawing surface",
   0, wave_horizontal_opts,
   NULL, NULL, wave_horizontal_exec
@@ -99,7 +100,8 @@
 
 struct pn_actuator_desc builtin_wave_vertical =
 {
-  "wave_vertical", "Draws one or two waveforms vertically across "
+  "wave_vertical", "Vertical Waveform",
+  "Draws one or two waveforms vertically across "
   "the drawing surface",
   0, wave_vertical_opts,
   NULL, NULL, wave_vertical_exec
@@ -156,7 +158,8 @@
 
 struct pn_actuator_desc builtin_wave_normalize =
 {
-  "wave_normalize", "Normalizes the waveform data used by the wave_* actuators",
+  "wave_normalize", "Normalize Waveform Data",
+  "Normalizes the waveform data used by the wave_* actuators",
   0, wave_normalize_opts,
   NULL, NULL, wave_normalize_exec
 };
@@ -202,7 +205,8 @@
 
 struct pn_actuator_desc builtin_wave_smooth =
 {
-  "wave_smooth", "Smooth out the waveform data used by the wave_* actuators",
+  "wave_smooth", "Smooth Waveform Data",
+  "Smooth out the waveform data used by the wave_* actuators",
   0, wave_smooth_opts,
   NULL, NULL, wave_smooth_exec
 };
@@ -238,7 +242,8 @@
 
 struct pn_actuator_desc builtin_wave_radial =
 {
-  "wave_radial", "Draws a single waveform varying"
+  "wave_radial", "Radial Waveform",
+  "Draws a single waveform varying"
   " radially from the center of the image",
   0, wave_radial_opts,
   NULL, NULL, wave_radial_exec
diff -r 1378854babe0 -r adf9f4b26039 src/paranormal/xform.c
--- a/src/paranormal/xform.c	Tue Oct 31 01:29:30 2006 -0800
+++ b/src/paranormal/xform.c	Tue Oct 31 12:07:32 2006 -0800
@@ -180,7 +180,8 @@
 
 struct pn_actuator_desc builtin_xform_spin =
 {
-  "xform_spin", "Rotates and radially scales the image",
+  "xform_spin", "Spin Transform", 
+  "Rotates and radially scales the image",
   0, xform_spin_opts,
   xform_spin_init, xform_spin_cleanup, xform_spin_exec
 };
@@ -280,7 +281,7 @@
 
 struct pn_actuator_desc builtin_xform_ripple =
 {
-  "xform_ripple", "Creates an ripple effect",
+  "xform_ripple", "Ripple Transform", "Creates an ripple effect",
   0, xform_ripple_opts,
   xform_ripple_init, xform_ripple_cleanup, xform_ripple_exec
 };
@@ -375,7 +376,8 @@
 
 struct pn_actuator_desc builtin_xform_bump_spin =
 {
-  "xform_bump_spin", "Rotate the image at a varying speed to create "
+  "xform_bump_spin", "Bump Transform", 
+  "Rotate the image at a varying speed to create "
   "the illusion of bumps",
   0, xform_bump_spin_opts,
   xform_bump_spin_init, xform_bump_spin_cleanup, xform_bump_spin_exec