Skip to content
Snippets Groups Projects
Commit 1ad6a125 authored by Tristan Carrier Baudouin's avatar Tristan Carrier Baudouin
Browse files

lpcvt

parent 303b0a6f
Branches
Tags
No related merge requests found
...@@ -1126,6 +1126,7 @@ void lpcvt::compute_metrics(DocRecord& triangulator){ ...@@ -1126,6 +1126,7 @@ void lpcvt::compute_metrics(DocRecord& triangulator){
void lpcvt::compute_parameters(int p){ void lpcvt::compute_parameters(int p){
double h1,h2,h3; double h1,h2,h3;
double k; double k;
double ratio;
SPoint2 center,p1,p2,p3; SPoint2 center,p1,p2,p3;
voronoi_vertex v1,v2,v3; voronoi_vertex v1,v2,v3;
std::list<voronoi_element>::iterator it; std::list<voronoi_element>::iterator it;
...@@ -1139,9 +1140,10 @@ void lpcvt::compute_parameters(int p){ ...@@ -1139,9 +1140,10 @@ void lpcvt::compute_parameters(int p){
p2 = v2.get_point(); p2 = v2.get_point();
p3 = v3.get_point(); p3 = v3.get_point();
center = SPoint2((p1.x()+p2.x()+p3.x())/3.0,(p1.y()+p2.y()+p3.y())/3.0); center = SPoint2((p1.x()+p2.x()+p3.x())/3.0,(p1.y()+p2.y()+p3.y())/3.0);
h1 = k*backgroundMesh::current()->operator()(p1.x(),p1.y(),0.0)*ratio(center); ratio = get_ratio(center);
h2 = k*backgroundMesh::current()->operator()(p2.x(),p2.y(),0.0)*ratio(center); h1 = k*backgroundMesh::current()->operator()(p1.x(),p1.y(),0.0)*ratio;
h3 = k*backgroundMesh::current()->operator()(p3.x(),p3.y(),0.0)*ratio(center); h2 = k*backgroundMesh::current()->operator()(p2.x(),p2.y(),0.0)*ratio;
h3 = k*backgroundMesh::current()->operator()(p3.x(),p3.y(),0.0)*ratio;
v1.set_h(h1); v1.set_h(h1);
v2.set_h(h2); v2.set_h(h2);
v3.set_h(h3); v3.set_h(h3);
...@@ -1153,7 +1155,7 @@ void lpcvt::compute_parameters(int p){ ...@@ -1153,7 +1155,7 @@ void lpcvt::compute_parameters(int p){
} }
} }
double lpcvt::ratio(SPoint2 point){ double lpcvt::get_ratio(SPoint2 point){
double val; double val;
double uv[2]; double uv[2];
double metric[3]; double metric[3];
......
...@@ -80,7 +80,7 @@ class lpcvt{ ...@@ -80,7 +80,7 @@ class lpcvt{
void compute_metrics(DocRecord&); void compute_metrics(DocRecord&);
void compute_parameters(int); void compute_parameters(int);
double ratio(SPoint2); double get_ratio(SPoint2);
void write(DocRecord&,GFace*,int); void write(DocRecord&,GFace*,int);
void eval(DocRecord&,std::vector<SVector3>&,double&,int); void eval(DocRecord&,std::vector<SVector3>&,double&,int);
void swap(); void swap();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment