From dac2e5020dc34c236b741ff5c4591244e73f56f2 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo@andromeda>
Date: Tue, 28 Dec 2010 23:48:08 +0000
Subject: [PATCH] Rewrite of frame is complete.
---
src/general.h | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/general.h b/src/general.h
index 340ed27..8bfdf73 100644
--- a/src/general.h
+++ b/src/general.h
@@ -2,6 +2,7 @@
#define _GENERAL_H
#include<stdarg.h>
+#include<stdio.h>
/* @brief This is a header file, defining general constants and structures.
* @file header.h
@@ -194,22 +195,32 @@
};
typedef struct ts_triangle_list ts_triangle_list;
-typedef struct ts_cell {
- ts_uint idx;
+typedef struct ts_cell_data {
ts_vertex **vertex;
ts_uint nvertex;
-} ts_cell;
+} ts_cell_data;
-typedef struct {
- ts_vertex *vlist;
- ts_bond *blist;
- ts_triangle *tlist;
- ts_cell *clist;
- ts_uint nshell;
+typedef struct ts_cell {
+ ts_uint idx;
+ ts_cell_data *data;
+} ts_cell;
+
+typedef struct ts_cell_list{
+ ts_uint ncmax[3];
+ ts_uint cellno;
+ ts_cell **cell;
ts_double dcell;
ts_double shift;
ts_double max_occupancy;
- ts_uint ncmax[3];
+} ts_cell_list;
+
+
+typedef struct {
+ ts_vertex_list *vlist;
+ ts_bond_list *blist;
+ ts_triangle_list *tlist;
+ ts_cell_list *clist;
+ ts_uint nshell;
ts_double bending_rigidity;
ts_double dmax;
ts_double stepsize;
@@ -237,7 +248,7 @@
*/
void fatal(char *text, ts_int errcode);
-//ts_uint ts_fprintf(FILE *fd, char *fmt, va_list ap);
+ts_uint ts_fprintf(FILE *fd, char *fmt, ...);
#define VTX(n) &(vlist->vtx[n])
#define VTX_DATA(n) vlist->vtx[n].data
--
Gitblit v1.9.3