changeset 188:0d826917c56f trunk

[svn] - 64-bit safety (pass 1 of 2)

--- a/ChangeLog	Thu Nov 02 02:35:04 2006 -0800
+++ b/ChangeLog	Thu Nov 02 18:22:02 2006 -0800
@@ -1,3 +1,12 @@
[phone]:35:04 +0000  William Pitcock <[e-mail]>
+  revision [374]
+  - add worms preset. demonstrates the floating particles renderer, 298 times/frame.
+  
+  trunk/src/paranormal/presets/Makefile            |    3 
+  trunk/src/paranormal/presets/nenolod_-_worms.pnv |  920 +++++++++++++++++++++++
+  2 files changed, 922 insertions(+), 1 deletion(-)
+
+
 2006-11-02 10:30:44 +0000  William Pitcock <[e-mail]>
   revision [372]
   - add floating particles.

--- a/src/paranormal/actuators.c	Thu Nov 02 02:35:04 2006 -0800
+++ b/src/paranormal/actuators.c	Thu Nov 02 18:22:02 2006 -0800
@@ -98,10 +98,10 @@
   if (actuator->desc->option_descs)
     {
       /* count the options */
-      for (i=0; actuator->desc->option_descs[i].name; i++);
+      for (i=0; actuator->desc->option_descs[i].name != NULL; i++);
 
-      actuator->options = g_new (struct pn_actuator_option, i);
-      for (i=0; actuator->desc->option_descs[i].name; i++)
+      actuator->options = g_new0 (struct pn_actuator_option, i + 1);
+      for (i=0; actuator->desc->option_descs[i].name != NULL; i++)
 	{
 	  actuator->options[i].desc = &actuator->desc->option_descs[i];
 

--- a/src/paranormal/cmaps.c	Thu Nov 02 02:35:04 2006 -0800
+++ b/src/paranormal/cmaps.c	Thu Nov 02 18:22:02 2006 -0800
@@ -34,7 +34,7 @@
     OPT_TYPE_COLOR, { cval: {0, 0, 0} } },
   { "hcolor", "The high color used in the gradient generation",
     OPT_TYPE_COLOR, { cval: {0, 0, 0} } },
-  { 0 }
+  { NULL }
 };
 
 static void
@@ -66,7 +66,7 @@
   STD_CMAP_OPTS,
   { "color", "The intermediate color to use in the gradient",
     OPT_TYPE_COLOR, { cval: {191, 191, 191} } },
-  { 0 }
+  { NULL }
 };
 
 static void

--- a/src/paranormal/containers.c	Thu Nov 02 02:35:04 2006 -0800
+++ b/src/paranormal/containers.c	Thu Nov 02 18:22:02 2006 -0800
@@ -146,7 +146,7 @@
     "child to be executed", OPT_TYPE_INT, { ival: 20 } },
   { "beat", "Whether or not the change should only occur on a beat",
     OPT_TYPE_BOOLEAN, { bval: TRUE } },
-  { 0 }
+  { NULL }
 };
 
 struct container_cycle_data

--- a/src/paranormal/misc.c	Thu Nov 02 02:35:04 2006 -0800
+++ b/src/paranormal/misc.c	Thu Nov 02 18:22:02 2006 -0800
@@ -16,7 +16,7 @@
 {
   { "value", "The colour value for the floater.",
     OPT_TYPE_INT, { ival: 255 } },
-  { 0 }
+  { NULL }
 };
 
 typedef enum

--- a/src/paranormal/wave.c	Thu Nov 02 02:35:04 2006 -0800
+++ b/src/paranormal/wave.c	Thu Nov 02 18:22:02 2006 -0800
@@ -12,7 +12,7 @@
   {"channels", "Which sound channels to use: negative = channel 1, \npositive = channel 2, "
    "zero = both (two wave-forms.)", OPT_TYPE_INT, {ival: -1} },
   {"value", "The colour value to use.", OPT_TYPE_INT, {ival: 255} },
-  { 0 }
+  { NULL }
 };
 
 static void
@@ -66,7 +66,7 @@
   {"channels", "Which sound channels to use: negative = channel 1, \npositive = channel 2, "
    "zero = both (two wave-forms.)", OPT_TYPE_INT, {ival: -1} },
   {"value", "The colour value to use.", OPT_TYPE_INT, {ival: 255} },
-  { 0 }
+  { NULL }
 };
 
 static void
@@ -126,7 +126,7 @@
   { "channels", "Which sound channel(s) to normalize: negative = channel 1,\n"
     "\tpositive = channel 2, 0 = both channels.",
     OPT_TYPE_INT, { ival: 0 } },
-  { 0 }
+  { NULL }
 };
 
 static void
@@ -221,7 +221,7 @@
   { "base_radius", " ", 
     OPT_TYPE_FLOAT, { fval: 0 } },
   {"value", "The colour value to use.", OPT_TYPE_INT, {ival: 255} },
-  { 0 }
+  { NULL }
 };
 
 static void

--- a/src/paranormal/xform.c	Thu Nov 02 02:35:04 2006 -0800
+++ b/src/paranormal/xform.c	Thu Nov 02 18:22:02 2006 -0800
@@ -101,7 +101,7 @@
     "increased (before scaling)", OPT_TYPE_FLOAT, { fval: 0.0 } },
   { "r_scale", "The amount by which the r coordinate of each pixel will "
     "be scaled", OPT_TYPE_FLOAT, { fval: 1.0 } },
-  { 0 }
+  { NULL }
 };
 
 struct xform_spin_data
@@ -146,7 +146,7 @@
       if (d->vfield)
 	g_free (d->vfield);
 
-      d->vfield = g_malloc (sizeof(struct xform_vector)
+      d->vfield = g_malloc0 (sizeof(struct xform_vector)
 			    * d->width * d->height);
 
       for (j=-(pn_image_data->height>>1)+1; j<=pn_image_data->height>>1; j++)
@@ -196,7 +196,7 @@
     OPT_TYPE_FLOAT, { fval: 1 } },
   { "mod_speed", "The maximum number of pixels by which base_speed"
     " will be modified", OPT_TYPE_FLOAT, { fval: 1 } },
-  { 0 }
+  { NULL }
 };
 
 struct xform_ripple_data
@@ -297,7 +297,7 @@
   { "mod_scale", "The maximum amount that should be "
     "added to the base_scale to create the 'bump' effect",
     OPT_TYPE_FLOAT, { fval: .1 } },
-  { 0 }
+  { NULL }
 };
 
 struct xform_bump_spin_data