From 19c1fd84d1fd75e9bfd55feb670fda87a2e02086 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Fri, 08 Feb 2019 08:32:29 +0000
Subject: [PATCH] Merge branch 'master' of ssh://git.penic.eu:29418/trisurf-ng

---
 src/vertex.h |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/vertex.h b/src/vertex.h
index e0df249..0eb8dd3 100644
--- a/src/vertex.h
+++ b/src/vertex.h
@@ -1,5 +1,8 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
 #ifndef _VERTEX_H
 #define _VERTEX_H
+
+ts_bool vertex_list_assign_id(ts_vertex_list *vlist, ts_uint id);
 
 /** @brief Creates initial vertex list
  *  
@@ -14,13 +17,21 @@
  *	@returns ts_bool value 1 on success, 0 otherwise
 */
 ts_vertex_list *init_vertex_list(ts_uint N);
-ts_vertex_data *init_vertex_data(void);
 ts_bool vtx_add_neighbour(ts_vertex *vtx, ts_vertex *nvtx);
 ts_bool vtx_add_cneighbour(ts_bond_list *blist,ts_vertex *vtx1,ts_vertex *vtx2);
 ts_bool vtx_add_bond(ts_bond_list *blist,ts_vertex *vtx1,ts_vertex *vtx2);
 ts_bool vtx_remove_neighbour(ts_vertex *vtx, ts_vertex *nvtx);
-ts_bool vtx_data_free(ts_vertex_data *data);
 ts_bool vtx_free(ts_vertex *vtx);
 ts_bool vtx_list_free(ts_vertex_list *vlist);
 inline ts_double vtx_distance_sq(ts_vertex *vtx1, ts_vertex *vtx2);
+ts_bool vtx_set_global_values(ts_vesicle *vesicle);
+inline ts_double vtx_direct(ts_vertex *vtx1, ts_vertex *vtx2, ts_vertex *vtx3);
+inline ts_bool vertex_add_tristar(ts_vertex *vtx, ts_triangle *tristarmem);
+inline ts_bool vtx_insert_neighbour(ts_vertex *vtx, ts_vertex *nvtx, ts_vertex *vtxm);
+inline ts_bool vtx_remove_tristar(ts_vertex *vtx, ts_triangle *tristar);
+ts_bool vtx_copy(ts_vertex *cvtx,ts_vertex *ovtx);
+ts_bool vtx_duplicate(ts_vertex *cvtx, ts_vertex *ovtx);
+ts_vertex **vtx_neigh_copy(ts_vertex_list *vlist,ts_vertex *ovtx);
+ts_vertex_list *vertex_list_copy(ts_vertex_list *ovlist);
+
 #endif

--
Gitblit v1.9.3