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
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
David Cazier
CGoGN
Commits
595b28b3
Commit
595b28b3
authored
Jun 03, 2015
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
compil on mac
parent
5b297f16
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
32 deletions
+16
-32
Apps/Tests/Algo/BooleanOperator/mergeVertices.cpp
Apps/Tests/Algo/BooleanOperator/mergeVertices.cpp
+13
-12
Apps/Tests/Algo/Histogram/histogram.cpp
Apps/Tests/Algo/Histogram/histogram.cpp
+1
-18
CGoGN/include/Algo/BooleanOperator/mergeVertices.h
CGoGN/include/Algo/BooleanOperator/mergeVertices.h
+2
-2
No files found.
Apps/Tests/Algo/BooleanOperator/mergeVertices.cpp
View file @
595b28b3
...
...
@@ -14,8 +14,8 @@ struct PFP1 : public PFP_STANDARD
};
template
bool
Algo
::
Surface
::
BooleanOperator
::
isBetween
<
PFP1
>(
PFP1
::
MAP
&
map
,
const
VertexAttribute
<
PFP1
::
VEC3
,
PFP1
::
MAP
>&
positions
,
Dart
d
,
Dart
e
,
Dart
f
);
template
void
Algo
::
Surface
::
BooleanOperator
::
mergeVertex
<
PFP1
>(
PFP1
::
MAP
&
map
,
VertexAttribute
<
PFP1
::
VEC3
,
PFP1
::
MAP
>&
positions
,
Dart
d
,
Dart
e
);
template
void
Algo
::
Surface
::
BooleanOperator
::
mergeVertices
<
PFP1
>(
PFP1
::
MAP
&
map
,
VertexAttribute
<
PFP1
::
VEC3
,
PFP1
::
MAP
>&
positions
);
template
void
Algo
::
Surface
::
BooleanOperator
::
mergeVertex
<
PFP1
>(
PFP1
::
MAP
&
map
,
VertexAttribute
<
PFP1
::
VEC3
,
PFP1
::
MAP
>&
positions
,
Dart
d
,
Dart
e
,
int
precision
);
template
void
Algo
::
Surface
::
BooleanOperator
::
mergeVertices
<
PFP1
>(
PFP1
::
MAP
&
map
,
VertexAttribute
<
PFP1
::
VEC3
,
PFP1
::
MAP
>&
positions
,
int
precision
);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
...
...
@@ -25,23 +25,24 @@ struct PFP2 : public PFP_DOUBLE
};
template
bool
Algo
::
Surface
::
BooleanOperator
::
isBetween
<
PFP2
>(
PFP2
::
MAP
&
map
,
const
VertexAttribute
<
PFP2
::
VEC3
,
PFP2
::
MAP
>&
positions
,
Dart
d
,
Dart
e
,
Dart
f
);
template
void
Algo
::
Surface
::
BooleanOperator
::
mergeVertex
<
PFP2
>(
PFP2
::
MAP
&
map
,
VertexAttribute
<
PFP2
::
VEC3
,
PFP2
::
MAP
>&
positions
,
Dart
d
,
Dart
e
);
template
void
Algo
::
Surface
::
BooleanOperator
::
mergeVertices
<
PFP2
>(
PFP2
::
MAP
&
map
,
VertexAttribute
<
PFP2
::
VEC3
,
PFP2
::
MAP
>&
positions
);
template
void
Algo
::
Surface
::
BooleanOperator
::
mergeVertex
<
PFP2
>(
PFP2
::
MAP
&
map
,
VertexAttribute
<
PFP2
::
VEC3
,
PFP2
::
MAP
>&
positions
,
Dart
d
,
Dart
e
,
int
precision
);
template
void
Algo
::
Surface
::
BooleanOperator
::
mergeVertices
<
PFP2
>(
PFP2
::
MAP
&
map
,
VertexAttribute
<
PFP2
::
VEC3
,
PFP2
::
MAP
>&
positions
,
int
precision
);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
struct
PFP3
:
public
PFP_STANDARD
{
typedef
EmbeddedGMap2
MAP
;
};
//
struct PFP3 : public PFP_STANDARD
//
{
//
typedef EmbeddedGMap2 MAP;
//
};
template
bool
Algo
::
Surface
::
BooleanOperator
::
isBetween
<
PFP3
>(
PFP3
::
MAP
&
map
,
const
VertexAttribute
<
PFP3
::
VEC3
,
PFP3
::
MAP
>&
positions
,
Dart
d
,
Dart
e
,
Dart
f
);
template
void
Algo
::
Surface
::
BooleanOperator
::
mergeVertex
<
PFP3
>(
PFP3
::
MAP
&
map
,
VertexAttribute
<
PFP3
::
VEC3
,
PFP3
::
MAP
>&
positions
,
Dart
d
,
Dart
e
);
template
void
Algo
::
Surface
::
BooleanOperator
::
mergeVertices
<
PFP3
>(
PFP3
::
MAP
&
map
,
VertexAttribute
<
PFP3
::
VEC3
,
PFP3
::
MAP
>&
positions
);
//
template bool Algo::Surface::BooleanOperator::isBetween<PFP3>(PFP3::MAP& map, const VertexAttribute<PFP3::VEC3, PFP3::MAP>& positions, Dart d, Dart e, Dart f);
//template void Algo::Surface::BooleanOperator::mergeVertex<PFP3>(PFP3::MAP& map, VertexAttribute<PFP3::VEC3, PFP3::MAP>& positions, Dart d, Dart e, int precision
);
//template void Algo::Surface::BooleanOperator::mergeVertices<PFP3>(PFP3::MAP& map, VertexAttribute<PFP3::VEC3, PFP3::MAP>& positions, int precision
);
// TODO add removeEdgeFromVertex & insertEdgeInVertex in GMap2
int
test_mergeVertices
()
{
return
0
;
}
\ No newline at end of file
}
Apps/Tests/Algo/Histogram/histogram.cpp
View file @
595b28b3
...
...
@@ -22,27 +22,10 @@ template unsigned int Algo::Histogram::Histogram::markCellsOfHistogramColumn<CM1
template
unsigned
int
Algo
::
Histogram
::
Histogram
::
markCellsOfQuantilesColumn
<
CM1
>(
unsigned
int
c
,
CM1
&
cm
)
const
;
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
struct
PFP2
:
public
PFP_STANDARD
{
typedef
EmbeddedMap2
MAP
;
};
typedef
VertexAttribute
<
double
,
PFP2
::
MAP
>
VA2
;
typedef
VertexAttribute
<
Geom
::
Vec3f
,
PFP2
::
MAP
>
VAC2
;
typedef
CellMarker
<
PFP2
::
MAP
,
VERTEX
>
CM2
;
template
void
Algo
::
Histogram
::
Histogram
::
initData
<
VA2
>(
const
VA2
&
attr
);
template
void
Algo
::
Histogram
::
Histogram
::
histoColorize
<
VAC2
>(
VAC2
&
colors
);
template
void
Algo
::
Histogram
::
Histogram
::
quantilesColorize
<
VAC2
>(
VAC2
&
colors
,
const
std
::
vector
<
Geom
::
Vec3f
>&
tc
);
template
unsigned
int
Algo
::
Histogram
::
Histogram
::
markCellsOfHistogramColumn
<
CM2
>(
unsigned
int
c
,
CM2
&
cm
)
const
;
template
unsigned
int
Algo
::
Histogram
::
Histogram
::
markCellsOfQuantilesColumn
<
CM2
>(
unsigned
int
c
,
CM2
&
cm
)
const
;
int
test_histogram
()
{
return
0
;
}
\ No newline at end of file
}
CGoGN/include/Algo/BooleanOperator/mergeVertices.h
View file @
595b28b3
...
...
@@ -45,10 +45,10 @@ template <typename PFP>
bool
isBetween
(
typename
PFP
::
MAP
&
map
,
const
VertexAttribute
<
typename
PFP
::
VEC3
,
typename
PFP
::
MAP
>&
positions
,
Dart
d
,
Dart
e
,
Dart
f
)
;
template
<
typename
PFP
>
void
mergeVertex
(
typename
PFP
::
MAP
&
map
,
VertexAttribute
<
typename
PFP
::
VEC3
,
typename
PFP
::
MAP
>&
positions
,
Dart
d
,
Dart
e
);
void
mergeVertex
(
typename
PFP
::
MAP
&
map
,
VertexAttribute
<
typename
PFP
::
VEC3
,
typename
PFP
::
MAP
>&
positions
,
Dart
d
,
Dart
e
,
int
precision
);
template
<
typename
PFP
>
void
mergeVertices
(
typename
PFP
::
MAP
&
map
,
VertexAttribute
<
typename
PFP
::
VEC3
,
typename
PFP
::
MAP
>&
positions
);
void
mergeVertices
(
typename
PFP
::
MAP
&
map
,
VertexAttribute
<
typename
PFP
::
VEC3
,
typename
PFP
::
MAP
>&
positions
,
int
precision
);
}
...
...
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