[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13510] trunk/blender/source/blender/src/ drawtime.c: Patch #8177: Timeline Performance Patch

[Joshua Leung]

Revision: 13510
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13510
Author:   aligorith
Date:     2008-02-01 11:23:40 +0100 (Fri, 01 Feb 2008)

Log Message:
-----------
Patch #8177: Timeline Performance Patch
Patch by: Adriano Macchietto (macchiea)

This patch optimises the way keyframes are drawn in the Timeline, so that it is more responsive when working with heaps of keyframes (i.e. motion-capture data).

Detailed Description of Patch (from author):
* No longer uses a list to store the keys before drawing. Uses
less memory.
* Culls the drawing of keyframes outside of the visible window.
Good for dealing with long mocap tracks.
* Performs a check to avoid redrawing a line over a line which
has already been drawn to the same pixels. This speeds up the
scenario when you have many keyframes and are zoomed out.
* Batches the draws into one glBegin/glEnd block.

This is all done on a per IpoCurve basis.

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawtime.c

Modified: trunk/blender/source/blender/src/drawtime.c
===================================================================
--- trunk/blender/source/blender/src/drawtime.c	2008-01-31 23:22:57 UTC (rev 13509)
+++ trunk/blender/source/blender/src/drawtime.c	2008-02-01 10:23:40 UTC (rev 13510)
@@ -39,6 +39,7 @@
 #include "BLI_arithb.h"
 
 #include "DNA_action_types.h"
+#include "DNA_curve_types.h"
 #include "DNA_ipo_types.h"
 #include "DNA_object_types.h"
 #include "DNA_material_types.h"
@@ -141,7 +142,6 @@
 		BIF_DrawString(G.fonts, str, 0);
 		glScalef(xscale, yscale, 1.0);
 	}
-	
 }
 
 /* ---------- */
@@ -321,23 +321,74 @@
 	glDisable(GL_POLYGON_STIPPLE);
 }
 
-/*draw all the keys in a list (elems) as lines */
-static void draw_key_list(ListBase elems, char col[3]) 
+
+static void draw_ipo_keys(Ipo *ipo, char col[3])
 {
-	CfraElem *ce;
-	float drawframe;
-
-	ce= elems.first;
-	while(ce) {
-		drawframe = ce->cfra; //not correct for G.scene->r.framelen;
-		glColor3ub(col[0], col[1], col[2]);
-
-		fdrawline(drawframe, G.v2d->cur.ymin, drawframe, G.v2d->cur.ymax);
-		
-		ce= ce->next;
+	IpoCurve *icu;
+	int nvert;
+	int i;
+	int lbound, ubound;
+	int idx;
+	int diff;
+	float t;
+	float drawnext; /* next time to begin drawing new keyframes */
+	
+	float space = G.v2d->cur.xmax - G.v2d->cur.xmin;
+	float pixels = G.v2d->mask.xmax-G.v2d->mask.xmin;
+	float spaceperpix = 1; /* amount of time occupied per pixel */
+	
+	if (pixels > 0) 
+		spaceperpix = space / pixels;
+	
+	glColor3ub(col[0], col[1], col[2]);
+	glBegin(GL_LINES);
+	
+	for (icu= ipo->curve.first; icu; icu= icu->next) {
+		if (icu->flag & IPO_VISIBLE) {
+			if (icu->bezt) {
+				nvert= icu->totvert;
+				
+				if (nvert > 0)
+					drawnext = icu->bezt[0].vec[1][0];
+				else
+					continue;
+				
+				/* binary search for beginning of the visible keys */
+				lbound = 0;
+				ubound = nvert;
+				while (ubound - lbound > 1) {
+					diff = (ubound - lbound) / 2;
+					idx = lbound + diff;
+					t= icu->bezt[idx].vec[1][0];
+					if (t < G.v2d->cur.xmin)
+						lbound += diff;
+					else
+						ubound = lbound + diff;
+				}
+				
+				for (i = lbound; i < nvert; i++) {
+					t= icu->bezt[i].vec[1][0];
+					
+					/* dont do anymore draw tests after we draw the last visible key */
+					if (t > G.v2d->cur.xmax)
+						break;
+					/* avoid repeatedly drawing lines on the same pixel */
+					if (t < drawnext)
+						continue;
+					
+					glVertex2f(t, G.v2d->cur.ymin);
+					glVertex2f(t, G.v2d->cur.ymax);
+					
+					drawnext = t + spaceperpix;
+				}
+			}
+		}
 	}
+	
+	glEnd();
 }
 
+
 /* This function draws keyframes that the active object has (as long as
  * it is not in EditMode). Some filters are available to optimise the
  * drawing efficiency.
@@ -346,7 +397,6 @@
 {
 	/* mostly copied from drawobject.c, draw_object() */
 	SpaceTime *stime= curarea->spacedata.first;
-	ListBase elems= {0, 0};
 	
 	Object *ob= OBACT;
 	short filter, ok;
@@ -356,15 +406,9 @@
 	if (ob && ob!=G.obedit) {
 		/* Object's IPO block - show all keys */
 		if (ob->ipo) {
-			/* convert the ipo to a list of 'current frame elements' */
-			elems.first= elems.last= NULL;
-			make_cfra_list(ob->ipo, &elems);
-			
 			/* draw the list of current frame elements */
 			col[0] = 0xDD; col[1] = 0xD7; col[2] = 0x00;
-			draw_key_list(elems, col);
-			
-			BLI_freelistN(&elems);
+			draw_ipo_keys(ob->ipo, col);
 		}
 		
 		/* Object's Action block - may be filtered in some cases */
@@ -386,13 +430,8 @@
 				
 				/* convert the ipo to a list of 'current frame elements' */
 				if (achan->ipo && ok) {
-					elems.first= elems.last= NULL;
-					make_cfra_list(achan->ipo, &elems);
-					
 					col[0] = 0x00; col[1] = 0x82; col[2] = 0x8B;
-					draw_key_list(elems, col);
-					
-					BLI_freelistN(&elems);
+					draw_ipo_keys(achan->ipo, col);
 				}
 			}
 		}
@@ -409,13 +448,8 @@
 			else ok= 1;
 			
 			if (ma && ma->ipo && ok) {
-				elems.first= elems.last= NULL;
-				make_cfra_list(ma->ipo, &elems);
-				
 				col[0] = 0xDD; col[1] = 0xA7; col[2] = 0x00;
-				draw_key_list(elems, col);
-				
-				BLI_freelistN(&elems);
+				draw_ipo_keys(ma->ipo, col);
 			}
 		}
 	}