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
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Thomas Pitiot
CGoGN
Commits
3e4dba23
Commit
3e4dba23
authored
Nov 28, 2012
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
restore oldi-school embnull testing algos
parent
f0c76ffa
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
97 additions
and
275 deletions
+97
-275
include/Algo/MC/marchingcube.hpp
include/Algo/MC/marchingcube.hpp
+3
-11
include/Algo/Modelisation/polyhedron.h
include/Algo/Modelisation/polyhedron.h
+4
-1
include/Algo/Modelisation/polyhedron.hpp
include/Algo/Modelisation/polyhedron.hpp
+90
-263
No files found.
include/Algo/MC/marchingcube.hpp
View file @
3e4dba23
...
...
@@ -26,8 +26,6 @@
#include "Topology/generic/dartmarker.h"
#include <vector>
#include "Algo/Modelisation/boundEmb.h"
namespace
CGoGN
{
...
...
@@ -119,9 +117,7 @@ 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);
L_DART d = Modelisation::newFaceEmb<PFP>(*m_map,3);
L_DART
d
=
m_map
->
newFace
(
3
,
false
);
FunctorSetEmb
<
GenericMap
,
VERTEX
>
fsetemb
(
*
m_map
,
e1
);
m_map
->
template
foreach_dart_of_orbit
<
PFP
::
MAP
::
VERTEX_OF_PARENT
>(
d
,
fsetemb
);
...
...
@@ -926,9 +922,7 @@ void MarchingCube<DataType, Windowing, PFP>::setNeighbourSimple(L_DART d1, L_DAR
{
if
(
m_map
->
phi2
(
d1
)
!=
d2
)
{
// m_map->sewFaces(d1,d2,false);
Modelisation::sewFaceEmb<PFP>(*m_map,d1,d2);
m_map
->
sewFaces
(
d1
,
d2
,
false
);
#ifdef MC_WIDTH_EDGE_Z_EMBEDED
if
(
m_zslice
!=
NULL
)
{
...
...
@@ -945,9 +939,7 @@ void MarchingCube<DataType, Windowing, PFP>::setNeighbour(L_DART d1, L_DART d2)
{
if
(
m_map
->
phi2
(
d1
)
!=
d2
)
{
// m_map->sewFaces(d1,d2,false);
Modelisation::sewFaceEmb<PFP>(*m_map,d1,d2);
m_map
->
sewFaces
(
d1
,
d2
,
false
);
#ifdef MC_WIDTH_EDGE_Z_EMBEDED
if
(
m_zslice
!=
NULL
)
{
...
...
include/Algo/Modelisation/polyhedron.h
View file @
3e4dba23
...
...
@@ -200,7 +200,8 @@ protected:
void
computeCenter
();
Dart
grid_topo_open
(
unsigned
int
x
,
unsigned
int
y
);
Dart
cylinder_topo_open
(
unsigned
int
n
,
unsigned
int
z
);
public:
/**
* Constructor
...
...
@@ -239,6 +240,8 @@ public:
*/
std
::
vector
<
Dart
>&
getVertexDarts
()
{
return
m_tableVertDarts
;
}
/**
* Create a 2D grid
* quads are oriented counter-clockwise and the returned dart
...
...
include/Algo/Modelisation/polyhedron.hpp
View file @
3e4dba23
This diff is collapsed.
Click to expand it.
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