Skip to content

Commit e0d0e25

Browse files
alxbilgeralxbilger
authored
adapt to #5539 (#34)
1 parent ca1db77 commit e0d0e25

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

‎src/CGALPlugin/CylinderMesh.inl‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ void CylinderMesh<DataTypes>::doUpdate()
105105
{
106106
Point p(i*t, j*t, k*t);
107107
points.push_back(p);
108-
Index g(i,j,k);
108+
Index g({i,j,k});
109109
m_ptID.insert(std::make_pair(g,count));
110110
++count;
111111
}
@@ -124,7 +124,7 @@ void CylinderMesh<DataTypes>::doUpdate()
124124
{
125125
Point p(i*t, j*t, k*t);
126126
points.push_back(p);
127-
Index g(i,j,k);
127+
Index g({i,j,k});
128128
m_ptID.insert(std::make_pair(g,count));
129129
++count;
130130
}
@@ -142,7 +142,7 @@ void CylinderMesh<DataTypes>::doUpdate()
142142
{
143143
Point p(-n*t, j*t, k*t);
144144
points.push_back(p);
145-
Index g(-n,j,k);
145+
Index g({-n,j,k});
146146
m_ptID.insert(std::make_pair(g,count));
147147
++count;
148148
}
@@ -154,7 +154,7 @@ void CylinderMesh<DataTypes>::doUpdate()
154154
{
155155
Point p(n*t, j*t, k*t);
156156
points.push_back(p);
157-
Index g(n,j,k);
157+
Index g({n,j,k});
158158
m_ptID.insert(std::make_pair(g,count));
159159
++count;
160160
}
@@ -166,7 +166,7 @@ void CylinderMesh<DataTypes>::doUpdate()
166166
{
167167
Point p(i*t, -n*t, k*t);
168168
points.push_back(p);
169-
Index g(i,-n,k);
169+
Index g({i,-n,k});
170170
m_ptID.insert(std::make_pair(g,count));
171171
++count;
172172
}
@@ -178,7 +178,7 @@ void CylinderMesh<DataTypes>::doUpdate()
178178
{
179179
Point p(i*t, n*t, k*t);
180180
points.push_back(p);
181-
Index g(i,n,k);
181+
Index g({i,n,k});
182182
m_ptID.insert(std::make_pair(g,count));
183183
++count;
184184
}
@@ -191,7 +191,7 @@ void CylinderMesh<DataTypes>::doUpdate()
191191
{
192192
Point p(i*t, j*t, -m*t);
193193
points.push_back(p);
194-
Index g(i,j,-m);
194+
Index g({i,j,-m});
195195
m_ptID.insert(std::make_pair(g,count));
196196
++count;
197197
}
@@ -204,7 +204,7 @@ void CylinderMesh<DataTypes>::doUpdate()
204204
{
205205
Point p(i*t, j*t, m*t);
206206
points.push_back(p);
207-
Index g(i,j,m);
207+
Index g({i,j,m});
208208
m_ptID.insert(std::make_pair(g,count));
209209
++count;
210210
}
@@ -222,10 +222,10 @@ void CylinderMesh<DataTypes>::doUpdate()
222222
for(int i = b1; i <= b2; i+=2)
223223
//for(int i = -n+1; i < n-2; i+=2)
224224
{
225-
Index c1(i,j,k), c2(i+2,j,k);
225+
Index c1({i,j,k}), c2({i+2,j,k});
226226
if(m_ptID.find(c1) == m_ptID.end() || m_ptID.find(c2) == m_ptID.end())
227227
msg_error() << "Tetrahedron is out of boundary. c ";
228-
Index p[4] = {Index(i+1,j-1,k-1), Index(i+1,j+1,k-1), Index(i+1,j+1,k+1), Index(i+1,j-1,k+1)};
228+
Index p[4] = {Index({i+1,j-1,k-1}), Index({i+1,j+1,k-1}), Index({i+1,j+1,k+1}), Index({i+1,j-1,k+1})};
229229
for(int s = 0; s < 4; ++s)
230230
{
231231
if(m_ptID.find(p[s]) == m_ptID.end() || m_ptID.find(p[(s+1)%4]) == m_ptID.end())
@@ -245,10 +245,10 @@ void CylinderMesh<DataTypes>::doUpdate()
245245
for(int j = b1; j <= b2; j+=2)
246246
//for(int j = -n+1; j < n-2; j+=2)
247247
{
248-
Index c1(i,j,k), c2(i,j+2,k);
248+
Index c1({i,j,k}), c2({i,j+2,k});
249249
if(m_ptID.find(c1) == m_ptID.end() || m_ptID.find(c2) == m_ptID.end())
250250
msg_info() << "Tetrahedron is out of boundary. c";
251-
Index p[4] = {Index(i-1,j+1,k-1), Index(i+1,j+1,k-1), Index(i+1,j+1,k+1), Index(i-1,j+1,k+1)};
251+
Index p[4] = {Index({i-1,j+1,k-1}), Index({i+1,j+1,k-1}), Index({i+1,j+1,k+1}), Index({i-1,j+1,k+1})};
252252
for(int s = 0; s < 4; ++s)
253253
{
254254
if(m_ptID.find(p[s]) == m_ptID.end() || m_ptID.find(p[(s+1)%4]) == m_ptID.end())
@@ -268,8 +268,8 @@ void CylinderMesh<DataTypes>::doUpdate()
268268
{
269269
for(int k = -m+1; k <= m-3; k+=2)
270270
{
271-
Index c1(i,j,k), c2(i,j,k+2);
272-
Index p[4] = {Index(i-1,j-1,k+1), Index(i+1,j-1,k+1), Index(i+1,j+1,k+1), Index(i-1,j+1,k+1)};
271+
Index c1({i,j,k}), c2({i,j,k+2});
272+
Index p[4] = {Index({i-1,j-1,k+1}), Index({i+1,j-1,k+1}), Index({i+1,j+1,k+1}), Index({i-1,j+1,k+1})};
273273
if(m_ptID.find(c1) == m_ptID.end() || m_ptID.find(c2) == m_ptID.end())
274274
msg_error() << "Tetrahedron is out of boundary. c";
275275
bool flag[4] = {true, true, true, true};
@@ -294,10 +294,10 @@ void CylinderMesh<DataTypes>::doUpdate()
294294
for(int j = b1; j <= b2; j+=2)
295295
//for(int j = -n+1; j <= n-1; j+=2)
296296
{
297-
Index c1(-n+1,j,k), c2(-n,j,k);
297+
Index c1({-n+1,j,k}), c2({-n,j,k});
298298
if(m_ptID.find(c1) == m_ptID.end() || m_ptID.find(c2) == m_ptID.end())
299299
msg_error() << "Tetrahedron is out of boundary.";
300-
Index p[4] = {Index(-n,j-1,k-1), Index(-n,j+1,k-1), Index(-n,j+1,k+1), Index(-n,j-1,k+1)};
300+
Index p[4] = {Index({-n,j-1,k-1}), Index({-n,j+1,k-1}), Index({-n,j+1,k+1}), Index({-n,j-1,k+1})};
301301
for(int s = 0; s < 4; ++s)
302302
{
303303
if(m_ptID.find(p[s]) == m_ptID.end() || m_ptID.find(p[(s+1)%4]) == m_ptID.end())
@@ -313,10 +313,10 @@ void CylinderMesh<DataTypes>::doUpdate()
313313
for(int j = b1; j <= b2; j+=2)
314314
//for(int j = -n+1; j < n; j+=2)
315315
{
316-
Index c1(n-1,j,k), c2(n,j,k);
316+
Index c1({n-1,j,k}), c2({n,j,k});
317317
if(m_ptID.find(c1) == m_ptID.end() || m_ptID.find(c2) == m_ptID.end())
318318
msg_error() << "Tetrahedron is out of boundary.";
319-
Index p[4] = {Index(n,j-1,k-1), Index(n,j+1,k-1), Index(n,j+1,k+1), Index(n,j-1,k+1)};
319+
Index p[4] = {Index({n,j-1,k-1}), Index({n,j+1,k-1}), Index({n,j+1,k+1}), Index({n,j-1,k+1})};
320320
for(int s = 0; s < 4; ++s)
321321
{
322322
if(m_ptID.find(p[s]) == m_ptID.end() || m_ptID.find(p[(s+1)%4]) == m_ptID.end())
@@ -333,10 +333,10 @@ void CylinderMesh<DataTypes>::doUpdate()
333333
for(int i = b1; i <= b2; i+=2)
334334
//for(int i = -n+1; i < n; i+=2)
335335
{
336-
Index c1(i,-n+1,k), c2(i,-n,k);
336+
Index c1({i,-n+1,k}), c2({i,-n,k});
337337
if(m_ptID.find(c1) == m_ptID.end() || m_ptID.find(c2) == m_ptID.end())
338338
msg_error() << "Tetrahedron is out of boundary.";
339-
Index p[4] = {Index(i-1,-n,k-1), Index(i+1,-n,k-1), Index(i+1,-n,k+1), Index(i-1,-n,k+1)};
339+
Index p[4] = {Index({i-1,-n,k-1}), Index({i+1,-n,k-1}), Index({i+1,-n,k+1}), Index({i-1,-n,k+1})};
340340
for(int s = 0; s < 4; ++s)
341341
{
342342
if(m_ptID.find(p[s]) == m_ptID.end() || m_ptID.find(p[(s+1)%4]) == m_ptID.end())
@@ -351,10 +351,10 @@ void CylinderMesh<DataTypes>::doUpdate()
351351
for(int i = b1; i <= b2; i+=2)
352352
//for(int i = -n+1; i < n; i+=2)
353353
{
354-
Index c1(i,n-1,k), c2(i,n,k);
354+
Index c1({i,n-1,k}), c2({i,n,k});
355355
if(m_ptID.find(c1) == m_ptID.end() || m_ptID.find(c2) == m_ptID.end())
356356
msg_error() << "Tetrahedron is out of boundary.";
357-
Index p[4] = {Index(i-1,n,k-1), Index(i+1,n,k-1), Index(i+1,n,k+1), Index(i-1,n,k+1)};
357+
Index p[4] = {Index({i-1,n,k-1}), Index({i+1,n,k-1}), Index({i+1,n,k+1}), Index({i-1,n,k+1})};
358358
for(int s = 0; s < 4; ++s)
359359
{
360360
if(m_ptID.find(p[s]) == m_ptID.end() || m_ptID.find(p[(s+1)%4]) == m_ptID.end())
@@ -371,10 +371,10 @@ void CylinderMesh<DataTypes>::doUpdate()
371371
for(int j = b1; j <= b2; j+=2)
372372
//for(int j = -n+1; j < n; j+=2)
373373
{
374-
Index c1(i,j,-m+1), c2(i,j,-m);
374+
Index c1({i,j,-m+1}), c2({i,j,-m});
375375
if(m_ptID.find(c1) == m_ptID.end() || m_ptID.find(c2) == m_ptID.end())
376376
msg_error() << "Tetrahedron is out of boundary. c";
377-
Index p[4] = {Index(i-1,j-1,-m), Index(i+1,j-1,-m), Index(i+1,j+1,-m), Index(i-1,j+1,-m)};
377+
Index p[4] = {Index({i-1,j-1,-m}), Index({i+1,j-1,-m}), Index({i+1,j+1,-m}), Index({i-1,j+1,-m})};
378378
bool flag[4] = {true, true, true, true};
379379
for(int s = 0; s < 4; ++s)
380380
if(m_ptID.find(p[s]) == m_ptID.end())
@@ -397,10 +397,10 @@ void CylinderMesh<DataTypes>::doUpdate()
397397
b1 = MAX(-n+1, MAX(-2*a-i, -2*a+i)), b2 = MIN(n-1, MIN(2*a-i, 2*a+i));
398398
for(int j = b1; j <= b2; j+=2)
399399
{
400-
Index c1(i,j,m-1), c2(i,j,m);
400+
Index c1({i,j,m-1}), c2({i,j,m});
401401
if(m_ptID.find(c1) == m_ptID.end() || m_ptID.find(c2) == m_ptID.end())
402402
msg_error() << "Tetrahedron is out of boundary.";
403-
Index p[4] = {Index(i-1,j-1,m), Index(i+1,j-1,m), Index(i+1,j+1,m), Index(i-1,j+1,m)};
403+
Index p[4] = {Index({i-1,j-1,m}), Index({i+1,j-1,m}), Index({i+1,j+1,m}), Index({i-1,j+1,m})};
404404
bool flag[4] = {true, true, true, true};
405405
for(int s = 0; s < 4; ++s)
406406
if(m_ptID.find(p[s]) == m_ptID.end())

0 commit comments

Comments
 (0)