From 0652ee2715994b48a9bbfd1132bf0b65ad206289 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 27 Nov 2013 18:46:13 +0000
Subject: [PATCH] commiting all changes.
---
src/frame.c | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/frame.c b/src/frame.c
index a4a9d32..5cfede9 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -9,13 +9,24 @@
vesicle->cm[1]=0;
vesicle->cm[2]=0;
for(i=0;i<n;i++){
- vesicle->cm[0]+=vtx[i]->data->x;
- vesicle->cm[1]+=vtx[i]->data->y;
- vesicle->cm[2]+=vtx[i]->data->z;
+ vesicle->cm[0]+=vtx[i]->x;
+ vesicle->cm[1]+=vtx[i]->y;
+ vesicle->cm[2]+=vtx[i]->z;
}
vesicle->cm[0]/=(ts_float)n;
vesicle->cm[1]/=(ts_float)n;
vesicle->cm[2]/=(ts_float)n;
+
+ for(i=0;i<n;i++){
+ vtx[i]->x-=vesicle->cm[0];
+ vtx[i]->y-=vesicle->cm[1];
+ vtx[i]->z-=vesicle->cm[2];
+ }
+
+ vesicle->cm[0]=0;
+ vesicle->cm[1]=0;
+ vesicle->cm[2]=0;
+
return TS_SUCCESS;
}
@@ -30,7 +41,8 @@
cell_list_cell_occupation_clear(vesicle->clist);
for(i=0;i<n;i++){
cellidx=vertex_self_avoidance(vesicle, vesicle->vlist->vtx[i]);
- vesicle->vlist->vtx[i]->data->cell=vesicle->clist->cell[cellidx];
+// already done in cell_add_vertex
+// vesicle->vlist->vtx[i]->cell=vesicle->clist->cell[cellidx];
cell_add_vertex(vesicle->clist->cell[cellidx],vesicle->vlist->vtx[i]);
--
Gitblit v1.9.3