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
6908d2ad
Commit
6908d2ad
authored
May 03, 2012
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update traversorCell next operator
parent
7d4483cc
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
23 deletions
+24
-23
Apps/Examples/viewer.h
Apps/Examples/viewer.h
+2
-2
include/Topology/generic/traversorCell.h
include/Topology/generic/traversorCell.h
+3
-2
include/Topology/generic/traversorCell.hpp
include/Topology/generic/traversorCell.hpp
+19
-18
include/Topology/generic/traversorGen.h
include/Topology/generic/traversorGen.h
+0
-1
No files found.
Apps/Examples/viewer.h
View file @
6908d2ad
...
...
@@ -93,8 +93,8 @@ public:
bool
m_drawNormals
;
bool
m_drawTopo
;
AttributeHandler
<
VEC3
,
VERTEX
>
position
;
AttributeHandler
<
VEC3
,
VERTEX
>
normal
;
VertexAttribute
<
VEC3
>
position
;
VertexAttribute
<
VEC3
>
normal
;
Algo
::
Render
::
GL2
::
MapRender
*
m_render
;
Algo
::
Render
::
GL2
::
TopoRender
*
m_topoRender
;
...
...
include/Topology/generic/traversorCell.h
View file @
6908d2ad
...
...
@@ -21,6 +21,7 @@
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
#include "Topology/generic/traversorGen.h"
#ifndef __TRAVERSOR_CELL_H__
...
...
@@ -34,7 +35,7 @@ namespace CGoGN
{
template
<
typename
MAP
,
unsigned
int
ORBIT
>
class
TraversorCell
:
public
Traversor
<
MAP
>
class
TraversorCell
:
public
Traversor
<
MAP
>
{
private:
MAP
&
m
;
...
...
@@ -99,7 +100,7 @@ public:
template
<
typename
MAP
,
unsigned
int
ORBIT
>
class
TraversorDartsOfOrbit
:
public
Traversor
<
MAP
>
class
TraversorDartsOfOrbit
:
public
Traversor
<
MAP
>
{
private:
std
::
vector
<
Dart
>::
iterator
m_current
;
...
...
include/Topology/generic/traversorCell.hpp
View file @
6908d2ad
...
...
@@ -111,31 +111,32 @@ Dart TraversorCell<MAP, ORBIT>::next()
}
else
{
bool
ismarked
;
if
(
dmark
)
ismarked
=
dmark
->
isMarked
(
current
)
;
else
ismarked
=
cmark
->
isMarked
(
current
)
;
while
(
current
!=
NIL
&&
(
ismarked
||
m
.
isBoundaryMarked
(
current
)
||
!
m_good
(
current
)))
{
m
.
next
(
current
)
;
if
(
current
==
m
.
end
())
current
=
NIL
;
else
bool
ismarked
=
dmark
->
isMarked
(
current
)
;
while
(
current
!=
NIL
&&
(
ismarked
||
m
.
isBoundaryMarked
(
current
)
||
!
m_good
(
current
)))
{
if
(
dmark
)
ismarked
=
dmark
->
isMarked
(
current
)
;
m
.
next
(
current
)
;
if
(
current
==
m
.
end
())
current
=
NIL
;
else
ismarked
=
c
mark
->
isMarked
(
current
)
;
ismarked
=
d
mark
->
isMarked
(
current
)
;
}
if
(
current
!=
NIL
)
dmark
->
markOrbit
<
ORBIT
>
(
current
)
;
}
if
(
current
!=
NIL
)
else
{
if
(
dmark
)
dmark
->
markOrbit
<
ORBIT
>
(
current
)
;
else
bool
ismarked
=
cmark
->
isMarked
(
current
)
;
while
(
current
!=
NIL
&&
(
ismarked
||
m
.
isBoundaryMarked
(
current
)
||
!
m_good
(
current
)))
{
m
.
next
(
current
)
;
if
(
current
==
m
.
end
())
current
=
NIL
;
else
ismarked
=
cmark
->
isMarked
(
current
)
;
}
if
(
current
!=
NIL
)
cmark
->
mark
(
current
)
;
}
}
...
...
include/Topology/generic/traversorGen.h
View file @
6908d2ad
...
...
@@ -79,7 +79,6 @@ public:
* @return a ptr on Generic Traversor
*/
static
Traversor
<
MAP
>*
createCell
(
MAP
&
map
,
unsigned
int
orb
,
const
FunctorSelect
&
good
=
allDarts
,
bool
forceDartMarker
=
false
,
unsigned
int
thread
=
0
);
};
}
// namespace CGoGN
...
...
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