Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
David Cazier
CGoGN
Commits
d360e0e7
Commit
d360e0e7
authored
May 30, 2012
by
Thomas
Browse files
Resolving bug in MarkerForTraversor and compilation pb for importMoka and exportPov
parent
7a5a7687
Changes
5
Hide whitespace changes
Inline
Side-by-side
include/Algo/Export/exportPov.h
View file @
d360e0e7
...
...
@@ -180,7 +180,7 @@ void exportMeshWire(std::ofstream& out, typename PFP::MAP& map, VertexAttribute<
out
<<
"cylinder{ "
<<
std
::
endl
;
out
<<
"<"
<<
position
[
d
][
0
]
<<
","
<<
position
[
d
][
1
]
<<
","
<<
position
[
d
][
2
]
<<
">,"
<<
std
::
endl
;
out
<<
"<"
<<
position
[
dd
][
0
]
<<
","
<<
position
[
dd
][
1
]
<<
","
<<
position
[
dd
][
2
]
<<
">,"
<<
width
<<
std
::
endl
;
out
<<
"<"
<<
position
[
dd
][
0
]
<<
","
<<
position
[
dd
][
1
]
<<
","
<<
position
[
dd
][
2
]
<<
">,"
<<
0.5
<<
std
::
endl
;
out
<<
"}"
<<
std
::
endl
;
}
}
...
...
include/Algo/Import/importMoka.hpp
View file @
d360e0e7
...
...
@@ -118,7 +118,7 @@ bool importMoka(typename PFP::MAP& gmap, const std::string& filename, std::vecto
}
for
(
typename
std
::
map
<
Dart
,
unsigned
int
>::
iterator
it
=
map_dart_emb
.
begin
()
;
it
!=
map_dart_emb
.
end
()
;
++
it
)
gmap
.
embedOrbit
<
VERTEX
>
(
it
->
first
,
it
->
second
);
gmap
.
template
embedOrbit
<
VERTEX
>(
it
->
first
,
it
->
second
);
gmap
.
closeMap
();
...
...
include/Algo/Render/GL2/mapRender.hpp
View file @
d360e0e7
...
...
@@ -185,7 +185,7 @@ inline void MapRender::addEarTri(typename PFP::MAP& map, Dart d, std::vector<GLu
// compute normal to polygon
typename
PFP
::
VEC3
normalPoly
=
Algo
::
Geometry
::
newellNormal
<
PFP
>
(
map
,
d
,
position
);
// first pass create polygon in chained list with
t
angle computation
// first pass create polygon in chained list with angle computation
VertexPoly
*
vpp
=
NULL
;
VertexPoly
*
prem
=
NULL
;
unsigned
int
nbv
=
0
;
...
...
@@ -239,7 +239,7 @@ inline void MapRender::addEarTri(typename PFP::MAP& map, Dart d, std::vector<GLu
}
}
// NO WE HAVE THE POLYGON AND EARS
// NO
W
WE HAVE THE POLYGON AND EARS
// LET'S REMOVE THEM
while
(
nbv
>
3
)
{
...
...
include/Topology/generic/traversor3.h
View file @
d360e0e7
...
...
@@ -44,7 +44,6 @@ private:
MAP
&
m_map
;
DartMarkerStore
*
m_dmark
;
CellMarkerStore
<
ORBIT
>*
m_cmark
;
unsigned
int
m_orbit
;
public:
MarkerForTraversor
(
MAP
&
map
,
bool
forceDartMarker
=
false
,
unsigned
int
thread
=
0
)
;
~
MarkerForTraversor
();
...
...
include/Topology/generic/traversor3.hpp
View file @
d360e0e7
...
...
@@ -36,7 +36,7 @@ MarkerForTraversor<MAP, ORBIT>::MarkerForTraversor(MAP& map, bool forceDartMarke
m_dmark
(
NULL
),
m_cmark
(
NULL
)
{
if
(
!
forceDartMarker
&&
map
.
isOrbitEmbedded
(
m_orbit
))
if
(
!
forceDartMarker
&&
map
.
isOrbitEmbedded
(
ORBIT
))
m_cmark
=
new
CellMarkerStore
<
ORBIT
>
(
map
,
thread
)
;
else
m_dmark
=
new
DartMarkerStore
(
map
,
thread
)
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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