Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
CGoGN
CGoGN
Commits
11ba46af
Commit
11ba46af
authored
Mar 14, 2012
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove minor bug in marching cube
parent
5bcd6811
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
10 deletions
+27
-10
include/Algo/MC/marchingcube.h
include/Algo/MC/marchingcube.h
+1
-8
include/Algo/MC/marchingcube.hpp
include/Algo/MC/marchingcube.hpp
+25
-2
include/Topology/generic/functor.h
include/Topology/generic/functor.h
+1
-0
No files found.
include/Algo/MC/marchingcube.h
View file @
11ba46af
...
...
@@ -189,14 +189,7 @@ protected:
void
setNeighbour
(
L_DART
d1
,
L_DART
d2
);
L_DART
createTriEmb
(
unsigned
int
e1
,
unsigned
int
e2
,
unsigned
int
e3
)
{
L_DART
d
=
m_map
->
newFace
(
3
);
//TODO change this which work only with 2-maps
m_map
->
setDartEmbedding
(
VERTEX
,
d
,
e1
);
d
=
m_map
->
phi1
(
d
);
m_map
->
setDartEmbedding
(
VERTEX
,
d
,
e2
);
d
=
m_map
->
phi1
(
d
);
m_map
->
setDartEmbedding
(
VERTEX
,
d
,
e3
);
d
=
m_map
->
phi1
(
d
);
return
d
;
}
L_DART
createTriEmb
(
unsigned
int
e1
,
unsigned
int
e2
,
unsigned
int
e3
);
public:
/**
...
...
include/Algo/MC/marchingcube.hpp
View file @
11ba46af
...
...
@@ -100,6 +100,29 @@ void MarchingCube<DataType, Windowing, PFP>::deleteMesh()
}
}
template< typename DataType, template < typename D2 > class Windowing, typename PFP >
Dart MarchingCube<DataType, Windowing, PFP>::createTriEmb(unsigned int e1, unsigned int e2, unsigned int e3)
{
L_DART d = m_map->newFace(3,false);
//TODO change this which work only with 2-maps
// m_map->setDartEmbedding(VERTEX,d,e1); d = m_map->phi1(d);
// m_map->setDartEmbedding(VERTEX,d,e2); d = m_map->phi1(d);
// m_map->setDartEmbedding(VERTEX,d,e3); d = m_map->phi1(d);
FunctorSetEmb<GenericMap> fsetemb(*m_map, VERTEX, e1);
m_map->foreach_dart_of_orbit(PFP::MAP::ORBIT_IN_PARENT(VERTEX), d, fsetemb);
d = m_map->phi1(d);
fsetemb.changeEmb(e2);
m_map->foreach_dart_of_orbit(PFP::MAP::ORBIT_IN_PARENT(VERTEX), d, fsetemb);
d = m_map->phi1(d);
fsetemb.changeEmb(e3);
m_map->foreach_dart_of_orbit(PFP::MAP::ORBIT_IN_PARENT(VERTEX), d, fsetemb);
d = m_map->phi1(d);
return d;
}
template< typename DataType, template < typename D2 > class Windowing, typename PFP >
void MarchingCube<DataType, Windowing, PFP>::simpleMeshing()
{
...
...
@@ -948,14 +971,14 @@ template< typename DataType, template < typename D2 > class Windowing, typename
void MarchingCube<DataType, Windowing, PFP>::setNeighbourSimple(L_DART d1, L_DART d2)
{
if (m_map->phi2(d1) != d2)
m_map->sewFaces(d1,d2);
m_map->sewFaces(d1,d2
,false
);
}
template< typename DataType, template < typename D2 > class Windowing, typename PFP >
void MarchingCube<DataType, Windowing, PFP>::setNeighbour(L_DART d1, L_DART d2)
{
if (m_map->phi2(d1) != d2)
m_map->sewFaces(d1,d2);
m_map->sewFaces(d1,d2
,false
);
}
template< typename DataType, template < typename D2 > class Windowing, typename PFP >
...
...
include/Topology/generic/functor.h
View file @
11ba46af
...
...
@@ -253,6 +253,7 @@ public:
this
->
m_map
.
setDartEmbedding
(
orbit
,
d
,
emb
);
return
false
;
}
void
changeEmb
(
unsigned
int
e
)
{
emb
=
e
;}
};
// Functor Check Embedding : to check the embeddings of the given map
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment