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
b6114761
Commit
b6114761
authored
Feb 17, 2012
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace the next(d) of map by d = next(d) : better functional syntax
parent
f29d13fe
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
15 additions
and
15 deletions
+15
-15
include/Algo/ImplicitHierarchicalMesh/ihm.h
include/Algo/ImplicitHierarchicalMesh/ihm.h
+1
-1
include/Algo/ImplicitHierarchicalMesh/ihm.hpp
include/Algo/ImplicitHierarchicalMesh/ihm.hpp
+2
-1
include/Algo/ImplicitHierarchicalMesh/ihm3.h
include/Algo/ImplicitHierarchicalMesh/ihm3.h
+1
-1
include/Algo/ImplicitHierarchicalMesh/ihm3.hpp
include/Algo/ImplicitHierarchicalMesh/ihm3.hpp
+2
-1
include/Algo/Render/GL2/colorPerFaceRender.h
include/Algo/Render/GL2/colorPerFaceRender.h
+2
-1
include/Algo/Render/GL2/colorPerFaceRender.hpp
include/Algo/Render/GL2/colorPerFaceRender.hpp
+1
-5
include/Topology/generic/genericmap.h
include/Topology/generic/genericmap.h
+2
-2
include/Topology/generic/genericmap.hpp
include/Topology/generic/genericmap.hpp
+2
-1
include/Topology/generic/traversorCell.hpp
include/Topology/generic/traversorCell.hpp
+2
-2
No files found.
include/Algo/ImplicitHierarchicalMesh/ihm.h
View file @
b6114761
...
...
@@ -91,7 +91,7 @@ public:
virtual
Dart
end
()
;
virtual
void
next
(
Dart
&
d
)
;
virtual
Dart
next
(
Dart
&
d
)
;
virtual
bool
foreach_dart_of_vertex
(
Dart
d
,
FunctorType
&
f
,
unsigned
int
thread
=
0
)
;
...
...
include/Algo/ImplicitHierarchicalMesh/ihm.hpp
View file @
b6114761
...
...
@@ -152,12 +152,13 @@ inline Dart ImplicitHierarchicalMap::end()
return
Map2
::
end
()
;
}
inline
void
ImplicitHierarchicalMap
::
next
(
Dart
&
d
)
inline
Dart
ImplicitHierarchicalMap
::
next
(
Dart
&
d
)
{
do
{
Map2
::
next
(
d
)
;
}
while
(
d
!=
Map2
::
end
()
&&
m_dartLevel
[
d
]
>
m_curLevel
)
;
return
d
;
}
inline
bool
ImplicitHierarchicalMap
::
foreach_dart_of_vertex
(
Dart
d
,
FunctorType
&
f
,
unsigned
int
thread
)
...
...
include/Algo/ImplicitHierarchicalMesh/ihm3.h
View file @
b6114761
...
...
@@ -354,7 +354,7 @@ public:
virtual
Dart
end
()
;
virtual
void
next
(
Dart
&
d
)
;
virtual
Dart
next
(
Dart
&
d
)
;
virtual
bool
foreach_dart_of_vertex
(
Dart
d
,
FunctorType
&
f
,
unsigned
int
thread
=
0
)
;
...
...
include/Algo/ImplicitHierarchicalMesh/ihm3.hpp
View file @
b6114761
...
...
@@ -213,12 +213,13 @@ inline Dart ImplicitHierarchicalMap3::end()
return
Map3
::
end
()
;
}
inline
void
ImplicitHierarchicalMap3
::
next
(
Dart
&
d
)
inline
Dart
ImplicitHierarchicalMap3
::
next
(
Dart
&
d
)
{
do
{
Map3
::
next
(
d
)
;
}
while
(
d
!=
Map3
::
end
()
&&
m_dartLevel
[
d
]
>
m_curLevel
)
;
return
d
;
}
inline
bool
ImplicitHierarchicalMap3
::
foreach_dart_of_vertex
(
Dart
d
,
FunctorType
&
f
,
unsigned
int
thread
)
...
...
include/Algo/Render/GL2/colorPerFaceRender.h
View file @
b6114761
...
...
@@ -47,7 +47,8 @@ namespace GL2
{
/**
* Class that allors
* Class that update VBO to allow the rendering of per face color rendering
* Warning: do not use same position & color VBO than with pervertex rendering !
*/
class
ColorPerFaceRender
{
...
...
include/Algo/Render/GL2/colorPerFaceRender.hpp
View file @
b6114761
...
...
@@ -41,13 +41,9 @@ namespace GL2
{
//inline ColorPerFaceRender::ColorPerFaceRender(Utils::VBO& vboPosition, Utils::VBO& vboColor):
// m_vboPos(vboPosition), m_vboColors(vboColor), m_nbTris(0)
//{
//}
inline
ColorPerFaceRender
::
ColorPerFaceRender
()
:
m_nbTris
(
0
)
m_nbTris
(
0
)
{
}
...
...
include/Topology/generic/genericmap.h
View file @
b6114761
...
...
@@ -55,7 +55,7 @@ class MapBrowser
public:
virtual
Dart
begin
()
=
0
;
virtual
Dart
end
()
=
0
;
virtual
void
next
(
Dart
&
d
)
=
0
;
virtual
Dart
next
(
Dart
&
d
)
=
0
;
};
class
AttributeHandlerGen
;
...
...
@@ -540,7 +540,7 @@ public:
* in the order of storage
* @param d reference to the dart to be modified
*/
void
next
(
Dart
&
d
)
;
Dart
next
(
Dart
&
d
)
;
/**
* Apply a functor on each dart of the map
...
...
include/Topology/generic/genericmap.hpp
View file @
b6114761
...
...
@@ -360,7 +360,7 @@ inline Dart GenericMap::end()
return
Dart
::
create
(
m_attribs
[
DART
].
end
())
;
}
inline
void
GenericMap
::
next
(
Dart
&
d
)
inline
Dart
GenericMap
::
next
(
Dart
&
d
)
{
if
(
m_isMultiRes
)
{
...
...
@@ -371,6 +371,7 @@ inline void GenericMap::next(Dart& d)
}
else
m_attribs
[
DART
].
next
(
d
.
index
)
;
return
d
;
}
/****************************************
...
...
include/Topology/generic/traversorCell.hpp
View file @
b6114761
...
...
@@ -57,7 +57,7 @@ Dart TraversorCell<MAP>::begin()
current
=
m
.
begin
()
;
while
(
current
!=
m
.
end
()
&&
(
m
.
isBoundaryMarked
(
current
)
||
!
m_good
(
current
)))
m
.
next
(
current
)
;
current
=
m
.
next
(
current
)
;
if
(
current
==
m
.
end
())
current
=
NIL
;
...
...
@@ -92,7 +92,7 @@ Dart TraversorCell<MAP>::next()
while
(
current
!=
NIL
&&
(
ismarked
||
m
.
isBoundaryMarked
(
current
)
||
!
m_good
(
current
)))
{
m
.
next
(
current
)
;
current
=
m
.
next
(
current
)
;
if
(
current
==
m
.
end
())
current
=
NIL
;
else
...
...
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