From 719c9febac2eaff9483fda487b57684afbb59bb2 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 05 Mar 2014 16:47:50 +0000
Subject: [PATCH] dont know
---
src/frame.c | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/src/frame.c b/src/frame.c
index 5cfede9..d2d7e10 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3,7 +3,7 @@
#include "cell.h"
#include "frame.h"
ts_bool centermass(ts_vesicle *vesicle){
- ts_uint i, n=vesicle->vlist->n;
+ ts_uint i,j, n=vesicle->vlist->n;
ts_vertex **vtx=vesicle->vlist->vtx;
vesicle->cm[0]=0;
vesicle->cm[1]=0;
@@ -23,6 +23,15 @@
vtx[i]->z-=vesicle->cm[2];
}
+ for(i=0;i<vesicle->poly_list->n;i++){
+ for(j=0;j<vesicle->poly_list->poly[i]->vlist->n;j++){
+ vesicle->poly_list->poly[i]->vlist->vtx[j]->x-=vesicle->cm[0];
+ vesicle->poly_list->poly[i]->vlist->vtx[j]->y-=vesicle->cm[1];
+ vesicle->poly_list->poly[i]->vlist->vtx[j]->z-=vesicle->cm[2];
+ }
+ }
+
+
vesicle->cm[0]=0;
vesicle->cm[1]=0;
vesicle->cm[2]=0;
@@ -31,11 +40,11 @@
}
ts_bool cell_occupation(ts_vesicle *vesicle){
- ts_uint i,cellidx, n=vesicle->vlist->n;
- ts_double shift;
- ts_double dcell;
- shift=(ts_double) vesicle->clist->ncmax[0]/2;
- dcell=1.0/(1.0 + vesicle->stepsize);
+ ts_uint i,j,cellidx, n=vesicle->vlist->n;
+ //ts_double shift;
+ //ts_double dcell;
+ //shift=(ts_double) vesicle->clist->ncmax[0]/2;
+ //dcell=1.0/(1.0 + vesicle->stepsize);
//`fprintf(stderr, "Bil sem tu\n");
cell_list_cell_occupation_clear(vesicle->clist);
@@ -45,10 +54,19 @@
// vesicle->vlist->vtx[i]->cell=vesicle->clist->cell[cellidx];
cell_add_vertex(vesicle->clist->cell[cellidx],vesicle->vlist->vtx[i]);
-
}
+
+ for(i=0;i<vesicle->poly_list->n;i++){
+ for(j=0;j<vesicle->poly_list->poly[i]->vlist->n;j++){
+ cellidx=vertex_self_avoidance(vesicle, vesicle->poly_list->poly[i]->vlist->vtx[j]);
+ cell_add_vertex(vesicle->clist->cell[cellidx],vesicle->poly_list->poly[i]->vlist->vtx[j]);
+ }
+ }
+
+
+
//fprintf(stderr, "Bil sem tu\n");
- if(dcell);
- if(shift);
+ //if(dcell);
+ //if(shift);
return TS_SUCCESS;
}
--
Gitblit v1.9.3