gnome-games r8692 - trunk/gnometris

[jclinton svn gnome org]

Author: jclinton
Date: Mon Feb  9 08:06:08 2009
New Revision: 8692
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8692&view=rev

Log:
Falling piece movement now much, much more reliable, smooth

This is pretty feature complete.

Issues/work that remains.
1. Appears to be a racecondition in the line removal code. Two different
pieces of code are racing each other to delete actors.
2. Preview widget is just not right. Not sure what to do about
preference dialog box. Some of that is gtk_clutter_embed.
3. A lot of ugly code needs second eyes; probably reworked. C++ can go
fuck-off and die. Really.
4. I know I'm leaking memory in a few places.
5. I have no idea if I'm using ClutterBehaviour correctly.

Modified:
   trunk/gnometris/blockops.cpp
   trunk/gnometris/blockops.h

Modified: trunk/gnometris/blockops.cpp
==============================================================================
--- trunk/gnometris/blockops.cpp	(original)
+++ trunk/gnometris/blockops.cpp	Mon Feb  9 08:06:08 2009
@@ -27,6 +27,9 @@
 #define FONT "Sans Bold"
 
 GList *Block::destroy_actors = NULL;
+GList *Block::destroy_behaviours = NULL;
+ClutterTimeline *Block::move_block_tml = NULL;
+ClutterAlpha *Block::move_block_alpha = NULL;
 
 void
 Block::animation_destroy (ClutterTimeline *tml, gpointer *data)
@@ -34,30 +37,58 @@
 	ClutterActor *tmp_actor = NULL;
 	g_list_foreach (destroy_actors,
 			(GFunc)clutter_actor_destroy,
-			CLUTTER_ACTOR(tmp_actor));
+			tmp_actor);
 	g_list_free (destroy_actors);
 	destroy_actors = NULL;
 }
 
+void
+Block::behaviours_destroy (ClutterTimeline *tml, gpointer *data)
+{
+	ClutterBehaviour *tmp_behav = NULL;
+	g_list_foreach (destroy_behaviours,
+			(GFunc)clutter_behaviour_remove_all,
+			tmp_behav);
+	g_list_free (destroy_behaviours);
+	destroy_behaviours = NULL;
+}
+
 Block::Block ():
 	what(EMPTY),
 	actor(NULL),
-	block_tml(NULL),
 	x(0),
-	y(0)
+	y(0),
+	move_block_path(NULL)
 {
+	//knot_line;
+
 	if (!timeline)
 		timeline = clutter_timeline_new_for_duration (180);
 	if (!tmpl)
 		tmpl = clutter_effect_template_new (timeline, CLUTTER_ALPHA_RAMP_INC);
+	if (!move_block_tml)
+		move_block_tml = clutter_timeline_new_for_duration (120);
+	if (!move_block_alpha)
+		move_block_alpha = clutter_alpha_new_full (move_block_tml,
+				CLUTTER_ALPHA_RAMP_INC,
+				NULL, NULL);
 }
 
 Block::~Block ()
 {
 	if (actor)
 		clutter_actor_destroy (CLUTTER_ACTOR(actor));
-	if (block_tml)
-		g_object_unref (block_tml);
+	if (move_block_path)
+		g_object_unref (move_block_path);
+}
+
+void
+Block::shift (gint cell_width, gint cell_height, gint shift_x, gint shift_y)
+{
+	const ClutterKnot knot_line[] = {{x - shift_x * cell_width, y - shift_y * cell_height}, {x, y}};
+	move_block_path = clutter_behaviour_path_new (move_block_alpha, knot_line, 2);
+	clutter_behaviour_apply (move_block_path, actor);
+	destroy_behaviours = g_list_append (destroy_behaviours, move_block_path);
 }
 
 void
@@ -502,18 +533,13 @@
 				field[i][j].what = FALLING;
 				field[i][j].color = color;
 				field[i][j].actor = blocks_tmp[x][y];
-				if (field[i][j].block_tml)
-				{
-					clutter_timeline_pause (field[i][j].block_tml);
-					g_object_unref (field[i][j].block_tml);
-				}
-				field[i][j].block_tml = clutter_effect_move (tmpl, field[i][j].actor,
-								field[i][j].x, field[i][j].y,
-								NULL, NULL);
-				g_object_ref (field[i][j].block_tml);
+				field[i][j].shift (cell_width, cell_height, shift_x, shift_y);
 			}
 		}
 	}
+	clutter_timeline_start (Block::move_block_tml);
+	g_signal_connect (Block::move_block_tml, "completed",
+			G_CALLBACK (Block::behaviours_destroy), (gpointer) NULL);
 	posx_old = posx;
 	posy_old = posy;
 }

Modified: trunk/gnometris/blockops.h
==============================================================================
--- trunk/gnometris/blockops.h	(original)
+++ trunk/gnometris/blockops.h	Mon Feb  9 08:06:08 2009
@@ -47,16 +47,22 @@
 	SlotType what;
 	guint color;
 	ClutterActor *actor;
-	ClutterTimeline *block_tml;
 
 	int x;
 	int y;
 
+	static ClutterTimeline *move_block_tml;
+	static ClutterAlpha *move_block_alpha;
+	ClutterBehaviour *move_block_path;
+	void shift (gint cell_width, gint cell_height, gint shift_x, gint shift_y);
+
 	void createActor (ClutterActor *chamber, ClutterActor *texture_source);
 	void associateActor (ClutterActor *chamber, ClutterActor *other_actor);
 
 	static GList *destroy_actors;
+	static GList *destroy_behaviours;
 	static void animation_destroy (ClutterTimeline *timeline, gpointer *data);
+	static void behaviours_destroy (ClutterTimeline *timeline, gpointer *data);
 };
 
 class BlockOps {