archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Benchmarkings timer cleanup

Browse Source 
Don't number groups with only one arc (easy fix for fly model, need a two pass arc match for real fix)
This commit is contained in:
Martin Poirier
2008-09-15 21:48:05 +00:00
parent 980969ab63
commit 871b24dd67
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenlib/intern/graph.c
View File

@@ -732,6 +732,7 @@ static void handleRadialSymmetry(BGraph *graph, BNode *root_node, int depth, flo
if (sub_total == 1)
{
group -= 1; /* not really a group so decrement */
/* NOTHING TO DO */
}
else if (sub_total == 2)

23
source/blender/src/autoarmature.c
View File

@@ -2827,11 +2827,15 @@ void BIF_retargetArmature()
Base *base;
ReebGraph *reebg;
double start_time, end_time;
double gstart_time, gend_time;
double reeb_time, rig_time, retarget_time;
start_time = PIL_check_seconds_timer();
gstart_time = start_time = PIL_check_seconds_timer();
reebg = BIF_ReebGraphMultiFromEditMesh();
end_time = PIL_check_seconds_timer();
reeb_time = end_time - start_time;
printf("Reeb Graph created\n");
@@ -2853,8 +2857,13 @@ void BIF_retargetArmature()
list.first= list.last = NULL;
make_boneList(&list, &arm->bonebase, NULL);
start_time = PIL_check_seconds_timer();
rigg = armatureToGraph(ob, &list);
end_time = PIL_check_seconds_timer();
rig_time = end_time - start_time;
printf("Armature graph created\n");
//RIG_printGraph(rigg);
@@ -2863,8 +2872,13 @@ void BIF_retargetArmature()
printf("retargetting %s\n", ob->id.name);
start_time = PIL_check_seconds_timer();
retargetGraphs(rigg);
end_time = PIL_check_seconds_timer();
retarget_time = end_time - start_time;
/* Turn the list into an armature */
editbones_to_armature(&list, ob);
@@ -2877,10 +2891,13 @@ void BIF_retargetArmature()
REEB_freeGraph(reebg);
end_time = PIL_check_seconds_timer();
gend_time = PIL_check_seconds_timer();
printf("-----------\n");
printf("runtime: %.3f\n", end_time - start_time);
printf("runtime: \t%.3f\n", gend_time - gstart_time);
printf("reeb: \t%.3f\n", reeb_time);
printf("rig: \t%.3f\n", rig_time);
printf("retarget: \t%.3f\n", retarget_time);
printf("-----------\n");
BIF_undo_push("Retarget Skeleton");

9
source/blender/src/reeb.c
View File

@@ -3413,9 +3413,6 @@ ReebGraph *BIF_ReebGraphMultiFromEditMesh(void)
ReebGraph *rg = NULL;
ReebGraph *rgi, *previous;
int i, nb_levels = REEB_MAX_MULTI_LEVEL;
double start_time, end_time;
start_time = PIL_check_seconds_timer();
if (em == NULL)
return NULL;
@@ -3438,12 +3435,6 @@ ReebGraph *BIF_ReebGraphMultiFromEditMesh(void)
freeEdgeIndex(&indexed_edges);
end_time = PIL_check_seconds_timer();
printf("-----------\n");
printf("runtime: %.3f\n", end_time - start_time);
printf("-----------\n");
#ifdef DEBUG_REEB
weightToVCol(em, 0);
#endif