5b6c317a
Pavel Govyadinov
implemented the c...
|
1
2
3
4
|
#ifndef STIM_CYLINDER_H
#define STIM_CYLINDER_H
#include <iostream>
#include <stim/math/circle.h>
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
5
|
#include <stim/biomodels/centerline.h>
|
c72184d1
Jiaming Guo
add many function...
|
6
|
#include <stim/visualization/obj.h>
|
5b6c317a
Pavel Govyadinov
implemented the c...
|
7
|
|
5b6c317a
Pavel Govyadinov
implemented the c...
|
8
9
10
11
|
namespace stim
{
template<typename T>
|
c72184d1
Jiaming Guo
add many function...
|
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
class cylinder : public centerline<T> {
protected:
std::vector< stim::vec3<T> > U; //stores the array of U vectors defining the Frenet frame
std::vector< std::vector<T> > M; //stores a list of magnitudes for each point in the centerline (assuming mags[0] is the radius)
using stim::centerline<T>::findIdx;
//calculates the U values for each point to initialize the frenet frame
// this function assumes that the centerline has already been set
void init() {
U.resize(size()); //allocate space for the frenet frame vectors
stim::circle<T> c; //create a circle
stim::vec3<T> d0, d1;
for (size_t i = 0; i < size() - 1; i++) { //for each line segment in the centerline
c.rotate(d(i)); //rotate the circle to match that normal
U[i] = c.U; //save the U vector from the circle
}
U[size() - 1] = c.U; //for the last point, duplicate the final frenet frame vector
}
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
33
|
|
c72184d1
Jiaming Guo
add many function...
|
34
|
public:
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
35
|
|
c72184d1
Jiaming Guo
add many function...
|
36
37
|
using stim::centerline<T>::size;
using stim::centerline<T>::at;
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
38
|
|
c72184d1
Jiaming Guo
add many function...
|
39
|
cylinder() : centerline(){}
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
40
|
|
c72184d1
Jiaming Guo
add many function...
|
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
|
cylinder(centerline& c) : centerline(c) {
init();
}
cylinder(centerline& c, T r) : centerline(c) {
init();
add_mag(r);
}
//initialize a cylinder with a list of points and magnitude values
cylinder(centerline& c, std::vector<T> r) : centerline(c){
init();
add_mag(r);
}
///Returns magnitude i at the given length into the fiber (based on the pvalue).
///Interpolates the position along the line.
///@param l: the location of the in the cylinder.
///@param idx: integer location of the point closest to l but prior to it.
T m(T l, int idx, size_t i) {
T a = (l - L[idx]) / (L[idx + 1] - L[idx]);
T v2 = (M[idx][i] + (M[idx + 1][i] - M[idx][i])*a);
return v2;
}
///Returns the ith magnitude at the given p-value (p value ranges from 0 to 1).
///interpolates the radius along the line.
///@param pvalue: the location of the in the cylinder, from 0 (beginning to 1).
T m(T pvalue, unsigned i = 0) {
if (pvalue <= 0.0) return M[0][i];
if (pvalue >= 1.0) return M[size() - 1][i];
T l = pvalue*L[L.size() - 1];
int idx = findIdx(l);
return m(l, idx, i);
}
/// Returns the magnitude at the given index
/// @param i is the index of the desired point
/// @param m is the index of the magnitude value
T m(unsigned i, unsigned m) {
return M[i][m];
}
///adds a magnitude to each point in the cylinder
void add_mag(T val = 0) {
if (M.size() == 0) M.resize(size()); //if the magnitude vector isn't initialized, resize it to match the centerline
for (size_t i = 0; i < size(); i++) //for each point
M[i].push_back(val); //add this value to the magnitude vector at each point
}
//adds a magnitude based on a list of magnitudes for each point
void add_mag(std::vector<T> val) {
if (M.size() == 0) M.resize(size()); //if the magnitude vector isn't initialized, resize it to match the centerline
for (size_t i = 0; i < size(); i++) //for each point
M[i].push_back(val[i]); //add this value to the magnitude vector at each point
}
//sets the value of magnitude m at point i
void set_mag(size_t m, size_t i, T v) {
M[i][m] = v;
}
size_t nmags() {
if (M.size() == 0) return 0;
else return M[0].size();
}
///Returns a circle representing the cylinder cross section at point i
stim::circle<T> circ(size_t i, size_t m = 0) {
return stim::circle<T>(at(i), M[i][m], d(i), U[i]);
}
///Returns an OBJ object representing the cylinder with a radial tesselation value of N using magnitude m
stim::obj<T> OBJ(size_t N, size_t m = 0) {
stim::obj<T> out; //create an OBJ object
stim::circle<T> c0, c1;
std::vector< stim::vec3<T> > p0, p1; //allocate space for the point sets representing the circles bounding each cylinder segment
T u0, u1, v0, v1; //allocate variables to store running texture coordinates
for (size_t i = 1; i < size(); i++) { //for each line segment in the cylinder
c0 = circ(i - 1); //get the two circles bounding the line segment
c1 = circ(i);
p0 = c0.points(N); //get t points for each of the end caps
p1 = c1.points(N);
u0 = L[i - 1] / length(); //calculate the texture coordinate (u, v) where u runs along the cylinder length
u1 = L[i] / length();
for (size_t n = 1; n < N; n++) { //for each point in the circle
v0 = (double)(n-1) / (double)(N - 1); //v texture coordinate runs around the cylinder
v1 = (double)(n) / (double)(N - 1);
out.Begin(OBJ_FACE); //start a face (quad)
out.TexCoord(u0, v0);
out.Vertex(p0[n - 1][0], p0[n - 1][1], p0[n - 1][2]); //output the points composing a strip of quads wrapping the cylinder segment
out.TexCoord(u1, v0);
out.Vertex(p1[n - 1][0], p1[n - 1][1], p1[n - 1][2]);
out.TexCoord(u0, v1);
out.Vertex(p1[n][0], p1[n][1], p1[n][2]);
out.TexCoord(u1, v1);
out.Vertex(p0[n][0], p0[n][1], p0[n][2]);
out.End();
}
v0 = (double)(N - 2) / (double)(N - 1); //v texture coordinate runs around the cylinder
v1 = 1.0;
out.Begin(OBJ_FACE);
out.TexCoord(u0, v0);
out.Vertex(p0[N - 1][0], p0[N - 1][1], p0[N - 1][2]); //output the points composing a strip of quads wrapping the cylinder segment
out.TexCoord(u1, v0);
out.Vertex(p1[N - 1][0], p1[N - 1][1], p1[N - 1][2]);
out.TexCoord(u0, v1);
out.Vertex(p1[0][0], p1[0][1], p1[0][2]);
out.TexCoord(u1, v1);
out.Vertex(p0[0][0], p0[0][1], p0[0][2]);
out.End();
}
return out;
}
std::string str() {
std::stringstream ss;
size_t N = std::vector< stim::vec3<T> >::size();
ss << "---------[" << N << "]---------" << std::endl;
for (size_t i = 0; i < N; i++)
ss << std::vector< stim::vec3<T> >::at(i) << " r = " << M[i][0] << " u = " << U[i] << std::endl;
ss << "--------------------" << std::endl;
return ss.str();
}
/// Integrates a magnitude value along the cylinder.
/// @param m is the magnitude value to be integrated (this is usually the radius)
T integrate(size_t m = 0) {
T sum = 0; //initialize the integral to zero
T m0, m1; //allocate space for both magnitudes in a single segment
m0 = M[0][m]; //initialize the first point and magnitude to the first point in the cylinder
T len = L[0]; //allocate space for the segment length
for (unsigned p = 1; p < size(); p++) { //for every consecutive point in the cylinder
m1 = M[p][m];
if (p > 1) len = (L[p - 1] - L[p - 2]); //calculate the segment length using the L array
sum += (m0 + m1) / (T)2.0 * len; //add the average magnitude, weighted by the segment length
m0 = m1; //move to the next segment by shifting points
}
return sum; //return the integral
}
/// Resamples the cylinder to provide a maximum distance of "spacing" between centerline points. All current
/// centerline points are guaranteed to exist in the new cylinder
/// @param spacing is the maximum spacing allowed between sample points
cylinder<T> resample(T spacing) {
cylinder<T> c = stim::centerline<T>::resample(spacing); //resample the centerline and use it to create a new cylinder
size_t nm = nmags(); //get the number of magnitude values in the current cylinder
if (nm > 0) { //if there are magnitude values
std::vector<T> magvec(nm, 0); //create a magnitude vector for a single point
c.M.resize(c.size(), magvec); //allocate space for a magnitude vector at each point of the new cylinder
}
|
10654a1f
Pavel Govyadinov
added the necessa...
|
204
|
|
c72184d1
Jiaming Guo
add many function...
|
205
206
207
208
209
210
211
|
T l, t;
for (size_t i = 0; i < c.size(); i++) { //for each point in the new cylinder
l = c.L[i]; //get the length along the new cylinder
t = l / length(); //calculate the parameter value along the new cylinder
for (size_t mag = 0; mag < nm; mag++) { //for each magnitude value
c.M[i][mag] = m(t, mag); //retrieve the interpolated magnitude from the current cylinder and store it in the new one
}
|
5b6c317a
Pavel Govyadinov
implemented the c...
|
212
213
|
}
|
c72184d1
Jiaming Guo
add many function...
|
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
|
return c;
}
std::vector< stim::cylinder<T> > split(unsigned int idx){
unsigned N = size();
std::vector< stim::centerline<T> > LL;
LL.resize(2);
LL = (*this).centerline<T>::split(idx);
std::vector< stim::cylinder<T> > C(LL.size());
unsigned i = 0;
C[0] = LL[0];
C[0].M.resize(idx);
for( ; i < idx; i++){
//for(unsigned d = 0; d < 3; d++)
//C[0][i][d] = LL[0].c[i][d];
C[0].M[i] = M[i];
C[0].M[i].resize(1);
}
if(C.size() == 2){
C[1] = LL[1];
C[1].M.resize(N - idx);
for( ; i < N; i++){
//for(unsigned d = 0; d < 3; d++)
//C[1][i - idx][d] = LL[1].c[i - idx][d];
C[1].M[i - idx] = M[i];
C[1].M[i - idx].resize(1);
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
242
|
}
|
c72184d1
Jiaming Guo
add many function...
|
243
244
245
246
247
|
}
return C;
}
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
248
|
|
c72184d1
Jiaming Guo
add many function...
|
249
250
|
/*
///inits the cylinder from a list of points (std::vector of stim::vec3 --inP) and magnitudes (inM)
|
5b6c317a
Pavel Govyadinov
implemented the c...
|
251
|
void
|
c72184d1
Jiaming Guo
add many function...
|
252
253
254
|
init(centerline inP, std::vector< std::vector<T> > inM) {
M = inM; //the magnitude vector can be copied directly
(*this) = inP; //the centerline can be copied to this class directly
|
308a743c
David Mayerich
fixed class compa...
|
255
256
|
stim::vec3<float> v1;
stim::vec3<float> v2;
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
257
|
e.resize(inP.size());
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
258
259
260
261
|
norms.resize(inP.size());
Us.resize(inP.size());
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
262
263
|
if(inP.size() < 2)
return;
|
8495a970
Pavel Govyadinov
added comments to...
|
264
265
|
//calculate each L.
|
1b2858a2
David Mayerich
fixed some commen...
|
266
267
268
|
L.resize(inP.size()); //the number of precomputed lengths will equal the number of points
T temp = (T)0; //length up to that point
L[0] = temp;
|
308a743c
David Mayerich
fixed class compa...
|
269
|
for(size_t i = 1; i < L.size(); i++)
|
10654a1f
Pavel Govyadinov
added the necessa...
|
270
|
{
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
271
|
temp += (inP[i-1] - inP[i]).len();
|
bf23ee36
Pavel Govyadinov
more minor bug fi...
|
272
|
L[i] = temp;
|
10654a1f
Pavel Govyadinov
added the necessa...
|
273
|
}
|
9c97e126
David Mayerich
added an axis-ali...
|
274
|
|
308a743c
David Mayerich
fixed class compa...
|
275
276
|
stim::vec3<T> dr = (inP[1] - inP[0]).norm();
s = stim::circle<T>(inP[0], inM[0][0], dr, stim::vec3<T>(1,0,0));
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
277
|
norms[0] = s.N;
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
278
|
e[0] = s;
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
279
|
Us[0] = e[0].U;
|
308a743c
David Mayerich
fixed class compa...
|
280
|
for(size_t i = 1; i < inP.size()-1; i++)
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
281
282
283
284
285
286
|
{
s.center(inP[i]);
v1 = (inP[i] - inP[i-1]).norm();
v2 = (inP[i+1] - inP[i]).norm();
dr = (v1+v2).norm();
s.normal(dr);
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
287
288
289
|
norms[i] = s.N;
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
290
291
|
s.scale(inM[i][0]/inM[i-1][0]);
e[i] = s;
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
292
|
Us[i] = e[i].U;
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
293
294
295
296
297
298
|
}
int j = inP.size()-1;
s.center(inP[j]);
dr = (inP[j] - inP[j-1]).norm();
s.normal(dr);
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
299
300
301
|
norms[j] = s.N;
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
302
303
|
s.scale(inM[j][0]/inM[j-1][0]);
e[j] = s;
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
304
|
Us[j] = e[j].U;
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
305
306
|
}
|
8495a970
Pavel Govyadinov
added comments to...
|
307
|
///returns the direction vector at point idx.
|
308a743c
David Mayerich
fixed class compa...
|
308
|
stim::vec3<T>
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
309
310
311
312
|
d(int idx)
{
if(idx == 0)
{
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
313
314
315
316
317
318
319
|
stim::vec3<T> temp(
c[idx+1][0]-c[idx][0],
c[idx+1][1]-c[idx][1],
c[idx+1][2]-c[idx][2]
);
// return (e[idx+1].P - e[idx].P).norm();
return (temp.norm());
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
320
|
}
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
321
|
else if(idx == N-1)
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
322
|
{
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
323
324
325
326
327
328
329
|
stim::vec3<T> temp(
c[idx][0]-c[idx+1][0],
c[idx][1]-c[idx+1][1],
c[idx][2]-c[idx+1][2]
);
// return (e[idx].P - e[idx-1].P).norm();
return (temp.norm());
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
330
331
332
|
}
else
{
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
333
|
// return (e[idx+1].P - e[idx].P).norm();
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
|
// stim::vec3<float> v1 = (e[idx].P-e[idx-1].P).norm();
stim::vec3<T> v1(
c[idx][0]-c[idx-1][0],
c[idx][1]-c[idx-1][1],
c[idx][2]-c[idx-1][2]
);
// stim::vec3<float> v2 = (e[idx+1].P-e[idx].P).norm();
stim::vec3<T> v2(
c[idx+1][0]-c[idx][0],
c[idx+1][1]-c[idx][1],
c[idx+1][2]-c[idx][2]
);
return (v1.norm()+v2.norm()).norm();
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
349
350
351
|
}
// return e[idx].N;
|
10654a1f
Pavel Govyadinov
added the necessa...
|
352
353
|
}
|
308a743c
David Mayerich
fixed class compa...
|
354
|
stim::vec3<T>
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
355
|
d(T l, int idx)
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
356
|
{
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
357
|
if(idx == 0 || idx == N-1)
|
10654a1f
Pavel Govyadinov
added the necessa...
|
358
|
{
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
359
360
|
return norms[idx];
// return e[idx].N;
|
10654a1f
Pavel Govyadinov
added the necessa...
|
361
|
}
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
362
363
|
else
{
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
364
|
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
365
|
T rat = (l-L[idx])/(L[idx+1]-L[idx]);
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
366
367
|
return( norms[idx] + (norms[idx+1] - norms[idx])*rat);
// return( e[idx].N + (e[idx+1].N - e[idx].N)*rat);
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
368
|
}
|
10654a1f
Pavel Govyadinov
added the necessa...
|
369
370
|
}
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
371
|
|
8495a970
Pavel Govyadinov
added comments to...
|
372
373
|
///finds the index of the point closest to the length l on the lower bound.
///binary search.
|
10654a1f
Pavel Govyadinov
added the necessa...
|
374
|
int
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
375
376
377
378
379
|
findIdx(T l)
{
unsigned int i = L.size()/2;
unsigned int max = L.size()-1;
unsigned int min = 0;
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
380
|
while(i > 0 && i < L.size()-1)
|
10654a1f
Pavel Govyadinov
added the necessa...
|
381
|
{
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
382
383
|
// std::cerr << "Trying " << i << std::endl;
// std::cerr << "l is " << l << ", L[" << i << "]" << L[i] << std::endl;
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
384
|
if(l < L[i])
|
10654a1f
Pavel Govyadinov
added the necessa...
|
385
|
{
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
386
|
max = i;
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
387
|
i = min+(max-min)/2;
|
10654a1f
Pavel Govyadinov
added the necessa...
|
388
|
}
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
389
|
else if(L[i] <= l && L[i+1] >= l)
|
10654a1f
Pavel Govyadinov
added the necessa...
|
390
391
392
393
394
|
{
break;
}
else
{
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
395
|
min = i;
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
396
|
i = min+(max-min)/2;
|
10654a1f
Pavel Govyadinov
added the necessa...
|
397
398
399
400
|
}
}
return i;
}
|
5b6c317a
Pavel Govyadinov
implemented the c...
|
401
|
|
9c97e126
David Mayerich
added an axis-ali...
|
402
403
|
public:
///default constructor
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
404
|
cylinder()
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
405
|
// : centerline<T>()
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
406
407
408
|
{
}
|
9c97e126
David Mayerich
added an axis-ali...
|
409
|
|
5b6c317a
Pavel Govyadinov
implemented the c...
|
410
|
///constructor to create a cylinder from a set of points, radii, and the number of sides for the cylinder.
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
411
|
///@param inP: Vector of stim vec3 composing the points of the centerline.
|
5b6c317a
Pavel Govyadinov
implemented the c...
|
412
|
///@param inM: Vector of stim vecs composing the radii of the centerline.
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
413
414
415
|
cylinder(std::vector<stim::vec3<T> > inP, std::vector<stim::vec<T> > inM)
: centerline<T>(inP)
{
|
5b6c317a
Pavel Govyadinov
implemented the c...
|
416
417
418
|
init(inP, inM);
}
|
09049866
Pavel Govyadinov
fixed a drawing b...
|
419
420
421
422
423
424
425
|
///constructor to create a cylinder from a set of points, radii, and the number of sides for the cylinder.
///@param inP: Vector of stim vec3 composing the points of the centerline.
///@param inM: Vector of stim vecs composing the radii of the centerline.
cylinder(std::vector<stim::vec3<T> > inP, std::vector< T > inM)
: centerline<T>(inP)
{
std::vector<stim::vec<T> > temp;
|
a36c3850
Pavel Govyadinov
fixed the bug tha...
|
426
|
stim::vec<T> zero(0.0,0.0);
|
09049866
Pavel Govyadinov
fixed a drawing b...
|
427
|
temp.resize(inM.size(), zero);
|
47fe6300
Pavel Govyadinov
fixed an accident...
|
428
429
|
for(int i = 0; i < inM.size(); i++)
temp[i][0] = inM[i];
|
09049866
Pavel Govyadinov
fixed a drawing b...
|
430
431
432
|
init(inP, temp);
}
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
433
|
|
58ee2b21
David Mayerich
incorporated stim...
|
434
|
///Constructor defines a cylinder with centerline inP and magnitudes of zero
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
435
|
///@param inP: Vector of stim vec3 composing the points of the centerline
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
436
437
438
|
cylinder(std::vector< stim::vec3<T> > inP)
: centerline<T>(inP)
{
|
96e8ab1f
David Mayerich
fixed stim::cylin...
|
439
|
std::vector< stim::vec<T> > inM; //create an array of arbitrary magnitudes
|
9c97e126
David Mayerich
added an axis-ali...
|
440
441
442
443
444
|
stim::vec<T> zero;
zero.push_back(0);
inM.resize(inP.size(), zero); //initialize the magnitude values to zero
|
58ee2b21
David Mayerich
incorporated stim...
|
445
446
447
|
init(inP, inM);
}
|
c72184d1
Jiaming Guo
add many function...
|
448
449
450
451
452
|
//assignment operator creates a cylinder from a centerline (default radius is zero)
cylinder& operator=(stim::centerline<T> c) {
init(c);
}
|
58ee2b21
David Mayerich
incorporated stim...
|
453
454
455
|
///Returns the number of points on the cylinder centerline
unsigned int size(){
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
456
|
return N;
|
58ee2b21
David Mayerich
incorporated stim...
|
457
458
|
}
|
c72184d1
Jiaming Guo
add many function...
|
459
|
|
10654a1f
Pavel Govyadinov
added the necessa...
|
460
|
///Returns a position vector at the given p-value (p value ranges from 0 to 1).
|
8495a970
Pavel Govyadinov
added comments to...
|
461
462
|
///interpolates the position along the line.
///@param pvalue: the location of the in the cylinder, from 0 (beginning to 1).
|
308a743c
David Mayerich
fixed class compa...
|
463
|
stim::vec3<T>
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
464
465
|
p(T pvalue)
{
|
bf23ee36
Pavel Govyadinov
more minor bug fi...
|
466
|
if(pvalue < 0.0 || pvalue > 1.0)
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
467
|
{
|
308a743c
David Mayerich
fixed class compa...
|
468
|
return stim::vec3<float>(-1,-1,-1);
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
469
|
}
|
10654a1f
Pavel Govyadinov
added the necessa...
|
470
471
|
T l = pvalue*L[L.size()-1];
int idx = findIdx(l);
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
472
|
return (p(l,idx));
|
c72184d1
Jiaming Guo
add many function...
|
473
|
}
|
10654a1f
Pavel Govyadinov
added the necessa...
|
474
|
|
8495a970
Pavel Govyadinov
added comments to...
|
475
476
477
478
|
///Returns a position vector at the given length into the fiber (based on the pvalue).
///Interpolates the radius along the line.
///@param l: the location of the in the cylinder.
///@param idx: integer location of the point closest to l but prior to it.
|
308a743c
David Mayerich
fixed class compa...
|
479
|
stim::vec3<T>
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
480
481
482
|
p(T l, int idx)
{
T rat = (l-L[idx])/(L[idx+1]-L[idx]);
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
483
484
485
486
487
488
489
490
491
492
493
494
495
|
stim::vec3<T> v1(
c[idx][0],
c[idx][1],
c[idx][2]
);
stim::vec3<T> v2(
c[idx+1][0],
c[idx+1][1],
c[idx+1][2]
);
// return( e[idx].P + (e[idx+1].P-e[idx].P)*rat);
return( v1 + (v2-v1)*rat);
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
496
497
|
// return(
// return (pos[idx] + (pos[idx+1]-pos[idx])*((l-L[idx])/(L[idx+1]- L[idx])));
|
10654a1f
Pavel Govyadinov
added the necessa...
|
498
499
500
|
}
///Returns a radius at the given p-value (p value ranges from 0 to 1).
|
8495a970
Pavel Govyadinov
added comments to...
|
501
502
|
///interpolates the radius along the line.
///@param pvalue: the location of the in the cylinder, from 0 (beginning to 1).
|
10654a1f
Pavel Govyadinov
added the necessa...
|
503
|
T
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
504
505
|
r(T pvalue)
{
|
98eecaa9
David Mayerich
VS and win32 updates
|
506
507
508
509
|
if(pvalue < 0.0 || pvalue > 1.0){
std::cerr<<"Error, value "<<pvalue<<" is outside of [0 1]."<<std::endl;
exit(1);
}
|
10654a1f
Pavel Govyadinov
added the necessa...
|
510
511
|
T l = pvalue*L[L.size()-1];
int idx = findIdx(l);
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
512
|
return (r(l,idx));
|
c72184d1
Jiaming Guo
add many function...
|
513
|
}
|
10654a1f
Pavel Govyadinov
added the necessa...
|
514
|
|
8495a970
Pavel Govyadinov
added comments to...
|
515
516
517
518
|
///Returns a radius at the given length into the fiber (based on the pvalue).
///Interpolates the position along the line.
///@param l: the location of the in the cylinder.
///@param idx: integer location of the point closest to l but prior to it.
|
10654a1f
Pavel Govyadinov
added the necessa...
|
519
|
T
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
520
521
522
|
r(T l, int idx)
{
T rat = (l-L[idx])/(L[idx+1]-L[idx]);
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
523
524
525
526
527
528
529
530
|
T v1 = (e[idx].U.len() + (e[idx+1].U.len() - e[idx].U.len())*rat);
T v3 = (Us[idx].len() + (Us[idx+1].len() - Us[idx].len())*rat);
T v2 = (mags[idx][0] + (mags[idx+1][0]-mags[idx][0])*rat);
// std::cout << (float)v1 = (float) v2 << std::endl;
if(abs(v3 - v1) >= 10e-6)
{
std::cout << "-------------------------" << std::endl;
std::cout << e[idx].str() << std::endl << std::endl;
|
b50c840e
David Mayerich
eliminated ANN fr...
|
531
|
std::cout << Us[idx].str() << std::endl;
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
532
533
534
535
536
|
std::cout << (float)v1 - (float) v2 << std::endl;
std::cout << "failed" << std::endl;
}
// std::cout << e[idx].U.len() << " " << mags[idx][0] << std::endl;
// std::cout << v2 << std::endl;
|
24dee661
Pavel Govyadinov
finished the debu...
|
537
|
return(v2);
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
538
539
|
// return (mags[idx][0] + (mags[idx+1][0]-mags[idx][0])*rat);
// (
|
66fe63f3
Pavel Govyadinov
fixed minor typo
|
540
|
}
|
10654a1f
Pavel Govyadinov
added the necessa...
|
541
|
|
9c97e126
David Mayerich
added an axis-ali...
|
542
543
544
545
546
547
548
549
550
551
|
/// Returns the magnitude at the given index
/// @param i is the index of the desired point
/// @param m is the index of the magnitude value
T ri(unsigned i, unsigned m = 0){
return mags[i][m];
}
/// Adds a new magnitude value to all points
/// @param m is the starting value for the new magnitude
void add_mag(T m = 0){
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
552
|
for(unsigned int p = 0; p < N; p++)
|
9c97e126
David Mayerich
added an axis-ali...
|
553
554
555
556
557
558
559
560
561
562
563
|
mags[p].push_back(m);
}
/// Sets a magnitude value
/// @param val is the new value for the magnitude
/// @param p is the point index for the magnitude to be set
/// @param m is the index for the magnitude
void set_mag(T val, unsigned p, unsigned m = 0){
mags[p][m] = val;
}
|
b3a38641
David Mayerich
added the ability...
|
564
565
566
567
568
|
/// Returns the number of magnitude values at each point
unsigned nmags(){
return mags[0].size();
}
|
10654a1f
Pavel Govyadinov
added the necessa...
|
569
|
///returns the position of the point with a given pvalue and theta on the surface
|
8495a970
Pavel Govyadinov
added comments to...
|
570
571
572
|
///in x, y, z coordinates. Theta is in degrees from 0 to 360.
///@param pvalue: the location of the in the cylinder, from 0 (beginning to 1).
///@param theta: the angle to the point of a circle.
|
308a743c
David Mayerich
fixed class compa...
|
573
|
stim::vec3<T>
|
10654a1f
Pavel Govyadinov
added the necessa...
|
574
575
|
surf(T pvalue, T theta)
{
|
bf23ee36
Pavel Govyadinov
more minor bug fi...
|
576
|
if(pvalue < 0.0 || pvalue > 1.0)
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
577
|
{
|
308a743c
David Mayerich
fixed class compa...
|
578
|
return stim::vec3<float>(-1,-1,-1);
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
579
|
} else {
|
10654a1f
Pavel Govyadinov
added the necessa...
|
580
581
|
T l = pvalue*L[L.size()-1];
int idx = findIdx(l);
|
308a743c
David Mayerich
fixed class compa...
|
582
|
stim::vec3<T> ps = p(l, idx);
|
10654a1f
Pavel Govyadinov
added the necessa...
|
583
|
T m = r(l, idx);
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
584
585
586
587
|
s = e[idx];
s.center(ps);
s.normal(d(l, idx));
s.scale(m/e[idx].U.len());
|
10654a1f
Pavel Govyadinov
added the necessa...
|
588
|
return(s.p(theta));
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
589
|
}
|
10654a1f
Pavel Govyadinov
added the necessa...
|
590
591
|
}
|
8495a970
Pavel Govyadinov
added comments to...
|
592
|
///returns a vector of points necessary to create a circle at every position in the fiber.
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
593
|
///@param sides: the number of sides of each circle.
|
308a743c
David Mayerich
fixed class compa...
|
594
|
std::vector<std::vector<vec3<T> > >
|
5b6c317a
Pavel Govyadinov
implemented the c...
|
595
596
|
getPoints(int sides)
{
|
308a743c
David Mayerich
fixed class compa...
|
597
|
std::vector<std::vector <vec3<T> > > points;
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
598
599
|
points.resize(N);
for(int i = 0; i < N; i++)
|
5b6c317a
Pavel Govyadinov
implemented the c...
|
600
|
{
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
601
|
points[i] = e[i].getPoints(sides);
|
5b6c317a
Pavel Govyadinov
implemented the c...
|
602
|
}
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
603
|
return points;
|
5b6c317a
Pavel Govyadinov
implemented the c...
|
604
|
}
|
58ee2b21
David Mayerich
incorporated stim...
|
605
|
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
606
607
608
609
610
611
|
///returns the total length of the line at index j.
T
getl(int j)
{
return (L[j]);
}
|
58ee2b21
David Mayerich
incorporated stim...
|
612
613
|
/// Allows a point on the centerline to be accessed using bracket notation
|
308a743c
David Mayerich
fixed class compa...
|
614
|
vec3<T> operator[](unsigned int i){
|
3e5d3ad3
Pavel Govyadinov
merged the change...
|
615
|
return e[i].P;
|
58ee2b21
David Mayerich
incorporated stim...
|
616
617
618
619
620
621
622
|
}
/// Returns the total length of the cylinder centerline
T length(){
return L.back();
}
|
9c97e126
David Mayerich
added an axis-ali...
|
623
624
625
626
627
628
629
|
/// Integrates a magnitude value along the cylinder.
/// @param m is the magnitude value to be integrated (this is usually the radius)
T integrate(unsigned m = 0){
T M = 0; //initialize the integral to zero
T m0, m1; //allocate space for both magnitudes in a single segment
|
308a743c
David Mayerich
fixed class compa...
|
630
|
//vec3<T> p0, p1; //allocate space for both points in a single segment
|
9c97e126
David Mayerich
added an axis-ali...
|
631
632
633
634
635
636
637
|
m0 = mags[0][m]; //initialize the first point and magnitude to the first point in the cylinder
//p0 = pos[0];
T len = L[0]; //allocate space for the segment length
//for every consecutive point in the cylinder
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
638
|
for(unsigned p = 1; p < N; p++){
|
9c97e126
David Mayerich
added an axis-ali...
|
639
640
641
642
643
644
645
|
//p1 = pos[p]; //get the position and magnitude for the next point
m1 = mags[p][m];
if(p > 1) len = (L[p-1] - L[p-2]); //calculate the segment length using the L array
//add the average magnitude, weighted by the segment length
|
308a743c
David Mayerich
fixed class compa...
|
646
|
M += (m0 + m1)/(T)2.0 * len;
|
9c97e126
David Mayerich
added an axis-ali...
|
647
648
649
650
651
652
653
654
655
656
657
658
659
660
|
m0 = m1; //move to the next segment by shifting points
}
return M; //return the integral
}
/// Averages a magnitude value across the cylinder
/// @param m is the magnitude value to be averaged (this is usually the radius)
T average(unsigned m = 0){
//return the average magnitude
return integrate(m) / L.back();
}
|
58ee2b21
David Mayerich
incorporated stim...
|
661
662
663
664
665
|
/// Resamples the cylinder to provide a maximum distance of "spacing" between centerline points. All current
/// centerline points are guaranteed to exist in the new cylinder
/// @param spacing is the maximum spacing allowed between sample points
cylinder<T> resample(T spacing){
|
308a743c
David Mayerich
fixed class compa...
|
666
|
std::vector< vec3<T> > result;
|
9c97e126
David Mayerich
added an axis-ali...
|
667
|
|
1b2858a2
David Mayerich
fixed some commen...
|
668
|
vec3<T> p0 = e[0].P; //initialize p0 to the first point on the centerline
|
308a743c
David Mayerich
fixed class compa...
|
669
|
vec3<T> p1;
|
1b2858a2
David Mayerich
fixed some commen...
|
670
|
unsigned N = size(); //number of points in the current centerline
|
58ee2b21
David Mayerich
incorporated stim...
|
671
672
673
|
//for each line segment on the centerline
for(unsigned int i = 1; i < N; i++){
|
1b2858a2
David Mayerich
fixed some commen...
|
674
|
p1 = e[i].P; //get the second point in the line segment
|
58ee2b21
David Mayerich
incorporated stim...
|
675
|
|
1b2858a2
David Mayerich
fixed some commen...
|
676
677
|
vec3<T> v = p1 - p0; //calculate the vector between these two points
T d = v.len(); //calculate the distance between these two points (length of the line segment)
|
58ee2b21
David Mayerich
incorporated stim...
|
678
|
|
308a743c
David Mayerich
fixed class compa...
|
679
|
size_t nsteps = (size_t)std::ceil(d / spacing); //calculate the number of steps to take along the segment to meet the spacing criteria
|
1b2858a2
David Mayerich
fixed some commen...
|
680
|
T stepsize = (T)1.0 / nsteps; //calculate the parametric step size between new centerline points
|
58ee2b21
David Mayerich
incorporated stim...
|
681
682
683
|
//for each step along the line segment
for(unsigned s = 0; s < nsteps; s++){
|
1b2858a2
David Mayerich
fixed some commen...
|
684
685
|
T alpha = stepsize * s; //calculate the fraction of the distance along the line segment covered
result.push_back(p0 + alpha * v); //push the point at alpha position along the line segment
|
58ee2b21
David Mayerich
incorporated stim...
|
686
687
|
}
|
1b2858a2
David Mayerich
fixed some commen...
|
688
|
p0 = p1; //shift the points to move to the next line segment
|
58ee2b21
David Mayerich
incorporated stim...
|
689
690
|
}
|
1b2858a2
David Mayerich
fixed some commen...
|
691
|
result.push_back(e[size() - 1].P); //push the last point in the centerline
|
9c97e126
David Mayerich
added an axis-ali...
|
692
|
|
58ee2b21
David Mayerich
incorporated stim...
|
693
694
|
return cylinder<T>(result);
|
c72184d1
Jiaming Guo
add many function...
|
695
|
}*/
|
9c97e126
David Mayerich
added an axis-ali...
|
696
|
|
26aee9ed
Pavel Govyadinov
changed circle cl...
|
697
|
|
5b6c317a
Pavel Govyadinov
implemented the c...
|
698
699
700
|
};
}
|
c72184d1
Jiaming Guo
add many function...
|
701
|
#endif
|