1 files changed, 171 insertions, 107 deletions

diff --git a/src/post/goom/tentacle3d.c b/src/post/goom/tentacle3d.c
index ffb73d6ba..600511327 100755
--- a/src/post/goom/tentacle3d.c
+++ b/src/post/goom/tentacle3d.c
@@ -4,6 +4,8 @@
 #include "surf3d.h"
 #include "goom_tools.h"
 #include "goom_config.h"
+#include "goom_plugin_info.h"
+#include "tentacle3d.h"
 
 #define D 256.0f
 
@@ -11,40 +13,119 @@
 #define definitionx 15
 #define definitionz 45
 
-static float cycle = 0.0f;
-static grid3d *grille[nbgrid];
-static float *vals;
+typedef struct _TENTACLE_FX_DATA {
+	PluginParam enabled_bp;
+	PluginParameters params;
 
-void tentacle_free (void) {
+	float cycle;
+	grid3d *grille[nbgrid];
+	float *vals;
+
+#define NB_TENTACLE_COLORS 3
+	int colors[NB_TENTACLE_COLORS];
+
+	int col;
+	int dstcol;
+	float lig;
+	float ligs;
+
+	/* statics from pretty_move */
+	float distt;
+	float distt2;
+	float rot; /* entre 0 et 2 * M_PI */
+	int happens;
+	int rotation;
+	int lock;
+} TentacleFXData;
+
+void tentacle_new (TentacleFXData *data);
+void tentacle_update(PluginInfo *goomInfo, Pixel *buf, Pixel *back, int W, int H,
+                     short[2][512], float, int drawit, TentacleFXData *data);
+void tentacle_free (TentacleFXData *data);
+
+/* 
+ * VisualFX wrapper for the tentacles
+ */
+
+void tentacle_fx_init(VisualFX *_this) {
+	
+	TentacleFXData *data = (TentacleFXData*)malloc(sizeof(TentacleFXData));
+	
+	data->enabled_bp = secure_b_param("Enabled", 1);
+	data->params = plugin_parameters ("3D Tentacles", 1);
+	data->params.params[0] = &data->enabled_bp;
+
+	data->cycle = 0.0f;
+	data->col = (0x28<<(ROUGE*8))|(0x2c<<(VERT*8))|(0x5f<<(BLEU*8));
+	data->dstcol = 0;
+	data->lig = 1.15f;
+	data->ligs = 0.1f;
+	
+	data->distt = 10.0f;
+	data->distt2 = 0.0f;
+	data->rot = 0.0f; /* entre 0 et 2 * M_PI */
+	data->happens = 0;
+	
+	data->rotation = 0;
+	data->lock = 0;
+	data->colors[0] = (0x18<<(ROUGE*8))|(0x4c<<(VERT*8))|(0x2f<<(BLEU*8));
+	data->colors[1] = (0x48<<(ROUGE*8))|(0x2c<<(VERT*8))|(0x6f<<(BLEU*8));
+	data->colors[2] = (0x58<<(ROUGE*8))|(0x3c<<(VERT*8))|(0x0f<<(BLEU*8));
+	tentacle_new(data);
+
+	_this->params = &data->params;
+	_this->fx_data = (void*)data;
+}
+
+void tentacle_fx_apply(VisualFX *_this, Pixel *src, Pixel *dest, PluginInfo *goomInfo) {
+	
+	tentacle_update(goomInfo, dest, src, goomInfo->screen.width, goomInfo->screen.height, goomInfo->sound.samples,
+	                (float)goomInfo->sound.accelvar, goomInfo->curGState->drawTentacle, (TentacleFXData*)_this->fx_data);
+}
+
+void tentacle_fx_free(VisualFX *_this) {
+	tentacle_free((TentacleFXData*)_this->fx_data);
+	free(_this->fx_data);
+}
+
+VisualFX tentacle_fx_create() {
+	VisualFX fx;
+	fx.init = tentacle_fx_init;
+	fx.apply = tentacle_fx_apply;
+	fx.free = tentacle_fx_free;
+	return fx;
+}
+
+/* ----- */
+
+void tentacle_free (TentacleFXData *data) {
 	/* TODO : un vrai FREE GRID!! */
-	free (vals);
-//	free (grille);
+	free (data->vals);
 }
 
-void tentacle_new (void) {
+void tentacle_new (TentacleFXData *data) {
 	int tmp;
 
 	v3d center = {0,-17.0,0};
-	vals = malloc ((definitionx+20)*sizeof(float));
-	
+	data->vals = (float*)malloc ((definitionx+20)*sizeof(float));
+
 	for (tmp=0;tmp<nbgrid;tmp++) {
 		int x,z;
-		z = 45+rand()%30;
-		x = 85+rand()%5;
+		z = 45 + rand() % 30;
+		x = 85 + rand() % 5;
 		center.z = z;
-		grille[tmp] = grid3d_new (x,definitionx,z,definitionz+rand()%10,center);
+		data->grille[tmp] = grid3d_new (x, definitionx, z, definitionz + rand() % 10, center);
 		center.y += 8;
 	}
 }
 
-static inline unsigned char
-lighten (unsigned char value, float power)
+static inline unsigned char lighten (unsigned char value, float power)
 {
-	int     val = value;
-	float   t = (float) val * log10(power) / 2.0;
+	int val = value;
+	float t = (float) val * log10(power) / 2.0;
 
 	if (t > 0) {
-		val = (int) t; // (32.0f * log (t));
+		val = (int) t; /* (32.0f * log (t)); */
 		if (val > 255)
 			val = 255;
 		if (val < 0)
@@ -56,8 +137,7 @@ lighten (unsigned char value, float power)
 	}
 }
 
-static void
-lightencolor (int *col, float power)
+static void lightencolor (int *col, float power)
 {
 	unsigned char *color;
 
@@ -71,12 +151,12 @@ lightencolor (int *col, float power)
 	*color = lighten (*color, power);
 }
 
-// retourne x>>s , en testant le signe de x
+/* retourne x>>s , en testant le signe de x */
 #define ShiftRight(_x,_s) ((_x<0) ? -(-_x>>_s) : (_x>>_s))
 
-static
-int evolutecolor (unsigned int src,unsigned int dest,
-									unsigned int mask, unsigned int incr) {
+static int evolutecolor (unsigned int src,unsigned int dest,
+                         unsigned int mask, unsigned int incr) {
+	
 	int color = src & (~mask);
 	src &= mask;
 	dest &= mask;
@@ -90,132 +170,116 @@ int evolutecolor (unsigned int src,unsigned int dest,
 	return (src&mask)|color;
 }
 
-static void pretty_move (float cycle,
-												 float *dist,float *dist2,
-												 float *rotangle) {
-	static float distt = 10.0f;
-	static float distt2 = 0.0f;
-	static float rot = 0.0f; // entre 0 et 2 * M_PI
-	static int happens = 0;
+static void pretty_move (PluginInfo *goomInfo, float cycle, float *dist, float *dist2, float *rotangle, TentacleFXData *fx_data) {
+
+	/* TODO: remove these STATICS !! */
 	float tmp;
-	static int rotation = 0;
-	static int lock = 0;
-
-	if (happens)
-		happens -= 1;
-	else if (lock == 0) {
-		happens = iRAND(200)?0:100+iRAND(60);
-		lock = happens * 3 / 2;
+
+	/* many magic numbers here... I don't really like that. */
+	if (fx_data->happens)
+		fx_data->happens -= 1;
+	else if (fx_data->lock == 0) {
+		fx_data->happens = goom_irand(goomInfo->gRandom,200)?0:100+goom_irand(goomInfo->gRandom,60);
+		fx_data->lock = fx_data->happens * 3 / 2;
 	}
-	else lock --;
-//	happens = 1;
-	
-	tmp = happens?8.0f:0;
-	*dist2 = distt2 = (tmp + 15.0f*distt2)/16.0f;
+	else fx_data->lock --;
+
+	tmp = fx_data->happens?8.0f:0;
+	*dist2 = fx_data->distt2 = (tmp + 15.0f*fx_data->distt2)/16.0f;
 
 	tmp = 30+D-90.0f*(1.0f+sin(cycle*19/20));
-	if (happens)
+	if (fx_data->happens)
 		tmp *= 0.6f;
 
-	*dist = distt = (tmp + 3.0f*distt)/4.0f;
+	*dist = fx_data->distt = (tmp + 3.0f*fx_data->distt)/4.0f;
 
-	if (!happens){
+	if (!fx_data->happens){
 		tmp = M_PI*sin(cycle)/32+3*M_PI/2;
 	}
 	else {
-		rotation = iRAND(500)?rotation:iRAND(2);
-		if (rotation)
+		fx_data->rotation = goom_irand(goomInfo->gRandom,500)?fx_data->rotation:goom_irand(goomInfo->gRandom,2);
+		if (fx_data->rotation)
 			cycle *= 2.0f*M_PI;
 		else
 			cycle *= -1.0f*M_PI;
 		tmp = cycle - (M_PI*2.0) * floor(cycle/(M_PI*2.0));
 	}
-	
-	if (abs(tmp-rot) > abs(tmp-(rot+2.0*M_PI))) {
-		rot = (tmp + 15.0f*(rot+2*M_PI)) / 16.0f;
-		if (rot>2.0*M_PI)
-			rot -= 2.0*M_PI;
-		*rotangle = rot;
+
+	if (abs(tmp-fx_data->rot) > abs(tmp-(fx_data->rot+2.0*M_PI))) {
+		fx_data->rot = (tmp + 15.0f*(fx_data->rot+2*M_PI)) / 16.0f;
+		if (fx_data->rot>2.0*M_PI)
+			fx_data->rot -= 2.0*M_PI;
+		*rotangle = fx_data->rot;
 	}
-	else if (abs(tmp-rot) > abs(tmp-(rot-2.0*M_PI))) {
-		rot = (tmp + 15.0f*(rot-2.0*M_PI)) / 16.0f;
-		if (rot<0.0f)
-			rot += 2.0*M_PI;
-		*rotangle = rot;
+	else if (abs(tmp-fx_data->rot) > abs(tmp-(fx_data->rot-2.0*M_PI))) {
+		fx_data->rot = (tmp + 15.0f*(fx_data->rot-2.0*M_PI)) / 16.0f;
+		if (fx_data->rot<0.0f)
+			fx_data->rot += 2.0*M_PI;
+		*rotangle = fx_data->rot;
 	}
 	else
-		*rotangle = rot = (tmp + 15.0f*rot) / 16.0f;
+		*rotangle = fx_data->rot = (tmp + 15.0f*fx_data->rot) / 16.0f;
 }
 
-void tentacle_update(int *buf, int *back, int W, int H,
-										 short data[2][512], float rapport,
-										 int drawit) {
+void tentacle_update(PluginInfo *goomInfo, Pixel *buf, Pixel *back, int W, int H,
+                     short data[2][512], float rapport, int drawit, TentacleFXData *fx_data) {
+	
 	int tmp;
 	int tmp2;
-	
-	static int colors[] = {
-		(0x18<<(ROUGE*8))|(0x4c<<(VERT*8))|(0x2f<<(BLEU*8)),
-		(0x48<<(ROUGE*8))|(0x2c<<(VERT*8))|(0x6f<<(BLEU*8)),
-		(0x58<<(ROUGE*8))|(0x3c<<(VERT*8))|(0x0f<<(BLEU*8))};
-	
-	static int col = (0x28<<(ROUGE*8))|(0x2c<<(VERT*8))|(0x5f<<(BLEU*8));
-	static int dstcol = 0;
-	static float lig = 1.15f;
-	static float ligs = 0.1f;
 
 	int color;
 	int colorlow;
 
 	float dist,dist2,rotangle;
 
-	if ((!drawit) && (ligs>0.0f))
-		ligs = -ligs;
+	if ((!drawit) && (fx_data->ligs>0.0f))
+		fx_data->ligs = -fx_data->ligs;
+
+	fx_data->lig += fx_data->ligs;
 
-	lig += ligs;
+	if (fx_data->lig > 1.01f) {
+		if ((fx_data->lig>10.0f) | (fx_data->lig<1.1f)) fx_data->ligs = -fx_data->ligs;
 
-	if (lig > 1.01f) {
-		if ((lig>10.0f) | (lig<1.1f)) ligs = -ligs;
-		
-		if ((lig<6.3f)&&(iRAND(30)==0))
-			dstcol=iRAND(3);
+		if ((fx_data->lig<6.3f)&&(goom_irand(goomInfo->gRandom,30)==0))
+			fx_data->dstcol=goom_irand(goomInfo->gRandom,NB_TENTACLE_COLORS);
 
-		col = evolutecolor(col,colors[dstcol],0xff,0x01);
-		col = evolutecolor(col,colors[dstcol],0xff00,0x0100);
-		col = evolutecolor(col,colors[dstcol],0xff0000,0x010000);
-		col = evolutecolor(col,colors[dstcol],0xff000000,0x01000000);
-		
-		color = col;
-		colorlow = col;
-		
-		lightencolor(&color,lig * 2.0f + 2.0f);
-		lightencolor(&colorlow,(lig/3.0f)+0.67f);
+		fx_data->col = evolutecolor(fx_data->col,fx_data->colors[fx_data->dstcol],0xff,0x01);
+		fx_data->col = evolutecolor(fx_data->col,fx_data->colors[fx_data->dstcol],0xff00,0x0100);
+		fx_data->col = evolutecolor(fx_data->col,fx_data->colors[fx_data->dstcol],0xff0000,0x010000);
+		fx_data->col = evolutecolor(fx_data->col,fx_data->colors[fx_data->dstcol],0xff000000,0x01000000);
+
+		color = fx_data->col;
+		colorlow = fx_data->col;
+
+		lightencolor(&color,fx_data->lig * 2.0f + 2.0f);
+		lightencolor(&colorlow,(fx_data->lig/3.0f)+0.67f);
 
 		rapport = 1.0f + 2.0f * (rapport - 1.0f);
-                rapport *= 1.2f;
+		rapport *= 1.2f;
 		if (rapport > 1.12f)
 			rapport = 1.12f;
-		
-		pretty_move (cycle,&dist,&dist2,&rotangle);
+
+		pretty_move (goomInfo, fx_data->cycle, &dist, &dist2, &rotangle, fx_data);
 
 		for (tmp=0;tmp<nbgrid;tmp++) {
 			for (tmp2=0;tmp2<definitionx;tmp2++) {
-				float val = (float)(ShiftRight(data[0][iRAND(511)],10)) * rapport;
-				vals[tmp2] = val;
+				float val = (float)(ShiftRight(data[0][goom_irand(goomInfo->gRandom,511)],10)) * rapport;
+				fx_data->vals[tmp2] = val;
 			}
-			
-			grid3d_update (grille[tmp],rotangle, vals, dist2);
+
+			grid3d_update (fx_data->grille[tmp], rotangle, fx_data->vals, dist2);
 		}
-		cycle+=0.01f;
+		fx_data->cycle+=0.01f;
 		for (tmp=0;tmp<nbgrid;tmp++)
-			grid3d_draw (grille[tmp],color,colorlow,dist,buf,back,W,H);
+			grid3d_draw (goomInfo, fx_data->grille[tmp],color,colorlow,dist,buf,back,W,H);
 	}
 	else {
-		lig = 1.05f;
-		if (ligs < 0.0f)
-			ligs = -ligs;
-		pretty_move (cycle,&dist,&dist2,&rotangle);
-		cycle+=0.1f;
-		if (cycle > 1000)
-			cycle = 0;
+		fx_data->lig = 1.05f;
+		if (fx_data->ligs < 0.0f)
+			fx_data->ligs = -fx_data->ligs;
+		pretty_move (goomInfo, fx_data->cycle, &dist, &dist2, &rotangle, fx_data);
+		fx_data->cycle+=0.1f;
+		if (fx_data->cycle > 1000)
+			fx_data->cycle = 0;
 	}
 }