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
Sauvage
CGoGN
Commits
e42d0200
Commit
e42d0200
authored
May 23, 2012
by
Sylvain Thery
Browse files
resolve compilation pb after merge
parent
513390af
Changes
3
Show whitespace changes
Inline
Side-by-side
Apps/Examples/viewer.h
View file @
e42d0200
...
...
@@ -46,7 +46,7 @@
#include
"Utils/Shaders/shaderVectorPerVertex.h"
#include
"Utils/pointSprite.h"
#include
"Utils/text3d.h"
#include
"Utils/qtInputs.h"
#include
"Utils/
Qt/
qtInputs.h"
#include
"Algo/Geometry/boundingbox.h"
#include
"Algo/Geometry/normal.h"
...
...
Apps/Examples/volumeExplorer.cpp
View file @
e42d0200
...
...
@@ -327,7 +327,7 @@ int main(int argc, char **argv)
return
1
;
}
else
position
=
myMap
.
getAttribute
<
PFP
::
VEC3
>
(
VERTEX
,
attrNames
[
0
])
;
position
=
myMap
.
getAttribute
<
PFP
::
VEC3
,
VERTEX
>
(
attrNames
[
0
])
;
}
...
...
src/Topology/map/embeddedMap3.cpp
View file @
e42d0200
...
...
@@ -34,23 +34,23 @@ Dart EmbeddedMap3::splitVertex(std::vector<Dart>& vd)
Dart
dres
=
Map3
::
splitVertex
(
vd
);
if
(
isOrbitEmbedded
(
VERTEX
))
if
(
isOrbitEmbedded
<
VERTEX
>
(
))
{
embedNewCell
(
VERTEX
,
d2
);
copyCell
(
VERTEX
,
d2
,
d
);
embedOrbit
(
VERTEX
,
d
,
getEmbedding
(
VERTEX
,
d
));
embedNewCell
<
VERTEX
>
(
d2
);
copyCell
<
VERTEX
>
(
d2
,
d
);
embedOrbit
<
VERTEX
>
(
d
,
getEmbedding
<
VERTEX
>
(
d
));
}
if
(
isOrbitEmbedded
(
EDGE
))
if
(
isOrbitEmbedded
<
EDGE
>
(
))
{
}
if
(
isOrbitEmbedded
(
VOLUME
))
if
(
isOrbitEmbedded
<
VOLUME
>
(
))
{
for
(
std
::
vector
<
Dart
>::
iterator
it
=
vd
.
begin
()
;
it
!=
vd
.
end
()
;
++
it
)
{
embedOrbit
(
VOLUME
,
*
it
,
getEmbedding
(
VOLUME
,
*
it
))
;
embedOrbit
<
VOLUME
>
(
*
it
,
getEmbedding
<
VOLUME
>
(
*
it
))
;
}
}
...
...
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